Move some api from AweryLifecycle.kt,

Use external safeargsnext to fix broken builds,
Updated target sdk to 35

Signed-off-by: MrBoom <github@mrboomdev.ru>

Author: MrBoomDeveloper

androidApp/build.gradle.kts

@@ -19,7 +19,7 @@ val releaseVersion = properties["awery.app.version"].toString()
 val packageName = "com.mrboomdev.awery"
 
 room {
-    schemaDirectory("$projectDir/schemas")
+    schemaDirectory("${projectDir}/../schemas")
 }
 
 android {
@@ -130,8 +130,6 @@ dependencies {
     implementation(libs.androidx.fragment)
     implementation(libs.androidx.shortcuts)
     implementation(libs.androidx.preference)
-    implementation(libs.xcrash)
-    implementation(libs.retrostreams)
     implementation(libs.bundles.aniyomi)
     implementation(projects.ext)
     implementation(projects.resources)
@@ -192,7 +190,7 @@ dependencies {
     implementation(libs.coil.network.okhttp)
 
     // Serialization
-    implementation(files("../libs/safe-args-next.aar"))
+    implementation(libs.safeargsnext)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.kotlinx.serialization.json.okio)
     implementation(libs.kotlinx.serialization.protobuf)
@@ -204,9 +202,11 @@ dependencies {
     implementation(libs.glide)
     implementation(libs.glide.okhttp3)
     implementation(libs.bundles.okhttp)
+    implementation(libs.retrostreams)
 
 	// Debugging
     implementation(libs.androidx.compose.ui.tooling)
+    implementation(libs.xcrash)
     debugImplementation(libs.leakcanary)
 }
 

androidApp/mobile/build.gradle.kts

@@ -6,12 +6,12 @@ plugins {
 
 android {
     namespace = "com.mrboomdev.awery.mobile"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.mrboomdev.awery.mobile"
         minSdk = 24
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 

androidApp/src/main/AndroidManifest.xml

@@ -217,11 +217,6 @@
             android:windowSoftInputMode="adjustPan"
             android:exported="true" />
 
-        <activity
-            android:name=".ui.mobile.screens.ReaderActivity"
-            android:windowSoftInputMode="adjustPan"
-            android:exported="false" />
-
         <activity
             android:name=".ui.mobile.screens.settings.SettingsActivity"
             android:windowSoftInputMode="adjustPan"

androidApp/src/main/assets/app_settings.json

@@ -512,6 +512,13 @@
 							"title": "Remastered settings",
 							"type": "boolean",
 							"value": false
+						},
+
+						{
+							"key": "experiment_compose_ui",
+							"title": "Compose UI",
+							"type": "boolean",
+							"value": false
 						}
 					]
 				},

androidApp/src/main/java/com/mrboomdev/awery/MainActivity.kt

@@ -18,7 +18,6 @@ import com.mrboomdev.awery.app.App.Companion.database
 import com.mrboomdev.awery.app.App.Companion.getMoshi
 import com.mrboomdev.awery.app.App.Companion.isLandscape
 import com.mrboomdev.awery.app.App.Companion.navigationStyle
-import com.mrboomdev.awery.app.App.Companion.toast
 import com.mrboomdev.awery.app.AweryLifecycle.Companion.runDelayed
 import com.mrboomdev.awery.app.theme.ThemeManager.applyTheme
 import com.mrboomdev.awery.app.update.UpdatesManager
@@ -28,6 +27,7 @@ import com.mrboomdev.awery.data.settings.SettingsList
 import com.mrboomdev.awery.databinding.LayoutHeaderHomeBinding
 import com.mrboomdev.awery.databinding.ScreenMainBinding
 import com.mrboomdev.awery.generated.*
+import com.mrboomdev.awery.platform.android.AndroidGlobals.toast
 import com.mrboomdev.awery.platform.i18n
 import com.mrboomdev.awery.ui.mobile.components.EmptyStateView
 import com.mrboomdev.awery.ui.mobile.screens.catalog.feeds.FeedsFragment

androidApp/src/main/java/com/mrboomdev/awery/app/App.kt

@@ -31,12 +31,10 @@ import androidx.activity.OnBackPressedCallback
 import androidx.activity.OnBackPressedDispatcherOwner
 import androidx.activity.enableEdgeToEdge
 import androidx.annotation.AttrRes
-import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.LinearLayoutCompat
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.app.ShareCompat.IntentBuilder
-import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
@@ -52,7 +50,6 @@ import com.google.android.material.snackbar.Snackbar
 import com.mrboomdev.awery.BuildConfig
 import com.mrboomdev.awery.R
 import com.mrboomdev.awery.app.AweryLifecycle.Companion.anyContext
-import com.mrboomdev.awery.app.AweryLifecycle.Companion.appContext
 import com.mrboomdev.awery.app.AweryLifecycle.Companion.getAnyActivity
 import com.mrboomdev.awery.app.AweryLifecycle.Companion.runOnUiThread
 import com.mrboomdev.awery.app.AweryNotifications.registerNotificationChannels
@@ -64,6 +61,10 @@ import com.mrboomdev.awery.data.db.AweryDB
 import com.mrboomdev.awery.data.db.item.DBCatalogList
 import com.mrboomdev.awery.extensions.data.CatalogList
 import com.mrboomdev.awery.generated.*
+import com.mrboomdev.awery.platform.CrashHandler
+import com.mrboomdev.awery.platform.android.AndroidGlobals
+import com.mrboomdev.awery.platform.android.AndroidGlobals.isTv
+import com.mrboomdev.awery.platform.android.AndroidGlobals.toast
 import com.mrboomdev.awery.platform.i18n
 import com.mrboomdev.awery.ui.mobile.screens.BrowserActivity
 import com.mrboomdev.awery.ui.mobile.screens.IntentHandlerActivity
@@ -86,21 +87,21 @@ import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import org.jetbrains.compose.resources.StringResource
-import org.jetbrains.compose.resources.stringResource
 import java.util.WeakHashMap
 
+private const val TAG = "App"
+private val backPressedCallbacks = WeakHashMap<Runnable, Any>()
+
 class App : Application() {
 
 	override fun attachBaseContext(base: Context) {
-		appContext = this
+		AndroidGlobals.applicationContext = this
 		super.attachBaseContext(base)
-		CrashHandler.setupCrashListener(this)
+		CrashHandler.setup()
 	}
 
 	@OptIn(DelicateCoroutinesApi::class)
 	override fun onCreate() {
-		AndroidGlobals.applicationContext = this
 		applyTheme()
 		super.onCreate()
 		setupStrictMode()
@@ -181,9 +182,6 @@ class App : Application() {
 	}
 
 	companion object {
-		private val backPressedCallbacks = WeakHashMap<Runnable, Any>()
-		private const val TAG = "App"
-		
 		var didInit = false 
 			private set
 
@@ -194,7 +192,7 @@ class App : Application() {
 		}
 
 		val database: AweryDB by lazy {
-			databaseBuilder(appContext, AweryDB::class.java, "db")
+			databaseBuilder(AndroidGlobals.applicationContext, AweryDB::class.java, "db")
 				.addMigrations(AweryDB.MIGRATION_2_3, AweryDB.MIGRATION_3_4)
 				.build()
 		}
@@ -239,7 +237,7 @@ class App : Application() {
 		}
 
 		fun copyToClipboard(clipData: ClipData) {
-			appContext.getSystemService<ClipboardManager>()!!.setPrimaryClip(clipData)
+			AndroidGlobals.applicationContext.getSystemService<ClipboardManager>()!!.setPrimaryClip(clipData)
 
 			// Android 13 and higher shows a visual confirmation of copied contents
 			// https://developer.android.com/about/versions/13/features/copy-paste
@@ -281,16 +279,6 @@ class App : Application() {
 			}
 		}
 
-		private fun toastImpl(context: Context?, text: Any?, duration: Int = 0) {
-			runOnUiThread { Toast.makeText(context, text.toString(), duration).show() }
-		}
-
-		@JvmStatic
-		@JvmOverloads
-		fun toast(text: Any?, duration: Int = 0) {
-			toastImpl(appContext, text, duration)
-		}
-
 		/**
 		 * There is a bug in an appcompat library which sometimes throws an [NullPointerException].
 		 * This method tries to do it without throwing any exceptions.
@@ -388,18 +376,7 @@ class App : Application() {
 
 		@JvmStatic
 		val isLandscape: Boolean
-			get() = isLandscape(appContext)
-
-		@Suppress("DEPRECATION")
-		@JvmStatic
-		val isTv by lazy {
-			with(appContext) {
-				packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
-						|| packageManager.hasSystemFeature(PackageManager.FEATURE_TELEVISION)
-						|| getSystemService<UiModeManager>()!!.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION
-						|| !packageManager.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)
-			}
-		}
+			get() = isLandscape(AndroidGlobals.applicationContext)
 
 		@JvmStatic
 		@JvmOverloads

androidApp/src/main/java/com/mrboomdev/awery/app/AweryLifecycle.kt

@@ -14,8 +14,9 @@ import androidx.annotation.MainThread
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
-import com.mrboomdev.awery.app.App.Companion.toast
 import com.mrboomdev.awery.platform.PlatformResources
+import com.mrboomdev.awery.platform.android.AndroidGlobals
+import com.mrboomdev.awery.platform.android.AndroidGlobals.toast
 import com.mrboomdev.awery.utils.UniqueIdGenerator
 import org.jetbrains.annotations.Contract
 import java.lang.ref.WeakReference
@@ -138,28 +139,6 @@ open class AweryLifecycle private constructor() : ActivityLifecycleCallbacks {
 		private const val TAG = "AweryLifecycle"
 		private var handler: Handler? = null
 
-		@JvmStatic
-		fun restartApp() {
-			Log.i(TAG, "restartApp() has been invoked!")
-
-			app!!.startActivity(Intent.makeRestartActivityTask(
-				app!!.packageManager.getLaunchIntentForPackage(app!!.packageName)!!.component
-			).apply {
-				setPackage(app!!.packageName)
-			})
-
-			app = null
-			exitProcess(0)
-		}
-
-		fun exitApp() {
-			val activity = getAnyActivity(Activity::class.java)
-			app = null
-
-			if(activity != null) activity.finishAffinity()
-			else Runtime.getRuntime().exit(0)
-		}
-
 		@JvmStatic
 		@Deprecated(message = "Java")
 		fun getActivity(context: Context): Activity? {
@@ -322,7 +301,7 @@ open class AweryLifecycle private constructor() : ActivityLifecycleCallbacks {
 					if(activity != null) return activity
 				} catch(ignored: IndexOutOfBoundsException) { }
 
-				return appContext
+				return AndroidGlobals.applicationContext
 			}
 
 		@get:SuppressLint("PrivateApi", "DiscouragedPrivateApi")
@@ -362,32 +341,6 @@ open class AweryLifecycle private constructor() : ActivityLifecycleCallbacks {
 			}
 		}
 
-		private var app: App? = null
-
-		@JvmStatic
-		var appContext: App
-			get() {
-				contextUsingPrivateApi.let {
-					if(it != null) {
-						app = it
-						return it
-					}
-				}
-
-				getAnyActivity(Activity::class.java)?.let {
-					app = it.applicationContext as App
-					return app!!
-				}
-
-				return app!!
-			}
-
-			set(value) {
-				app = value
-				value.registerActivityLifecycleCallbacks(AweryLifecycle())
-				handler = Handler(Looper.getMainLooper())
-			}
-
 		@JvmStatic
 		fun cancelDelayed(runnable: Runnable?) {
 			handler!!.removeCallbacks(runnable!!)