Full migration to Compose (#69)

Author: rafakob

app/build.gradle.kts

@@ -12,53 +12,28 @@ plugins {
 
 android {
     namespace = "com.twofasapp"
+
+    ksp {
+        arg("room.schemaLocation", "$projectDir/schemas")
+    }
 }
 
 dependencies {
-    implementation(project(":base"))
-    implementation(project(":core:di"))
-    implementation(project(":extensions"))
-    implementation(project(":prefs"))
-    
-    implementation(project(":serialization"))
-    implementation(project(":spanner"))
-    implementation(project(":truetime"))
-    implementation(project(":truetime-rx"))
-    implementation(project(":browserextension"))
-    implementation(project(":parsers"))
-    implementation(project(":resources"))
-    implementation(project(":design"))
-    implementation(project(":permissions"))
-    implementation(project(":push"))
-    implementation(project(":persistence"))
-    implementation(project(":qrscanner"))
-    implementation(project(":widgets"))
-    implementation(project(":services"))
-    implementation(project(":services:domain"))
-    implementation(project(":widgets:domain"))
-    
-    implementation(project(":backup"))
-    implementation(project(":core"))
-    implementation(project(":time"))
-    implementation(project(":featuretoggle"))
-    implementation(project(":developer"))
-    implementation(project(":backup:domain"))
-    implementation(project(":security"))
-    implementation(project(":security:domain"))
-    implementation(project(":start"))
-    implementation(project(":start:domain"))
-    implementation(project(":time:domain"))
-
     implementation(project(":core:common"))
     implementation(project(":core:android"))
     implementation(project(":core:designsystem"))
     implementation(project(":core:storage"))
     implementation(project(":core:network"))
     implementation(project(":core:locale"))
+    implementation(project(":core:cipher"))
+
     implementation(project(":data:notifications"))
     implementation(project(":data:session"))
     implementation(project(":data:services"))
     implementation(project(":data:browserext"))
+    implementation(project(":data:cloud"))
+    implementation(project(":data:push"))
+
     implementation(project(":feature:startup"))
     implementation(project(":feature:home"))
     implementation(project(":feature:trash"))
@@ -67,70 +42,58 @@ dependencies {
     implementation(project(":feature:browserext"))
     implementation(project(":feature:appsettings"))
     implementation(project(":feature:qrscan"))
+    implementation(project(":feature:backup"))
+    implementation(project(":feature:widget"))
+    implementation(project(":feature:security"))
+
+    implementation(project(":base"))
+    implementation(project(":prefs"))
+    implementation(project(":truetime"))
+    implementation(project(":parsers"))
 
     implementation(libs.bundles.appCompat)
-    implementation(libs.bundles.rxJava)
-    implementation(libs.bundles.materialDialogs)
-    implementation(libs.bundles.fastAdapter)
-    implementation(libs.bundles.rxBinding)
     implementation(libs.bundles.compose)
     implementation(libs.bundles.barcodeScanner)
     implementation(libs.bundles.room)
+    implementation(libs.reLinker)
+    ksp(libs.roomCompiler)
     implementation(libs.bundles.compose)
     implementation(libs.bundles.viewModel)
     implementation(libs.bundles.accompanist)
     implementation(libs.bundles.playReview)
     implementation(libs.bundles.playUpdate)
+    implementation(libs.bundles.glance)
+    implementation(libs.biometric)
     implementation(libs.timber)
     implementation(libs.webkit)
     implementation(libs.securityCrypto)
     implementation(libs.secureStorage)
     implementation(libs.lottie)
     implementation(libs.kotlinCoroutines)
-    implementation(libs.coroutinesToRx)
     implementation(libs.workManager)
-    implementation(libs.workManagerRx)
     implementation(libs.activityX)
-
     implementation(libs.coreSplash)
-
-    // Google
-    implementation("androidx.recyclerview:recyclerview:1.2.1")
-    implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
-    implementation("androidx.drawerlayout:drawerlayout:1.1.1")
-    implementation("androidx.multidex:multidex:2.0.1")
-    implementation("androidx.biometric:biometric:1.1.0")
-
-    implementation("com.google.android.gms:play-services-auth:20.4.0"){
+    implementation(platform(libs.firebaseBom))
+    implementation(libs.firebaseCrashlytics)
+    implementation(libs.firebaseMessaging)
+    implementation(libs.playServicesCorutines)
+    implementation(libs.googleApiClientGson)
+    implementation(libs.googleApiClientAndroid) {
+        exclude("org.apache.httpcomponents", "guava-jdk5")
         exclude("com.google.http-client", "google-http-client")
-        exclude("com.google.http-client", "google-http-client-jackson")
     }
-
-    implementation("com.github.rafakob.google-http-java-client:google-http-client-gson:1.43.0")
-
-    implementation("com.google.api-client:google-api-client-android:2.2.0") {
-        exclude("org.apache.httpcomponents", "guava-jdk5")
-        exclude("com.google.http-client","google-http-client")
+    implementation(libs.googleAuth) {
+        exclude("com.google.http-client", "google-http-client")
+        exclude("com.google.http-client", "google-http-client-jackson")
     }
-    implementation("com.google.apis:google-api-services-drive:v3-rev197-1.25.0") {
+    implementation(libs.googleDrive) {
         exclude("org.apache.httpcomponents", "guava-jdk5")
-        exclude("com.google.http-client","google-http-client")
-
+        exclude("com.google.http-client", "google-http-client")
     }
 
-    // Utilities
+    // ObjectBox - legacy
     debugImplementation("io.objectbox:objectbox-android-objectbrowser:2.9.1")
     releaseImplementation("io.objectbox:objectbox-android:2.9.1")
     implementation("io.objectbox:objectbox-kotlin:2.9.1")
     kapt("io.objectbox:objectbox-processor:2.9.1")
-    implementation("org.apache.commons:commons-text:1.9")
-    implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
-    implementation("androidx.lifecycle:lifecycle-common-java8:2.4.1")
-
-    implementation(platform("com.google.firebase:firebase-bom:31.1.0"))
-    implementation("com.google.firebase:firebase-messaging-ktx")
-    implementation("com.google.firebase:firebase-crashlytics")
-
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.1")
 }

persistence/schemas/com.twofasapp.persistence.AppDatabase/10.json app/schemas/com.twofasapp.storage.AppDatabase/10.json

@@ -5,9 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
@@ -54,19 +52,14 @@
         </provider>
 
         <service
-            android:name=".push.FcmMessagingService"
+            android:name=".data.push.FcmMessagingService"
             android:exported="false"
             android:stopWithTask="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
 
-        <service
-            android:name=".widgets.adapter.WidgetViewsService"
-            android:exported="false"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-
         <!--
             Prompt Google Play services to install the backported photo picker module
             https://developer.android.com/training/data-storage/shared/photopicker#device-availability
@@ -87,7 +80,7 @@
 
         <receiver
             android:name=".widgets.WidgetProvider"
-            android:exported="false">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -97,27 +90,16 @@
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_provider" />
-        </receiver>
-
-        <receiver
-            android:name=".widgets.WidgetTimerReceiver"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="WIDGET_TIMER" />
-            </intent-filter>
+                android:resource="@xml/widget_info" />
         </receiver>
 
         <!-- ACTIVITIES -->
-
         <activity
             android:name=".ui.main.StartActivity"
             android:exported="true"
             android:launchMode="singleTask"
             android:noHistory="false"
-            android:screenOrientation="locked"
-            android:theme="@style/Theme.App">
+            android:screenOrientation="locked">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -133,26 +115,6 @@
                 <data android:scheme="otpauth" />
             </intent-filter>
 
-        </activity>
-
-        <activity
-            android:name=".ui.main.MainActivity"
-            android:label="Add service by scanning QR Code"
-            android:launchMode="singleTask" />
-
-        <activity
-            android:name=".features.backup.BackupActivity"
-            android:label="@string/backup__2fas_backup"
-            android:windowSoftInputMode="adjustResize" />
-
-        <activity
-            android:name=".backup.ui.export.ExportBackupActivity"
-            android:label="Export Backup" />
-
-        <activity
-            android:name=".features.backup.import.ImportBackupActivity"
-            android:exported="true"
-            android:label="Import Backup">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -173,16 +135,13 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.2fas" />
 
             </intent-filter>
+
         </activity>
 
         <activity
-            android:name=".widgets.configure.WidgetSettingsActivity"
-            android:exported="true"
-            android:label="Widget settings">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-            </intent-filter>
-        </activity>
+            android:name=".ui.main.MainActivity"
+            android:label="Add service by scanning QR Code"
+            android:launchMode="singleTask" />
 
     </application>
 </manifest>