Refactor/v4.0.0

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "master", "dep/**" ]
   pull_request:
-    branches: [ "master", "dep/**" ]
+    branches: [ "master", "dep/**", "refactor/**" ]
 
 jobs:
   build:
@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -25,7 +25,7 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew assembleDevDebug
     - name: Upload debug APK
-      uses: actions/upload-artifact@v3.1.3
+      uses: actions/upload-artifact@v4
       with:
         name: main-dev-debug.apk
         path: main/build/outputs/apk/dev/debug/main-dev-debug.apk

.gitignore

@@ -49,3 +49,4 @@ google-services.json
 !main/src/dev/google-services.json
 config_ad.xml
 !main/src/main/res/values/config_ad.xml
+.kotlin/

build.gradle

@@ -1,9 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.nav_version = "2.6.0" // require SDK 34 from 2.7.0
+    ext.nav_version = "2.9.0" // require SDK 34 from 2.7.0
+    ext.hilt_version = "2.56.2"
+    ext.coroutines_version = "1.10.2"
+    ext.lifecycle_version = "2.9.0"
+    ext.text_recognition_version = "16.0.1"
+    ext.kotpref_version = "2.13.2"
+    ext.retrofit2_version = "3.0.0"
+    ext.moshi_version = "1.15.2"
+
     repositories {
         google()
+        gradlePluginPortal()
         mavenCentral()
         maven {
             url "https://jitpack.io"
@@ -13,20 +22,28 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.3'
+        classpath 'com.android.tools.build:gradle:8.9.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'com.google.gms:google-services:4.4.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
+        classpath 'com.google.gms:google-services:4.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21"
         classpath 'com.google.firebase:perf-plugin:1.4.2'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.3'
 
         // Refactor
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
+
+        // Detekt
+        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
     }
 }
 
+plugins {
+    id 'com.google.dagger.hilt.android' version '2.56.2' apply false
+    id 'com.google.devtools.ksp' version '2.1.21-2.0.1' apply false
+}
+
 allprojects {
     repositories {
         google()

detekt.yml

@@ -0,0 +1,85 @@
+# From https://mrmans0n.github.io/compose-rules/detekt/
+Compose:
+  ComposableAnnotationNaming:
+    active: true
+  ComposableNaming:
+    active: true
+    # -- You can optionally disable the checks in this rule for regex matches against the composable name (e.g. molecule presenters)
+    # allowedComposableFunctionNames: .*Presenter,.*MoleculePresenter
+  ComposableParamOrder:
+    active: true
+    # -- You can optionally have a list of types to be treated as lambdas (e.g. typedefs or fun interfaces not picked up automatically)
+    # treatAsLambda: MyLambdaType
+  CompositionLocalAllowlist:
+    active: true
+    # -- You can optionally define a list of CompositionLocals that are allowed here
+    # allowedCompositionLocals: LocalSomething,LocalSomethingElse
+  CompositionLocalNaming:
+    active: true
+  ContentEmitterReturningValues:
+    active: true
+    # -- You can optionally add your own composables here
+    # contentEmitters: MyComposable,MyOtherComposable
+  DefaultsVisibility:
+    active: true
+  ModifierClickableOrder:
+    active: true
+    # -- You can optionally add your own Modifier types
+    # customModifiers: BananaModifier,PotatoModifier
+  ModifierComposable:
+    active: true
+    # -- You can optionally add your own Modifier types
+    # customModifiers: BananaModifier,PotatoModifier
+  ModifierMissing:
+    active: true
+    # -- You can optionally control the visibility of which composables to check for here
+    # -- Possible values are: `only_public`, `public_and_internal` and `all` (default is `only_public`)
+    # checkModifiersForVisibility: only_public
+    # -- You can optionally add your own Modifier types
+    # customModifiers: BananaModifier,PotatoModifier
+  ModifierNaming:
+    active: true
+    # -- You can optionally add your own Modifier types
+    # customModifiers: BananaModifier,PotatoModifier
+  ModifierNotUsedAtRoot:
+    active: true
+    # -- You can optionally add your own composables here
+    # contentEmitters: MyComposable,MyOtherComposable
+    # -- You can optionally add your own Modifier types
+    # customModifiers: BananaModifier,PotatoModifier
+  ModifierReused:
+    active: true
+    # -- You can optionally add your own Modifier types
+    # customModifiers: BananaModifier,PotatoModifier
+  ModifierWithoutDefault:
+    active: true
+  MultipleEmitters:
+    active: true
+    # -- You can optionally add your own composables here that will count as content emitters
+    # contentEmitters: MyComposable,MyOtherComposable
+    # -- You can add composables here that you don't want to count as content emitters (e.g. custom dialogs or modals)
+    # contentEmittersDenylist: MyNonEmitterComposable
+  MutableParams:
+    active: true
+  MutableStateParam:
+    active: true
+  PreviewAnnotationNaming:
+    active: true
+  PreviewPublic:
+    active: true
+  RememberMissing:
+    active: true
+  RememberContentMissing:
+    active: true
+  UnstableCollections:
+    active: true
+  ViewModelForwarding:
+    active: true
+    # -- You can optionally use this rule on things other than types ending in "ViewModel" or "Presenter" (which are the defaults). You can add your own via a regex here:
+    # allowedStateHolderNames: .*ViewModel,.*Presenter
+    # -- You can optionally add an allowlist for Composable names that won't be affected by this rule
+    # allowedForwarding: .*Content,.*FancyStuff
+  ViewModelInjection:
+    active: true
+    # -- You can optionally add your own ViewModel factories here
+    # viewModelFactories: hiltViewModel,potatoViewModel

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

main/build.gradle

@@ -1,11 +1,14 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'kotlin-kapt'
+    id 'com.google.devtools.ksp'
     id 'androidx.navigation.safeargs.kotlin'
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
     id 'com.google.firebase.firebase-perf'
+    id 'com.google.dagger.hilt.android'
+    id "io.gitlab.arturbosch.detekt"
+    id("org.jetbrains.kotlin.plugin.compose") version "2.1.21"
 }
 
 def buildParams = getGradle().getStartParameter().toString().toLowerCase()
@@ -20,15 +23,14 @@ task ensureFiles {
 }
 
 android {
-    compileSdk 33
-    buildToolsVersion = "33.0.1"
+    compileSdk 35
 
     defaultConfig {
         applicationId "tw.firemaples.onscreenocr"
         minSdkVersion 21
-        targetSdkVersion 33
-        versionCode 117
-        versionName "3.1.25"
+        targetSdkVersion 35
+        versionCode 128
+        versionName "4.0.10"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -91,7 +93,11 @@ android {
         jvmTarget = '17'
     }
     buildFeatures {
-        viewBinding true
+        viewBinding true //TODO remove after full migrating to compose
+        compose true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.15"
     }
     packagingOptions {
         jniLibs {
@@ -101,26 +107,29 @@ android {
 }
 
 dependencies {
+    detektPlugins "io.nlopez.compose.rules:detekt:0.4.22"
+
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
 
-    implementation 'androidx.core:core-ktx:1.10.1'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.core:core-ktx:1.16.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
     implementation "androidx.preference:preference-ktx:1.2.1"
-    implementation 'androidx.webkit:webkit:1.7.0'
+    implementation 'androidx.webkit:webkit:1.13.0'
     //noinspection GradleDynamicVersion
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     // For using coroutines in tests
     // For runBlockingTest, CoroutineDispatcher etc.
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
     // For InstantTaskExecutorRule
     testImplementation "androidx.arch.core:core-testing:2.2.0"
 
@@ -136,10 +145,27 @@ dependencies {
     androidTestImplementation "androidx.navigation:navigation-testing:$nav_version"
 
     // required to avoid crash on Android 12 API 31
-    implementation 'androidx.work:work-runtime-ktx:2.8.1'
+    implementation 'androidx.work:work-runtime-ktx:2.10.1'
+
+    // Compose
+    def composeBom = platform('androidx.compose:compose-bom:2025.05.00')
+    implementation composeBom
+    androidTestImplementation composeBom
+    // Material Design 3
+    implementation 'androidx.compose.material3:material3'
+    // Android Studio Preview support
+    implementation 'androidx.compose.ui:ui-tooling-preview'
+    debugImplementation 'androidx.compose.ui:ui-tooling'
+    // UI Tests
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
+    debugImplementation 'androidx.compose.ui:ui-test-manifest'
+
+    // Hilt
+    implementation "com.google.dagger:hilt-android:$hilt_version"
+    ksp "com.google.dagger:hilt-compiler:$hilt_version"
 
     // Firebase
-    implementation platform('com.google.firebase:firebase-bom:32.6.0')
+    implementation platform('com.google.firebase:firebase-bom:33.13.0')
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-analytics'
     //  implementation 'com.google.firebase:firebase-core'
@@ -148,49 +174,52 @@ dependencies {
 
     // Google MLKit - Text recognition v2
     // To recognize Latin script
-    implementation 'com.google.mlkit:text-recognition:16.0.0'
+    implementation "com.google.mlkit:text-recognition:$text_recognition_version"
     // To recognize Chinese script
-    implementation 'com.google.mlkit:text-recognition-chinese:16.0.0'
+    implementation "com.google.mlkit:text-recognition-chinese:$text_recognition_version"
     // To recognize Devanagari script
-    implementation 'com.google.mlkit:text-recognition-devanagari:16.0.0'
+    implementation "com.google.mlkit:text-recognition-devanagari:$text_recognition_version"
     // To recognize Japanese script
-    implementation 'com.google.mlkit:text-recognition-japanese:16.0.0'
+    implementation "com.google.mlkit:text-recognition-japanese:$text_recognition_version"
     // To recognize Korean script
-    implementation 'com.google.mlkit:text-recognition-korean:16.0.0'
+    implementation "com.google.mlkit:text-recognition-korean:$text_recognition_version"
 
     // Google MLKit - Text translate
-    implementation 'com.google.mlkit:translate:17.0.2'
+    implementation 'com.google.mlkit:translate:17.0.3'
 
     // Google MLKit - Identify Languages
-    implementation 'com.google.mlkit:language-id:17.0.4'
+    implementation 'com.google.mlkit:language-id:17.0.6'
 
     // Kotpref
     // core
-    implementation 'com.chibatching.kotpref:kotpref:2.13.2'
+    implementation "com.chibatching.kotpref:kotpref:$kotpref_version"
     // optional, auto initialization module
-    implementation 'com.chibatching.kotpref:initializer:2.13.2'
+    implementation "com.chibatching.kotpref:initializer:$kotpref_version"
     // optional, support saving enum value and ordinal
-    implementation 'com.chibatching.kotpref:enum-support:2.13.2'
+    implementation "com.chibatching.kotpref:enum-support:$kotpref_version"
     // optional, support saving json string through Gson
-    implementation 'com.chibatching.kotpref:gson-support:2.13.2'
-    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation "com.chibatching.kotpref:gson-support:$kotpref_version"
+    implementation 'com.google.code.gson:gson:2.13.1'
     // optional, support LiveData observable preference
-    implementation 'com.chibatching.kotpref:livedata-support:2.13.2'
+    implementation "com.chibatching.kotpref:livedata-support:$kotpref_version"
 //    implementation 'androidx.lifecycle:lifecycle-livedata:2.2.0'
 //    // experimental, preference screen build dsl
 //    implementation 'com.chibatching.kotpref:preference-screen-dsl:2.13.1'
 
     // Retrofit
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
+    implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
+    implementation "com.squareup.retrofit2:converter-moshi:$retrofit2_version"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
+    // Moshi
+    ksp("com.squareup.moshi:moshi-kotlin-codegen:$moshi_version")
+    implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
 
     // Tesseract
-    implementation 'cz.adaptech.tesseract4android:tesseract4android:4.5.0'
+    implementation 'cz.adaptech.tesseract4android:tesseract4android:4.8.0'
 //    implementation 'cz.adaptech:tesseract4android:4.1.0'
 
     // koral--/android-gif-drawable
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.28'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.29'
 
 //    // Ad network mediation - Mopub
 //    implementation('com.mopub:mopub-sdk:+@aar') {
@@ -210,9 +239,9 @@ dependencies {
 //    implementation 'com.mopub.mediation:adcolony:4.5.0.1'
 
     // Admob
-    implementation 'com.google.android.gms:play-services-ads:22.5.0'
+    implementation 'com.google.android.gms:play-services-ads:23.6.0'
     // Facebook Ad network
-    implementation 'com.google.ads.mediation:facebook:6.16.0.0'
+    implementation 'com.google.ads.mediation:facebook:6.19.0.0'
     // Adcolony Ad network
     implementation 'com.google.ads.mediation:adcolony:4.8.0.2'
     // To fix build failed with issue
@@ -221,5 +250,5 @@ dependencies {
     implementation 'com.facebook.infer.annotation:infer-annotation:0.18.0'
 
     // TouchImageView
-    implementation 'com.github.MikeOrtiz:TouchImageView:3.6'
+    implementation 'com.github.MikeOrtiz:TouchImageView:3.7.1'
 }