diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index be35543..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -MyScan \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e0fa003..e4a6e11 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,12 +17,12 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.MyScan" + android:theme="@style/Theme.FairScan" tools:targetApi="31"> + android:theme="@style/Theme.FairScan"> diff --git a/app/src/main/java/org/fairscan/app/MainActivity.kt b/app/src/main/java/org/fairscan/app/MainActivity.kt index c7880f4..8ac3cf0 100644 --- a/app/src/main/java/org/fairscan/app/MainActivity.kt +++ b/app/src/main/java/org/fairscan/app/MainActivity.kt @@ -46,7 +46,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.withContext -import org.fairscan.app.ui.theme.MyScanTheme +import org.fairscan.app.ui.theme.FairScanTheme import org.fairscan.app.view.AboutScreen import org.fairscan.app.view.CameraScreen import org.fairscan.app.view.DocumentScreen @@ -84,7 +84,7 @@ class MainActivity : ComponentActivity() { Toast.makeText(context, message, Toast.LENGTH_SHORT).show() } } - MyScanTheme { + FairScanTheme { val navigation = Navigation( toHomeScreen = { viewModel.navigateTo(Screen.Main.Home) }, toCameraScreen = { viewModel.navigateTo(Screen.Main.Camera) }, @@ -206,7 +206,7 @@ class MainActivity : ComponentActivity() { ) { _, _ -> continuation.resume(Unit) {} } } } catch (e: Exception) { - Log.e("MyScan", "Failed to save PDF", e) + Log.e("FairScan", "Failed to save PDF", e) withContext(Dispatchers.Main) { Toast.makeText(context, getString(R.string.error_save), Toast.LENGTH_SHORT).show() diff --git a/app/src/main/java/org/fairscan/app/MainViewModel.kt b/app/src/main/java/org/fairscan/app/MainViewModel.kt index 6548ed9..36c6f46 100644 --- a/app/src/main/java/org/fairscan/app/MainViewModel.kt +++ b/app/src/main/java/org/fairscan/app/MainViewModel.kt @@ -279,7 +279,7 @@ class MainViewModel( ) } } catch (e: Exception) { - Log.e("MyScan", "PDF generation failed", e) + Log.e("FairScan", "PDF generation failed", e) _pdfUiState.update { it.copy( isGenerating = false, diff --git a/app/src/main/java/org/fairscan/app/ui/theme/Theme.kt b/app/src/main/java/org/fairscan/app/ui/theme/Theme.kt index 7dc162e..3d7bc1b 100644 --- a/app/src/main/java/org/fairscan/app/ui/theme/Theme.kt +++ b/app/src/main/java/org/fairscan/app/ui/theme/Theme.kt @@ -73,7 +73,7 @@ private val LightColorScheme = lightColorScheme( ) @Composable -fun MyScanTheme( +fun FairScanTheme( darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit ) { diff --git a/app/src/main/java/org/fairscan/app/view/AboutScreen.kt b/app/src/main/java/org/fairscan/app/view/AboutScreen.kt index 549a57e..38bf69e 100644 --- a/app/src/main/java/org/fairscan/app/view/AboutScreen.kt +++ b/app/src/main/java/org/fairscan/app/view/AboutScreen.kt @@ -64,7 +64,7 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import org.fairscan.app.BuildConfig import org.fairscan.app.R -import org.fairscan.app.ui.theme.MyScanTheme +import org.fairscan.app.ui.theme.FairScanTheme @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -261,7 +261,7 @@ fun LicenseBottomSheet( @Preview @Composable fun AboutScreenPreview() { - MyScanTheme { + FairScanTheme { AboutScreen(onBack = {}, onViewLibraries = {}) } } \ No newline at end of file diff --git a/app/src/main/java/org/fairscan/app/view/CameraScreen.kt b/app/src/main/java/org/fairscan/app/view/CameraScreen.kt index 3c2a285..318c0ea 100644 --- a/app/src/main/java/org/fairscan/app/view/CameraScreen.kt +++ b/app/src/main/java/org/fairscan/app/view/CameraScreen.kt @@ -84,7 +84,7 @@ import org.fairscan.app.MainViewModel.CaptureState import org.fairscan.app.Navigation import org.fairscan.app.R import org.fairscan.app.Screen -import org.fairscan.app.ui.theme.MyScanTheme +import org.fairscan.app.ui.theme.FairScanTheme data class CameraUiState( val pageCount: Int, @@ -169,7 +169,7 @@ fun CameraScreen( isDebugMode), onCapture = { previewView?.bitmap?.let { - Log.i("MyScan", "Pressed ") + Log.i("FairScan", "Pressed ") viewModel.onCapturePressed(it) captureController.takePicture( onImageCaptured = { imageProxy -> viewModel.onImageCaptured(imageProxy) } @@ -448,7 +448,7 @@ fun CameraScreenPreviewInLandscapeMode() { @Composable private fun ScreenPreview(captureState: CaptureState, rotationDegrees: Float = 0f) { - MyScanTheme { + FairScanTheme { val thumbnailCoords = remember { mutableStateOf(Offset.Zero) } CameraScreenScaffold( cameraPreview = { diff --git a/app/src/main/java/org/fairscan/app/view/DocumentScreen.kt b/app/src/main/java/org/fairscan/app/view/DocumentScreen.kt index 7143d71..3e55e35 100644 --- a/app/src/main/java/org/fairscan/app/view/DocumentScreen.kt +++ b/app/src/main/java/org/fairscan/app/view/DocumentScreen.kt @@ -56,7 +56,7 @@ import net.engawapg.lib.zoomable.ZoomState import net.engawapg.lib.zoomable.zoomable import org.fairscan.app.Navigation import org.fairscan.app.R -import org.fairscan.app.ui.theme.MyScanTheme +import org.fairscan.app.ui.theme.FairScanTheme @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -223,7 +223,7 @@ private fun BottomBar( @Composable @Preview fun DocumentScreenPreview() { - MyScanTheme { + FairScanTheme { DocumentScreen( fakeDocument( listOf(1, 2, 2, 2).map { "gallica.bnf.fr-bpt6k5530456s-$it.jpg" }, diff --git a/app/src/main/java/org/fairscan/app/view/ExportScreen.kt b/app/src/main/java/org/fairscan/app/view/ExportScreen.kt index a7ceee9..6a1fe04 100644 --- a/app/src/main/java/org/fairscan/app/view/ExportScreen.kt +++ b/app/src/main/java/org/fairscan/app/view/ExportScreen.kt @@ -71,7 +71,7 @@ import org.fairscan.app.Navigation import org.fairscan.app.PdfGenerationActions import org.fairscan.app.R import org.fairscan.app.ui.PdfGenerationUiState -import org.fairscan.app.ui.theme.MyScanTheme +import org.fairscan.app.ui.theme.FairScanTheme import java.io.File import java.text.SimpleDateFormat import java.util.Date @@ -429,7 +429,7 @@ fun PreviewExportScreenAfterSaveHorizontal() { @Composable fun ExportPreviewToCustomize(uiState: PdfGenerationUiState) { - MyScanTheme { + FairScanTheme { ExportScreen( filename = remember { mutableStateOf("Scan 2025-07-02 17.40.42") }, onFilenameChange = {_->}, diff --git a/app/src/main/java/org/fairscan/app/view/HomeScreen.kt b/app/src/main/java/org/fairscan/app/view/HomeScreen.kt index bc34256..8bd5e5c 100644 --- a/app/src/main/java/org/fairscan/app/view/HomeScreen.kt +++ b/app/src/main/java/org/fairscan/app/view/HomeScreen.kt @@ -59,7 +59,7 @@ import org.fairscan.app.Navigation import org.fairscan.app.R import org.fairscan.app.rememberCameraPermissionState import org.fairscan.app.ui.RecentDocumentUiState -import org.fairscan.app.ui.theme.MyScanTheme +import org.fairscan.app.ui.theme.FairScanTheme import java.io.File @OptIn(ExperimentalMaterial3Api::class) @@ -265,7 +265,7 @@ private fun RecentDocumentList( @Preview @Composable fun HomeScreenPreviewOnFirstLaunch() { - MyScanTheme { + FairScanTheme { HomeScreen( cameraPermission = rememberCameraPermissionState(), currentDocument = fakeDocument(), @@ -280,7 +280,7 @@ fun HomeScreenPreviewOnFirstLaunch() { @Preview @Composable fun HomeScreenPreviewWithCurrentDocument() { - MyScanTheme { + FairScanTheme { HomeScreen( cameraPermission = rememberCameraPermissionState(), currentDocument = fakeDocument( @@ -297,7 +297,7 @@ fun HomeScreenPreviewWithCurrentDocument() { @Preview @Composable fun HomeScreenPreviewWithLastSavedFiles() { - MyScanTheme { + FairScanTheme { HomeScreen( cameraPermission = rememberCameraPermissionState(), currentDocument = fakeDocument(), diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 9879ca9..d5ee7a4 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,5 @@ -