From c4baeee723ce7cc739322a23a529eeeb89947094 Mon Sep 17 00:00:00 2001 From: Jacob Rein Date: Thu, 7 Sep 2023 05:10:51 -0400 Subject: [PATCH] Updating libs --- .../uiviews/utils/SettingsComposables.kt | 14 +++++++------- gradle/libs.versions.toml | 18 +++++++++--------- .../mangaworld/reader/ReaderCompose.kt | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/utils/SettingsComposables.kt b/UIViews/src/main/java/com/programmersbox/uiviews/utils/SettingsComposables.kt index ec6eabf5f..f9e78a344 100644 --- a/UIViews/src/main/java/com/programmersbox/uiviews/utils/SettingsComposables.kt +++ b/UIViews/src/main/java/com/programmersbox/uiviews/utils/SettingsComposables.kt @@ -16,8 +16,8 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.List import androidx.compose.material.icons.filled.ArrowDropDown -import androidx.compose.material.icons.filled.List import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.AlertDialog import androidx.compose.material3.Checkbox @@ -259,7 +259,7 @@ private fun SwitchSettingPreview() { value = true, updateValue = {}, settingTitle = { Text("Title") }, - settingIcon = { Icon(Icons.Default.List, null) }, + settingIcon = { Icon(Icons.AutoMirrored.Filled.List, null) }, summaryValue = { Text("Value") } ) } @@ -304,7 +304,7 @@ private fun CheckboxSettingPreview() { value = true, updateValue = {}, settingTitle = { Text("Title") }, - settingIcon = { Icon(Icons.Default.List, null) }, + settingIcon = { Icon(Icons.AutoMirrored.Filled.List, null) }, summaryValue = { Text("Value") } ) } @@ -405,7 +405,7 @@ private fun SliderSettingPreview() { range = 0f..10f, settingTitle = { Text("Slider") }, settingSummary = { Text("Summary") }, - settingIcon = { Icon(Icons.Default.List, null) }, + settingIcon = { Icon(Icons.AutoMirrored.Filled.List, null) }, ) } } @@ -447,7 +447,7 @@ private fun ShowMorePreview() { Column { ShowMoreSetting( settingTitle = { Text("Title") }, - settingIcon = { Icon(Icons.Default.List, null) }, + settingIcon = { Icon(Icons.AutoMirrored.Filled.List, null) }, summaryValue = { Text("Value") } ) { Text("Content") } } @@ -502,7 +502,7 @@ private fun DefaultPreferenceLayoutPreview() { Column { DefaultPreferenceLayout( settingTitle = { Text("Title") }, - settingIcon = { Icon(Icons.Default.List, null) }, + settingIcon = { Icon(Icons.AutoMirrored.Filled.List, null) }, summaryValue = { Text("Value") } ) { Text("Content") } } @@ -547,7 +547,7 @@ private fun CategoryPreview() { PreviewTheme { Column { CategorySetting( - settingIcon = { Icon(Icons.Default.List, null) }, + settingIcon = { Icon(Icons.AutoMirrored.Filled.List, null) }, settingTitle = { Text("Title") } ) CategorySetting( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8935852af..631dbeb21 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,17 +8,17 @@ kotlin = "1.9.10" latestAboutLibsRelease = "10.8.3" coroutinesVersion = "1.7.3" glideVersion = "4.16.0" -navigationSafeArgsGradlePlugin = "2.7.1" -pagingVersion = "3.2.0" +navigationSafeArgsGradlePlugin = "2.7.2" +pagingVersion = "3.2.1" roomVersion = "2.5.2" -navVersion = "2.7.1" +navVersion = "2.7.2" koinVersion = "3.4.3" lottieVersion = "6.0.0" coil = "2.4.0" -lifecycle = "2.6.1" +lifecycle = "2.6.2" jetpack = "1.6.0-alpha03" jetpackCompiler = "1.5.3" -jetbrainsCompiler = "1.5.0" +jetbrainsCompiler = "1.5.1" accompanist = "0.32.0" okhttpVersion = "4.11.0" ktorVersion = "2.3.4" @@ -28,7 +28,7 @@ ziplineVersion = "1.1.0" landscapist = "2.2.8" protobufVersion = "3.24.2" sketchVersion = "3.2.5" -composeBomVersion = "2023.07.00-alpha02" +composeBomVersion = "2023.10.00-alpha01" ### MangaWorld piasy = "1.8.1" @@ -64,6 +64,7 @@ materialYou = { group = "androidx.compose.material3", name = "material3" } materialWindow = { group = "androidx.compose.material3", name = "material3-window-size-class" } composeMaterialIconsCore = { group = "androidx.compose.material", name = "material-icons-core" } composeMaterialIconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" } +composeViewBinding = { group = "androidx.compose.ui", name = "ui-viewbinding" } tv-material = { module = "androidx.tv:tv-material", version.ref = "tvCompose" } tv-foundation = { module = "androidx.tv:tv-foundation", version.ref = "tvCompose" } uiUtil = { group = "androidx.compose.ui", name = "ui-util" } @@ -71,7 +72,7 @@ composeAnimation = { group = "androidx.compose.animation", name = "animation" } composeRuntimeLivedata = { group = "androidx.compose.runtime", name = "runtime-livedata" } composeLifecycle = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } composeActivity = "androidx.activity:activity-compose:1.7.2" -composeLifecycleRuntime = "androidx.lifecycle:lifecycle-runtime-compose:2.6.1" +composeLifecycleRuntime = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle" } landscapistGlide = { module = "com.github.skydoves:landscapist-glide", version.ref = "landscapist" } landscapistPalette = { module = "com.github.skydoves:landscapist-palette", version.ref = "landscapist" } landscapistPlaceholder = { module = "com.github.skydoves:landscapist-placeholder", version.ref = "landscapist" } @@ -181,7 +182,7 @@ recyclerview = "androidx.recyclerview:recyclerview:1.3.1" constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4" swiperefresh = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" -zoomableModifier = "net.engawapg.lib:zoomable:1.5.0" +zoomableModifier = "net.engawapg.lib:zoomable:1.5.1" ### MangaWorld coilGif = { module = "io.coil-kt:coil-gif", version.ref = "coil" } @@ -199,7 +200,6 @@ castFramework = "com.google.android.gms:play-services-cast-framework:21.3.0" localCast = "com.github.KaustubhPatange:Android-Cast-Local-Sample:0.01" superForwardView = "com.github.ertugrulkaragoz:SuperForwardView:0.2" -composeViewBinding = { module = "androidx.compose.ui:ui-viewbinding", version.ref = "jetpack" } autoBindings = { module = "io.github.kaustubhpatange:autobindings", version.ref = "autoBinding" } autoBindingsCompiler = { module = "io.github.kaustubhpatange:autobindings-compiler", version.ref = "autoBinding" } # For media playback using ExoPlayer diff --git a/mangaworld/src/main/java/com/programmersbox/mangaworld/reader/ReaderCompose.kt b/mangaworld/src/main/java/com/programmersbox/mangaworld/reader/ReaderCompose.kt index a44bb2b6f..98c20b54f 100644 --- a/mangaworld/src/main/java/com/programmersbox/mangaworld/reader/ReaderCompose.kt +++ b/mangaworld/src/main/java/com/programmersbox/mangaworld/reader/ReaderCompose.kt @@ -63,13 +63,13 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.List import androidx.compose.material.icons.filled.BatteryAlert import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.FastForward import androidx.compose.material.icons.filled.FastRewind import androidx.compose.material.icons.filled.FormatLineSpacing import androidx.compose.material.icons.filled.GridOn -import androidx.compose.material.icons.filled.List import androidx.compose.material.icons.filled.Pages import androidx.compose.material.icons.filled.Settings import androidx.compose.material.pullrefresh.PullRefreshIndicator @@ -278,7 +278,7 @@ fun ReadView( summaryValue = { Text(stringResource(R.string.list_or_pager_description)) }, value = listOrPager, updateValue = { scope.launch { activity.updatePref(LIST_OR_PAGER, it) } }, - settingIcon = { Icon(if (listOrPager) Icons.Default.List else Icons.Default.Pages, null) } + settingIcon = { Icon(if (listOrPager) Icons.AutoMirrored.Filled.List else Icons.Default.Pages, null) } ) } },