chore: update dependencies

* update all dependencies (except compose material and material3 as they have issues on newer alphas), AGP, Kotlin, Gradle * replace `Enum.values()` with `Enum.entries` * replace deprecated functions
aliernfrog · Jan 21, 2024 · f01f307 · f01f307
1 parent f3ba8b0
commit f01f307
Show file tree

Hide file tree

Showing 23 changed files with 73 additions and 74 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -3,12 +3,9 @@ plugins {
     id("org.jetbrains.kotlin.android")
 }
 
-// compose material 1.6.0-alpha08 has crashes with LazyColumn/Row
-// 1.6.0-beta01 - beta02 has IME issues (focused text fields do not open keyboard when clicked)
-// sticking to alpha07 (also alpha09 for material3) until these issues are fixed.
 val composeMaterialVersion = "1.6.0-alpha07"
 val composeMaterial3Version = "1.2.0-alpha09"
-val composeCompilerVersion = "1.5.5"
+val composeCompilerVersion = "1.5.8"
 
 android {
     namespace = "com.aliernfrog.lactool"
@@ -64,13 +61,13 @@ dependencies {
     implementation("androidx.compose.material:material-icons-extended:$composeMaterialVersion")
     implementation("androidx.compose.material3:material3:$composeMaterial3Version")
     implementation("androidx.compose.material3:material3-window-size-class:$composeMaterial3Version")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
-    implementation("androidx.activity:activity-compose:1.8.1")
-    implementation("androidx.navigation:navigation-compose:2.7.5")
-    implementation("io.insert-koin:koin-androidx-compose:3.5.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
+    implementation("androidx.activity:activity-compose:1.8.2")
+    implementation("androidx.navigation:navigation-compose:2.7.6")
+    implementation("io.insert-koin:koin-androidx-compose:3.5.3")
     implementation("com.github.aliernfrog:top-toast-compose:1.3.4")
     implementation("com.github.aliernfrog:laclib:1.1.0")
     implementation("com.lazygeniouz:dfc:1.0.8")
     implementation("io.coil-kt:coil-compose:2.5.0")
-    implementation("com.github.jeziellago:compose-markdown:0.3.7")
+    implementation("com.github.jeziellago:compose-markdown:0.4.1")
 }
diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/activity/MainActivity.kt b/app/src/main/java/com/aliernfrog/lactool/ui/activity/MainActivity.kt
@@ -24,7 +24,7 @@ import com.aliernfrog.lactool.ui.theme.LACToolTheme
 import com.aliernfrog.lactool.ui.theme.Theme
 import com.aliernfrog.lactool.ui.viewmodel.MainViewModel
 import com.aliernfrog.toptoast.component.TopToastHost
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 class MainActivity : ComponentActivity() {
 
@@ -39,7 +39,7 @@ class MainActivity : ComponentActivity() {
 
     @Composable
     private fun AppContent(
-        mainViewModel: MainViewModel = getViewModel()
+        mainViewModel: MainViewModel = koinViewModel()
     ) {
         val view = LocalView.current
         val scope = rememberCoroutineScope()

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/component/AppModalBottomSheet.kt b/app/src/main/java/com/aliernfrog/lactool/ui/component/AppModalBottomSheet.kt
@@ -22,7 +22,7 @@ import com.aliernfrog.lactool.ui.theme.AppBottomSheetShape
 import com.aliernfrog.lactool.ui.viewmodel.InsetsViewModel
 import com.aliernfrog.lactool.util.extension.isAnyVisible
 import kotlinx.coroutines.launch
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -60,7 +60,7 @@ fun AppModalBottomSheet(
 @Composable
 fun BaseModalBottomSheet(
     sheetState: SheetState,
-    insetsViewModel: InsetsViewModel = getViewModel(),
+    insetsViewModel: InsetsViewModel = koinViewModel(),
     dragHandle: @Composable (() -> Unit)? = { BottomSheetDefaults.DragHandle() },
     content: @Composable ColumnScope.(bottomPadding: Dp) -> Unit
 ) {

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/component/BaseScaffold.kt b/app/src/main/java/com/aliernfrog/lactool/ui/component/BaseScaffold.kt
@@ -64,7 +64,7 @@ fun BaseScaffold(
     val density = LocalDensity.current
     val layoutDirection = LocalLayoutDirection.current
 
-    val destinations = remember { Destination.values().toList() }
+    val destinations = remember { Destination.entries.toList() }
     val mainDestinations = remember { destinations.filter { it.showInNavigationBar } }
     val currentRoute = navController.currentBackStackEntryAsState().value?.destination?.route
     val currentDestination = destinations.find { it.route == currentRoute }

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/component/FilesDowngradeNotice.kt b/app/src/main/java/com/aliernfrog/lactool/ui/component/FilesDowngradeNotice.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -54,8 +55,10 @@ fun FilesDowngradeNotice(
                 modifier = Modifier.verticalScroll(rememberScrollState()),
                 markdown = stringResource(R.string.permissions_filesApp_moreInfo_text)
                     .replace("{MORE_INFO_URL}", "https://aliernfrog.github.io/android-data-access"),
-                color = LocalContentColor.current,
                 linkColor = MaterialTheme.colorScheme.primary,
+                style = LocalTextStyle.current.copy(
+                    color = LocalContentColor.current
+                ),
                 onLinkClicked = {
                     uriHandler.openUri(it)
                 }

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/component/InsetsObserver.kt b/app/src/main/java/com/aliernfrog/lactool/ui/component/InsetsObserver.kt
@@ -10,11 +10,11 @@ import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import com.aliernfrog.lactool.ui.viewmodel.InsetsViewModel
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Composable
 fun InsetsObserver(
-    insetsViewModel: InsetsViewModel = getViewModel()
+    insetsViewModel: InsetsViewModel = koinViewModel()
 ) {
     val density = LocalDensity.current
     fun toDp(pxs: Int): Dp {

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/dialog/FolderConfigurationDialog.kt b/app/src/main/java/com/aliernfrog/lactool/ui/dialog/FolderConfigurationDialog.kt
@@ -40,12 +40,12 @@ import com.aliernfrog.lactool.util.extension.horizontalFadingEdge
 import com.aliernfrog.lactool.util.extension.resolvePath
 import com.aliernfrog.lactool.util.extension.takePersistablePermissions
 import com.aliernfrog.lactool.util.manager.PreferenceManager
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Composable
 fun FolderConfigurationDialog(
     onDismissRequest: () -> Unit,
-    settingsViewModel: SettingsViewModel = getViewModel()
+    settingsViewModel: SettingsViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
     val folders = remember { SettingsConstant.folders }

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/MainScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/MainScreen.kt
@@ -28,12 +28,12 @@ import com.aliernfrog.lactool.ui.sheet.UpdateSheet
 import com.aliernfrog.lactool.ui.viewmodel.MainViewModel
 import com.aliernfrog.lactool.util.Destination
 import com.aliernfrog.lactool.util.NavigationConstant
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MainScreen(
-    mainViewModel: MainViewModel = getViewModel()
+    mainViewModel: MainViewModel = koinViewModel()
 ) {
     val navController = rememberNavController()
     BaseScaffold(

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/SettingsScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/SettingsScreen.kt
@@ -41,14 +41,14 @@ import com.aliernfrog.lactool.ui.viewmodel.SettingsViewModel
 import com.aliernfrog.lactool.util.staticutil.GeneralUtil
 import com.aliernfrog.toptoast.enum.TopToastType
 import kotlinx.coroutines.launch
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SettingsScreen(
-    mainViewModel: MainViewModel = getViewModel(),
-    settingsViewModel: SettingsViewModel = getViewModel()
+    mainViewModel: MainViewModel = koinViewModel(),
+    settingsViewModel: SettingsViewModel = koinViewModel()
 ) {
     val scope = rememberCoroutineScope()
     AppScaffold(
@@ -78,7 +78,7 @@ fun SettingsScreen(
 
 @Composable
 private fun AppearanceOptions(
-    settingsViewModel: SettingsViewModel = getViewModel()
+    settingsViewModel: SettingsViewModel = koinViewModel()
 ) {
     val themeOptions = listOf(
         stringResource(R.string.settings_appearance_theme_system),
@@ -113,7 +113,7 @@ private fun AppearanceOptions(
 
 @Composable
 private fun GeneralOptions(
-    settingsViewModel: SettingsViewModel = getViewModel()
+    settingsViewModel: SettingsViewModel = koinViewModel()
 ) {
     FormSection(title = stringResource(R.string.settings_general)) {
         SwitchRow(
@@ -145,8 +145,8 @@ private fun GeneralOptions(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun AboutApp(
-    mainViewModel: MainViewModel = getViewModel(),
-    settingsViewModel: SettingsViewModel = getViewModel()
+    mainViewModel: MainViewModel = koinViewModel(),
+    settingsViewModel: SettingsViewModel = koinViewModel()
 ) {
     val scope = rememberCoroutineScope()
     val version = "${mainViewModel.applicationVersionName} (${mainViewModel.applicationVersionCode})"
@@ -215,8 +215,8 @@ private fun Links(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun ExperimentalSettings(
-    mainViewModel: MainViewModel = getViewModel(),
-    settingsViewModel: SettingsViewModel = getViewModel()
+    mainViewModel: MainViewModel = koinViewModel(),
+    settingsViewModel: SettingsViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsEditScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsEditScreen.kt
@@ -35,12 +35,12 @@ import com.aliernfrog.lactool.ui.viewmodel.MapsEditViewModel
 import com.aliernfrog.lactool.util.Destination
 import com.aliernfrog.lactool.util.extension.getName
 import kotlinx.coroutines.launch
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MapsEditScreen(
-    mapsEditViewModel: MapsEditViewModel = getViewModel(),
+    mapsEditViewModel: MapsEditViewModel = koinViewModel(),
     onNavigateBackRequest: () -> Unit,
     onNavigateRequest: (Destination) -> Unit
 ) {
@@ -92,7 +92,7 @@ fun MapsEditScreen(
 
 @Composable
 private fun GeneralActions(
-    mapsEditViewModel: MapsEditViewModel = getViewModel(),
+    mapsEditViewModel: MapsEditViewModel = koinViewModel(),
     onNavigateRequest: (Destination) -> Unit
 ) {
     FormSection(title = stringResource(R.string.mapsEdit_general), bottomDivider = false) {
@@ -113,10 +113,10 @@ private fun GeneralActions(
                 }
             ) {
                 RadioButtons(
-                    options = LACMapType.values().map { it.getName() },
+                    options = LACMapType.entries.map { it.getName() },
                     selectedOptionIndex = (mapsEditViewModel.mapEditor?.mapType ?: LACMapType.WHITE_GRID).index,
                     contentColor = MaterialTheme.colorScheme.onSurfaceVariant,
-                    onSelect = { mapsEditViewModel.setMapType(LACMapType.values()[it]) }
+                    onSelect = { mapsEditViewModel.setMapType(LACMapType.entries[it]) }
                 )
             }
         }
@@ -147,7 +147,7 @@ private fun GeneralActions(
 
 @Composable
 private fun OptionsActions(
-    mapsEditViewModel: MapsEditViewModel = getViewModel()
+    mapsEditViewModel: MapsEditViewModel = koinViewModel()
 ) {
     FadeVisibilityColumn(visible = !mapsEditViewModel.mapEditor?.mapOptions.isNullOrEmpty()) {
         FormSection(title = stringResource(R.string.mapsEdit_options), topDivider = true, bottomDivider = false) {
@@ -187,7 +187,7 @@ private fun OptionsActions(
 
 @Composable
 private fun MiscActions(
-    mapsEditViewModel: MapsEditViewModel = getViewModel()
+    mapsEditViewModel: MapsEditViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
     FormSection(title = stringResource(R.string.mapsEdit_misc), topDivider = true, bottomDivider = false) {
@@ -218,7 +218,7 @@ private fun MiscActions(
 
 @Composable
 private fun FilterObjects(
-    mapsEditViewModel: MapsEditViewModel = getViewModel()
+    mapsEditViewModel: MapsEditViewModel = koinViewModel()
 ) {
     val context = LocalContext.current
     val matches = mapsEditViewModel.getObjectFilterMatches().size

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsListScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsListScreen.kt
@@ -67,13 +67,13 @@ import com.aliernfrog.toptoast.enum.TopToastColor
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
 @Composable
 fun MapsListScreen(
-    mapsListViewModel: MapsListViewModel = getViewModel(),
-    mapsViewModel: MapsViewModel = getViewModel(),
+    mapsListViewModel: MapsListViewModel = koinViewModel(),
+    mapsViewModel: MapsViewModel = koinViewModel(),
     title: String = stringResource(R.string.mapsList_pickMap),
     onBackClick: (() -> Unit)?,
     onMapPick: (Any) -> Unit
@@ -253,7 +253,7 @@ private fun Search(
                     modifier = Modifier.padding(horizontal = 10.dp)
                 )
                 DividerRow(Modifier.padding(vertical = 4.dp))
-                MapsListSortingType.values().forEach { option ->
+                MapsListSortingType.entries.forEach { option ->
                     DropdownMenuItem(
                         text = { Text(stringResource(option.labelId)) },
                         leadingIcon = {
@@ -310,14 +310,14 @@ private fun Filter(
     onSelectedSegmentChange: (MapsListSegment) -> Unit
 ) {
     SegmentedButtons(
-        options = MapsListSegment.values().map {
+        options = MapsListSegment.entries.map {
             stringResource(it.labelId)
         },
         selectedIndex = selectedSegment.ordinal,
         modifier = Modifier
             .fillMaxWidth()
             .padding(8.dp)
     ) {
-        onSelectedSegmentChange(MapsListSegment.values()[it])
+        onSelectedSegmentChange(MapsListSegment.entries[it])
     }
 }
diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsMaterialsScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsMaterialsScreen.kt
@@ -39,12 +39,12 @@ import com.aliernfrog.lactool.ui.dialog.MaterialsNoConnectionDialog
 import com.aliernfrog.lactool.ui.sheet.DownloadableMaterialSheet
 import com.aliernfrog.lactool.ui.viewmodel.MapsEditViewModel
 import kotlinx.coroutines.launch
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MapsMaterialsScreen(
-    mapsEditViewModel: MapsEditViewModel = getViewModel(),
+    mapsEditViewModel: MapsEditViewModel = koinViewModel(),
     onNavigateBackRequest: () -> Unit
 ) {
     val context = LocalContext.current
@@ -124,7 +124,7 @@ fun MapsMaterialsScreen(
 
 @Composable
 private fun Suggestions(
-    mapsEditViewModel: MapsEditViewModel = getViewModel()
+    mapsEditViewModel: MapsEditViewModel = koinViewModel()
 ) {
     val scope = rememberCoroutineScope()
     val unusedMaterials = mapsEditViewModel.mapEditor?.downloadableMaterials?.filter { it.usedBy.isEmpty() } ?: listOf()

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsMergeScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsMergeScreen.kt
@@ -39,11 +39,11 @@ import com.aliernfrog.lactool.ui.component.maps.MapToMerge
 import com.aliernfrog.lactool.ui.dialog.MergeMapDialog
 import com.aliernfrog.lactool.ui.viewmodel.MapsMergeViewModel
 import kotlinx.coroutines.launch
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Composable
 fun MapsMergeScreen(
-    mapsMergeViewModel: MapsMergeViewModel = getViewModel(),
+    mapsMergeViewModel: MapsMergeViewModel = koinViewModel(),
     onNavigateBackRequest: () -> Unit
 ) {
     val context = LocalContext.current
@@ -66,7 +66,7 @@ fun MapsMergeScreen(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun MergeScreen(
-    mapsMergeViewModel: MapsMergeViewModel = getViewModel(),
+    mapsMergeViewModel: MapsMergeViewModel = koinViewModel(),
     onNavigateBackRequest: () -> Unit
 ) {
     val context = LocalContext.current
@@ -168,7 +168,7 @@ private fun PickMapButton(
 
 @Composable
 private fun MapButtonWithActions(
-    mapsMergeViewModel: MapsMergeViewModel = getViewModel(),
+    mapsMergeViewModel: MapsMergeViewModel = koinViewModel(),
     mapToMerge: LACMapToMerge,
     mapIndex: Int,
     containerColor: Color = MaterialTheme.colorScheme.surfaceVariant

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsPermissionsScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsPermissionsScreen.kt
@@ -11,12 +11,12 @@ import com.aliernfrog.lactool.data.PermissionData
 import com.aliernfrog.lactool.ui.screen.PermissionsScreen
 import com.aliernfrog.lactool.ui.viewmodel.MapsViewModel
 import com.aliernfrog.lactool.util.Destination
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Composable
 fun MapsPermissionsScreen(
     onNavigateRequest: (Destination) -> Unit,
-    mapsViewModel: MapsViewModel = getViewModel()
+    mapsViewModel: MapsViewModel = koinViewModel()
 ) {
     val permissions = remember { arrayOf(
         PermissionData(

diff --git a/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsRolesScreen.kt b/app/src/main/java/com/aliernfrog/lactool/ui/screen/maps/MapsRolesScreen.kt
@@ -32,12 +32,12 @@ import com.aliernfrog.lactool.ui.sheet.AddRoleSheet
 import com.aliernfrog.lactool.ui.viewmodel.MapsEditViewModel
 import com.aliernfrog.lactool.util.extension.removeHtml
 import kotlinx.coroutines.launch
-import org.koin.androidx.compose.getViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MapsRolesScreen(
-    mapsEditViewModel: MapsEditViewModel = getViewModel(),
+    mapsEditViewModel: MapsEditViewModel = koinViewModel(),
     onNavigateBackRequest: () -> Unit
 ) {
     val context = LocalContext.current