Localize tab names,

Load bookmarks in the new arch,
Loading indicator on tv,
Show failed to load feeds separately on tv,
Check extensions count before loading all of them in the new arch,
Display empty feeds as if it an error in the new arch,
Refactored build.gradle.kts,
Use a single statement to set room schema directory,
Update android gradle plugin,
Check crash file existence before reading it,
Use gradle version catalog references only if it's existence occurs more than for a single time,
Limit title max lines on tv to 2

Author: MrBoomDeveloper

app/build.gradle.kts

@@ -1,83 +1,57 @@
+import com.android.build.api.dsl.ApplicationBaseFlavor
 import com.android.build.api.dsl.ApplicationProductFlavor
 import java.util.Locale
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapter
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 
 plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    id("com.google.devtools.ksp").version("2.0.21-1.0.25")
-    kotlin("plugin.serialization") version "2.0.20"
+    alias(libs.plugins.android.app)
+    alias(libs.plugins.android.kotlin)
+    alias(libs.plugins.room)
     alias(libs.plugins.compose.compiler)
-    id("androidx.room").version(libs.versions.roomRuntime)
+    alias(libs.plugins.kotlin.ksp)
+    alias(libs.plugins.kotlin.serialization)
 }
 
-val useSdk = 35
-val releaseVersion = "1.0.5.2"
+val releaseVersion = "1.0.5.3"
 val packageName = "com.mrboomdev.awery"
 
-// Note: Please, don't edit it if you don't know what it does
-val startVersionCode = 2808
-val startMillis = 1719658313080
+fun ApplicationBaseFlavor.setupVersion() {
+    // Note: Please, don't edit it if you don't know what it does
+    val startVersionCode = 2808
+    val startMillis = 1719658313080
 
-val gitCommitHash = providers.exec {
-    commandLine("git", "rev-parse", "--short", "HEAD")
-}.standardOutput.asText.get().trim()
+    val gitCommitHash = providers.exec {
+        commandLine("git", "rev-parse", "--short", "HEAD")
+    }.standardOutput.asText.get().trim()
+
+    versionName = "$releaseVersion-$gitCommitHash"
+
+    versionCode = (startVersionCode + (System.currentTimeMillis() - startMillis) / 1000).let {
+        if(it.toInt() <= 0 || it >= Int.MAX_VALUE) {
+            throw IllegalStateException("We've reached an Integer limit! " +
+                    "Now Awery 2 must be released! Generated version code: $it")
+        }
+
+        it.toInt()
+    }
+}
+
+room {
+    schemaDirectory("$projectDir/schemas")
+}
 
 android {
     namespace = packageName
-    compileSdk = useSdk
+    compileSdk = 35
 
     defaultConfig {
         applicationId = packageName
-        targetSdk = useSdk
+        targetSdk = 35
         minSdk = 25
-
-        buildConfigField("boolean", "IS_BETA",
-            "CHANNEL != ${packageName}.app.update.UpdatesChannel.STABLE")
-
-        /* Only one version can be published per second or else horrible things will happen.
-        *  After 70 years we'll be required to make Awery 2 because of an integer limit,
-        *  Date receiver from the test below:
-        *
-        *   3865053756028  :  2145398250  -  Mon Jun 23 15:02:36 YEKT 2092
-        *   3865747384956  :  2146091879  -  Tue Jul 01 15:43:04 YEKT 2092
-        *   3866441013884  :  2146785508  -  Wed Jul 09 16:23:33 YEKT 2092
-        *   3867134642812  :  2147479137  -  Thu Jul 17 17:04:02 YEKT 2092
-        *   3867828271740  :  -2146794530  -  Fri Jul 25 17:44:31 YEKT 2092
-        *  */
-        versionName = "$releaseVersion-$gitCommitHash"
-        versionCode = ((startVersionCode + ((System.currentTimeMillis() - startMillis) / 1000)).toInt())
-
-        /*long i = System.currentTimeMillis()
-        var a = new Date(i)
-        while(true) {
-            i += (1000 * 60 * 60 * 24 * 356)
-            a.setTime(i)
-
-            versionCode ((startVersionCode + ((i - startMillis) / 1000)) as int)
-
-            System.out.println("$i  :  $versionCode  -  ${a}")
-
-            if(versionCode < 0 || versionCode >= Integer.MAX_VALUE) {
-                throw new IllegalStateException("We've reached the end. Now Awery 2 must be released!" +
-                        " Input: $versionCode : ${a}")
-            }
-        }*/
-
-        if(versionCode!! < 0 || versionCode!! >= Int.MAX_VALUE) {
-            throw IllegalStateException("We've reached the end. " +
-                    "Now Awery 2 must be released! Input int: $versionCode")
-        }
-
+        setupVersion()
         buildConfigField("long", "BUILD_TIME", "${System.currentTimeMillis()}")
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments["room.schemaLocation"] = "$projectDir/schemas"
-            }
-        }
     }
 
     androidResources {
@@ -90,10 +64,6 @@ android {
         }
     }
 
-    room {
-        schemaDirectory("schemas")
-    }
-
     buildTypes {
         debug {
             isDebuggable = true
@@ -171,15 +141,16 @@ android {
 
 dependencies {
     // Core
-    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.browser)
     implementation(libs.androidx.webkit)
     implementation(libs.androidx.fragment)
-    implementation(libs.androidx.core.google.shortcuts)
+    implementation(libs.androidx.shortcuts)
     implementation(libs.androidx.preference.ktx)
-    implementation(libs.xcrash.android.lib)
+    implementation(libs.xcrash.android)
     implementation(libs.deprecated.android.retrostreams)
+    implementation(libs.bundles.aniyomi)
     implementation(project(":ext"))
 
     // Database
@@ -229,29 +200,15 @@ dependencies {
     implementation(libs.androidx.media3.session)
     implementation(libs.androidx.media3.ui)
 
-    // Image Loading
+    // Networking
     api(libs.glide)
     ksp(libs.glide.compiler)
     implementation(libs.glide.annotations)
     implementation(libs.glide)
     implementation(libs.glide.okhttp3)
-
     implementation(libs.coil.compose)
     implementation(libs.coil.network.okhttp)
-
-    // Networking
-    implementation(libs.okhttp)
-    implementation(libs.okhttp.logging)
-    implementation(libs.okhttp.dnsoverhttps)
-    implementation(libs.okhttp.brotli)
-
-    // Aniyomi
-    implementation(libs.quickjs.android)
-    implementation(libs.rx.java)
-    implementation(libs.rx.android)
-    implementation(libs.injekt)
-    implementation(libs.jsoup)
-    implementation(libs.java.nat.sort)
+    implementation(libs.bundles.okhttp)
 
     // Serialization
     implementation(files("../libs/safe-args-next.aar"))
@@ -361,9 +318,9 @@ fun generateSettingsClass(dir: File) {
     File(dir, "AwerySettings.java").writeText(buildString {
         append("package com.mrboomdev.awery.generated;\n")
         append("\n")
-        append("import com.mrboomdev.awery.app.data.settings.NicePreferences.*;\n")
-        append("import com.mrboomdev.awery.app.data.settings.NicePreferences;\n")
-        append("import com.mrboomdev.awery.app.data.settings.SettingsItem;\n")
+        append("import com.mrboomdev.awery.data.settings.NicePreferences.*;\n")
+        append("import com.mrboomdev.awery.data.settings.NicePreferences;\n")
+        append("import com.mrboomdev.awery.data.settings.SettingsItem;\n")
         append("\n")
         append("// Auto-generated class created during the compilation. Please, do not edit it.\n")
         append("public class AwerySettings {\n")

…boomdev.awery.app.data.db.AweryDB/1.json …m.mrboomdev.awery.data.db.AweryDB/1.jsonapp/schemas/com.mrboomdev.awery.app.data.db.AweryDB/1.json renamed to app/schemas/com.mrboomdev.awery.data.db.AweryDB/1.json app/schemas/com.mrboomdev.awery.app.data.db.AweryDB/1.json renamed to app/schemas/com.mrboomdev.awery.data.db.AweryDB/1.json

@@ -198,9 +198,6 @@
 						{
 							"key": "experiment_splash_load_sources", "title": "Use new sources loader",
 							"type": "boolean", "boolean_value": false
-						}, {
-							"key": "experiment_pip_controls", "title": "Picture in picture player controls",
-							"type": "boolean", "boolean_value": false
 						}, {
 							"key": "experiment_tv_compose", "title": "Launch TV activity on startup",
 							"type": "boolean", "boolean_value": false

…boomdev.awery.app.data.db.AweryDB/2.json …m.mrboomdev.awery.data.db.AweryDB/2.jsonapp/schemas/com.mrboomdev.awery.app.data.db.AweryDB/2.json renamed to app/schemas/com.mrboomdev.awery.data.db.AweryDB/2.json app/schemas/com.mrboomdev.awery.app.data.db.AweryDB/2.json renamed to app/schemas/com.mrboomdev.awery.data.db.AweryDB/2.json

@@ -6,7 +6,7 @@
 		"description": "A lot of content, a feed with a selection of all installed extensions and a bunch of features!",
 		"tabs": [
 			{
-				"title": "Home",
+				"title": "home",
 				"icon": "home",
 				"id": "home",
 				"feeds": [
@@ -22,7 +22,7 @@
 					}
 				]
 			}, {
-				"title": "Library",
+				"title": "library",
 				"id": "library",
 				"icon": "bookmark",
 				"show_end": false,

…boomdev.awery.app.data.db.AweryDB/3.json …m.mrboomdev.awery.data.db.AweryDB/3.jsonapp/schemas/com.mrboomdev.awery.app.data.db.AweryDB/3.json renamed to app/schemas/com.mrboomdev.awery.data.db.AweryDB/3.json app/schemas/com.mrboomdev.awery.app.data.db.AweryDB/3.json renamed to app/schemas/com.mrboomdev.awery.data.db.AweryDB/3.json

@@ -36,9 +36,7 @@ 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.res.ResourcesCompat
 import androidx.room.Room.databaseBuilder
-import androidx.viewbinding.ViewBinding
 import com.github.piasy.biv.BigImageViewer
 import com.github.piasy.biv.loader.glide.GlideCustomImageLoader
 import com.google.android.material.color.DynamicColors
@@ -53,11 +51,12 @@ 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.theme.ThemeManager.isDarkModeEnabled
-import com.mrboomdev.awery.app.data.Constants
-import com.mrboomdev.awery.app.data.db.AweryDB
-import com.mrboomdev.awery.app.data.db.item.DBCatalogList
-import com.mrboomdev.awery.app.data.settings.NicePreferences.getPrefs
+import com.mrboomdev.awery.data.Constants
+import com.mrboomdev.awery.data.db.AweryDB
+import com.mrboomdev.awery.data.db.item.DBCatalogList
+import com.mrboomdev.awery.data.settings.NicePreferences.getPrefs
 import com.mrboomdev.awery.app.theme.ThemeManager
+import com.mrboomdev.awery.app.update.UpdatesChannel
 import com.mrboomdev.awery.extensions.data.CatalogList
 import com.mrboomdev.awery.generated.AwerySettings
 import com.mrboomdev.awery.generated.AwerySettings.NavigationStyle_Values
@@ -99,9 +98,9 @@ class App : Application() {
 	override fun onCreate() {
 		AweryNotifications.registerNotificationChannels()
 		ThemeManager.applyApp(this)
-		setupStrictMode()
 
 		super.onCreate()
+		setupStrictMode()
 		patchInjekt()
 		BigImageViewer.initialize(GlideCustomImageLoader.with(this))
 
@@ -261,6 +260,10 @@ class App : Application() {
 			return if(id == 0) null else i18n(id)
 		}
 
+		inline fun <reified T> i18n(resourceId: String): String? {
+			return i18n(T::class.java, resourceId)
+		}
+
 		@JvmStatic
 		fun i18n(@StringRes res: Int, vararg params: Any) =
 			ContextCompat.getContextForLanguage(appContext).getString(res, *params)
@@ -307,12 +310,6 @@ class App : Application() {
 			}
 		}
 
-		@JvmStatic
-		@Deprecated("")
-		fun setContentViewCompat(activity: Activity, view: ViewBinding) {
-			setContentViewCompat(activity, view.root)
-		}
-
 		/**
 		 * Safely enables the "Edge to edge" experience.
 		 * I really don't know why, but sometimes it just randomly crashes!
@@ -453,11 +450,15 @@ class App : Application() {
 				.apply {
 					if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
 						penaltyListener({ it.run() }) { violation ->
-							runOnUiThread { DialogBuilder(getAnyActivity<AppCompatActivity>()!!)
-								.setTitle("StrictMode.VmPolicy Violation!")
-								.setMessage(Log.getStackTraceString(violation))
-								.setPositiveButton(R.string.ok) { it.dismiss() }
-								.show() }
+							try {
+								runOnUiThread { DialogBuilder(getAnyActivity<AppCompatActivity>()!!)
+									.setTitle("StrictMode.VmPolicy Violation!")
+									.setMessage(Log.getStackTraceString(violation))
+									.setPositiveButton(R.string.ok) { it.dismiss() }
+									.show() }
+							} catch(e: Throwable) {
+								Log.e(TAG, "Failed to warn about an strict mode violation!", e)
+							}
 						}
 					}
 				}.build())
@@ -543,7 +544,7 @@ class App : Application() {
 			val result = when(mRequirement) {
 				"material_you" -> DynamicColors.isDynamicColorAvailable()
 				"tv" -> isTv
-				"beta" -> BuildConfig.IS_BETA
+				"beta" -> BuildConfig.CHANNEL != UpdatesChannel.STABLE
 				"debug" -> BuildConfig.DEBUG
 				"never" -> false
 				else -> true

…boomdev.awery.app.data.db.AweryDB/4.json …m.mrboomdev.awery.data.db.AweryDB/4.jsonapp/schemas/com.mrboomdev.awery.app.data.db.AweryDB/4.json renamed to app/schemas/com.mrboomdev.awery.data.db.AweryDB/4.json app/schemas/com.mrboomdev.awery.app.data.db.AweryDB/4.json renamed to app/schemas/com.mrboomdev.awery.data.db.AweryDB/4.json

@@ -211,7 +211,7 @@ object CrashHandler {
 					it.dismiss()
 				}
 
-				if(file != null || message != null || oki != null) {
+				if(file?.exists() == true || message != null || oki != null) {
 					setNegativeButton(R.string.share) {
 						val mFile = file ?: File((mContext ?: appContext).filesDir, "crash_report.txt").apply {
 							delete()
@@ -237,9 +237,12 @@ object CrashHandler {
 						BottomSheetDialog(mContext?.activity ?: activity!!).apply {
 							setContentView(NestedScrollView(mContext!!).apply {
 								addView(MaterialTextView(mContext).apply {
-									text = (file?.readText() ?: oki?.print() ?: message ?: i18n(messageRes!!)).trim()
 									setTextIsSelectable(true)
 									setPadding(dpPx(16f))
+
+									text = if(file?.exists() == true) {
+										file.readText()
+									} else (oki?.print() ?: message ?: i18n(messageRes!!)).trim()
 								})
 							})
 						}.fixAndShow()