Fixed crash during backups,

Continue splash screen loading only after all dialogs were closed,
Fixed library,
Fixed broken database insertions,
Experimental settings to try out not finished stuff,
Fixed media poster not being clickable,
You can now enable tv version in experiments,
Create experiments shortcut to be able disable them at any time,
Better toolbar on desktop

Author: MrBoomDeveloper

app/build.gradle.kts

@@ -158,6 +158,7 @@ dependencies {
     implementation(libs.androidx.browser)
     implementation(libs.androidx.webkit)
     implementation(libs.fragment.ktx)
+    implementation(libs.androidx.core.google.shortcuts)
     implementation(libs.androidx.preference.ktx)
     implementation(libs.xcrash.android.lib)
     implementation(libs.deprecated.android.retrostreams)

app/src/main/AndroidManifest.xml

@@ -211,6 +211,11 @@
             android:windowSoftInputMode="adjustPan"
             android:exported="false" />
 
+        <activity
+            android:name=".ui.mobile.screens.settings.SettingsActivity2"
+            android:windowSoftInputMode="adjustPan"
+            android:exported="false" />
+
         <property
             android:name="android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED"
             android:value="true" />

app/src/main/assets/settings.json

@@ -204,10 +204,33 @@
 				{ "key": "check_app_update", "type": "action", "title": "Check app update" },
 
 				{ "type": "category", "title": "Developers" },
+
+				{
+					"key": "experiments", "type": "screen", "title": "Experiments",
+					"icon": "ic_experiment_outlined", "items": [
+						{
+							"key": "experiment_splash_load_sources", "title": "experiment_splash_load_sources",
+							"type": "boolean", "boolean_value": false
+						}, {
+							"key": "experiment_pip_controls", "title": "experiment_pip_controls",
+							"type": "boolean", "boolean_value": false
+						}, {
+							"key": "experiment_media_play2", "title": "experiment_media_play2",
+							"type": "boolean", "boolean_value": false
+						}, {
+							"key": "experiment_tv_compose", "title": "experiment_tv_compose",
+							"type": "boolean", "boolean_value": false
+						}, {
+							"key": "experiment_settings2", "title": "experiment_settings2",
+							"type": "boolean", "boolean_value": false
+						}
+					]
+				},
+
 				{ "key": "log_network", "type": "boolean", "restart": true, "title": "Verbose network logging" },
 				{ "key": "start_onboarding", "type": "action", "title": "Start onboarding" },
 
-				{ "type": "category",  "title": "These buttons are supposed to crash the app. Don't report them!" },
+				{ "type": "category", "title": "These buttons are supposed to crash the app. Don't report them!" },
 				{ "key": "try_crash_native", "type": "action", "title": "Throw Native Exception" },
 				{ "key": "try_crash_native_async", "type": "action", "title": "Throw Async Native Exception" },
 				{ "key": "try_crash_java", "type": "action", "title": "Throw Java Exception" },

app/src/main/java/com/mrboomdev/awery/app/CrashHandler.kt

@@ -3,13 +3,10 @@ package com.mrboomdev.awery.app
 import android.content.Context
 import android.content.Intent
 import android.util.Log
-import android.view.View
 import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.LinearLayoutCompat
 import androidx.core.content.FileProvider
-import androidx.core.view.setMargins
 import androidx.core.view.setPadding
 import androidx.core.widget.NestedScrollView
 import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -28,7 +25,6 @@ import com.mrboomdev.awery.util.exceptions.OkiThrowableMessage
 import com.mrboomdev.awery.util.extensions.activity
 import com.mrboomdev.awery.util.extensions.dpPx
 import com.mrboomdev.awery.util.extensions.fixAndShow
-import com.mrboomdev.awery.util.extensions.setMargin
 import com.mrboomdev.awery.util.ui.dialog.DialogBuilder
 import xcrash.Errno
 import xcrash.XCrash
@@ -149,10 +145,10 @@ object CrashHandler {
 				title = if(files.size == 1) null else "Awery crash report #${index + 1}",
 				messagePrefixRes = R.string.please_report_bug_app,
 				file = file,
-				dismissCallback = {
+				dismissCallback = if(index == 0) {{
 					crashLogsDirectory.delete()
 					continuationCallback()
-				}
+				}} else {{}}
 			)
 		}
 	}

app/src/main/java/com/mrboomdev/awery/app/data/db/item/DBCatalogMedia.java

@@ -6,6 +6,7 @@
 import static com.mrboomdev.awery.util.NiceUtils.uniqueStringToList;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
@@ -35,29 +36,37 @@ public class DBCatalogMedia {
 	@ColumnInfo(name = "global_id")
 	@NonNull
 	public String globalId;
-
-	public String titles, description, ids, url;
-	public String banner, extra, country, authors;
-	public String duration, type;
+	@Nullable
+	public String titles, description, ids, url, banner, extra, country, authors, duration, type;
 	@ColumnInfo(name = "release_date")
+	@Nullable
 	public String releaseDate;
 	@ColumnInfo(name = "episodes_count")
+	@Nullable
 	public String episodesCount;
 	@ColumnInfo(name = "average_score")
+	@Nullable
 	public String averageScore;
+	@Nullable
 	public String tags, genres;
+	@Nullable
 	public String status;
 	@ColumnInfo(name = "poster_extra_large")
+	@Nullable
 	public String poster;
 	@ColumnInfo(name = "poster_large")
 	@Deprecated(forRemoval = true)
+	@Nullable
 	public String __DEPRECATED_largePoster;
 	@ColumnInfo(name = "poster_medium")
 	@Deprecated(forRemoval = true)
+	@Nullable
 	public String __DEPRECATED_mediumPoster;
 	@ColumnInfo(name = "latest_episode")
+	@Nullable
 	public String latestEpisode;
 	@ColumnInfo(name = "age_rating")
+	@Nullable
 	public String ageRating;
 
 	public DBCatalogMedia(@NonNull String globalId) {
@@ -152,11 +161,11 @@ public CatalogMedia toCatalogMedia() {
 				averageScore != null ? Float.parseFloat(averageScore) : null,
 				parseEnum(status, CatalogMedia.Status.class),
 
-				tags != null ? (CatalogTag[]) stream(uniqueStringToList(tags))
-						.map(CatalogTag::new).toArray() : null,
+				tags != null ? stream(uniqueStringToList(tags))
+						.map(CatalogTag::new).toArray(CatalogTag[]::new) : null,
 
-				genres == null ? null : (String[]) uniqueStringToList(genres).toArray(),
-				titles == null ? null : (String[]) uniqueStringToList(titles).toArray(),
+				genres == null ? null : stream(uniqueStringToList(genres)).toArray(String[]::new),
+				titles == null ? null : stream(uniqueStringToList(titles)).toArray(String[]::new),
 				authors == null ? null : ParserAdapter.mapFromString(authors),
 				ids == null ? null : ParserAdapter.mapFromString(ids));
 	}

app/src/main/java/com/mrboomdev/awery/app/services/BackupService.kt

@@ -1,5 +1,6 @@
 package com.mrboomdev.awery.app.services
 
+import android.app.Service
 import android.content.Intent
 import android.net.Uri
 import android.os.IBinder
@@ -10,6 +11,7 @@ import com.mrboomdev.awery.app.App.Companion.toast
 import com.mrboomdev.awery.app.AweryLifecycle.Companion.restartApp
 import com.mrboomdev.awery.app.AweryLifecycle.Companion.runOnUiThread
 import com.mrboomdev.awery.app.CrashHandler
+import com.mrboomdev.awery.util.FileType
 import com.mrboomdev.awery.util.io.unzipFiles
 import com.mrboomdev.awery.util.io.zipFiles
 import com.mrboomdev.safeargsnext.owner.SafeArgsService
@@ -23,24 +25,27 @@ private const val TAG = "BackupService"
 private val BACKUP_DIRECTORIES = arrayOf("shared_prefs", "databases")
 
 class BackupService : SafeArgsService<BackupService.Args>() {
-	class Args(val action: Action, val targetUri: Uri)
+	class Args(val action: Action, val targetUri: Uri, val fileType: FileType = FileType.AWERY_BACKUP)
 
 	enum class Action {
 		BACKUP, RESTORE
 	}
 
 	override fun onStartCommand(args: Args?, flags: Int, startId: Int): Int {
-		if(args == null) throw NullPointerException("Arguments are required!")
+		if(args == null) {
+			stopSelf()
+			return START_NOT_STICKY
+		}
 
 		when(args.action) {
-			Action.BACKUP -> startBackup(args.targetUri)
-			Action.RESTORE -> startRestore(args.targetUri)
+			Action.BACKUP -> startBackup(args.targetUri, args.fileType)
+			Action.RESTORE -> startRestore(args.targetUri, args.fileType)
 		}
 
 		return super.onStartCommand(args, flags, startId)
 	}
 
-	private fun startBackup(into: Uri) {
+	private fun startBackup(into: Uri, fileType: FileType) {
 		val popup = showLoadingWindow()
 
 		CoroutineScope(Dispatchers.IO + CoroutineExceptionHandler { _, t ->
@@ -51,23 +56,29 @@ class BackupService : SafeArgsService<BackupService.Args>() {
 				stopSelf()
 			}
 		}).launch {
-			zipFiles(HashMap<String, File>().apply {
-				for(dir in BACKUP_DIRECTORIES) {
-					val list = File(dataDir, dir).listFiles() ?: continue
+			when(fileType) {
+				FileType.AWERY_BACKUP -> {
+					zipFiles(HashMap<String, File>().apply {
+						for(dir in BACKUP_DIRECTORIES) {
+							val list = File(dataDir, dir).listFiles() ?: continue
 
-					for(file in list) {
-						this[dir + "/" + file.name] = file
-					}
+							for(file in list) {
+								this[dir + "/" + file.name] = file
+							}
+						}
+					}, into)
 				}
-			}, into)
+
+				else -> TODO("Unsupported backup type: $fileType")
+			}
 
 			toast(R.string.backup_success)
 			runOnUiThread { popup.dismiss() }
 			stopSelf()
 		}
 	}
 
-	private fun startRestore(uri: Uri) {
+	private fun startRestore(uri: Uri, fileType: FileType) {
 		val window = showLoadingWindow()
 
 		CoroutineScope(Dispatchers.IO + CoroutineExceptionHandler { _, t ->
@@ -82,7 +93,11 @@ class BackupService : SafeArgsService<BackupService.Args>() {
 				File(dataDir, dir).deleteRecursively()
 			}
 
-			unzipFiles(uri, dataDir)
+			when(fileType) {
+				FileType.AWERY_BACKUP -> unzipFiles(uri, dataDir)
+				else -> TODO("Unsupported restore type: $fileType")
+			}
+
 			toast(R.string.restore_success)
 			restartApp()
 			stopSelf()

app/src/main/java/com/mrboomdev/awery/extensions/ExtensionsFactory.java

@@ -71,16 +71,7 @@ private ExtensionsFactory(@NonNull Application context) {
 
 		managers.add(new AniyomiManager());
 		managers.add(new InternalManager());
-
-		//managers.add(new TachiyomiManager()); // We doesn't support manga reading at the moment so we can just disable it for now
-
-		/*List.of(
-				,
-				//
-				//new CloudstreamManager(),
-				//new MiruManager(),
-				//new JsManager(), //J s extensions were a bad decision
-				);*/
+		managers.add(new InternalManager());
 
 		for(var manager : managers) {
 			manager.loadAllExtensions(context);

app/src/main/java/com/mrboomdev/awery/extensions/support/internal/InternalManager.java

@@ -1,5 +1,7 @@
 package com.mrboomdev.awery.extensions.support.internal;
 
+import static com.mrboomdev.awery.util.NiceUtils.stream;
+
 import androidx.annotation.NonNull;
 
 import com.mrboomdev.awery.extensions.Extension;
@@ -14,15 +16,15 @@ public class InternalManager extends ExtensionsManager {
 
 	@NonNull
 	private Extension createExtension(@NonNull InternalProviders.InternalProvider provider) {
-		var extension = new Extension(provider.getName(), provider.getId(), "1.0.0", null);
+		var extension = new Extension(provider.getId(), provider.getName(), "1.0.0", null);
 		extension.addProvider(provider);
 		provider.setup(this, extension);
 		return extension;
 	}
 
 	@Override
 	public Extension getExtension(String id) {
-		return null;
+		return stream(extensions).filter(it -> id.equals(it.getId())).findAny().orElseThrow();
 	}
 
 	@Override

app/src/main/java/com/mrboomdev/awery/ui/mobile/AweryTheme.kt

@@ -0,0 +1,16 @@
+package com.mrboomdev.awery.ui.mobile
+
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.darkColors
+import androidx.compose.material.lightColors
+import androidx.compose.runtime.Composable
+import com.mrboomdev.awery.app.ThemeManager
+
+@Composable
+fun AweryTheme(content: @Composable () -> Unit) {
+	MaterialTheme(
+		colors = if(ThemeManager.isDarkModeEnabled()) darkColors() else lightColors()
+	) {
+		content()
+	}
+}