cyy/Fairscan_cyy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorg: move CameraPermission.kt to ui/components

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2025-11-18 20:04:26 +01:00
parent 5f64eaea09
commit ccbfb2f2e0
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/fairscan/app/MainActivity.kt
View File

@@ -49,6 +49,7 @@ import kotlinx.coroutines.withContext
import org.fairscan.app.data.GeneratedPdf import org.fairscan.app.data.GeneratedPdf
import org.fairscan.app.ui.Navigation import org.fairscan.app.ui.Navigation
import org.fairscan.app.ui.Screen import org.fairscan.app.ui.Screen
import org.fairscan.app.ui.components.rememberCameraPermissionState
import org.fairscan.app.ui.theme.FairScanTheme import org.fairscan.app.ui.theme.FairScanTheme
import org.fairscan.app.ui.screens.AboutScreen import org.fairscan.app.ui.screens.AboutScreen
import org.fairscan.app.ui.screens.camera.CameraScreen import org.fairscan.app.ui.screens.camera.CameraScreen

3
app/src/main/java/org/fairscan/app/CameraPermission.kt → app/src/main/java/org/fairscan/app/ui/components/CameraPermission.kt
View File

@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package org.fairscan.app package org.fairscan.app.ui.components
import android.Manifest import android.Manifest
import android.content.Context import android.content.Context
@@ -29,6 +29,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import org.fairscan.app.R
private fun hasCameraPermission(context: Context): Boolean { private fun hasCameraPermission(context: Context): Boolean {
val camera = Manifest.permission.CAMERA val camera = Manifest.permission.CAMERA

4
app/src/main/java/org/fairscan/app/ui/screens/HomeScreen.kt
View File

@@ -55,10 +55,10 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.persistentListOf
import org.fairscan.app.CameraPermissionState import org.fairscan.app.ui.components.CameraPermissionState
import org.fairscan.app.ui.Navigation import org.fairscan.app.ui.Navigation
import org.fairscan.app.R import org.fairscan.app.R
import org.fairscan.app.rememberCameraPermissionState import org.fairscan.app.ui.components.rememberCameraPermissionState
import org.fairscan.app.ui.state.RecentDocumentUiState import org.fairscan.app.ui.state.RecentDocumentUiState
import org.fairscan.app.ui.components.AboutScreenNavButton import org.fairscan.app.ui.components.AboutScreenNavButton
import org.fairscan.app.ui.components.formatDate import org.fairscan.app.ui.components.formatDate

2
app/src/main/java/org/fairscan/app/ui/screens/camera/CameraPreview.kt
View File

@@ -53,7 +53,7 @@ import androidx.core.graphics.scale
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.LocalLifecycleOwner
import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.ListenableFuture
import org.fairscan.app.CameraPermissionState import org.fairscan.app.ui.components.CameraPermissionState
import org.fairscan.app.ui.state.LiveAnalysisState import org.fairscan.app.ui.state.LiveAnalysisState
import org.fairscan.app.domain.Point import org.fairscan.app.domain.Point
import org.fairscan.app.domain.scaledTo import org.fairscan.app.domain.scaledTo

2
app/src/main/java/org/fairscan/app/ui/screens/camera/CameraScreen.kt
View File

@@ -82,7 +82,7 @@ import androidx.compose.ui.unit.sp
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import org.fairscan.app.CameraPermissionState import org.fairscan.app.ui.components.CameraPermissionState
import org.fairscan.app.ui.state.LiveAnalysisState import org.fairscan.app.ui.state.LiveAnalysisState
import org.fairscan.app.MainViewModel import org.fairscan.app.MainViewModel
import org.fairscan.app.MainViewModel.CaptureState import org.fairscan.app.MainViewModel.CaptureState