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

Last bits of renaming to FairScan

Browse Source
This commit is contained in:
Pierre-Yves Nicolas
2025-09-13 11:25:25 +02:00
parent fa41c57388
commit 0d0e31d731
12 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/.name generated
View File

@@ -1 +0,0 @@
MyScan

4
app/src/main/AndroidManifest.xml
View File

@@ -17,12 +17,12 @@
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.MyScan" android:theme="@style/Theme.FairScan"
tools:targetApi="31"> tools:targetApi="31">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true" android:exported="true"
android:theme="@style/Theme.MyScan"> android:theme="@style/Theme.FairScan">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

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

@@ -46,7 +46,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.suspendCancellableCoroutine
import kotlinx.coroutines.withContext 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.AboutScreen
import org.fairscan.app.view.CameraScreen import org.fairscan.app.view.CameraScreen
import org.fairscan.app.view.DocumentScreen import org.fairscan.app.view.DocumentScreen
@@ -84,7 +84,7 @@ class MainActivity : ComponentActivity() {
Toast.makeText(context, message, Toast.LENGTH_SHORT).show() Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
} }
} }
MyScanTheme { FairScanTheme {
val navigation = Navigation( val navigation = Navigation(
toHomeScreen = { viewModel.navigateTo(Screen.Main.Home) }, toHomeScreen = { viewModel.navigateTo(Screen.Main.Home) },
toCameraScreen = { viewModel.navigateTo(Screen.Main.Camera) }, toCameraScreen = { viewModel.navigateTo(Screen.Main.Camera) },
@@ -206,7 +206,7 @@ class MainActivity : ComponentActivity() {
) { _, _ -> continuation.resume(Unit) {} } ) { _, _ -> continuation.resume(Unit) {} }
} }
} catch (e: Exception) { } catch (e: Exception) {
Log.e("MyScan", "Failed to save PDF", e) Log.e("FairScan", "Failed to save PDF", e)
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
Toast.makeText(context, Toast.makeText(context,
getString(R.string.error_save), Toast.LENGTH_SHORT).show() getString(R.string.error_save), Toast.LENGTH_SHORT).show()

2
app/src/main/java/org/fairscan/app/MainViewModel.kt
View File

@@ -279,7 +279,7 @@ class MainViewModel(
) )
} }
} catch (e: Exception) { } catch (e: Exception) {
Log.e("MyScan", "PDF generation failed", e) Log.e("FairScan", "PDF generation failed", e)
_pdfUiState.update { _pdfUiState.update {
it.copy( it.copy(
isGenerating = false, isGenerating = false,

2
app/src/main/java/org/fairscan/app/ui/theme/Theme.kt
View File

@@ -73,7 +73,7 @@ private val LightColorScheme = lightColorScheme(
) )
@Composable @Composable
fun MyScanTheme( fun FairScanTheme(
darkTheme: Boolean = isSystemInDarkTheme(), darkTheme: Boolean = isSystemInDarkTheme(),
content: @Composable () -> Unit content: @Composable () -> Unit
) { ) {

4
app/src/main/java/org/fairscan/app/view/AboutScreen.kt
View File

@@ -64,7 +64,7 @@ import androidx.compose.ui.unit.dp
import androidx.core.net.toUri import androidx.core.net.toUri
import org.fairscan.app.BuildConfig import org.fairscan.app.BuildConfig
import org.fairscan.app.R import org.fairscan.app.R
import org.fairscan.app.ui.theme.MyScanTheme import org.fairscan.app.ui.theme.FairScanTheme
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
@@ -261,7 +261,7 @@ fun LicenseBottomSheet(
@Preview @Preview
@Composable @Composable
fun AboutScreenPreview() { fun AboutScreenPreview() {
MyScanTheme { FairScanTheme {
AboutScreen(onBack = {}, onViewLibraries = {}) AboutScreen(onBack = {}, onViewLibraries = {})
} }
} }

6
app/src/main/java/org/fairscan/app/view/CameraScreen.kt
View File

@@ -84,7 +84,7 @@ import org.fairscan.app.MainViewModel.CaptureState
import org.fairscan.app.Navigation import org.fairscan.app.Navigation
import org.fairscan.app.R import org.fairscan.app.R
import org.fairscan.app.Screen import org.fairscan.app.Screen
import org.fairscan.app.ui.theme.MyScanTheme import org.fairscan.app.ui.theme.FairScanTheme
data class CameraUiState( data class CameraUiState(
val pageCount: Int, val pageCount: Int,
@@ -169,7 +169,7 @@ fun CameraScreen(
isDebugMode), isDebugMode),
onCapture = { onCapture = {
previewView?.bitmap?.let { previewView?.bitmap?.let {
Log.i("MyScan", "Pressed <Capture>") Log.i("FairScan", "Pressed <Capture>")
viewModel.onCapturePressed(it) viewModel.onCapturePressed(it)
captureController.takePicture( captureController.takePicture(
onImageCaptured = { imageProxy -> viewModel.onImageCaptured(imageProxy) } onImageCaptured = { imageProxy -> viewModel.onImageCaptured(imageProxy) }
@@ -448,7 +448,7 @@ fun CameraScreenPreviewInLandscapeMode() {
@Composable @Composable
private fun ScreenPreview(captureState: CaptureState, rotationDegrees: Float = 0f) { private fun ScreenPreview(captureState: CaptureState, rotationDegrees: Float = 0f) {
MyScanTheme { FairScanTheme {
val thumbnailCoords = remember { mutableStateOf(Offset.Zero) } val thumbnailCoords = remember { mutableStateOf(Offset.Zero) }
CameraScreenScaffold( CameraScreenScaffold(
cameraPreview = { cameraPreview = {

4
app/src/main/java/org/fairscan/app/view/DocumentScreen.kt
View File

@@ -56,7 +56,7 @@ import net.engawapg.lib.zoomable.ZoomState
import net.engawapg.lib.zoomable.zoomable import net.engawapg.lib.zoomable.zoomable
import org.fairscan.app.Navigation import org.fairscan.app.Navigation
import org.fairscan.app.R import org.fairscan.app.R
import org.fairscan.app.ui.theme.MyScanTheme import org.fairscan.app.ui.theme.FairScanTheme
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
@@ -223,7 +223,7 @@ private fun BottomBar(
@Composable @Composable
@Preview @Preview
fun DocumentScreenPreview() { fun DocumentScreenPreview() {
MyScanTheme { FairScanTheme {
DocumentScreen( DocumentScreen(
fakeDocument( fakeDocument(
listOf(1, 2, 2, 2).map { "gallica.bnf.fr-bpt6k5530456s-$it.jpg" }, listOf(1, 2, 2, 2).map { "gallica.bnf.fr-bpt6k5530456s-$it.jpg" },

4
app/src/main/java/org/fairscan/app/view/ExportScreen.kt
View File

@@ -71,7 +71,7 @@ import org.fairscan.app.Navigation
import org.fairscan.app.PdfGenerationActions import org.fairscan.app.PdfGenerationActions
import org.fairscan.app.R import org.fairscan.app.R
import org.fairscan.app.ui.PdfGenerationUiState 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.io.File
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Date import java.util.Date
@@ -429,7 +429,7 @@ fun PreviewExportScreenAfterSaveHorizontal() {
@Composable @Composable
fun ExportPreviewToCustomize(uiState: PdfGenerationUiState) { fun ExportPreviewToCustomize(uiState: PdfGenerationUiState) {
MyScanTheme { FairScanTheme {
ExportScreen( ExportScreen(
filename = remember { mutableStateOf("Scan 2025-07-02 17.40.42") }, filename = remember { mutableStateOf("Scan 2025-07-02 17.40.42") },
onFilenameChange = {_->}, onFilenameChange = {_->},

8
app/src/main/java/org/fairscan/app/view/HomeScreen.kt
View File

@@ -59,7 +59,7 @@ import org.fairscan.app.Navigation
import org.fairscan.app.R import org.fairscan.app.R
import org.fairscan.app.rememberCameraPermissionState import org.fairscan.app.rememberCameraPermissionState
import org.fairscan.app.ui.RecentDocumentUiState import org.fairscan.app.ui.RecentDocumentUiState
import org.fairscan.app.ui.theme.MyScanTheme import org.fairscan.app.ui.theme.FairScanTheme
import java.io.File import java.io.File
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@@ -265,7 +265,7 @@ private fun RecentDocumentList(
@Preview @Preview
@Composable @Composable
fun HomeScreenPreviewOnFirstLaunch() { fun HomeScreenPreviewOnFirstLaunch() {
MyScanTheme { FairScanTheme {
HomeScreen( HomeScreen(
cameraPermission = rememberCameraPermissionState(), cameraPermission = rememberCameraPermissionState(),
currentDocument = fakeDocument(), currentDocument = fakeDocument(),
@@ -280,7 +280,7 @@ fun HomeScreenPreviewOnFirstLaunch() {
@Preview @Preview
@Composable @Composable
fun HomeScreenPreviewWithCurrentDocument() { fun HomeScreenPreviewWithCurrentDocument() {
MyScanTheme { FairScanTheme {
HomeScreen( HomeScreen(
cameraPermission = rememberCameraPermissionState(), cameraPermission = rememberCameraPermissionState(),
currentDocument = fakeDocument( currentDocument = fakeDocument(
@@ -297,7 +297,7 @@ fun HomeScreenPreviewWithCurrentDocument() {
@Preview @Preview
@Composable @Composable
fun HomeScreenPreviewWithLastSavedFiles() { fun HomeScreenPreviewWithLastSavedFiles() {
MyScanTheme { FairScanTheme {
HomeScreen( HomeScreen(
cameraPermission = rememberCameraPermissionState(), cameraPermission = rememberCameraPermissionState(),
currentDocument = fakeDocument(), currentDocument = fakeDocument(),

2
app/src/main/res/values/themes.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Theme.MyScan" parent="android:Theme.Material.Light.NoActionBar" /> <style name="Theme.FairScan" parent="android:Theme.Material.Light.NoActionBar" />
</resources> </resources>

2
settings.gradle.kts
View File

@@ -19,6 +19,6 @@ dependencyResolutionManagement {
} }
} }
rootProject.name = "MyScan" rootProject.name = "FairScan"
include(":app") include(":app")