Remove some old libraries

And converting 4 screens into coroutine MVPs
Jays2Kings · Mar 23, 2023 · 6a0d161 · 6a0d161
1 parent 28dc7bd
commit 6a0d161
Show file tree

Hide file tree

Showing 39 changed files with 368 additions and 813 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -158,10 +158,12 @@ dependencies {
     implementation("androidx.browser:browser:1.5.0")
     implementation("androidx.biometric:biometric:1.1.0")
     implementation("androidx.palette:palette:1.0.0")
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
+    implementation("androidx.activity:activity-ktx:1.7.0-rc01")
+    implementation("androidx.core:core-ktx:1.10.0-rc01")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0")
     implementation("com.google.android.flexbox:flexbox:3.0.0")
     implementation("androidx.window:window:1.0.0")
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
 
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
 
@@ -181,7 +183,6 @@ dependencies {
     implementation("io.reactivex:rxandroid:1.2.1")
     implementation("io.reactivex:rxjava:1.3.8")
     implementation("com.jakewharton.rxrelay:rxrelay:1.2.0")
-    implementation("com.github.pwittchen:reactivenetwork:0.13.0")
 
     // Coroutines
     implementation("com.fredporciuncula:flow-preferences:1.6.0")
@@ -224,9 +225,6 @@ dependencies {
 
     implementation("com.google.android.gms:play-services-gcm:17.0.0")
 
-    // Changelog
-    implementation("com.github.gabrielemariotti.changeloglib:changelog:2.1.0")
-
     // Database
     implementation("androidx.sqlite:sqlite-ktx:2.3.0")
     implementation("com.github.requery:sqlite-android:3.39.2")
@@ -261,7 +259,6 @@ dependencies {
     implementation("com.mikepenz:fastadapter-extensions-binding:$fastAdapterVersion")
     implementation("com.github.arkon.FlexibleAdapter:flexible-adapter:c8013533")
     implementation("com.github.arkon.FlexibleAdapter:flexible-adapter-ui:c8013533")
-    implementation("com.nononsenseapps:filepicker:2.5.2")
     implementation("com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0")
     implementation("com.github.mthli:Slice:v1.2")
     implementation("io.noties.markwon:core:4.6.2")

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -127,10 +127,6 @@
             android:configChanges="uiMode|orientation|screenSize"/>
         <activity
             android:name=".ui.security.BiometricActivity" />
-        <activity
-            android:name=".widget.CustomLayoutPickerActivity"
-            android:label="@string/app_name"
-            android:theme="@style/FilePickerTheme" />
         <activity
             android:name=".ui.setting.track.MyAnimeListLoginActivity"
             android:label="MyAnimeList"

diff --git a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
@@ -39,8 +39,7 @@ class AppModule(val app: Application) : InjektModule {
 
         addSingletonFactory { JavaScriptEngine(app) }
 
-        addSingletonFactory { SourceManager(app).also { get<ExtensionManager>().init(it) } }
-
+        addSingletonFactory { SourceManager(app, get()) }
         addSingletonFactory { ExtensionManager(app) }
 
         addSingletonFactory { DownloadManager(app) }

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
@@ -109,7 +109,7 @@ class LibraryUpdateNotifier(private val context: Context) {
                 setContentIntent(pendingIntent)
                 setSmallIcon(R.drawable.ic_tachij2k_notification)
                 addAction(
-                    R.drawable.nnf_ic_file_folder,
+                    R.drawable.ic_file_open_24dp,
                     context.getString(R.string.open_log),
                     pendingIntent,
                 )
@@ -144,7 +144,7 @@ class LibraryUpdateNotifier(private val context: Context) {
                 setContentIntent(NotificationHandler.openUrl(context, HELP_SKIPPED_URL))
                 setSmallIcon(R.drawable.ic_tachij2k_notification)
                 addAction(
-                    R.drawable.nnf_ic_file_folder,
+                    R.drawable.ic_file_open_24dp,
                     context.getString(R.string.open_log),
                     NotificationReceiver.openErrorOrSkippedLogPendingActivity(context, uri),
                 )

diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionInstallService.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionInstallService.kt
@@ -81,7 +81,7 @@ class ExtensionInstallService(
         instance = this
 
         val list = intent.getParcelableArrayListExtra<ExtensionInfo>(KEY_EXTENSION)?.filter {
-            val installedExt = extensionManager.installedExtensions.find { installed ->
+            val installedExt = extensionManager.installedExtensionsFlow.value.find { installed ->
                 installed.pkgName == it.pkgName
             } ?: return@filter false
             installedExt.versionCode < it.versionCode || installedExt.libVersion < it.libVersion