diff --git a/app/build.gradle.kts b/app/build.gradle.kts index aa3ff5d8..13d4c337 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,8 +1,9 @@ import com.android.build.api.dsl.ApplicationProductFlavor import com.mrboomdev.awery.gradle.ProjectVersion.generateVersionCode import com.mrboomdev.awery.gradle.ProjectVersion.getGitCommitHash -import com.mrboomdev.awery.gradle.SettingsClassGenerator.generatedSettingsDir -import com.mrboomdev.awery.gradle.SettingsGenerateTask +import com.mrboomdev.awery.gradle.settings.GenerateSettingsTask +import com.mrboomdev.awery.gradle.settings.generatedSettingsKotlinDirectory +import com.mrboomdev.awery.gradle.settings.generatedSettingsResourcesDirectory plugins { alias(libs.plugins.android.app) @@ -38,13 +39,12 @@ android { androidResources { generateLocaleConfig = true } - - sourceSets { - get("main").apply { - java.srcDirs(layout.buildDirectory.file("generated/awery/kotlin"), generatedSettingsDir) - } + + sourceSets["main"].apply { + kotlin.srcDir(generatedSettingsKotlinDirectory) + resources.srcDir(generatedSettingsResourcesDirectory) } - + buildTypes { debug { isDebuggable = true @@ -133,8 +133,8 @@ dependencies { implementation(libs.retrostreams) implementation(libs.bundles.aniyomi) implementation(projects.ext) - - // Database + + // Database ksp(libs.androidx.room.compiler) implementation(libs.androidx.room.runtime) @@ -163,6 +163,9 @@ dependencies { implementation(libs.androidx.navigation.compose) implementation(libs.compose.tv.material) implementation(libs.compose.tv.foundation) + implementation(libs.androidx.adaptive) + implementation(libs.androidx.adaptive.layout) + implementation(libs.androidx.adaptive.navigation) // Markdown implementation(libs.markwon.core) @@ -204,12 +207,11 @@ dependencies { debugImplementation(libs.leakcanary) } -tasks.register("generateClasses") { - outputFile = layout.buildDirectory.file("generated/awery/kotlin/com/mrboomdev/awery/AwerySettings.kt") +tasks.register("generateSettings") { + packageName = "com.mrboomdev.awery.generated" + className = "AwerySettings" inputFiles = listOf( layout.projectDirectory.file("src/main/assets/app_settings.json"), layout.projectDirectory.file("src/main/assets/system_settings.json") ) -} - -tasks["preBuild"].dependsOn(tasks["generateClasses"]) \ No newline at end of file +}.let { tasks["preBuild"].dependsOn(it) } \ No newline at end of file diff --git a/app/src/main/assets/app_settings.json b/app/src/main/assets/app_settings.json index edf94aed..1677fcbf 100644 --- a/app/src/main/assets/app_settings.json +++ b/app/src/main/assets/app_settings.json @@ -179,49 +179,49 @@ { "key": "player_double_tap_seek_length", "type": "select", - "value": "10", + "value": 10, "title": "double_tap_seek", "icon": "ic_round_touch_app_24", "description": "${VALUE}", "show_if": ["!tv"], "items": [ { - "key": "0", + "key": 0, "title": "disabled" }, { - "key": "3", + "key": 3, "title": "3s" }, { - "key": "5", + "key": 5, "title": "5s" }, { - "key": "10", + "key": 10, "title": "10s" }, { - "key": "15", + "key": 15, "title": "15s" }, { - "key": "30", + "key": 30, "title": "30s" }, { - "key": "60", + "key": 60, "title": "60s" }, { - "key": "120", + "key": 120, "title": "120s" } ] @@ -230,43 +230,43 @@ { "key": "player_big_seek_length", "type": "select", - "value": "60", + "value": 60, "title": "quick_rewind", "icon": "ic_fast_forward_outlined", "description": "${VALUE}", "items": [ { - "key": "0", + "key": 0, "title": "Disabled" }, { - "key": "30", + "key": 30, "title": "30s" }, { - "key": "45", + "key": 45, "title": "45s" }, { - "key": "60", + "key": 60, "title": "1m" }, { - "key": "120", + "key": 120, "title": "2m" }, { - "key": "180", + "key": 180, "title": "3m" }, { - "key": "240", + "key": 240, "title": "4m" } ] @@ -330,42 +330,42 @@ }, { - "key": "144", + "key": 144, "title": "144p" }, { - "key": "240", + "key": 240, "title": "240p" }, { - "key": "360", + "key": 360, "title": "360p" }, { - "key": "480", + "key": 480, "title": "480p" }, { - "key": "720", + "key": 720, "title": "720p" }, { - "key": "1080", + "key": 1080, "title": "1080p" }, { - "key": "1440", + "key": 1440, "title": "1440p" }, { - "key": "2160", + "key": 2160, "title": "2160p" } ] @@ -520,6 +520,7 @@ "key": "log_network", "type": "boolean", "restart": true, + "value": false, "title": "Verbose network logging" }, diff --git a/app/src/main/assets/system_settings.json b/app/src/main/assets/system_settings.json index 9722a293..0ca94940 100644 --- a/app/src/main/assets/system_settings.json +++ b/app/src/main/assets/system_settings.json @@ -3,7 +3,8 @@ "items": [ { "key": "did_suggest_material_you", - "type": "boolean" + "type": "boolean", + "value": false }, { @@ -13,13 +14,13 @@ { "key": "last_opened_version", - "type": "integer", "value": 0 + "type": "integer", "value": -1 }, { "key": "setup_version_finished", "type": "integer", - "value": 0 + "value": -1 }, { @@ -86,6 +87,7 @@ { "key": "use_amoled_theme", "type": "boolean", + "value": false, "restart": true, "title": "amoled", "icon": "ic_contrast", @@ -95,6 +97,7 @@ { "key": "extract_banner_color", "type": "boolean", + "value": true, "title": "use_unique_theme_for_each_item", "icon": "ic_round_movie_filter_24", "show_if": ["never"] diff --git a/app/src/main/java/com/mrboomdev/awery/app/App.kt b/app/src/main/java/com/mrboomdev/awery/app/App.kt index c12b8031..9c3d63d4 100644 --- a/app/src/main/java/com/mrboomdev/awery/app/App.kt +++ b/app/src/main/java/com/mrboomdev/awery/app/App.kt @@ -8,7 +8,9 @@ import android.app.Dialog import android.app.UiModeManager import android.content.ClipData import android.content.ClipboardManager +import android.content.ComponentName import android.content.Context +import android.content.Intent import android.content.pm.PackageManager import android.content.res.Configuration import android.content.res.Resources @@ -36,6 +38,9 @@ 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 +import androidx.core.graphics.drawable.IconCompat import androidx.room.Room.databaseBuilder import com.github.piasy.biv.BigImageViewer import com.github.piasy.biv.loader.glide.GlideCustomImageLoader @@ -51,17 +56,20 @@ 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 -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.theme.ThemeManager.applyTheme import com.mrboomdev.awery.app.update.UpdatesChannel +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.extensions.data.CatalogList -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.generated.AwerySettings +import com.mrboomdev.awery.generated.GeneratedSetting +import com.mrboomdev.awery.platform.PlatformResources import com.mrboomdev.awery.ui.mobile.screens.BrowserActivity +import com.mrboomdev.awery.ui.mobile.screens.IntentHandlerActivity import com.mrboomdev.awery.ui.mobile.screens.settings.SettingsActivity +import com.mrboomdev.awery.ui.tv.TvExperimentsActivity import com.mrboomdev.awery.util.extensions.configuration import com.mrboomdev.awery.util.extensions.startActivity import com.mrboomdev.awery.util.ui.dialog.DialogBuilder @@ -76,16 +84,11 @@ import io.noties.markwon.ext.strikethrough.StrikethroughPlugin import io.noties.markwon.html.HtmlPlugin import io.noties.markwon.image.glide.GlideImagesPlugin import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import okhttp3.OkHttpClient -import java.io.File -import java.io.FileWriter -import java.io.IOException import java.util.WeakHashMap -import java.util.logging.Handler -import java.util.logging.LogRecord -import java.util.logging.Logger class App : Application() { @@ -95,47 +98,40 @@ class App : Application() { CrashHandler.setupCrashListener(this) } + @OptIn(DelicateCoroutinesApi::class) override fun onCreate() { AndroidGlobals.applicationContext = this - registerNotificationChannels() applyTheme() - super.onCreate() setupStrictMode() + + GlobalScope.launch(Dispatchers.IO) { + initSync() + } + } + + /** + * Long-time performing operations are performing here. + * Don't forget to call this method to init everything! + */ + private fun initSync() { + didInit = false + patchInjekt() + registerNotificationChannels() BigImageViewer.initialize(GlideCustomImageLoader.with(this)) - + + // Material you isn't available on tv, so we do reset an value to something else. + if(AwerySettings.THEME_COLOR_PALETTE.value == AwerySettings.ThemeColorPaletteValue.MATERIAL_YOU && isTv) { + AwerySettings.THEME_COLOR_PALETTE.value = AwerySettings.ThemeColorPaletteValue.RED + } + + // TODO: Replace this stupid fix when proper settings would be implemented everywhere. if(AwerySettings.USE_DARK_THEME.value == null) { AwerySettings.USE_DARK_THEME.value = ThemeManager.isDarkModeEnabled } - - if(AwerySettings.LOG_NETWORK.value == true) { - val logFile = File(getExternalFilesDir(null), "okhttp3_log.txt") - logFile.delete() - - try { - logFile.createNewFile() - - Logger.getLogger(OkHttpClient::class.java.name).addHandler(object : Handler() { - override fun publish(record: LogRecord) { - try { - FileWriter(logFile, true).use { writer -> - writer.write("[" + record.level + "] " + record.message + "\n") - } - } catch(e: IOException) { - Log.e(TAG, "Failed to write log file!", e) - } - } - - override fun flush() {} - override fun close() {} - }) - } catch(e: IOException) { - Log.e(TAG, "Failed to create log file!", e) - } - } - - if(AwerySettings.LAST_OPENED_VERSION.value.let { it ?: -1 } < 1) { + + if(AwerySettings.LAST_OPENED_VERSION.value < 1) { CoroutineScope(Dispatchers.IO).launch { database.listDao.insert( DBCatalogList.fromCatalogList(CatalogList(getString(R.string.currently_watching), "1")), @@ -147,15 +143,49 @@ class App : Application() { DBCatalogList.fromCatalogList(CatalogList("Hidden", Constants.CATALOG_LIST_BLACKLIST)), DBCatalogList.fromCatalogList(CatalogList("History", Constants.CATALOG_LIST_HISTORY)) ) - + AwerySettings.LAST_OPENED_VERSION.value = 1 } } + + // If any experiment is enabled, then crate an shortcut + if(AwerySettings.EXPERIMENTS.items.find { it is GeneratedSetting.Boolean && it.value == true } != null) { + if(isTv) { + // Tv doesn't show up any shortcuts, so we have to show an separate app launcher. + packageManager.setComponentEnabledSetting( + ComponentName(this, TvExperimentsActivity::class.java), + PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP) + } else { + ShortcutManagerCompat.pushDynamicShortcut(applicationContext, + ShortcutInfoCompat.Builder(this, "experiments") + .setIcon(IconCompat.createWithResource(this, R.drawable.ic_experiment_outlined)) + .setLongLabel("Open experimental settings") + .setShortLabel("Experiments") + .setLongLived(true) + .setIntent(Intent(this, IntentHandlerActivity::class.java).apply { + action = Intent.ACTION_VIEW + data = Uri.parse("awery://experiments") + }).build()) + } + } else { + if(isTv) { + packageManager.setComponentEnabledSetting( + ComponentName(this, TvExperimentsActivity::class.java), + PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP) + } else { + ShortcutManagerCompat.removeLongLivedShortcuts(applicationContext, listOf("experiments")) + } + } + + didInit = true } companion object { private val backPressedCallbacks = WeakHashMap() private const val TAG = "App" + + var didInit = false + private set private val globalMoshi: Moshi by lazy { Moshi.Builder() @@ -260,14 +290,14 @@ class App : Application() { "com.mrboomdev.awery.platform.PlatformResources")) fun i18n(clazz: Class<*>, string: String?, vararg args: Any): String? { val id = getResourceId(clazz, string) - return if(id == 0) null else i18n(id, *args) + return if(id == 0) null else PlatformResources.i18n(id, *args) } @Deprecated("old shit", ReplaceWith( "PlatformResources.i18n(resourceId, *args)", "com.mrboomdev.awery.platform.PlatformResources")) inline fun i18n(resourceId: String, vararg args: Any): String? { - return i18n(T::class.java, resourceId, *args) + return PlatformResources.i18n(resourceId, *args) } @JvmStatic @@ -276,27 +306,21 @@ class App : Application() { "com.mrboomdev.awery.platform.PlatformResources")) fun i18n(@StringRes res: Int, vararg params: Any) = ContextCompat.getContextForLanguage(appContext).getString(res, *params) - - @JvmStatic - @JvmOverloads - fun toast(context: Context?, text: Any?, duration: Int = 0) { - runOnUiThread { Toast.makeText(context, text?.toString() ?: "null", duration).show() } + + 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) { - toast(appContext, text, duration) + toastImpl(appContext, text, duration) } @JvmStatic - fun toast(@StringRes res: Int) { - toast(appContext.getString(res)) - } - - @JvmStatic - fun toast(@StringRes res: Int, duration: Int) { - toast(i18n(res), duration) + @JvmOverloads + fun toast(@StringRes res: Int, duration: Int = 0) { + toast(appContext.getString(res), duration) } /** @@ -480,7 +504,7 @@ class App : Application() { @JvmStatic val navigationStyle: AwerySettings.NavigationStyleValue get() = AwerySettings.NAVIGATION_STYLE.value.let { - if((it == null || isTv)) AwerySettings.NavigationStyleValue.MATERIAL else it + if(isTv) AwerySettings.NavigationStyleValue.MATERIAL else it } @Deprecated(message = "java shit") diff --git a/app/src/main/java/com/mrboomdev/awery/data/settings/SettingsData.java b/app/src/main/java/com/mrboomdev/awery/data/settings/SettingsData.java index 19ca4787..c7e65d52 100644 --- a/app/src/main/java/com/mrboomdev/awery/data/settings/SettingsData.java +++ b/app/src/main/java/com/mrboomdev/awery/data/settings/SettingsData.java @@ -24,7 +24,6 @@ import com.mrboomdev.awery.extensions.ExtensionsManager; import com.mrboomdev.awery.extensions.support.yomi.aniyomi.AniyomiManager; import com.mrboomdev.awery.extensions.support.yomi.tachiyomi.TachiyomiManager; -import com.mrboomdev.awery.generated.AwerySettings; import com.mrboomdev.awery.ui.mobile.screens.settings.TabsSettings; import com.mrboomdev.awery.util.Selection; import com.mrboomdev.awery.util.async.AsyncFuture; @@ -119,9 +118,9 @@ public static void saveSelectionList(@NonNull String listId, Selection Log.e(TAG, "Failed to save tags list"); diff --git a/app/src/main/java/com/mrboomdev/awery/extensions/data/CatalogFeed.java b/app/src/main/java/com/mrboomdev/awery/extensions/data/CatalogFeed.java index acd41f03..24ea10df 100644 --- a/app/src/main/java/com/mrboomdev/awery/extensions/data/CatalogFeed.java +++ b/app/src/main/java/com/mrboomdev/awery/extensions/data/CatalogFeed.java @@ -149,27 +149,23 @@ private static List processFeed(@NonNull CatalogFeed feed) { if(!provider.hasFeatures(ExtensionProvider.FEATURE_FEEDS)) { return false; } - - var adultMode = AwerySettings.ADULT_MODE.getValue(); - - if(adultMode != null) { - switch(adultMode) { - case SAFE -> { - switch(provider.getAdultContentMode()) { - case ONLY, PARTIAL -> { - return false; - } - } - } - - case ONLY -> { - if(provider.getAdultContentMode() == ExtensionProvider.AdultContent.NONE) { + + switch(AwerySettings.INSTANCE.getADULT_MODE().getValue()) { + case SAFE -> { + switch(provider.getAdultContentMode()) { + case ONLY, PARTIAL -> { return false; } } } + + case ONLY -> { + if(provider.getAdultContentMode() == ExtensionProvider.AdultContent.NONE) { + return false; + } + } } - + return true; }) .map(provider -> AsyncUtils.>awaitResult(breaker -> provider.getFeeds(new ExtensionProvider.ResponseCallback<>() { diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/IntentHandlerActivity.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/IntentHandlerActivity.kt index 9618608e..c0b2456f 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/IntentHandlerActivity.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/IntentHandlerActivity.kt @@ -10,12 +10,11 @@ import com.mrboomdev.awery.R import com.mrboomdev.awery.app.App.Companion.database import com.mrboomdev.awery.app.App.Companion.showLoadingWindow import com.mrboomdev.awery.app.App.Companion.toast -import com.mrboomdev.awery.data.db.item.DBRepository import com.mrboomdev.awery.app.services.BackupService import com.mrboomdev.awery.app.theme.ThemeManager.applyTheme -import com.mrboomdev.awery.extensions.support.yomi.aniyomi.AniyomiManager -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.data.db.item.DBRepository import com.mrboomdev.awery.data.settings.NicePreferences +import com.mrboomdev.awery.extensions.support.yomi.aniyomi.AniyomiManager import com.mrboomdev.awery.ui.mobile.screens.settings.SettingsActivity import com.mrboomdev.awery.util.FileType import com.mrboomdev.awery.util.extensions.cleanUrl @@ -24,7 +23,6 @@ import com.mrboomdev.awery.util.io.FileUtil.fileName import com.mrboomdev.awery.util.ui.dialog.DialogBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlin.jvm.Throws class IntentHandlerActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/LoginActivity.java b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/LoginActivity.java index 109e10fe..ad556394 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/LoginActivity.java +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/LoginActivity.java @@ -54,7 +54,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { if(savedInstanceState != null) { if(getArgument(savedInstanceState, SAVED_DID_LAUNCHED_BROWSER, Boolean.class)) { - toast(this, "Failed to login into an account!", 1); + toast("Failed to login into an account!", 1); finish(); return; } diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/SplashActivity.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/SplashActivity.kt index 81779b1f..566a343e 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/SplashActivity.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/SplashActivity.kt @@ -1,23 +1,14 @@ package com.mrboomdev.awery.ui.mobile.screens import android.annotation.SuppressLint -import android.content.ComponentName -import android.content.Intent -import android.content.pm.PackageManager -import android.net.Uri import android.os.Bundle import android.util.Log import androidx.appcompat.app.AppCompatActivity -import androidx.core.content.pm.ShortcutInfoCompat -import androidx.core.content.pm.ShortcutManagerCompat -import androidx.core.graphics.drawable.IconCompat import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.lifecycle.lifecycleScope -import com.mrboomdev.awery.AwerySettings -import com.mrboomdev.awery.GeneratedSetting import com.mrboomdev.awery.R +import com.mrboomdev.awery.app.App import com.mrboomdev.awery.app.App.Companion.database -import com.mrboomdev.awery.app.App.Companion.isTv import com.mrboomdev.awery.app.AweryLifecycle.Companion.exitApp import com.mrboomdev.awery.app.AweryLifecycle.Companion.runDelayed import com.mrboomdev.awery.app.CrashHandler @@ -25,9 +16,9 @@ import com.mrboomdev.awery.app.ExtensionsManager import com.mrboomdev.awery.app.theme.ThemeManager.applyTheme import com.mrboomdev.awery.databinding.ScreenSplashBinding import com.mrboomdev.awery.extensions.ExtensionsFactory +import com.mrboomdev.awery.generated.AwerySettings import com.mrboomdev.awery.ui.mobile.screens.catalog.MainActivity import com.mrboomdev.awery.ui.mobile.screens.setup.SetupActivity -import com.mrboomdev.awery.ui.tv.TvExperimentsActivity import com.mrboomdev.awery.ui.tv.TvMainActivity import com.mrboomdev.awery.util.async.AsyncFuture import com.mrboomdev.awery.util.extensions.enableEdgeToEdge @@ -54,35 +45,6 @@ class SplashActivity : AppCompatActivity() { enableEdgeToEdge() super.onCreate(savedInstanceState) - // If any experiment is enabled, then crate an shortcut - if(AwerySettings.EXPERIMENTS.items.find { it is GeneratedSetting.Boolean && it.value == true } != null) { - if(isTv) { - // Tv doesn't show up any shortcuts, so we have to show an separate app launcher. - packageManager.setComponentEnabledSetting( - ComponentName(this, TvExperimentsActivity::class.java), - PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP) - } else { - ShortcutManagerCompat.pushDynamicShortcut(applicationContext, - ShortcutInfoCompat.Builder(this, "experiments") - .setIcon(IconCompat.createWithResource(this, R.drawable.ic_experiment_outlined)) - .setLongLabel("Open experimental settings") - .setShortLabel("Experiments") - .setLongLived(true) - .setIntent(Intent(this, IntentHandlerActivity::class.java).apply { - action = Intent.ACTION_VIEW - data = Uri.parse("awery://experiments") - }).build()) - } - } else { - if(isTv) { - packageManager.setComponentEnabledSetting( - ComponentName(this, TvExperimentsActivity::class.java), - PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP) - } else { - ShortcutManagerCompat.removeLongLivedShortcuts(applicationContext, listOf("experiments")) - } - } - binding = ScreenSplashBinding.inflate(layoutInflater).apply { root.setBackgroundColor(resolveAttrColor(android.R.attr.colorBackground)) status.setText(R.string.checking_if_crash_occurred) @@ -108,14 +70,17 @@ class SplashActivity : AppCompatActivity() { return@launch } - - if(AwerySettings.SETUP_VERSION_FINISHED.value.let { it ?: -1 } < SetupActivity.SETUP_VERSION) { + + @Suppress("ControlFlowWithEmptyBody") + while(!App.didInit) {} + + if(AwerySettings.SETUP_VERSION_FINISHED.value < SetupActivity.SETUP_VERSION) { startActivity(SetupActivity::class) finish() return@launch } - if(AwerySettings.EXPERIMENT_SPLASH_LOAD_SOURCES.value == true) { + if(AwerySettings.EXPERIMENT_SPLASH_LOAD_SOURCES.value) { try { ExtensionsManager.init(applicationContext).data.onEach { launch(Dispatchers.Main) { @@ -134,7 +99,7 @@ class SplashActivity : AppCompatActivity() { return@launch } - startActivity(if(/*isTv*/AwerySettings.EXPERIMENT_TV_COMPOSE.value == true) TvMainActivity::class else MainActivity::class) + startActivity(if(/*isTv*/AwerySettings.EXPERIMENT_TV_COMPOSE.value) TvMainActivity::class else MainActivity::class) finish() return@launch @@ -142,7 +107,7 @@ class SplashActivity : AppCompatActivity() { ExtensionsFactory.getInstance().addCallback(object : AsyncFuture.Callback { override fun onSuccess(result: ExtensionsFactory) { - startActivity(if(/*isTv*/AwerySettings.EXPERIMENT_TV_COMPOSE.value == true) TvMainActivity::class else MainActivity::class) + startActivity(if(/*isTv*/AwerySettings.EXPERIMENT_TV_COMPOSE.value) TvMainActivity::class else MainActivity::class) finish() } diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/MainActivity.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/MainActivity.kt index 40ce3c74..9093cc27 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/MainActivity.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/MainActivity.kt @@ -17,7 +17,6 @@ import com.google.android.material.navigationrail.NavigationRailView import com.mrboomdev.awery.R import com.mrboomdev.awery.app.App.Companion.database import com.mrboomdev.awery.app.App.Companion.getMoshi -import com.mrboomdev.awery.app.App.Companion.i18n import com.mrboomdev.awery.app.App.Companion.isLandscape import com.mrboomdev.awery.app.App.Companion.navigationStyle import com.mrboomdev.awery.app.App.Companion.toast @@ -30,10 +29,12 @@ import com.mrboomdev.awery.data.settings.SettingsList import com.mrboomdev.awery.databinding.LayoutHeaderHomeBinding import com.mrboomdev.awery.databinding.ScreenMainBinding import com.mrboomdev.awery.generated.AwerySettings -import com.mrboomdev.awery.generated.AwerySettings.NavigationStyle_Values +import com.mrboomdev.awery.platform.PlatformResources.i18n +import com.mrboomdev.awery.ui.mobile.components.EmptyStateView +import com.mrboomdev.awery.ui.mobile.screens.catalog.feeds.FeedsFragment import com.mrboomdev.awery.ui.mobile.screens.search.MultiSearchActivity import com.mrboomdev.awery.ui.mobile.screens.settings.SettingsActivity -import com.mrboomdev.awery.ui.mobile.screens.catalog.feeds.FeedsFragment +import com.mrboomdev.awery.ui.mobile.screens.settings.SettingsActivity2 import com.mrboomdev.awery.util.IconStateful import com.mrboomdev.awery.util.TabsTemplate import com.mrboomdev.awery.util.extensions.UI_INSETS @@ -53,18 +54,19 @@ import com.mrboomdev.awery.util.extensions.setHorizontalPadding import com.mrboomdev.awery.util.extensions.startActivity import com.mrboomdev.awery.util.extensions.topPadding import com.mrboomdev.awery.util.io.FileUtil.readAssets -import com.mrboomdev.awery.ui.mobile.components.EmptyStateView -import com.mrboomdev.awery.ui.mobile.screens.settings.SettingsActivity2 import com.mrboomdev.awery.util.ui.FadeTransformer +import com.mrboomdev.awery.utils.div import com.squareup.moshi.adapter import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import java.io.File import java.io.IOException import java.io.Serializable import java.lang.ref.WeakReference +private const val TAG = "MainActivity" +private const val SAVED_TAB_INDEX = "was_tab" + @OptIn(ExperimentalStdlibApi::class) class MainActivity : AppCompatActivity() { private var binding: ScreenMainBinding? = null @@ -93,9 +95,10 @@ class MainActivity : AppCompatActivity() { if(savedInstanceState != null) { tabIndex = savedInstanceState.getInt(SAVED_TAB_INDEX, -1) } - - val template = AwerySettings.TABS_TEMPLATE.value - if(template == "custom") loadCustomTabs() else loadTemplateTabs(template) + + AwerySettings.TABS_TEMPLATE.value.also { + if(it == "custom") loadCustomTabs() else loadTemplateTabs(it) + } if(AwerySettings.AUTO_CHECK_APP_UPDATE.value) { lifecycleScope.launch(Dispatchers.IO + CoroutineExceptionHandler { _, t -> @@ -143,19 +146,19 @@ class MainActivity : AppCompatActivity() { setupNavigation() when(navigationStyle) { - NavigationStyle_Values.BUBBLE -> { + AwerySettings.NavigationStyleValue.BUBBLE -> { for(i in tabs.indices) { val tab = tabs[i] val drawable = icons[tab.icon]?.getDrawable(this) ?: ContextCompat.getDrawable(this, R.drawable.ic_view_cozy)!! - if (tabIndex == -1 && tab.id == savedDefaultTab) { + if(tabIndex == -1 && tab.id == savedDefaultTab) { tabIndex = i } binding!!.navbarBubble.addTab(binding!!.navbarBubble.createTab( - drawable, i18n(tab.title) ?: tab.title + drawable, i18n(tab.title) ?: tab.title )) } @@ -163,24 +166,25 @@ class MainActivity : AppCompatActivity() { binding!!.navbarBubble.visibility = View.VISIBLE } - NavigationStyle_Values.MATERIAL -> { + AwerySettings.NavigationStyleValue.MATERIAL -> { val nav = binding!!.navbarMaterial - for (i in tabs.indices) { + for(i in tabs.indices) { val tab = tabs[i] val icon = icons[tab.icon] - val drawable = icon?.getDrawable(this) ?: ContextCompat.getDrawable(this, R.drawable.ic_view_cozy)!! + val drawable = icon?.getDrawable(this) + ?: ContextCompat.getDrawable(this, R.drawable.ic_view_cozy)!! if(tabIndex == -1 && tab.id == savedDefaultTab) { tabIndex = i } - nav.menu.add(0, i, 0, i18n(tab.title) ?: tab.title) + nav.menu.add(0, i, 0, i18n(tab.title) ?: tab.title) nav.menu.getItem(i).setIcon(drawable) } - nav.selectedItemId = if (tabIndex != -1) tabIndex else 0 + nav.selectedItemId = if(tabIndex != -1) tabIndex else 0 nav.visibility = View.VISIBLE } } @@ -215,7 +219,7 @@ class MainActivity : AppCompatActivity() { binding!!.pages.isUserInputEnabled = false binding!!.pages.setPageTransformer(FadeTransformer()) - if(navigationStyle == NavigationStyle_Values.MATERIAL) { + if(navigationStyle == AwerySettings.NavigationStyleValue.MATERIAL) { if(AwerySettings.USE_AMOLED_THEME.value) { binding!!.navbarMaterial.setBackgroundColor(-0x1000000) @Suppress("DEPRECATION") @@ -352,7 +356,7 @@ class MainActivity : AppCompatActivity() { view.rightPadding = dpPx(32f) + insets.right view.rightPadding = dpPx(32f) + insets.right view.leftPadding = dpPx(32f) + - (if(navigationStyle == NavigationStyle_Values.MATERIAL) 0 else insets.left) + (if(navigationStyle == AwerySettings.NavigationStyleValue.MATERIAL) 0 else insets.left) } else { view.setHorizontalPadding(dpPx(16f)) } @@ -362,7 +366,7 @@ class MainActivity : AppCompatActivity() { header = binding - if (isHeaderTransparent) { + if(isHeaderTransparent) { updateHeader(false) } @@ -373,14 +377,14 @@ class MainActivity : AppCompatActivity() { super.setContentBehindToolbarEnabled(isEnabled) isHeaderTransparent = isEnabled - if (header != null) { + if(header != null) { updateHeader(isEnabled) } } private fun updateHeader(isTransparent: Boolean) { - if (isTransparent) { - if (header!!.searchBar != null) { + if(isTransparent) { + if(header!!.searchBar != null) { header!!.logo.visibility = View.GONE header!!.searchBar!!.visibility = View.GONE } @@ -391,32 +395,19 @@ class MainActivity : AppCompatActivity() { header!!.title.visibility = View.VISIBLE header!!.logo.visibility = View.VISIBLE - if (header!!.searchBar != null) { + if(header!!.searchBar != null) { header!!.search.visibility = View.GONE header!!.searchBar!!.visibility = View.VISIBLE } } } - override fun getFilters(): SettingsList { - return SettingsList() - } - - override fun getMaxLoadsAtSameTime(): Int { - return 1 - } - - override fun loadOnStartup(): Boolean { - return true - } - - override fun getCacheFile(): File { - return File(requireContext().cacheDir, Constants.DIRECTORY_NET_CACHE + "/" + Constants.FILE_FEEDS_NET_CACHE) - } - } - - companion object { - private const val TAG = "MainActivity" - private const val SAVED_TAB_INDEX = "was_tab" + override fun getFilters() = SettingsList() + override fun getMaxLoadsAtSameTime() = 1 + override fun loadOnStartup() = true + + override fun getCacheFile() = requireContext().cacheDir / + Constants.DIRECTORY_NET_CACHE / + Constants.FILE_FEEDS_NET_CACHE } } \ No newline at end of file diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/feeds/FailedFeedViewHolder.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/feeds/FailedFeedViewHolder.kt index 0236bcfb..a204bfa4 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/feeds/FailedFeedViewHolder.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/feeds/FailedFeedViewHolder.kt @@ -31,7 +31,7 @@ class FailedFeedViewHolder private constructor( if(isLandscape) { view.rightMargin = insets.right + view.dpPx(16f) view.leftMargin = view.dpPx(16f) + - (if(navigationStyle != AwerySettings.NavigationStyle_Values.MATERIAL) insets.left else 0) + (if(navigationStyle != AwerySettings.NavigationStyleValue.MATERIAL) insets.left else 0) } else { view.setHorizontalMargin(0) } diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/feeds/ListFeedViewHolder.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/feeds/ListFeedViewHolder.kt index 927a0291..e6e1e65e 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/feeds/ListFeedViewHolder.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/feeds/ListFeedViewHolder.kt @@ -8,8 +8,8 @@ import com.mrboomdev.awery.app.App.Companion.navigationStyle import com.mrboomdev.awery.databinding.FeedListBinding import com.mrboomdev.awery.extensions.data.CatalogSearchResults import com.mrboomdev.awery.generated.AwerySettings -import com.mrboomdev.awery.ui.mobile.screens.search.SearchActivity import com.mrboomdev.awery.ui.mobile.screens.catalog.MediaCatalogAdapter +import com.mrboomdev.awery.ui.mobile.screens.search.SearchActivity import com.mrboomdev.awery.util.WeakLazy import com.mrboomdev.awery.util.extensions.UI_INSETS import com.mrboomdev.awery.util.extensions.applyInsets @@ -38,7 +38,7 @@ class ListFeedViewHolder private constructor( binding.header.applyInsets(UI_INSETS, { view, insets -> if(isLandscape) { view.leftMargin = view.dpPx(16f) + (if( - navigationStyle != AwerySettings.NavigationStyle_Values.MATERIAL + navigationStyle != AwerySettings.NavigationStyleValue.MATERIAL ) insets.left else 0) binding.header.rightMargin = insets.right + view.dpPx(16f) @@ -52,7 +52,7 @@ class ListFeedViewHolder private constructor( binding.recycler.applyInsets(UI_INSETS, { view, insets -> if(isLandscape) { view.leftPadding = view.dpPx(32f) + (if( - navigationStyle != AwerySettings.NavigationStyle_Values.MATERIAL + navigationStyle != AwerySettings.NavigationStyleValue.MATERIAL ) insets.left else 0) view.rightPadding = insets.right + view.dpPx(32f) diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/feeds/PagesFeedViewHolder.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/feeds/PagesFeedViewHolder.kt index 43c4e490..6a750cab 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/feeds/PagesFeedViewHolder.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/catalog/feeds/PagesFeedViewHolder.kt @@ -13,14 +13,14 @@ import com.mrboomdev.awery.R import com.mrboomdev.awery.app.App.Companion.isLandscape import com.mrboomdev.awery.app.App.Companion.navigationStyle import com.mrboomdev.awery.app.AweryLifecycle.Companion.runOnUiThread +import com.mrboomdev.awery.app.theme.ThemeManager import com.mrboomdev.awery.databinding.FeedFeaturedItemBinding import com.mrboomdev.awery.databinding.FeedFeaturedWrapperBinding import com.mrboomdev.awery.ext.data.CatalogMedia import com.mrboomdev.awery.generated.AwerySettings -import com.mrboomdev.awery.app.theme.ThemeManager -import com.mrboomdev.awery.ui.mobile.screens.media.MediaActivity import com.mrboomdev.awery.ui.mobile.dialogs.MediaActionsDialog import com.mrboomdev.awery.ui.mobile.dialogs.MediaBookmarkDialog +import com.mrboomdev.awery.ui.mobile.screens.media.MediaActivity import com.mrboomdev.awery.util.MediaUtils import com.mrboomdev.awery.util.UniqueIdGenerator import com.mrboomdev.awery.util.extensions.UI_INSETS @@ -120,7 +120,7 @@ class PagesFeedViewHolder private constructor( binding.leftSideBarrier.applyInsets(UI_INSETS, { view, insets -> if(isLandscape) { view.leftMargin = view.dpPx(32f) + (if( - navigationStyle != AwerySettings.NavigationStyle_Values.MATERIAL + navigationStyle != AwerySettings.NavigationStyleValue.MATERIAL ) insets.left else 0) } else { view.rightMargin = 0 diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/media/MediaActivity.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/media/MediaActivity.kt index 73dc4dfc..e8e92569 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/media/MediaActivity.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/media/MediaActivity.kt @@ -21,7 +21,7 @@ import com.mrboomdev.awery.app.theme.ThemeManager.applyTheme import com.mrboomdev.awery.databinding.ScreenMediaDetailsBinding import com.mrboomdev.awery.ext.data.CatalogMedia import com.mrboomdev.awery.extensions.data.CatalogVideo -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.generated.AwerySettings import com.mrboomdev.awery.util.MediaUtils import com.mrboomdev.awery.util.extensions.UI_INSETS import com.mrboomdev.awery.util.extensions.applyInsets @@ -75,7 +75,7 @@ class MediaActivity : AppCompatActivity(), SafeArgsActivity - if(AwerySettings.USE_AMOLED_THEME.value == true) { + if(AwerySettings.USE_AMOLED_THEME.value) { view.setBackgroundColor(-0x1000000) window.navigationBarColor = if(isLandscape) 0 else -0x1000000 } else { diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/player/PlayerActivity.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/player/PlayerActivity.kt index 9e2457da..a04fcebc 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/player/PlayerActivity.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/player/PlayerActivity.kt @@ -54,7 +54,7 @@ import com.mrboomdev.awery.extensions.ExtensionProvider import com.mrboomdev.awery.extensions.data.CatalogSubtitle import com.mrboomdev.awery.extensions.data.CatalogVideo import com.mrboomdev.awery.extensions.data.CatalogVideoFile -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.generated.AwerySettings import com.mrboomdev.awery.util.NiceUtils import com.mrboomdev.awery.util.async.AsyncFuture import com.mrboomdev.awery.util.exceptions.explain @@ -62,6 +62,7 @@ import com.mrboomdev.awery.util.extensions.applyInsets import com.mrboomdev.awery.util.extensions.bottomMargin import com.mrboomdev.awery.util.extensions.enableEdgeToEdge import com.mrboomdev.awery.util.extensions.leftMargin +import com.mrboomdev.awery.util.extensions.toMimeType import com.mrboomdev.awery.util.ui.dialog.DialogBuilder import com.mrboomdev.safeargsnext.owner.SafeArgsActivity import com.mrboomdev.safeargsnext.util.rememberSafeArgs @@ -113,7 +114,6 @@ class PlayerActivity : AppCompatActivity(), SafeArgsActivity when(action) { @@ -153,8 +153,8 @@ class PlayerActivity : AppCompatActivity(), SafeArgsActivity gestures.onTouchEventRight(event) } binding.doubleTapBackward.setOnClickListener { - if(doubleTapSeek == 0) { + if(doubleTapSeek.key.toInt() == 0) { controller.toggleUiVisibility() return@setOnClickListener } @@ -209,7 +209,7 @@ class PlayerActivity : AppCompatActivity(), SafeArgsActivity getFeeds() { return false; } - var adultMode = AwerySettings.ADULT_MODE.getValue(); + var adultMode = AwerySettings.INSTANCE.getADULT_MODE().getValue(); if(adultMode != null) { switch(adultMode) { diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/settings/SettingsActions.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/settings/SettingsActions.kt index 1e054fad..513b1ff2 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/settings/SettingsActions.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/settings/SettingsActions.kt @@ -1,189 +1,17 @@ package com.mrboomdev.awery.ui.mobile.screens.settings -import android.app.Activity -import android.content.Intent -import android.net.Uri -import android.os.Build -import android.provider.Settings -import android.util.Log -import com.mrboomdev.awery.R -import com.mrboomdev.awery.app.App.Companion.showLoadingWindow -import com.mrboomdev.awery.app.App.Companion.toast 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.AweryLocales -import com.mrboomdev.awery.app.CrashHandler -import com.mrboomdev.awery.data.Constants -import com.mrboomdev.awery.data.Constants.DIRECTORY_IMAGE_CACHE import com.mrboomdev.awery.data.settings.SettingsItem -import com.mrboomdev.awery.app.services.BackupService -import com.mrboomdev.awery.app.update.UpdatesManager -import com.mrboomdev.awery.app.update.UpdatesManager.showUpdateDialog -import com.mrboomdev.awery.generated.AwerySettings -import com.mrboomdev.awery.ui.mobile.screens.setup.SetupActivity -import com.mrboomdev.awery.util.ContentType -import com.mrboomdev.awery.util.exceptions.explain -import com.mrboomdev.awery.util.extensions.hasPermission -import com.mrboomdev.awery.util.extensions.requestPermission -import com.mrboomdev.awery.util.extensions.startActivity -import com.mrboomdev.awery.util.extensions.startActivityForResult -import com.mrboomdev.awery.util.extensions.startService -import com.mrboomdev.awery.util.ui.dialog.DialogBuilder -import kotlinx.coroutines.CoroutineExceptionHandler -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import org.jetbrains.annotations.Contract -import xcrash.XCrash -import java.io.File -import java.util.Calendar -import kotlin.concurrent.thread -import kotlin.coroutines.cancellation.CancellationException +import com.mrboomdev.awery.platform.PlatformSetting +import com.mrboomdev.awery.platform.PlatformSettingHandler +@Deprecated(message = "old shit") object SettingsActions { - private const val TAG = "SettingsActions" @JvmStatic - @Contract(pure = true) fun run(item: SettingsItem) { - val actionName = item.key ?: return - - when(actionName) { - AwerySettings.TRY_CRASH_NATIVE -> XCrash.testNativeCrash(false) - AwerySettings.TRY_CRASH_JAVA -> XCrash.testJavaCrash(false) - AwerySettings.TRY_CRASH_NATIVE_ASYNC -> thread { XCrash.testNativeCrash(false) } - AwerySettings.TRY_CRASH_JAVA_ASYNC -> thread { XCrash.testJavaCrash(false) } - - AwerySettings.ABOUT -> anyContext.startActivity(AboutActivity::class) - AwerySettings.START_ONBOARDING -> anyContext.startActivity(SetupActivity::class) - AwerySettings.UI_LANGUAGE -> AweryLocales.showPicker(getAnyActivity()!!) - - AwerySettings.PLAYER_SYSTEM_SUBTITLES -> anyContext.startActivity( - action = Settings.ACTION_CAPTIONING_SETTINGS) - - AwerySettings.SETUP_THEME -> anyContext.startActivity( - SetupActivity::class, extras = mapOf( - SetupActivity.EXTRA_STEP to SetupActivity.STEP_THEMING, - SetupActivity.EXTRA_FINISH_ON_COMPLETE to true - )) - - AwerySettings.CLEAR_IMAGE_CACHE -> { - File(anyContext.cacheDir, DIRECTORY_IMAGE_CACHE).deleteRecursively() - toast(R.string.cleared_successfully) - } - - AwerySettings.CLEAR_WEBVIEW_CACHE -> { - File(anyContext.cacheDir, Constants.DIRECTORY_WEBVIEW_CACHE).deleteRecursively() - toast(R.string.cleared_successfully) - } - - AwerySettings.CLEAR_NET_CACHE -> { - File(appContext.cacheDir, Constants.DIRECTORY_NET_CACHE).deleteRecursively() - toast(R.string.cleared_successfully) - } - - AwerySettings.BACKUP -> { - val date = Calendar.getInstance() - - val defaultName = "awery_backup_[" + date[Calendar.YEAR] + "_" + - date[Calendar.MONTH] + "_" + - date[Calendar.DATE] + "]_[" + - date[Calendar.HOUR_OF_DAY] + "_" + - date[Calendar.MINUTE] + "].awerybck" - - val context = getAnyActivity()!! - - if(Build.VERSION.SDK_INT <= Build.VERSION_CODES.P && !context.hasPermission(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)) { - context.requestPermission(android.Manifest.permission.WRITE_EXTERNAL_STORAGE, { didGrant -> - if(didGrant) run(item) else (DialogBuilder(context).apply { - setTitle("Permission required!") - setMessage("Sorry, but you cannot create files without an storage permission.") - setNegativeButton(R.string.dismiss) { dismiss() } - - setPositiveButton("Open settings") { - context.startActivity(action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS, - data = Uri.parse("package:${context.packageName}")) - - dismiss() - } - }).show() - }) - - return - } - - context.startActivityForResult( - action = Intent.ACTION_CREATE_DOCUMENT, - type = ContentType.ANY.mimeType, - categories = arrayOf(Intent.CATEGORY_OPENABLE), - extras = mapOf(Intent.EXTRA_TITLE to defaultName), - callback = { resultCode, result -> - if(resultCode != Activity.RESULT_OK) { - return@startActivityForResult - } - - context.startService(BackupService::class, BackupService.Args( - BackupService.Action.BACKUP, result!!.data!!)) - }) - } - - AwerySettings.RESTORE -> { - val context = getAnyActivity()!! - - if(Build.VERSION.SDK_INT <= Build.VERSION_CODES.P && !context.hasPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE)) { - context.requestPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE, { didGrant -> - if(didGrant) run(item) else (DialogBuilder(context).apply { - setTitle("Permission required!") - setMessage("Sorry, but you cannot select files without an storage permission.") - setNegativeButton(R.string.dismiss) { dismiss() } - - setPositiveButton("Open settings") { - context.startActivity(action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS, - data = Uri.parse("package:${context.packageName}")) - - dismiss() - } - }).show() - }) - - return - } - - context.startActivityForResult(Intent.createChooser(Intent(Intent.ACTION_GET_CONTENT).apply { - setType(ContentType.ANY.mimeType) - }, "Choose a backup file"), { resultCode, result -> - if(resultCode != Activity.RESULT_OK) return@startActivityForResult - - context.startService(BackupService::class, BackupService.Args( - BackupService.Action.RESTORE, result!!.data!!)) - }) - } - - AwerySettings.CHECK_APP_UPDATE -> { - val window = showLoadingWindow() - - CoroutineScope(Dispatchers.IO + CoroutineExceptionHandler { _, t -> - Log.e(TAG, "Failed to check for updates!", t) - window.dismiss() - - if(t is CancellationException) { - toast(t.explain().title) - return@CoroutineExceptionHandler - } - - CrashHandler.showDialog( - title = "Failed to check for updates", - messagePrefixRes = R.string.please_report_bug_app, - throwable = t) - }).launch { - val update = UpdatesManager.fetchLatestAppUpdate() - showUpdateDialog(getAnyActivity()!!, update) - window.dismiss() - } - } - - else -> toast("Unknown action: $actionName") - } + PlatformSettingHandler.handlePlatformClick(anyContext, PlatformSetting( + key = item.key + )) } } \ No newline at end of file diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/settings/SettingsActivity2.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/settings/SettingsActivity2.kt index 5b4f1823..2ea90966 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/settings/SettingsActivity2.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/settings/SettingsActivity2.kt @@ -11,6 +11,9 @@ import androidx.compose.foundation.layout.safeContent import androidx.compose.foundation.layout.windowInsetsEndWidth import androidx.compose.foundation.layout.windowInsetsStartWidth import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi +import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo +import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole +import androidx.compose.material3.adaptive.layout.calculatePaneScaffoldDirective import androidx.compose.material3.adaptive.navigation.BackNavigationBehavior import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator import androidx.compose.runtime.getValue @@ -51,7 +54,8 @@ class SettingsActivity2: ComponentActivity() { } setThemedContent { - val navigator = rememberListDetailPaneScaffoldNavigator() + val scaffoldDirective = calculatePaneScaffoldDirective(currentWindowAdaptiveInfo()) + val navigator = rememberListDetailPaneScaffoldNavigator(scaffoldDirective) val navigatorHistory = remember { navigator.historyState } var didOpenAnyScreen by remember { mutableStateOf(false) } @@ -61,6 +65,11 @@ class SettingsActivity2: ComponentActivity() { try { progress.collect() navigator.navigateBack(BackNavigationBehavior.PopLatest) + + if(didOpenAnyScreen && navigatorHistory.isEmpty() && scaffoldDirective.maxHorizontalPartitions == 1) { + navigator.navigateTo(ListDetailPaneScaffoldRole.List, settings) + didOpenAnyScreen = false + } } catch(_: CancellationException) {} } diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/settings/TabsSettings.java b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/settings/TabsSettings.java index 649e12f8..fedc42ad 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/settings/TabsSettings.java +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/settings/TabsSettings.java @@ -119,7 +119,7 @@ public IconStateful getIcon(Map.Entry item) { .max().orElse(0) + 1; dao.insert(tab); - getPrefs().setValue(AwerySettings.TABS_TEMPLATE, "custom").saveAsync(); + getPrefs().setValue(AwerySettings.INSTANCE.getTABS_TEMPLATE().getKey(), "custom").saveAsync(); runOnUiThread(() -> { if(items.size() == 2) { @@ -161,7 +161,7 @@ public void loadData() { @Override public String getKey() { - return AwerySettings.DEFAULT_HOME_TAB.getKey(); + return AwerySettings.INSTANCE.getDEFAULT_HOME_TAB().getKey(); } @Override @@ -181,7 +181,7 @@ public Drawable getIcon(@NonNull Context context) { @Override public List getItems() { - var savedTemplate = AwerySettings.TABS_TEMPLATE.getValue(); + var savedTemplate = AwerySettings.INSTANCE.getTABS_TEMPLATE().getValue(); if(!Objects.equals(savedTemplate, "custom")) { try { diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/setup/SetupActivity.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/setup/SetupActivity.kt index c118e7c2..ecf61783 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/setup/SetupActivity.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/setup/SetupActivity.kt @@ -10,12 +10,10 @@ import com.google.android.material.materialswitch.MaterialSwitch import com.mrboomdev.awery.R import com.mrboomdev.awery.app.App.Companion.database import com.mrboomdev.awery.app.theme.ThemeManager.applyTheme -import com.mrboomdev.awery.data.settings.NicePreferences.getPrefs -import com.mrboomdev.awery.data.settings.SettingsItem import com.mrboomdev.awery.databinding.ScreenSetupBinding -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.generated.AwerySettings +import com.mrboomdev.awery.platform.PlatformSettingHandler import com.mrboomdev.awery.ui.mobile.screens.SplashActivity -import com.mrboomdev.awery.ui.mobile.screens.settings.SettingsActions import com.mrboomdev.awery.ui.mobile.screens.setup.SetupThemeAdapter.Companion.create import com.mrboomdev.awery.util.extensions.UI_INSETS import com.mrboomdev.awery.util.extensions.applyInsets @@ -65,7 +63,7 @@ class SetupActivity : AppCompatActivity() { when(intent.getIntExtra("step", STEP_WELCOME)) { STEP_WELCOME -> { - if(AwerySettings.SETUP_VERSION_FINISHED.value != 0) { + if(AwerySettings.SETUP_VERSION_FINISHED.value != -1) { binding.title.setText(R.string.awery_updated_title) binding.message.setText(R.string.awery_updated_description) binding.backButton.visibility = View.GONE @@ -75,7 +73,7 @@ class SetupActivity : AppCompatActivity() { binding.continueButton.setText(R.string.lets_begin) binding.backButton.setOnClickListener { - SettingsActions.run(SettingsItem.Builder().setKey(AwerySettings.RESTORE.key).build()) + PlatformSettingHandler.handlePlatformClick(this, AwerySettings.RESTORE.asPlatformSetting()) } binding.icon.setImageResource(R.mipmap.ic_launcher_foreground) @@ -116,7 +114,7 @@ class SetupActivity : AppCompatActivity() { val discordUrl = getString(R.string.discord_link) val telegramUrl = getString(R.string.telegram_link) - if (template == "dantotsu") { + if(template == "dantotsu") { binding.message.setMarkwon(getString(R.string.dantotsu_message, discordUrl, telegramUrl)) } else { binding.message.setMarkwon(getString(R.string.generic_message, discordUrl, telegramUrl)) @@ -166,7 +164,7 @@ class SetupActivity : AppCompatActivity() { val selected = (binding.recycler.adapter as SetupTabsAdapter).selected if(selected == null) { - AwerySettings.TABS_TEMPLATE.value = null + AwerySettings.TABS_TEMPLATE.value = "awery" startNextStep() return } @@ -272,20 +270,20 @@ class SetupActivity : AppCompatActivity() { .position(Position.Relative(x, .3)) .build() } - + companion object { /** * Note: Please increment this value by one every time when a new step is being added */ - const val SETUP_VERSION: Int = 2 - - const val EXTRA_STEP: String = "step" - const val EXTRA_FINISH_ON_COMPLETE: String = "finish_on_complete" - const val STEP_WELCOME: Int = 0 - const val STEP_FINISH: Int = 1 - const val STEP_TEMPLATE: Int = 2 - const val STEP_THEMING: Int = 3 - const val STEP_SOURCES: Int = 4 - const val STEP_ANALYTICS: Int = 5 + const val SETUP_VERSION = 2 + + const val EXTRA_STEP = "step" + const val EXTRA_FINISH_ON_COMPLETE = "finish_on_complete" + const val STEP_WELCOME = 0 + const val STEP_FINISH = 1 + const val STEP_TEMPLATE = 2 + const val STEP_THEMING = 3 + const val STEP_SOURCES = 4 + const val STEP_ANALYTICS = 5 } } \ No newline at end of file diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/setup/SetupTabsAdapter.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/setup/SetupTabsAdapter.kt index f3a9d8c4..f4042279 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/setup/SetupTabsAdapter.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/setup/SetupTabsAdapter.kt @@ -12,7 +12,7 @@ import com.google.android.material.R import com.mrboomdev.awery.app.App.Companion.getMoshi import com.mrboomdev.awery.data.settings.SettingsList import com.mrboomdev.awery.databinding.ItemListSettingBinding -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.generated.AwerySettings import com.mrboomdev.awery.util.TabsTemplate import com.mrboomdev.awery.util.extensions.clearImageTint import com.mrboomdev.awery.util.extensions.context diff --git a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/setup/SetupThemeAdapter.kt b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/setup/SetupThemeAdapter.kt index 3b675ad6..dfc81327 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/setup/SetupThemeAdapter.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/mobile/screens/setup/SetupThemeAdapter.kt @@ -17,21 +17,18 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.color.DynamicColors import com.mrboomdev.awery.R -import com.mrboomdev.awery.app.App.Companion.i18n import com.mrboomdev.awery.app.AweryLifecycle.Companion.appContext import com.mrboomdev.awery.app.AweryLifecycle.Companion.getActivities -import com.mrboomdev.awery.data.settings.NicePreferences.getPrefs -import com.mrboomdev.awery.data.settings.SettingsItem -import com.mrboomdev.awery.databinding.WidgetCircleButtonBinding -import com.mrboomdev.awery.AwerySettings -import com.mrboomdev.awery.AwerySettings.ThemeColorPaletteValue import com.mrboomdev.awery.app.theme.ThemeManager import com.mrboomdev.awery.app.theme.ThemeManager.applyTheme import com.mrboomdev.awery.asSetting +import com.mrboomdev.awery.data.settings.NicePreferences.getPrefs +import com.mrboomdev.awery.data.settings.SettingsItem +import com.mrboomdev.awery.databinding.WidgetCircleButtonBinding import com.mrboomdev.awery.ext.data.Setting -import com.mrboomdev.awery.findSetting +import com.mrboomdev.awery.ext.data.getRecursively +import com.mrboomdev.awery.generated.AwerySettings import com.mrboomdev.awery.platform.PlatformResources -import com.mrboomdev.awery.platform.PlatformResources.i18n import com.mrboomdev.awery.ui.mobile.screens.settings.SettingsAdapter import com.mrboomdev.awery.ui.mobile.screens.settings.SettingsDataHandler import com.mrboomdev.awery.util.extensions.balloon @@ -44,12 +41,10 @@ import com.mrboomdev.awery.util.ui.adapter.SingleViewAdapter import com.skydoves.balloon.BalloonAlign class SetupThemeAdapter private constructor(context: Context) : RecyclerView.Adapter() { - private val isAmoled = AwerySettings.USE_AMOLED_THEME.value == true private val materialYouDrawable: Drawable? private val selectedDrawable: Drawable private val themes: MutableList = ArrayList() private val context: Context - private var didSuggestYou = AwerySettings.DID_SUGGEST_MATERIAL_YOU.value == true var selected: Theme? /** @@ -67,8 +62,6 @@ class SetupThemeAdapter private constructor(context: Context) : RecyclerView.Ada setColor(context.resolveAttrColor(com.google.android.material.R.attr.colorOnSecondary)) } - - materialYouDrawable = run { if(!DynamicColors.isDynamicColorAvailable()) { return@run null @@ -77,18 +70,18 @@ class SetupThemeAdapter private constructor(context: Context) : RecyclerView.Ada LayerDrawable(arrayOf( GradientDrawable().apply { shape = GradientDrawable.OVAL - setColor(ContextThemeWrapper(context, - ThemeManager.getThemeRes(ThemeColorPaletteValue.MATERIAL_YOU, isAmoled) - ).resolveAttrColor(com.google.android.material.R.attr.colorPrimary)) + + val themeRes = ThemeManager.getThemeRes(AwerySettings.ThemeColorPaletteValue.MATERIAL_YOU, AwerySettings.USE_AMOLED_THEME.value) + setColor(ContextThemeWrapper(context, themeRes).resolveAttrColor(com.google.android.material.R.attr.colorPrimary)) }, ContextCompat.getDrawable(context, R.drawable.ic_round_auto_awesome_24) )) } - for(theme in ThemeColorPaletteValue.entries.toTypedArray()) { - if(theme == ThemeColorPaletteValue.MATERIAL_YOU && !DynamicColors.isDynamicColorAvailable()) continue - themes.add(Theme(theme, theme.findSetting())) + for(theme in AwerySettings.ThemeColorPaletteValue.entries.toTypedArray()) { + if(theme == AwerySettings.ThemeColorPaletteValue.MATERIAL_YOU && !DynamicColors.isDynamicColorAvailable()) continue + themes.add(Theme(theme, AwerySettings.maps.SYSTEM_SETTINGS.items!!.getRecursively(theme.key)!!)) } selected = themes.find { it.id == palette.key } @@ -140,26 +133,22 @@ class SetupThemeAdapter private constructor(context: Context) : RecyclerView.Ada binding.root.background = if(this.theme === selected) selectedDrawable else ContextCompat.getDrawable(context, R.drawable.ui_button_popup_background) - if(theme.palette == ThemeColorPaletteValue.MATERIAL_YOU) { + if(theme.palette == AwerySettings.ThemeColorPaletteValue.MATERIAL_YOU) { binding.root.setImageDrawable(materialYouDrawable) } else { - imageDrawable.setColor(ContextThemeWrapper(context, - ThemeManager.getThemeRes(theme.palette, isAmoled - )).resolveAttrColor(com.google.android.material.R.attr.colorPrimary) - ) - + val themeRes = ThemeManager.getThemeRes(theme.palette, AwerySettings.USE_AMOLED_THEME.value) + imageDrawable.setColor(ContextThemeWrapper(context, themeRes).resolveAttrColor(com.google.android.material.R.attr.colorPrimary)) binding.root.setImageDrawable(imageDrawable) } - if(theme.palette == ThemeColorPaletteValue.MATERIAL_YOU && !didSuggestYou) { - binding.root.balloon(PlatformResources.i18n(R.string.wallpaper_based_colors), BalloonAlign.END) - didSuggestYou = true + if(theme.palette == AwerySettings.ThemeColorPaletteValue.MATERIAL_YOU && !AwerySettings.DID_SUGGEST_MATERIAL_YOU.value) { + binding.root.balloon(PlatformResources.i18n(R.string.wallpaper_based_colors), BalloonAlign.BOTTOM) AwerySettings.DID_SUGGEST_MATERIAL_YOU.value = true } binding.root.setOnLongClickListener { - if(theme.palette == ThemeColorPaletteValue.MATERIAL_YOU) { - binding.root.balloon(PlatformResources.i18n(R.string.wallpaper_based_colors), BalloonAlign.END) + if(theme.palette == AwerySettings.ThemeColorPaletteValue.MATERIAL_YOU) { + binding.root.balloon(PlatformResources.i18n(R.string.wallpaper_based_colors), BalloonAlign.BOTTOM) return@setOnLongClickListener true } @@ -168,7 +157,10 @@ class SetupThemeAdapter private constructor(context: Context) : RecyclerView.Ada } } - inner class Theme(val palette: ThemeColorPaletteValue, private val item: Setting) { + inner class Theme( + val palette: AwerySettings.ThemeColorPaletteValue, + private val item: Setting + ) { val id: String get() = palette.key @@ -186,7 +178,6 @@ class SetupThemeAdapter private constructor(context: Context) : RecyclerView.Ada } companion object { - @JvmStatic fun create(context: Context): ConcatAdapter { return ConcatAdapter( ConcatAdapter.Config.Builder() diff --git a/app/src/main/java/com/mrboomdev/awery/ui/tv/TvMainActivity.kt b/app/src/main/java/com/mrboomdev/awery/ui/tv/TvMainActivity.kt index 15261fd1..56134de0 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/tv/TvMainActivity.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/tv/TvMainActivity.kt @@ -3,7 +3,6 @@ package com.mrboomdev.awery.ui.tv import android.app.Activity import android.os.Bundle import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent import androidx.compose.foundation.background import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi import androidx.compose.runtime.Composable @@ -15,9 +14,8 @@ import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import androidx.navigation.toRoute import com.mrboomdev.awery.app.theme.ThemeManager.setThemedContent -import com.mrboomdev.awery.ext.data.CatalogMedia -import com.mrboomdev.awery.AwerySettings import com.mrboomdev.awery.data.settings.NicePreferences +import com.mrboomdev.awery.ext.data.CatalogMedia import com.mrboomdev.awery.platform.PlatformSetting import com.mrboomdev.awery.ui.mobile.components.MobileSetting import com.mrboomdev.awery.ui.mobile.screens.settings.SettingsActivity diff --git a/app/src/main/java/com/mrboomdev/awery/ui/tv/components/MediaCard.kt b/app/src/main/java/com/mrboomdev/awery/ui/tv/components/MediaCard.kt index 4dff73a4..a5988e4b 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/tv/components/MediaCard.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/tv/components/MediaCard.kt @@ -22,9 +22,9 @@ import androidx.tv.material3.Card import androidx.tv.material3.Text import coil3.compose.AsyncImage import com.mrboomdev.awery.app.AweryLifecycle.Companion.getAnyActivity -import com.mrboomdev.awery.ext.data.CatalogMedia import com.mrboomdev.awery.app.theme.TvTheme -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.ext.data.CatalogMedia +import com.mrboomdev.awery.generated.AwerySettings import com.mrboomdev.awery.ui.mobile.dialogs.MediaActionsDialog /** diff --git a/app/src/main/java/com/mrboomdev/awery/ui/tv/screens/home/HomeScreen.kt b/app/src/main/java/com/mrboomdev/awery/ui/tv/screens/home/HomeScreen.kt index 00596f49..c9a0f771 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/tv/screens/home/HomeScreen.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/tv/screens/home/HomeScreen.kt @@ -24,7 +24,7 @@ import androidx.tv.material3.NavigationDrawerItemColors import androidx.tv.material3.Text import androidx.tv.material3.contentColorFor import com.mrboomdev.awery.app.AweryLifecycle.Companion.getAnyActivity -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.generated.AwerySettings import com.mrboomdev.awery.ui.mobile.screens.settings.SettingsActivity import com.mrboomdev.awery.ui.tv.Screens import com.mrboomdev.awery.ui.tv.components.FeedsGroup @@ -78,7 +78,7 @@ fun HomeScreen( onClick = { if(tab.id == "settings") { - if(AwerySettings.EXPERIMENT_SETTINGS2.value == true) { + if(AwerySettings.EXPERIMENT_SETTINGS2.value) { navController.navigate(Screens.Settings) return@NavigationDrawerItem } diff --git a/app/src/main/java/com/mrboomdev/awery/ui/tv/screens/home/HomeViewModel.kt b/app/src/main/java/com/mrboomdev/awery/ui/tv/screens/home/HomeViewModel.kt index eaa5f454..45c72a11 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/tv/screens/home/HomeViewModel.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/tv/screens/home/HomeViewModel.kt @@ -14,7 +14,7 @@ import com.mrboomdev.awery.app.App.Companion.getMoshi import com.mrboomdev.awery.app.App.Companion.i18n import com.mrboomdev.awery.app.ExtensionsManager.loadAll import com.mrboomdev.awery.ext.data.CatalogFeed -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.generated.AwerySettings import com.mrboomdev.awery.util.IconStateful import com.mrboomdev.awery.util.exceptions.ZeroResultsException import com.mrboomdev.awery.util.extensions.ensureSize diff --git a/app/src/main/java/com/mrboomdev/awery/ui/tv/screens/media/MediaScreen.kt b/app/src/main/java/com/mrboomdev/awery/ui/tv/screens/media/MediaScreen.kt index ebec548a..bab8cee7 100644 --- a/app/src/main/java/com/mrboomdev/awery/ui/tv/screens/media/MediaScreen.kt +++ b/app/src/main/java/com/mrboomdev/awery/ui/tv/screens/media/MediaScreen.kt @@ -29,10 +29,10 @@ import coil3.compose.SubcomposeAsyncImage import com.mrboomdev.awery.AweryDebug import com.mrboomdev.awery.R import com.mrboomdev.awery.app.App.Companion.toast +import com.mrboomdev.awery.app.theme.TvTheme import com.mrboomdev.awery.ext.data.CatalogMedia import com.mrboomdev.awery.ext.data.CatalogTag -import com.mrboomdev.awery.app.theme.TvTheme -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.generated.AwerySettings private val SHADOW_COLOR = Color(0xBB000000) diff --git a/app/src/main/java/com/mrboomdev/awery/util/MediaUtils.java b/app/src/main/java/com/mrboomdev/awery/util/MediaUtils.java index 746ae367..65a60364 100644 --- a/app/src/main/java/com/mrboomdev/awery/util/MediaUtils.java +++ b/app/src/main/java/com/mrboomdev/awery/util/MediaUtils.java @@ -14,8 +14,7 @@ import com.mrboomdev.awery.data.settings.NicePreferences; import com.mrboomdev.awery.ext.data.CatalogMedia; import com.mrboomdev.awery.extensions.data.CatalogMediaProgress; -import com.mrboomdev.awery.ext.data.CatalogTag; -import com.mrboomdev.awery.AwerySettings; +import com.mrboomdev.awery.generated.AwerySettings; import com.mrboomdev.awery.ui.mobile.screens.media.MediaActivity; import com.mrboomdev.safeargsnext.SafeArgsIntent; @@ -49,11 +48,11 @@ public static void filterMedia( public static boolean isMediaFilteredSync(@NonNull CatalogMedia media) { var prefs = NicePreferences.getPrefs(); - var badTags = prefs.getStringSet(AwerySettings.GLOBAL_EXCLUDED_TAGS); + //var badTags = prefs.getStringSet(AwerySettings.INSTANCE.getGLOBAL_EXCLUDED_TAGS()); var saved = App.Companion.getDatabase().getMediaProgressDao().get(media.getGlobalId()); if(saved != null) { - if(AwerySettings.HIDE_LIBRARY_ENTRIES.getValue() && saved.getListsCount() > 0) { + if(Boolean.TRUE.equals(AwerySettings.INSTANCE.getHIDE_LIBRARY_ENTRIES().getValue()) && saved.getListsCount() > 0) { return true; } @@ -61,10 +60,11 @@ public static boolean isMediaFilteredSync(@NonNull CatalogMedia media) { return true; } } - - return media.getTags() != null && stream(media.getTags()) - .map(CatalogTag::getName) - .anyMatch(badTags::contains); + +// return media.getTags() != null && stream(media.getTags()) +// .map(CatalogTag::getName) +// .anyMatch(badTags::contains); + return false; } public interface Callback1 { diff --git a/app/src/main/java/com/mrboomdev/awery/util/extensions/StringExtensions.kt b/app/src/main/java/com/mrboomdev/awery/util/extensions/StringExtensions.kt index 46001b7c..f0ff3522 100644 --- a/app/src/main/java/com/mrboomdev/awery/util/extensions/StringExtensions.kt +++ b/app/src/main/java/com/mrboomdev/awery/util/extensions/StringExtensions.kt @@ -24,31 +24,31 @@ fun Long.formatFileSize(): String { return "$gb b" } -fun Uri.parseMimeType(): String { +fun Uri.toMimeType(): String { if(scheme == "content") { appContext.contentResolver.query( this, null, null, null, null )?.use { cursor -> return cursor.getString(cursor.getColumnIndexOrThrow( OpenableColumns.DISPLAY_NAME - )).parseMimeType(true) + )).toMimeType(true) } } return (lastPathSegment ?: toString().let { it.substring(it.lastIndexOf("/") + 1) - }).parseMimeType(true) + }).toMimeType(true) } -fun File.parseMimeType(): String { - return name.parseMimeType(true) +fun File.toMimeType(): String { + return name.toMimeType(true) } -fun String.parseMimeType(): String { - return parseMimeType(false) +fun String.toMimeType(): String { + return toMimeType(false) } -private fun String.parseMimeType(isName: Boolean): String { +private fun String.toMimeType(isName: Boolean): String { var fileName = if(isName) this else File(this).name diff --git a/app/src/main/java/com/mrboomdev/awery/util/extensions/ViewExtensions.kt b/app/src/main/java/com/mrboomdev/awery/util/extensions/ViewExtensions.kt index 32c6c521..7a697b47 100644 --- a/app/src/main/java/com/mrboomdev/awery/util/extensions/ViewExtensions.kt +++ b/app/src/main/java/com/mrboomdev/awery/util/extensions/ViewExtensions.kt @@ -118,7 +118,7 @@ fun View.balloon(text: String, align: BalloonAlign) { } ) .setTextColor(context.resolveAttrColor(R.attr.colorSurface)) - .setBackgroundColor(context.resolveAttrColor(R.attr.colorPrimary)) + .setBackgroundColor(context.resolveAttrColor(R.attr.colorOnSurface)) .setLifecycleOwner(context.activity as AppCompatActivity?) .build().showAlign(align, this) }, 1) diff --git a/app/src/main/java/com/mrboomdev/awery/util/io/HttpClient.kt b/app/src/main/java/com/mrboomdev/awery/util/io/HttpClient.kt index db4ba10d..6980031a 100644 --- a/app/src/main/java/com/mrboomdev/awery/util/io/HttpClient.kt +++ b/app/src/main/java/com/mrboomdev/awery/util/io/HttpClient.kt @@ -2,7 +2,7 @@ package com.mrboomdev.awery.util.io import com.mrboomdev.awery.app.AweryLifecycle.Companion.appContext import com.mrboomdev.awery.data.Constants -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.generated.AwerySettings import com.mrboomdev.awery.util.async.AsyncFuture import com.mrboomdev.awery.util.async.AsyncUtils import kotlinx.coroutines.Dispatchers @@ -26,11 +26,12 @@ object HttpClient { val client: OkHttpClient by lazy { OkHttpClient.Builder().apply { - cache(File(appContext.cacheDir, Constants.DIRECTORY_NET_CACHE).let { - Cache(it, 10 * 1024 * 1024 /* 10mb */) - }) + cache(Cache( + directory = File(appContext.cacheDir, Constants.DIRECTORY_NET_CACHE), + maxSize = 10 * 1024 * 1024 /* 10mb */ + )) - if(AwerySettings.LOG_NETWORK.value == true) { + if(AwerySettings.LOG_NETWORK.value) { addNetworkInterceptor(HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY }) diff --git a/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt index a5158adb..2b259a0a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt @@ -1,8 +1,8 @@ package eu.kanade.tachiyomi.network import android.content.Context -import com.mrboomdev.awery.AwerySettings import com.mrboomdev.awery.data.Constants +import com.mrboomdev.awery.generated.AwerySettings import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor import eu.kanade.tachiyomi.network.interceptor.UncaughtExceptionInterceptor import eu.kanade.tachiyomi.network.interceptor.UserAgentInterceptor @@ -29,7 +29,7 @@ class NetworkHelper(context: Context) { directory = File(context.cacheDir, Constants.DIRECTORY_NET_CACHE), maxSize = 5L * 1024 * 1024, /* 5 MiB */)) - if(AwerySettings.LOG_NETWORK.value == true) { + if(AwerySettings.LOG_NETWORK.value) { val httpLoggingInterceptor = HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY } diff --git a/app/src/main/kotlin/com/mrboomdev/awery/AweryCompatibility.kt b/app/src/main/kotlin/com/mrboomdev/awery/AweryCompatibility.kt index d304240c..f5e870ea 100644 --- a/app/src/main/kotlin/com/mrboomdev/awery/AweryCompatibility.kt +++ b/app/src/main/kotlin/com/mrboomdev/awery/AweryCompatibility.kt @@ -2,6 +2,6 @@ package com.mrboomdev.awery import com.mrboomdev.awery.data.settings.NicePreferences import com.mrboomdev.awery.data.settings.SettingsItem +import com.mrboomdev.awery.generated.GeneratedSetting -fun GeneratedSetting.asSetting(): SettingsItem = NicePreferences.getSettingsMap().findItem(key) -fun AwerySettings.ThemeColorPaletteValue.findSetting(): SettingsItem = NicePreferences.getSettingsMap().findItem(name) \ No newline at end of file +fun GeneratedSetting.asSetting(): SettingsItem = NicePreferences.getSettingsMap().findItem(key) \ No newline at end of file diff --git a/app/src/main/kotlin/com/mrboomdev/awery/app/theme/MobileTheme.kt b/app/src/main/kotlin/com/mrboomdev/awery/app/theme/MobileTheme.kt index 7e971bd0..e407b384 100644 --- a/app/src/main/kotlin/com/mrboomdev/awery/app/theme/MobileTheme.kt +++ b/app/src/main/kotlin/com/mrboomdev/awery/app/theme/MobileTheme.kt @@ -9,9 +9,9 @@ import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext -import com.mrboomdev.awery.ui.Themes import com.mrboomdev.awery.app.App.Companion.isTv -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.generated.AwerySettings +import com.mrboomdev.awery.ui.Themes @Composable fun MobileTheme( diff --git a/app/src/main/kotlin/com/mrboomdev/awery/app/theme/ThemeManager.kt b/app/src/main/kotlin/com/mrboomdev/awery/app/theme/ThemeManager.kt index 886c74b8..5e63ce61 100644 --- a/app/src/main/kotlin/com/mrboomdev/awery/app/theme/ThemeManager.kt +++ b/app/src/main/kotlin/com/mrboomdev/awery/app/theme/ThemeManager.kt @@ -4,30 +4,21 @@ import android.annotation.SuppressLint import android.app.Activity import android.app.Application import android.app.UiModeManager -import android.content.Context import android.content.res.Configuration -import android.graphics.Bitmap import android.os.Build import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.appcompat.app.AppCompatDelegate -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import com.google.android.material.color.DynamicColors import com.google.android.material.color.DynamicColorsOptions import com.mrboomdev.awery.R import com.mrboomdev.awery.app.App.Companion.isTv import com.mrboomdev.awery.app.AweryLifecycle.Companion.anyContext -import com.mrboomdev.awery.AwerySettings -import com.mrboomdev.awery.AwerySettings.ThemeColorPaletteValue +import com.mrboomdev.awery.generated.AwerySettings object ThemeManager { - val currentColorPalette: ThemeColorPaletteValue + val currentColorPalette: AwerySettings.ThemeColorPaletteValue get() = AwerySettings.THEME_COLOR_PALETTE.value ?: resetPalette() val isDarkModeEnabled: Boolean @@ -59,10 +50,10 @@ object ThemeManager { } fun Activity.applyTheme() { - val isAmoled = AwerySettings.USE_AMOLED_THEME.value == true + val isAmoled = AwerySettings.USE_AMOLED_THEME.value val palette = currentColorPalette - if(palette == ThemeColorPaletteValue.MATERIAL_YOU) { + if(palette == AwerySettings.ThemeColorPaletteValue.MATERIAL_YOU) { return DynamicColors.applyToActivityIfAvailable(this, DynamicColorsOptions.Builder().apply { if(isAmoled) { @@ -98,28 +89,41 @@ object ThemeManager { } @SuppressLint("PrivateResource") - fun getThemeRes(theme: ThemeColorPaletteValue, isAmoled: Boolean): Int { + fun getThemeRes(theme: AwerySettings.ThemeColorPaletteValue, isAmoled: Boolean): Int { // Amoled theme breaks some colors in a light theme. val isReallyAmoled = isAmoled && isDarkModeEnabled return when(theme) { - ThemeColorPaletteValue.RED -> if(isReallyAmoled) R.style.Theme_Awery_Red_Amoled else R.style.Theme_Awery_Red - ThemeColorPaletteValue.PINK -> if(isReallyAmoled) R.style.Theme_Awery_Pink_Amoled else R.style.Theme_Awery_Pink - ThemeColorPaletteValue.PURPLE -> if(isReallyAmoled) R.style.Theme_Awery_Purple_Amoled else R.style.Theme_Awery_Purple - ThemeColorPaletteValue.BLUE -> if(isReallyAmoled) R.style.Theme_Awery_Blue_Amoled else R.style.Theme_Awery_Blue - ThemeColorPaletteValue.GREEN -> if(isReallyAmoled) R.style.Theme_Awery_Green_Amoled else R.style.Theme_Awery_Green - ThemeColorPaletteValue.MONOCHROME -> if(isReallyAmoled) R.style.Theme_Awery_Monochrome_Amoled else R.style.Theme_Awery_Monochrome - ThemeColorPaletteValue.MATERIAL_YOU -> com.google.android.material.R.style.Theme_Material3_DynamicColors_DayNight + AwerySettings.ThemeColorPaletteValue.RED -> + if(isReallyAmoled) R.style.Theme_Awery_Red_Amoled else R.style.Theme_Awery_Red + + AwerySettings.ThemeColorPaletteValue.PINK -> + if(isReallyAmoled) R.style.Theme_Awery_Pink_Amoled else R.style.Theme_Awery_Pink + + AwerySettings.ThemeColorPaletteValue.PURPLE -> + if(isReallyAmoled) R.style.Theme_Awery_Purple_Amoled else R.style.Theme_Awery_Purple + + AwerySettings.ThemeColorPaletteValue.BLUE -> + if(isReallyAmoled) R.style.Theme_Awery_Blue_Amoled else R.style.Theme_Awery_Blue + + AwerySettings.ThemeColorPaletteValue.GREEN -> + if(isReallyAmoled) R.style.Theme_Awery_Green_Amoled else R.style.Theme_Awery_Green + + AwerySettings.ThemeColorPaletteValue.MONOCHROME -> + if(isReallyAmoled) R.style.Theme_Awery_Monochrome_Amoled else R.style.Theme_Awery_Monochrome + + AwerySettings.ThemeColorPaletteValue.MATERIAL_YOU -> + com.google.android.material.R.style.Theme_Material3_DynamicColors_DayNight } } - private fun resetPalette(): ThemeColorPaletteValue { + private fun resetPalette(): AwerySettings.ThemeColorPaletteValue { val isMaterialYouSupported = DynamicColors.isDynamicColorAvailable() val theme = if(isMaterialYouSupported) { - ThemeColorPaletteValue.MATERIAL_YOU + AwerySettings.ThemeColorPaletteValue.MATERIAL_YOU } else { - ThemeColorPaletteValue.RED + AwerySettings.ThemeColorPaletteValue.RED } AwerySettings.THEME_COLOR_PALETTE.value = theme diff --git a/app/src/main/kotlin/com/mrboomdev/awery/app/theme/TvTheme.kt b/app/src/main/kotlin/com/mrboomdev/awery/app/theme/TvTheme.kt index 20f89057..fa6ce116 100644 --- a/app/src/main/kotlin/com/mrboomdev/awery/app/theme/TvTheme.kt +++ b/app/src/main/kotlin/com/mrboomdev/awery/app/theme/TvTheme.kt @@ -2,12 +2,12 @@ package com.mrboomdev.awery.app.theme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import androidx.tv.material3.MaterialTheme as TvMaterialTheme import androidx.tv.material3.darkColorScheme import androidx.tv.material3.lightColorScheme -import com.mrboomdev.awery.ui.Themes import com.mrboomdev.awery.app.App.Companion.isTv -import com.mrboomdev.awery.AwerySettings +import com.mrboomdev.awery.generated.AwerySettings +import com.mrboomdev.awery.ui.Themes +import androidx.tv.material3.MaterialTheme as TvMaterialTheme @Composable fun TvTheme( diff --git a/app/src/main/kotlin/com/mrboomdev/awery/platform/PlatformSettingHandler.kt b/app/src/main/kotlin/com/mrboomdev/awery/platform/PlatformSettingHandler.kt index 9db61b8d..50d1a2b3 100644 --- a/app/src/main/kotlin/com/mrboomdev/awery/platform/PlatformSettingHandler.kt +++ b/app/src/main/kotlin/com/mrboomdev/awery/platform/PlatformSettingHandler.kt @@ -17,8 +17,6 @@ import com.mrboomdev.awery.app.update.UpdatesManager import com.mrboomdev.awery.app.update.UpdatesManager.showUpdateDialog import com.mrboomdev.awery.data.Constants import com.mrboomdev.awery.data.Constants.DIRECTORY_IMAGE_CACHE -import com.mrboomdev.awery.data.settings.NicePreferences.getPrefs -import com.mrboomdev.awery.ext.data.Setting import com.mrboomdev.awery.generated.AwerySettings import com.mrboomdev.awery.ui.mobile.screens.settings.AboutActivity import com.mrboomdev.awery.ui.mobile.screens.setup.SetupActivity @@ -46,55 +44,53 @@ object PlatformSettingHandler { private const val TAG = "PlatformSettingHandler" fun handlePlatformClick(context: Context, setting: PlatformSetting) { - if(setting.key == null) return - when(setting.key) { - AwerySettings.TRY_CRASH_NATIVE -> + AwerySettings.TRY_CRASH_NATIVE.key -> XCrash.testNativeCrash(false) - AwerySettings.TRY_CRASH_JAVA -> + AwerySettings.TRY_CRASH_JAVA.key -> XCrash.testJavaCrash(false) - AwerySettings.TRY_CRASH_NATIVE_ASYNC -> + AwerySettings.TRY_CRASH_NATIVE_ASYNC.key -> thread { XCrash.testNativeCrash(false) } - AwerySettings.TRY_CRASH_JAVA_ASYNC -> + AwerySettings.TRY_CRASH_JAVA_ASYNC.key -> thread { XCrash.testJavaCrash(false) } - AwerySettings.ABOUT -> + AwerySettings.ABOUT.key -> context.startActivity(AboutActivity::class) - AwerySettings.START_ONBOARDING -> + AwerySettings.START_ONBOARDING.key -> context.startActivity(SetupActivity::class) - AwerySettings.UI_LANGUAGE -> + AwerySettings.UI_LANGUAGE.key -> AweryLocales.showPicker(context) - AwerySettings.PLAYER_SYSTEM_SUBTITLES -> + AwerySettings.PLAYER_SYSTEM_SUBTITLES.key -> context.startActivity(action = Settings.ACTION_CAPTIONING_SETTINGS) - AwerySettings.SETUP_THEME -> + AwerySettings.SETUP_THEME.key -> context.startActivity(SetupActivity::class, extras = mapOf( SetupActivity.EXTRA_STEP to SetupActivity.STEP_THEMING, SetupActivity.EXTRA_FINISH_ON_COMPLETE to true )) - AwerySettings.CLEAR_IMAGE_CACHE -> { + AwerySettings.CLEAR_IMAGE_CACHE.key -> { File(context.cacheDir, DIRECTORY_IMAGE_CACHE).deleteRecursively() toast(R.string.cleared_successfully) } - AwerySettings.CLEAR_WEBVIEW_CACHE -> { + AwerySettings.CLEAR_WEBVIEW_CACHE.key -> { File(context.cacheDir, Constants.DIRECTORY_WEBVIEW_CACHE).deleteRecursively() toast(R.string.cleared_successfully) } - AwerySettings.CLEAR_NET_CACHE -> { + AwerySettings.CLEAR_NET_CACHE.key -> { File(context.cacheDir, Constants.DIRECTORY_NET_CACHE).deleteRecursively() toast(R.string.cleared_successfully) } - AwerySettings.BACKUP -> { + AwerySettings.BACKUP.key -> { val activity = requireNotNull(context.activity) { "This action can be called only from an activity!" } @@ -161,7 +157,7 @@ object PlatformSettingHandler { }) } - AwerySettings.RESTORE -> { + AwerySettings.RESTORE.key -> { val activity = requireNotNull(context.activity) { "This action can be called only from an activity!" } @@ -192,7 +188,7 @@ object PlatformSettingHandler { } activity.startActivityForResult(Intent(Intent.ACTION_GET_CONTENT).apply { - setType(ContentType.ANY.mimeType) + type = ContentType.ANY.mimeType }.toChooser("Choose a backup file"), { resultCode, result -> if(resultCode != Activity.RESULT_OK) return@startActivityForResult @@ -202,7 +198,7 @@ object PlatformSettingHandler { }) } - AwerySettings.CHECK_APP_UPDATE -> { + AwerySettings.CHECK_APP_UPDATE.key -> { val window = showLoadingWindow() val activity = requireNotNull(context.activity) { diff --git a/build.gradle.kts b/build.gradle.kts index 43f79aef..1c03fb18 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,10 +7,10 @@ buildscript { plugins { alias(libs.plugins.android.app) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.kotlin.jvm) apply false + alias(libs.plugins.kotlin.multiplatform) apply false alias(libs.plugins.android.kotlin) apply false alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.compose) apply false - alias(libs.plugins.kotlin.multiplatform) apply false - alias(libs.plugins.android.library) apply false - alias(libs.plugins.kotlin.jvm) apply false } \ No newline at end of file diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index c930108e..b04192d7 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -9,6 +9,7 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { mavenCentral() + google() } versionCatalogs { diff --git a/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/SettingsClassGenerator.kt b/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/SettingsClassGenerator.kt deleted file mode 100644 index c0cf423e..00000000 --- a/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/SettingsClassGenerator.kt +++ /dev/null @@ -1,152 +0,0 @@ -package com.mrboomdev.awery.gradle - -import kotlinx.serialization.ExperimentalSerializationApi -import kotlinx.serialization.Serializable -import kotlinx.serialization.json.Json -import org.gradle.api.Project -import java.io.File -import java.util.Locale - -object SettingsClassGenerator { - - @Suppress("MemberVisibilityCanBePrivate") - val Project.generatedSettingsDir: File - get() = file("$projectDir/generatedSettings/main/kotlin") - - @Suppress("JSON_FORMAT_REDUNDANT") - @OptIn(ExperimentalSerializationApi::class) - fun generateSettings( - inputFiles: Collection, - outputFile: File - ) { - outputFile.apply { - parentFile.mkdirs() - }.writeText(buildString { - append("package com.mrboomdev.awery\n") - append("\n") - append("// This class has been auto-generated, so please, don't edit it.\n") - append("@Suppress(\"ClassName\")\n") - append("object AwerySettings {\n") - - for(file in inputFiles) { - val settings = Json { - decodeEnumsCaseInsensitive = true - isLenient = true - ignoreUnknownKeys = true - }.decodeFromString(file.readText()) - - appendSetting(settings, this) - append("\n") - } - - append("}") - }) - } - - private fun String.toCamelCase(): String { - var result = "" - - for(s in split("_")) { - result += Character.toUpperCase(s.toCharArray()[0]) - - if(s.length > 1) { - result += s.substring(1, s.length).lowercase(Locale.ENGLISH) - } - } - - return result - } - - private fun constructSetting(setting: Setting, output: StringBuilder) { - with(output) { - append("GeneratedSetting.") - - append(when(setting.type!!.lowercase()) { - "screen" -> "Screen" - "action" -> "Action" - "integer" -> "Integer" - "string" -> "String" - "boolean" -> "Boolean" - - // If we don't declare any items at compile-time, then we can't generate any type-safe enums, - // so instead use regular String in such cases. - "select" -> if(setting.items != null) "Select" else "String" - - else -> throw IllegalArgumentException( - "Unsupported setting type \"${setting.type}\" at \"${setting.key}\"!") - }) - - append("(\"") - append(setting.key) - append("\"") - - if(setting.type.lowercase() == "screen") { - append(", arrayOf(") - - if(setting.items != null) { - for(item in setting.items) { - if(item.key != null && item.type != null) { - constructSetting(item, output) - } - - output.append(", ") - } - } - - append(")") - } - - if(setting.type.lowercase() == "select") { - append(", ") - append(setting.key!!.toCamelCase()) - append("Value::class.java") - } - - append(")") - } - } - - private fun appendSetting(setting: Setting, output: StringBuilder) { - if(setting.key != null && setting.type != null) { - with(output) { - append("\tval ") - append(setting.key.uppercase()) - append(" = ") - constructSetting(setting, output) - append("\n") - - if(setting.type.lowercase() == "select" && setting.items != null) { - append("\tenum class ") - append(setting.key.toCamelCase()) - append("Value(val key: String) { ") - - for(item in setting.items) { - if(item.key?.get(0)?.isDigit() == true) { - append("NUMBER_") - } - - append(item.key!!.uppercase()) - append("(\"") - append(item.key) - append("\"), ") - } - - append(" }\n") - } - } - } - - if(setting.items != null) { - for(item in setting.items) { - appendSetting(item, output) - } - } - } - - @Serializable - private data class Setting( - val key: String? = null, - val type: String? = null, - val items: List? = null - ) -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/SettingsGenerateTask.kt b/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/SettingsGenerateTask.kt deleted file mode 100644 index 6107f953..00000000 --- a/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/SettingsGenerateTask.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.mrboomdev.awery.gradle - -import org.gradle.api.DefaultTask -import org.gradle.api.file.RegularFile -import org.gradle.api.file.RegularFileProperty -import org.gradle.api.provider.ListProperty -import org.gradle.api.tasks.InputFiles -import org.gradle.api.tasks.OutputFile -import org.gradle.api.tasks.TaskAction - -abstract class SettingsGenerateTask: DefaultTask() { - @get:OutputFile - abstract val outputFile: RegularFileProperty - - @get:InputFiles - abstract val inputFiles: ListProperty - - @TaskAction - fun run() { - SettingsClassGenerator.generateSettings( - inputFiles = inputFiles.get().map { it.asFile }, - outputFile = outputFile.get().asFile - ) - } -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/settings/GenerateSettingsTask.kt b/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/settings/GenerateSettingsTask.kt new file mode 100644 index 00000000..5cbc50c1 --- /dev/null +++ b/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/settings/GenerateSettingsTask.kt @@ -0,0 +1,37 @@ +package com.mrboomdev.awery.gradle.settings + +import org.gradle.api.DefaultTask +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.file.RegularFile +import org.gradle.api.provider.ListProperty +import org.gradle.api.provider.Property +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.InputFiles +import org.gradle.api.tasks.OutputDirectory +import org.gradle.api.tasks.TaskAction + +abstract class GenerateSettingsTask: DefaultTask() { + @get:OutputDirectory + val outputDirectory: DirectoryProperty = project.objects.directoryProperty().apply { + set(project.generatedSettingsDirectory) + } + + @get:InputFiles + abstract val inputFiles: ListProperty + + @get:Input + abstract val packageName: Property + + @get:Input + abstract val className: Property + + @TaskAction + fun run() { + outputDirectory.asFile.get().apply { + deleteRecursively() + mkdirs() + } + + SettingsGeneratorImpl.generate(this) + } +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/settings/SettingsGeneratorExtensions.kt b/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/settings/SettingsGeneratorExtensions.kt new file mode 100644 index 00000000..f1c66806 --- /dev/null +++ b/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/settings/SettingsGeneratorExtensions.kt @@ -0,0 +1,13 @@ +package com.mrboomdev.awery.gradle.settings + +import org.gradle.api.Project +import org.gradle.api.file.Directory + +val Project.generatedSettingsDirectory: Directory + get() = layout.buildDirectory.dir("generated/com.mrboomdev.settings").get() + +val Project.generatedSettingsKotlinDirectory: Directory + get() = generatedSettingsDirectory.dir("kotlin") + +val Project.generatedSettingsResourcesDirectory: Directory + get() = generatedSettingsDirectory.dir("resources") \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/settings/SettingsGeneratorImpl.kt b/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/settings/SettingsGeneratorImpl.kt new file mode 100644 index 00000000..02410ed1 --- /dev/null +++ b/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/settings/SettingsGeneratorImpl.kt @@ -0,0 +1,234 @@ +package com.mrboomdev.awery.gradle.settings + +import com.mrboomdev.awery.gradle.util.isNull +import com.mrboomdev.awery.gradle.util.items +import com.mrboomdev.awery.gradle.util.textContent +import kotlinx.serialization.ExperimentalSerializationApi +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonNull +import kotlinx.serialization.json.JsonObject +import kotlinx.serialization.json.JsonPrimitive +import kotlinx.serialization.json.jsonArray +import org.gradle.api.file.Directory +import java.io.File +import java.util.Locale + +internal object SettingsGeneratorImpl { + + fun generate(task: GenerateSettingsTask) { + task.outputDirectory.also { output -> + val path = task.packageName.get().replace(".", "/") + val files = task.inputFiles.get().map { it.asFile } + + createKotlin(files, task.packageName.get(), output.file("kotlin/$path/${task.className.get()}.kt").get().asFile) + createResources(files, output.dir("resources/$path").get()) + } + } + + private fun createResources(inputFiles: List, outputDirectory: Directory) { + outputDirectory.asFile.mkdirs() + + for(file in inputFiles) { + file.copyTo(outputDirectory.file("${file.name}.json").asFile, true) + } + } + + @Suppress("JSON_FORMAT_REDUNDANT") + @OptIn(ExperimentalSerializationApi::class) + private fun createKotlin(inputFiles: List, packageName: String, outputFile: File) { + outputFile.parentFile.mkdirs() + + outputFile.writeText(buildString { + append("package $packageName\n") + append("\n") + + for(importDeclaration in arrayOf( + "com.mrboomdev.awery.platform.PlatformSetting", + "kotlinx.serialization.ExperimentalSerializationApi", + "kotlinx.serialization.json.Json" + )) { + append("import ") + append(importDeclaration) + append("\n") + } + + append("\n") + append("// This class has been auto-generated, so please, don't edit it.\n") + append("object ") + append(outputFile.nameWithoutExtension) + append(" {\n") + + // Declare an private settings json file format + append("\t@OptIn(ExperimentalSerializationApi::class)\n") + append("\tprivate val MAP_JSON_FORMAT = Json {\n") + append("\t\tdecodeEnumsCaseInsensitive = true\n") + append("\t\tisLenient = true\n") + append("\t}\n") + append("\n") + append("\tobject maps {\n") + + for(file in inputFiles) { + append("\t\tval ") + append(file.nameWithoutExtension.uppercase()) + append(" = MAP_JSON_FORMAT.decodeFromString(") + append(outputFile.nameWithoutExtension) + append("::class.java.classLoader!!.getResourceAsStream(\"") + append(packageName.replace(".", "/")) + append("/") + append(file.name) + append(".json\")!!.use { it.readBytes().toString(Charsets.UTF_8) })\n") + } + + append("\t}\n\n") + + for(file in inputFiles) { + val text = file.readText() + + val settings = Json { + decodeEnumsCaseInsensitive = true + isLenient = true + ignoreUnknownKeys = true + }.parseToJsonElement(text) as JsonObject + + appendSetting(file.nameWithoutExtension, settings, this) + } + + append("}") + }) + } + + private fun String.camelCase(): String { + var result = "" + + for(s in split("_")) { + result += Character.toUpperCase(s.toCharArray()[0]) + + if(s.length > 1) { + result += s.substring(1, s.length).lowercase(Locale.ENGLISH) + } + } + + return result + } + + private fun constructSetting( + originalFile: String, + setting: JsonObject, + output: StringBuilder + ) { + with(output) { + append("GeneratedSetting.") + + append(setting["type"]!!.textContent!!.let { + it[0].uppercase() + it.substring(1) + }) + + if(!setting["value"].isNull) { + append(".NotNull") + } + + append("(\"") + append(setting["key"]!!.textContent) + append("\"") + + when(setting["type"]?.textContent?.lowercase()) { + "screen" -> { + append(", arrayOf(") + + setting["items"]?.items?.forEach { item -> + require(item is JsonObject) { "An item is required to be an object!" } + + if(!item["key"].isNull && !item["type"].isNull) { + constructSetting(originalFile, item, output) + } + + output.append(", ") + } + + append(")") + } + + "select" -> { + append(", ") + append(setting["key"]!!.textContent!!.camelCase()) + append("Value::class.java") + } + } + + when(val it = setting["value"]) { + is JsonPrimitive -> { + append(", ") + + when(setting["type"]!!.textContent!!.lowercase()) { + "string" -> { + append("\"") + append(it.textContent!!) + append("\"") + } + + "select" -> { + append(setting["key"]!!.textContent!!.camelCase()) + append("Value.") + + if(it.textContent?.get(0)?.isDigit() == true) { + append("NUMBER_") + } + + append(it.textContent!!.uppercase()) + } + + "boolean" -> append(it.textContent!!.toBoolean()) + "integer" -> append(it.textContent!!.toInt()) + else -> throw UnsupportedOperationException("Setting type \"${setting["type"]}\" doesn't support default values!") + } + } + + JsonNull, null -> {} + else -> throw UnsupportedOperationException("Unsupported default value type at \"${setting["key"]}\"!") + } + + append(", maps.") + append(originalFile.uppercase()) + + append(")") + } + } + + private fun appendSetting(originalFile: String, setting: JsonObject, output: StringBuilder) { + if(!setting["key"].isNull && !setting["type"].isNull) { + with(output) { + append("\tval ") + append(setting["key"]!!.textContent!!.uppercase()) + append(" = ") + constructSetting(originalFile, setting, output) + append("\n") + + if(setting["type"]?.textContent?.lowercase() == "select" && !setting["items"].isNull) { + append("\tenum class ") + append(setting["key"]!!.textContent!!.camelCase()) + append("Value(val key: String) { ") + + for(item in setting["items"]!!.jsonArray) { + require(item is JsonObject) { "An item is required to be an object!" } + + if(item["key"]?.textContent?.get(0)?.isDigit() == true) { + append("NUMBER_") + } + + append(item["key"]!!.textContent!!.uppercase()) + append("(\"") + append(item["key"]!!.textContent) + append("\"), ") + } + + append(" }\n") + } + } + } + + setting["items"]?.items?.forEach { item -> + require(item is JsonObject) { "An item is required to be an object!" } + appendSetting(originalFile, item, output) + } + } +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/util/Json.kt b/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/util/Json.kt new file mode 100644 index 00000000..f76a9f59 --- /dev/null +++ b/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/util/Json.kt @@ -0,0 +1,16 @@ +package com.mrboomdev.awery.gradle.util + +import kotlinx.serialization.json.JsonArray +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.JsonNull +import kotlinx.serialization.json.JsonPrimitive +import kotlinx.serialization.json.contentOrNull + +val JsonElement?.isNull: Boolean + get() = this == null || this is JsonNull + +val JsonElement.textContent: String? + get() = if(this is JsonPrimitive) contentOrNull else null + +val JsonElement.items: JsonArray? + get() = if(this is JsonArray) this else null \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/Xml.kt b/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/util/Xml.kt similarity index 97% rename from buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/Xml.kt rename to buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/util/Xml.kt index 19830cf1..7c2b38fe 100644 --- a/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/Xml.kt +++ b/buildSrc/src/main/kotlin/com/mrboomdev/awery/gradle/util/Xml.kt @@ -1,4 +1,4 @@ -package com.mrboomdev.awery.gradle +package com.mrboomdev.awery.gradle.util import groovy.util.Node import groovy.util.NodeList diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index c64bec30..a916ab8c 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -16,6 +16,10 @@ dependencies { implementation(kotlin("stdlib-jdk8")) // Ui + implementation(compose.foundation) + implementation(compose.runtime) + implementation(compose.ui) + implementation(compose.components.resources) implementation(compose.desktop.currentOs) implementation(projects.shared) diff --git a/ext/build.gradle.kts b/ext/build.gradle.kts index 5173045d..6a31907b 100644 --- a/ext/build.gradle.kts +++ b/ext/build.gradle.kts @@ -1,17 +1,13 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget import com.vanniktech.maven.publish.SonatypeHost plugins { - `java-library` alias(libs.plugins.kotlin.jvm) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.maven.publish) } -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} +group = "ru.mrboomdev.awery" +version = properties["awery.ext.version"].toString() kotlin { jvmToolchain(17) @@ -27,9 +23,6 @@ dependencies { api(libs.kotlinx.serialization.json) } -group = "ru.mrboomdev.awery" -version = properties["awery.ext.version"].toString() - mavenPublishing { coordinates(group.toString(), "ext-lib", version.toString()) diff --git a/ext/lib/.gitignore b/ext/platform/.gitignore similarity index 100% rename from ext/lib/.gitignore rename to ext/platform/.gitignore diff --git a/ext/lib/build.gradle.kts b/ext/platform/build.gradle.kts similarity index 81% rename from ext/lib/build.gradle.kts rename to ext/platform/build.gradle.kts index 9091749f..6cfbfff4 100644 --- a/ext/lib/build.gradle.kts +++ b/ext/platform/build.gradle.kts @@ -1,19 +1,13 @@ -import com.mrboomdev.awery.gradle.forEachNode -import com.mrboomdev.awery.gradle.toXmlString -import com.mrboomdev.awery.gradle.query -import com.mrboomdev.awery.gradle.queryAll +import com.mrboomdev.awery.gradle.util.toXmlString import com.vanniktech.maven.publish.SonatypeHost plugins { - `java-library` alias(libs.plugins.kotlin.jvm) alias(libs.plugins.maven.publish) } -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} +group = "ru.mrboomdev.awery" +version = properties["awery.ext.version"].toString() kotlin { jvmToolchain(17) @@ -23,9 +17,6 @@ dependencies { implementation(projects.ext) } -group = "ru.mrboomdev.awery" -version = properties["awery.ext.version"].toString() - mavenPublishing { coordinates(group.toString(), "ext-platform", version.toString()) diff --git a/ext/lib/src/main/kotlin/com/mrboomdev/awery/ext/AweryClient.kt b/ext/platform/src/main/kotlin/com/mrboomdev/awery/ext/AweryClient.kt similarity index 100% rename from ext/lib/src/main/kotlin/com/mrboomdev/awery/ext/AweryClient.kt rename to ext/platform/src/main/kotlin/com/mrboomdev/awery/ext/AweryClient.kt diff --git a/ext/lib/src/main/kotlin/com/mrboomdev/awery/ext/ResourcesProvider.kt b/ext/platform/src/main/kotlin/com/mrboomdev/awery/ext/ResourcesProvider.kt similarity index 71% rename from ext/lib/src/main/kotlin/com/mrboomdev/awery/ext/ResourcesProvider.kt rename to ext/platform/src/main/kotlin/com/mrboomdev/awery/ext/ResourcesProvider.kt index 81a08032..09c09a19 100644 --- a/ext/lib/src/main/kotlin/com/mrboomdev/awery/ext/ResourcesProvider.kt +++ b/ext/platform/src/main/kotlin/com/mrboomdev/awery/ext/ResourcesProvider.kt @@ -1,8 +1,6 @@ package com.mrboomdev.awery.ext import com.mrboomdev.awery.ext.source.Context -import com.mrboomdev.awery.ext.source.Source -import com.mrboomdev.awery.ext.util.Image import java.io.File object ResourcesProvider { diff --git a/ext/src/main/kotlin/com/mrboomdev/awery/ext/source/Preferences.kt b/ext/src/main/kotlin/com/mrboomdev/awery/ext/source/Preferences.kt index 3812dab9..42da5e6a 100644 --- a/ext/src/main/kotlin/com/mrboomdev/awery/ext/source/Preferences.kt +++ b/ext/src/main/kotlin/com/mrboomdev/awery/ext/source/Preferences.kt @@ -6,10 +6,10 @@ interface Preferences { fun getBoolean(key: String): Boolean? fun getFloat(key: String): Float? - operator fun set(key: String, value: String) - operator fun set(key: String, value: Int) - operator fun set(key: String, value: Boolean) - operator fun set(key: String, value: Float) + operator fun set(key: String, value: String?) + operator fun set(key: String, value: Int?) + operator fun set(key: String, value: Boolean?) + operator fun set(key: String, value: Float?) fun remove(key: String) fun save() diff --git a/gradle.properties b/gradle.properties index e49b1880..9d553341 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,13 @@ # Gradle org.gradle.jvmargs=-Xmx1024m -Dfile.encoding=UTF-8 org.gradle.unsafe.configuration-cache=true -# org.gradle.parallel=true +org.gradle.caching=true +org.gradle.parallel=true # Android android.useAndroidX=true android.nonTransitiveRClass=true -android.nonFinalResIds=false +android.nonFinalResIds=true # Awery awery.ext.version=1.0.2 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ea22b670..a93d7cc8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ android-gradle-plugin = "8.7.3" androidx-adaptive = "1.0.0" kotlinx-serialization = "1.7.3" kotlin = "2.1.0" -media3 = "1.5.0" +media3 = "1.5.1" markwon = "4.6.2" room = "2.6.1" coil = "3.0.4" @@ -25,6 +25,7 @@ ebook-reader = { module = "com.github.VipulOG:ebook-reader", version = "0.1.6" } pageindicatorview = { module = "com.github.emilaleborn:PageIndicatorView", version = "905cd4e2ab" } # Android +android-build-tools = { group = "com.android.tools.build", name = "gradle", version.ref = "android-gradle-plugin"} androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.15.0" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" } androidx-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c0..2c352119 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fd541f24..ba9ccfe4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Aug 30 19:57:04 IST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/gradlew b/gradlew index 4f906e0c..f5feea6d 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,69 +15,104 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd32..9d21a218 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle.kts b/settings.gradle.kts index fb9a4baa..aca090b1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,11 +30,15 @@ dependencyResolutionManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" +} + enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") rootProject.name = "Awery" include(":app") include(":desktop") include(":ext") -include(":ext:lib") +include(":ext:platform") include(":shared") \ No newline at end of file diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 10119c2d..06d59429 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -16,6 +16,7 @@ java { kotlin { jvmToolchain(17) + @OptIn(ExperimentalKotlinGradlePluginApi::class) compilerOptions { freeCompilerArgs = listOf("-Xexpect-actual-classes") } @@ -29,7 +30,7 @@ kotlin { commonMain.dependencies { // Used projects api(projects.ext) - api(projects.ext.lib) + api(projects.ext.platform) // Core implementation(compose.foundation) @@ -47,6 +48,10 @@ kotlin { implementation(libs.coil.compose) } + desktopMain.dependencies { + implementation(compose.desktop.currentOs) + } + androidMain.dependencies { implementation(libs.androidx.core) implementation(libs.material) diff --git a/shared/src/androidMain/kotlin/com/mrboomdev/awery/app/PlatformPreferences.android.kt b/shared/src/androidMain/kotlin/com/mrboomdev/awery/app/PlatformPreferences.android.kt index 98734ef8..825a3df4 100644 --- a/shared/src/androidMain/kotlin/com/mrboomdev/awery/app/PlatformPreferences.android.kt +++ b/shared/src/androidMain/kotlin/com/mrboomdev/awery/app/PlatformPreferences.android.kt @@ -69,20 +69,20 @@ actual object PlatformPreferences : Preferences { } } - override fun set(key: String, value: String) { - ensureEditorExistence().putString(key, value) + override fun set(key: String, value: String?) { + ensureEditorExistence().apply { value?.also { putString(key, it) } ?: remove(key) } } - override fun set(key: String, value: Int) { - ensureEditorExistence().putInt(key, value) + override fun set(key: String, value: Int?) { + ensureEditorExistence().apply { value?.also { putInt(key, it) } ?: remove(key) } } - override fun set(key: String, value: Boolean) { - ensureEditorExistence().putBoolean(key, value) + override fun set(key: String, value: Boolean?) { + ensureEditorExistence().apply { value?.also { putBoolean(key, it) } ?: remove(key) } } - override fun set(key: String, value: Float) { - ensureEditorExistence().putFloat(key, value) + override fun set(key: String, value: Float?) { + ensureEditorExistence().apply { value?.also { putFloat(key, it) } ?: remove(key) } } override fun remove(key: String) { diff --git a/shared/src/commonMain/kotlin/com/mrboomdev/awery/GeneratedSetting.kt b/shared/src/commonMain/kotlin/com/mrboomdev/awery/GeneratedSetting.kt deleted file mode 100644 index 7db9edcf..00000000 --- a/shared/src/commonMain/kotlin/com/mrboomdev/awery/GeneratedSetting.kt +++ /dev/null @@ -1,93 +0,0 @@ -package com.mrboomdev.awery - -import com.mrboomdev.awery.app.PlatformPreferences -import com.mrboomdev.awery.utils.parseEnum -import kotlin.reflect.KProperty - -sealed class GeneratedSetting(val key: kotlin.String) { - class Action( - key: kotlin.String - ): GeneratedSetting(key) - - class Select>( - key: kotlin.String, - val clazz: Class - ): GeneratedSetting(key) { - var value: T? - get() = PlatformPreferences.getString(key)?.parseEnum(clazz) - set(value) { - if(value != null) { - PlatformPreferences[key] = value.name - } else { - PlatformPreferences.remove(key) - } - - PlatformPreferences.save() - } - - operator fun getValue(thisRef: Any?, property: KProperty<*>): T? = this.value - operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T?) { this.value = value } - } - - class Screen( - key: kotlin.String, - val items: Array - ): GeneratedSetting(key) - - class Integer( - key: kotlin.String - ): GeneratedSetting(key) { - var value: Int? - get() = PlatformPreferences.getInt(key) - set(value) { - if(value != null) { - PlatformPreferences[key] = value - } else { - PlatformPreferences.remove(key) - } - - PlatformPreferences.save() - } - - operator fun getValue(thisRef: Any?, property: KProperty<*>): Int? = this.value - operator fun setValue(thisRef: Any?, property: KProperty<*>, value: Int?) { this.value = value } - } - - class Boolean( - key: kotlin.String - ): GeneratedSetting(key) { - var value: kotlin.Boolean? - get() = PlatformPreferences.getBoolean(key) - set(value) { - if(value != null) { - PlatformPreferences[key] = value - } else { - PlatformPreferences.remove(key) - } - - PlatformPreferences.save() - } - - operator fun getValue(thisRef: Any?, property: KProperty<*>): kotlin.Boolean? = this.value - operator fun setValue(thisRef: Any?, property: KProperty<*>, value: kotlin.Boolean?) { this.value = value } - } - - class String( - key: kotlin.String - ): GeneratedSetting(key) { - var value: kotlin.String? - get() = PlatformPreferences.getString(key) - set(value) { - if(value != null) { - PlatformPreferences[key] = value - } else { - PlatformPreferences.remove(key) - } - - PlatformPreferences.save() - } - - operator fun getValue(thisRef: Any?, property: KProperty<*>): kotlin.String? = this.value - operator fun setValue(thisRef: Any?, property: KProperty<*>, value: kotlin.String?) { this.value = value } - } -} \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/com/mrboomdev/awery/generated/GeneratedSetting.kt b/shared/src/commonMain/kotlin/com/mrboomdev/awery/generated/GeneratedSetting.kt new file mode 100644 index 00000000..814cafff --- /dev/null +++ b/shared/src/commonMain/kotlin/com/mrboomdev/awery/generated/GeneratedSetting.kt @@ -0,0 +1,134 @@ +package com.mrboomdev.awery.generated + +import com.mrboomdev.awery.app.PlatformPreferences +import com.mrboomdev.awery.ext.data.getRecursively +import com.mrboomdev.awery.platform.PlatformSetting +import com.mrboomdev.awery.utils.parseEnum +import kotlin.reflect.KProperty + +sealed class GeneratedSetting( + val key: kotlin.String, + private val parentMap: PlatformSetting +) { + + fun asPlatformSetting() = parentMap.items!!.getRecursively(key) as PlatformSetting + + class Action( + key: kotlin.String, + parentMap: PlatformSetting + ): GeneratedSetting(key, parentMap) + + class Screen( + key: kotlin.String, + val items: Array, + parentMap: PlatformSetting + ): GeneratedSetting(key, parentMap) + + interface WithValue { + var value: T + operator fun getValue(thisRef: Any?, property: KProperty<*>): T = this.value + operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) { this.value = value } + } + + class Select>( + key: kotlin.String, + val clazz: Class, + parentMap: PlatformSetting + ): GeneratedSetting(key, parentMap), WithValue { + override var value: T? + get() = PlatformPreferences.getString(key)?.parseEnum(clazz) + set(value) = PlatformPreferences.let { + it[key] = value?.name + it.save() + } + + class NotNull>( + key: kotlin.String, + val clazz: Class, + private val defaultValue: T, + parentMap: PlatformSetting + ): GeneratedSetting(key, parentMap), WithValue { + override var value: T + get() = PlatformPreferences.getString(key)?.parseEnum(clazz) ?: defaultValue + set(value) = PlatformPreferences.let { + it[key] = value.name + it.save() + } + } + } + + class Integer( + key: kotlin.String, + parentMap: PlatformSetting + ): GeneratedSetting(key, parentMap), WithValue { + override var value: Int? + get() = PlatformPreferences.getInt(key) + set(value) = PlatformPreferences.let { + it[key] = value + it.save() + } + + class NotNull( + key: kotlin.String, + private val defaultValue: Int, + parentMap: PlatformSetting + ): GeneratedSetting(key, parentMap), WithValue { + override var value: Int + get() = PlatformPreferences.getInt(key) ?: defaultValue + set(value) = PlatformPreferences.let { + it[key] = value + it.save() + } + } + } + + class Boolean( + key: kotlin.String, + parentMap: PlatformSetting + ): GeneratedSetting(key, parentMap), WithValue { + override var value: kotlin.Boolean? + get() = PlatformPreferences.getBoolean(key) + set(value) = PlatformPreferences.let { + it[key] = value + it.save() + } + + class NotNull( + key: kotlin.String, + private val defaultValue: kotlin.Boolean, + parentMap: PlatformSetting + ): GeneratedSetting(key, parentMap), WithValue { + override var value: kotlin.Boolean + get() = PlatformPreferences.getBoolean(key) ?: defaultValue + set(value) = PlatformPreferences.let { + it[key] = value + it.save() + } + } + } + + class String( + key: kotlin.String, + parentMap: PlatformSetting + ): GeneratedSetting(key, parentMap), WithValue { + override var value: kotlin.String? + get() = PlatformPreferences.getString(key) + set(value) = PlatformPreferences.let { + it[key] = value + it.save() + } + + class NotNull( + key: kotlin.String, + private val defaultValue: kotlin.String, + parentMap: PlatformSetting + ): GeneratedSetting(key, parentMap), WithValue { + override var value: kotlin.String + get() = PlatformPreferences.getString(key) ?: defaultValue + set(value) = PlatformPreferences.let { + it[key] = value + it.save() + } + } + } +} \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/com/mrboomdev/awery/ui/screens/settings/SettingsScreen.kt b/shared/src/commonMain/kotlin/com/mrboomdev/awery/ui/screens/settings/SettingsScreen.kt index 8d361170..5d48ff76 100644 --- a/shared/src/commonMain/kotlin/com/mrboomdev/awery/ui/screens/settings/SettingsScreen.kt +++ b/shared/src/commonMain/kotlin/com/mrboomdev/awery/ui/screens/settings/SettingsScreen.kt @@ -6,7 +6,6 @@ import androidx.compose.material3.MediumTopAppBar import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarColors import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi -import androidx.compose.material3.adaptive.layout.AnimatedPane import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole import androidx.compose.material3.adaptive.layout.ThreePaneScaffoldDestinationItem @@ -66,10 +65,38 @@ fun SettingsScreen( value = navigator.scaffoldValue, listPane = { - AnimatedPane { + SettingScreen( + screen = setting, + selected = history.mapNotNull { it.content }, + setting = settingComposable, + + header = { + MediumTopAppBar( + colors = getTitleHeaderColors(), + title = { + Text( + text = setting.title?.let { title -> + setting.takeIf { it is PlatformSetting }?.let { i18n(title) } ?: title + } ?: "", + + overflow = TextOverflow.Ellipsis, + maxLines = 1 + ) + } + ) + }, + + onOpenScreen = { + navigator.historyState.clear() + navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, it) + } + ) + }, + + detailPane = { + navigator.currentDestination?.content?.let { currentScreen -> SettingScreen( - screen = setting, - selected = history.mapNotNull { it.content }, + screen = currentScreen, setting = settingComposable, header = { @@ -77,52 +104,20 @@ fun SettingsScreen( colors = getTitleHeaderColors(), title = { Text( - text = setting.title?.let { title -> - setting.takeIf { it is PlatformSetting }?.let { i18n(title) } ?: title + text = currentScreen.title?.let { title -> + currentScreen.takeIf { it is PlatformSetting }?.let { i18n(title) } ?: title } ?: "", overflow = TextOverflow.Ellipsis, maxLines = 1 ) } - ) + ) }, - onOpenScreen = { - navigator.historyState.clear() - navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, it) - } + onOpenScreen = { navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, it) } ) } - }, - - detailPane = { - AnimatedPane { - navigator.currentDestination?.content?.let { currentScreen -> - SettingScreen( - screen = currentScreen, - setting = settingComposable, - - header = { - MediumTopAppBar( - colors = getTitleHeaderColors(), - title = { - Text( - text = currentScreen.title?.let { title -> - currentScreen.takeIf { it is PlatformSetting }?.let { i18n(title) } ?: title - } ?: "", - - overflow = TextOverflow.Ellipsis, - maxLines = 1 - ) - } - ) - }, - - onOpenScreen = { navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, it) } - ) - } - } } ) } \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/com/mrboomdev/awery/utils/FileExtensions.kt b/shared/src/commonMain/kotlin/com/mrboomdev/awery/utils/FileExtensions.kt new file mode 100644 index 00000000..4e7ebbc4 --- /dev/null +++ b/shared/src/commonMain/kotlin/com/mrboomdev/awery/utils/FileExtensions.kt @@ -0,0 +1,5 @@ +package com.mrboomdev.awery.utils + +import java.io.File + +operator fun File.div(child: String) = File(this, child) \ No newline at end of file diff --git a/shared/src/desktopMain/kotlin/com/mrboomdev/awery/app/PlatformPreferences.desktop.kt b/shared/src/desktopMain/kotlin/com/mrboomdev/awery/app/PlatformPreferences.desktop.kt index 7120f77b..1e8d3d0a 100644 --- a/shared/src/desktopMain/kotlin/com/mrboomdev/awery/app/PlatformPreferences.desktop.kt +++ b/shared/src/desktopMain/kotlin/com/mrboomdev/awery/app/PlatformPreferences.desktop.kt @@ -20,19 +20,19 @@ actual object PlatformPreferences : Preferences { TODO("Not yet implemented") } - override fun set(key: String, value: String) { + override fun set(key: String, value: String?) { TODO("Not yet implemented") } - override fun set(key: String, value: Int) { + override fun set(key: String, value: Int?) { TODO("Not yet implemented") } - override fun set(key: String, value: Boolean) { + override fun set(key: String, value: Boolean?) { TODO("Not yet implemented") } - override fun set(key: String, value: Float) { + override fun set(key: String, value: Float?) { TODO("Not yet implemented") }