From 52b9be5e529996ffb64c307efb3521ac3e7746c0 Mon Sep 17 00:00:00 2001 From: jacobrein Date: Thu, 19 Sep 2024 07:28:12 -0600 Subject: [PATCH] - Update dependencies Update Compose to 2024.09.02, Room to 2.7.0-alpha08, Navigation to 2.8.1, Koin to 4.0.0, Lifecycle to 2.9.0-alpha03, WorkManager to 2.10.0-alpha04, and Gradle to 8.6.1. Also add a setting to pause composition. --- .../programmersbox/uiviews/DebugFragment.kt | 22 +++++++++++++++++++ .../settings/ExtensionListViewModel.kt | 2 ++ gradle/libs.versions.toml | 22 +++++++++---------- settings.gradle.kts | 2 +- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/DebugFragment.kt b/UIViews/src/main/java/com/programmersbox/uiviews/DebugFragment.kt index 76c7b739f..74649a938 100644 --- a/UIViews/src/main/java/com/programmersbox/uiviews/DebugFragment.kt +++ b/UIViews/src/main/java/com/programmersbox/uiviews/DebugFragment.kt @@ -2,6 +2,8 @@ package com.programmersbox.uiviews import android.annotation.SuppressLint import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed @@ -16,12 +18,14 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.MediumTopAppBar import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface +import androidx.compose.material3.Switch import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.rememberTopAppBarState import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope @@ -257,6 +261,24 @@ fun DebugView() { build() if (index < moreSettings.size - 1) HorizontalDivider() } + + item { + var pauseComposition by remember { mutableStateOf(false) } + var count by remember { mutableIntStateOf(0) } + Column { + Row { + Text("Pause Composition") + Switch( + checked = pauseComposition, + onCheckedChange = { pauseComposition = it } + ) + } + + Text(count.toString()) + + Button(onClick = { count++ }) { Text("Count") } + } + } } } } \ No newline at end of file diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/settings/ExtensionListViewModel.kt b/UIViews/src/main/java/com/programmersbox/uiviews/settings/ExtensionListViewModel.kt index ec5b6f15b..9febb2fc2 100644 --- a/UIViews/src/main/java/com/programmersbox/uiviews/settings/ExtensionListViewModel.kt +++ b/UIViews/src/main/java/com/programmersbox/uiviews/settings/ExtensionListViewModel.kt @@ -59,6 +59,7 @@ class ExtensionListViewModel( .toList() .forEach { c -> remoteSources[c.name] = runCatching { c.getRemoteSources() } + .onFailure { it.printStackTrace() } .fold( onSuccess = { RemoteViewState(it) }, onFailure = { RemoteErrorState() } @@ -74,6 +75,7 @@ class ExtensionListViewModel( .toList() .forEach { c -> remoteSources[c.name] = runCatching { c.getRemoteSources(urls) } + .onFailure { it.printStackTrace() } .fold( onSuccess = { RemoteViewState(it) }, onFailure = { RemoteErrorState() } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f8b0a6524..a311313b7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] generativeai = "0.9.0" -gradle = "8.6.0" +gradle = "8.6.1" kotlin = "2.0.20" kspVersion = "2.0.20-1.0.25" androidxBaselineprofileGradlePlugin = "1.3.0" composeCollapsable = "0.3.0" -dragselect = "2.3.0" +dragselect = "2.3.2" easylauncher = "6.4.0" firebaseCrashlyticsGradle = "3.0.2" googleServices = "4.4.2" @@ -19,18 +19,18 @@ glideVersion = "4.16.0" pagecurl = "1.5.1" pagingVersion = "3.3.2" protobufGradlePlugin = "0.9.4" -roomVersion = "2.7.0-alpha07" -navVersion = "2.8.0" -koinVersion = "3.5.6" +roomVersion = "2.7.0-alpha08" +navVersion = "2.8.1" +koinVersion = "4.0.0" coil = "2.7.0" -lifecycle = "2.9.0-alpha02" +lifecycle = "2.9.0-alpha03" jetpack = "1.6.0-alpha03" jetpackCompiler = "1.5.11" jetbrainsCompiler = "1.5.1" accompanist = "0.36.0" okhttpVersion = "4.12.0" ktorVersion = "3.0.0-rc-1" -workVersion = "2.10.0-alpha03" +workVersion = "2.10.0-alpha04" ziplineVersion = "1.1.0" landscapist = "2.3.6" protobufVersion = "4.26.1" @@ -40,8 +40,8 @@ composeVersion = "1.8.0-alpha01" compose3Version = "1.3.0" compose3CommonVersion = "1.0.0-alpha01" compose3AdaptiveVersion = "1.1.0-alpha02" -composeBomVersion = "2024.09.00-alpha" -materialKolor = "1.7.0" +composeBomVersion = "2024.09.02" +materialKolor = "1.7.1" firebaseKtx = "0.2.0" ### MangaWorld @@ -97,7 +97,7 @@ gson = "com.google.code.gson:gson:2.11.0" androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activity" } #Compose -composePlatform = { module = "androidx.compose:compose-bom", version.ref = "composeBomVersion" } +composePlatform = { module = "androidx.compose:compose-bom-alpha", version.ref = "composeBomVersion" } composeUi = { group = "androidx.compose.ui", name = "ui" } composeUiTooling = { group = "androidx.compose.ui", name = "ui-tooling" } composeFoundation = { group = "androidx.compose.foundation", name = "foundation" } @@ -293,7 +293,7 @@ ziplineProfiler = { module = "app.cash.zipline:zipline-profiler", version.ref = retrofit = "com.squareup.retrofit2:retrofit:2.11.0" retrofitGson = "com.squareup.retrofit2:converter-gson:2.11.0" kotlinxSerialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2" -androidxWebkit = "androidx.webkit:webkit:1.11.0" +androidxWebkit = "androidx.webkit:webkit:1.12.0" mlkitTranslate = "com.google.mlkit:translate:17.0.3" mlkitLanguage = "com.google.mlkit:language-id:17.0.6" diff --git a/settings.gradle.kts b/settings.gradle.kts index b0d800597..da23eace9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,7 +22,7 @@ dependencyResolutionManagement { //TODO: Remove current ones and replace with this! versionCatalogs { create("androidx") { - from("androidx.gradle:gradle-version-catalog:2024.09.00") + from("androidx.gradle:gradle-version-catalog:2024.09.01") } } }