From 92f7ebbfd24a0dc756454ded900d3a124804f2c1 Mon Sep 17 00:00:00 2001
From: jacobrein <jacob.rein@gabb.com>
Date: Wed, 16 Oct 2024 13:10:03 -0600
Subject: [PATCH] - Update Dependencies

Updates several dependencies to their latest versions, including:
- Gradle to 8.7.1
- AndroidX Baseline Profile Gra
dle Plugin to 1.3.3
- Haze to 0.9.0-beta04
- Room to 2.7.0-alpha10
- Navigation to 2.9.0-alpha01
- Koin to 4.0.0
-
 Lifecycle to 2.9.0-alpha05
- Activity to 1.9.3
- Compose BOM to 2024.10.00
- AndroidX Gradle Version Catalog to 2024.10.00

This commit also modifies the `OtakuCustomListScreen` and `ReaderCompose` to use Haze for blurring effects, adjusts the `SourceOrderScreen` UI, and changes `OtakuScaffold` to accept custom Haze blur configurations.
---
 .idea/gradle.xml                              |  3 +-
 .idea/inspectionProfiles/Project_Default.xml  |  5 ++
 .idea/kotlinc.xml                             |  2 +-
 .idea/misc.xml                                |  1 -
 .../uiviews/lists/OtakuCustomListScreen.kt    | 31 +++++++--
 .../uiviews/settings/SourceOrderScreen.kt     | 66 ++++++++++---------
 .../uiviews/utils/components/HazeUtils.kt     |  7 +-
 .../uiviews/utils/components/OtakuScaffold.kt |  7 +-
 gradle/libs.versions.toml                     | 16 ++---
 .../reader/compose/ReaderCompose.kt           |  9 ++-
 settings.gradle.kts                           |  2 +-
 11 files changed, 95 insertions(+), 54 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a00698dbc..7240ce51c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,6 +15,7 @@
             </builds>
           </compositeBuild>
         </compositeConfiguration>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="/usr/local/Cellar/gradle/6.7.1/libexec" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
@@ -30,7 +31,7 @@
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/buildSrc" />
             <option value="$PROJECT_DIR$/favoritesdatabase" />
-            <option value="$PROJECT_DIR$/imageloader" />
+            <option value="$PROJECT_DIR$/gemini" />
             <option value="$PROJECT_DIR$/manga_sources" />
             <option value="$PROJECT_DIR$/manga_sources/defaultmangasources" />
             <option value="$PROJECT_DIR$/mangaworld" />
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index fb93d254a..afb1d81f1 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintUnsafeImplicitIntentLaunch" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
@@ -37,6 +38,10 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index ccfac8f03..d06678829 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -4,6 +4,6 @@
     <option name="jvmTarget" value="1.8" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.0" />
+    <option name="version" value="2.0.21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 76e02a329..7fea1e696 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/lists/OtakuCustomListScreen.kt b/UIViews/src/main/java/com/programmersbox/uiviews/lists/OtakuCustomListScreen.kt
index ea34cc37f..b65e5f301 100644
--- a/UIViews/src/main/java/com/programmersbox/uiviews/lists/OtakuCustomListScreen.kt
+++ b/UIViews/src/main/java/com/programmersbox/uiviews/lists/OtakuCustomListScreen.kt
@@ -114,12 +114,17 @@ import com.programmersbox.uiviews.utils.components.CoilGradientImage
 import com.programmersbox.uiviews.utils.components.DynamicSearchBar
 import com.programmersbox.uiviews.utils.components.ListBottomScreen
 import com.programmersbox.uiviews.utils.components.ListBottomSheetItemModel
-import com.programmersbox.uiviews.utils.components.OtakuHazeScaffold
+import com.programmersbox.uiviews.utils.components.plus
 import com.programmersbox.uiviews.utils.dispatchIo
 import com.programmersbox.uiviews.utils.launchCatching
 import com.programmersbox.uiviews.utils.loadItem
 import com.programmersbox.uiviews.utils.navigateToDetails
 import com.programmersbox.uiviews.utils.rememberBiometricPrompt
+import dev.chrisbanes.haze.HazeProgressive
+import dev.chrisbanes.haze.HazeState
+import dev.chrisbanes.haze.haze
+import dev.chrisbanes.haze.hazeChild
+import dev.chrisbanes.haze.materials.HazeMaterials
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.launchIn
@@ -152,6 +157,7 @@ fun OtakuCustomListScreen(
     removeSecurityItem: (UUID) -> Unit,
     hasAuthentication: Boolean = false,
 ) {
+    val hazeState = remember { HazeState() }
     val biometricPrompt = rememberBiometricPrompt(
         onAuthenticationSucceeded = {
             customItem?.item?.uuid?.let { addSecurityItem(it) }
@@ -374,7 +380,7 @@ fun OtakuCustomListScreen(
             )
         },
     ) {
-        OtakuHazeScaffold(
+        Scaffold(
             snackbarHost = {
                 SnackbarHost(
                     snackbarHostState,
@@ -511,14 +517,24 @@ fun OtakuCustomListScreen(
                             }
                         }
                     },
-                    modifier = Modifier.fillMaxWidth(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .let {
+                            if (showBlur)
+                                it.hazeChild(
+                                    hazeState,
+                                    HazeMaterials.regular(MaterialTheme.colorScheme.surface)
+                                ) {
+                                    progressive = HazeProgressive.verticalGradient(startIntensity = 1f, endIntensity = 0f)
+                                } else it
+                        },
                 ) {
                     LazyVerticalGrid(
                         columns = GridCells.Fixed(1),
                         verticalArrangement = Arrangement.spacedBy(4.dp),
                         modifier = Modifier
                             .padding(16.dp)
-                            .fillMaxWidth(),
+                            .fillMaxWidth()
                     ) {
                         itemsIndexed(items = searchItems) { index, item ->
                             ListItem(
@@ -538,14 +554,15 @@ fun OtakuCustomListScreen(
                     }
                 }
             },
-            blurTopBar = showBlur
         ) { padding ->
             LazyVerticalGrid(
                 columns = adaptiveGridCell(),
-                contentPadding = padding,
+                contentPadding = padding + LocalNavHostPadding.current,
                 verticalArrangement = Arrangement.spacedBy(4.dp),
                 horizontalArrangement = Arrangement.spacedBy(4.dp),
-                modifier = Modifier.padding(vertical = 4.dp)
+                modifier = Modifier
+                    .padding(vertical = 4.dp)
+                    .haze(state = hazeState)
             ) {
                 items(
                     items = items,
diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/settings/SourceOrderScreen.kt b/UIViews/src/main/java/com/programmersbox/uiviews/settings/SourceOrderScreen.kt
index ddf5f19de..27c259289 100644
--- a/UIViews/src/main/java/com/programmersbox/uiviews/settings/SourceOrderScreen.kt
+++ b/UIViews/src/main/java/com/programmersbox/uiviews/settings/SourceOrderScreen.kt
@@ -19,7 +19,6 @@ import androidx.compose.material.icons.rounded.DragHandle
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.ElevatedSplitButton
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
@@ -28,6 +27,7 @@ import androidx.compose.material3.ListItem
 import androidx.compose.material3.OutlinedCard
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SplitButtonDefaults
+import androidx.compose.material3.SplitButtonLayout
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
@@ -118,36 +118,42 @@ fun SourceOrderScreen(
                 title = { Text("Source Order") },
                 actions = {
                     var checked by remember { mutableStateOf(false) }
-                    ElevatedSplitButton(
-                        onLeadingButtonClick = {
-                            scope.launch { sourceSortOrder.sorting(sourceOrder, itemDao, modifiedOrder) }
-                        },
-                        checked = checked,
-                        onTrailingButtonClick = { checked = !checked },
-                        leadingContent = {
-                            Icon(
-                                Icons.AutoMirrored.Filled.Sort,
-                                modifier = Modifier.size(SplitButtonDefaults.LeadingIconSize),
-                                contentDescription = "Localized description"
-                            )
-                            Spacer(Modifier.size(ButtonDefaults.IconSpacing))
-                            Text(sourceSortOrder.name)
+                    SplitButtonLayout(
+                        leadingButton = {
+                            SplitButtonDefaults.ElevatedLeadingButton(
+                                onClick = {
+                                    scope.launch { sourceSortOrder.sorting(sourceOrder, itemDao, modifiedOrder) }
+                                }
+                            ) {
+                                Icon(
+                                    Icons.AutoMirrored.Filled.Sort,
+                                    modifier = Modifier.size(SplitButtonDefaults.LeadingIconSize),
+                                    contentDescription = "Localized description"
+                                )
+                                Spacer(Modifier.size(ButtonDefaults.IconSpacing))
+                                Text(sourceSortOrder.name)
+                            }
                         },
-                        trailingContent = {
-                            val rotation: Float by animateFloatAsState(
-                                targetValue = if (checked) 180f else 0f,
-                                label = "Trailing Icon Rotation"
-                            )
-                            Icon(
-                                Icons.Filled.KeyboardArrowDown,
-                                modifier =
-                                Modifier
-                                    .size(SplitButtonDefaults.TrailingIconSize)
-                                    .graphicsLayer {
-                                        this.rotationZ = rotation
-                                    },
-                                contentDescription = "Localized description"
-                            )
+                        trailingButton = {
+                            SplitButtonDefaults.ElevatedTrailingButton(
+                                checked = checked,
+                                onCheckedChange = { checked = it }
+                            ) {
+                                val rotation: Float by animateFloatAsState(
+                                    targetValue = if (checked) 180f else 0f,
+                                    label = "Trailing Icon Rotation"
+                                )
+                                Icon(
+                                    Icons.Filled.KeyboardArrowDown,
+                                    modifier =
+                                    Modifier
+                                        .size(SplitButtonDefaults.TrailingIconSize)
+                                        .graphicsLayer {
+                                            this.rotationZ = rotation
+                                        },
+                                    contentDescription = "Localized description"
+                                )
+                            }
                         }
                     )
 
diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/utils/components/HazeUtils.kt b/UIViews/src/main/java/com/programmersbox/uiviews/utils/components/HazeUtils.kt
index d34fa9b09..0a7d02cd9 100644
--- a/UIViews/src/main/java/com/programmersbox/uiviews/utils/components/HazeUtils.kt
+++ b/UIViews/src/main/java/com/programmersbox/uiviews/utils/components/HazeUtils.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.layout.SubcomposeLayout
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.offset
+import dev.chrisbanes.haze.HazeChildScope
 import dev.chrisbanes.haze.HazeState
 import dev.chrisbanes.haze.HazeStyle
 import dev.chrisbanes.haze.haze
@@ -58,6 +59,8 @@ fun HazeScaffold(
     hazeState: HazeState = remember { HazeState() },
     topBarStyle: HazeStyle = HazeMaterials.thin(containerColor),
     bottomBarStyle: HazeStyle = topBarStyle,
+    topBarBlur: (HazeChildScope.() -> Unit)? = null,
+    bottomBarBlur: (HazeChildScope.() -> Unit)? = null,
     content: @Composable (PaddingValues) -> Unit,
 ) {
     NestedScaffold(
@@ -67,7 +70,7 @@ fun HazeScaffold(
                 // We explicitly only want to add a Box if we are blurring.
                 // Scaffold has logic which changes based on whether `bottomBar` contains a layout node.
                 Box(
-                    modifier = Modifier.hazeChild(state = hazeState, style = topBarStyle),
+                    modifier = Modifier.hazeChild(state = hazeState, style = topBarStyle, block = topBarBlur),
                 ) { topBar() }
             } else {
                 topBar()
@@ -78,7 +81,7 @@ fun HazeScaffold(
                 // We explicitly only want to add a Box if we are blurring.
                 // Scaffold has logic which changes based on whether `bottomBar` contains a layout node.
                 Box(
-                    modifier = Modifier.hazeChild(state = hazeState, style = bottomBarStyle),
+                    modifier = Modifier.hazeChild(state = hazeState, style = bottomBarStyle, block = bottomBarBlur),
                 ) { bottomBar() }
             } else {
                 bottomBar()
diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/utils/components/OtakuScaffold.kt b/UIViews/src/main/java/com/programmersbox/uiviews/utils/components/OtakuScaffold.kt
index b64db34b6..b75b6210c 100644
--- a/UIViews/src/main/java/com/programmersbox/uiviews/utils/components/OtakuScaffold.kt
+++ b/UIViews/src/main/java/com/programmersbox/uiviews/utils/components/OtakuScaffold.kt
@@ -12,6 +12,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.programmersbox.uiviews.utils.LocalNavHostPadding
+import dev.chrisbanes.haze.HazeChildScope
 
 @ExperimentalMaterial3Api
 @Composable
@@ -27,6 +28,8 @@ fun OtakuHazeScaffold(
     contentColor: Color = contentColorFor(containerColor),
     blurTopBar: Boolean = false,
     blurBottomBar: Boolean = false,
+    topBarBlur: (HazeChildScope.() -> Unit)? = null,
+    bottomBarBlur: (HazeChildScope.() -> Unit)? = null,
     content: @Composable (PaddingValues) -> Unit,
 ) {
     HazeScaffold(
@@ -40,7 +43,9 @@ fun OtakuHazeScaffold(
         contentColor = contentColor,
         contentWindowInsets = contentWindowInsets,
         blurTopBar = blurTopBar,
-        blurBottomBar = blurBottomBar
+        blurBottomBar = blurBottomBar,
+        topBarBlur = topBarBlur,
+        bottomBarBlur = bottomBarBlur,
     ) { content(it + LocalNavHostPadding.current) }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4a8474bfc..fbb4b453a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,18 +2,18 @@
 biometricVersion = "1.4.0-alpha02"
 blurhash = "0.4.0-SNAPSHOT"
 generativeai = "0.9.0"
-gradle = "8.7.0"
+gradle = "8.7.1"
 
 kotlin = "2.0.21"
 kspVersion = "2.0.21-1.0.25"
 
-androidxBaselineprofileGradlePlugin = "1.3.0"
+androidxBaselineprofileGradlePlugin = "1.3.3"
 composeCollapsable = "0.4.0"
 dragselect = "2.3.2"
 easylauncher = "6.4.0"
 firebaseCrashlyticsGradle = "3.0.2"
 googleServices = "4.4.2"
-haze = "0.9.0-beta03"
+haze = "0.9.0-beta04"
 kamelImage = "1.0.0"
 latestAboutLibsRelease = "11.2.3"
 coroutinesVersion = "1.9.0"
@@ -22,11 +22,11 @@ pagecurl = "1.5.1"
 pagingVersion = "3.3.2"
 protobufGradlePlugin = "0.9.4"
 reorderable = "2.4.0-beta01"
-roomVersion = "2.7.0-alpha09"
-navVersion = "2.8.2"
+roomVersion = "2.7.0-alpha10"
+navVersion = "2.9.0-alpha01"
 koinVersion = "4.0.0"
 coil = "2.7.0"
-lifecycle = "2.9.0-alpha04"
+lifecycle = "2.9.0-alpha05"
 jetpack = "1.6.0-alpha03"
 jetpackCompiler = "1.5.11"
 jetbrainsCompiler = "1.5.1"
@@ -38,12 +38,12 @@ ziplineVersion = "1.1.0"
 landscapist = "2.4.1"
 protobufVersion = "4.26.1"
 sketchVersion = "3.3.2"
-activity = "1.9.2"
+activity = "1.9.3"
 composeVersion = "1.8.0-alpha01"
 compose3Version = "1.3.0"
 compose3CommonVersion = "1.0.0-alpha01"
 compose3AdaptiveVersion = "1.1.0-alpha02"
-composeBomVersion = "2024.09.03"
+composeBomVersion = "2024.10.00"
 materialKolor = "2.0.0"
 firebaseKtx = "0.2.0"
 
diff --git a/mangaworld/src/main/java/com/programmersbox/mangaworld/reader/compose/ReaderCompose.kt b/mangaworld/src/main/java/com/programmersbox/mangaworld/reader/compose/ReaderCompose.kt
index 8b8fd4a26..38d24e909 100644
--- a/mangaworld/src/main/java/com/programmersbox/mangaworld/reader/compose/ReaderCompose.kt
+++ b/mangaworld/src/main/java/com/programmersbox/mangaworld/reader/compose/ReaderCompose.kt
@@ -65,6 +65,7 @@ import com.programmersbox.uiviews.utils.LocalItemDao
 import com.programmersbox.uiviews.utils.LocalSettingsHandling
 import com.programmersbox.uiviews.utils.ToasterSetup
 import com.programmersbox.uiviews.utils.components.OtakuPullToRefreshBox
+import dev.chrisbanes.haze.HazeProgressive
 import dev.chrisbanes.haze.HazeState
 import dev.chrisbanes.haze.haze
 import dev.chrisbanes.haze.hazeChild
@@ -264,7 +265,9 @@ fun ReadView(
                         playingStartAction = startAction,
                         playingMiddleAction = middleAction,
                         showBlur = showBlur,
-                        modifier = if (showBlur) Modifier.hazeChild(hazeState, style = HazeMaterials.thin()) else Modifier
+                        modifier = if (showBlur) Modifier.hazeChild(hazeState, style = HazeMaterials.thin()) {
+                            progressive = HazeProgressive.verticalGradient(startIntensity = 1f, endIntensity = 0f)
+                        } else Modifier
                     )
                 }
             },
@@ -281,7 +284,9 @@ fun ReadView(
                         vm = readVm,
                         showBlur = showBlur,
                         isAmoledMode = isAmoledMode,
-                        modifier = if (showBlur) Modifier.hazeChild(hazeState, style = HazeMaterials.thin()) else Modifier
+                        modifier = if (showBlur) Modifier.hazeChild(hazeState, style = HazeMaterials.thin()) {
+                            //progressive = HazeProgressive.verticalGradient(startIntensity = 0f, endIntensity = 1f)
+                        } else Modifier
                     )
                 }
             },
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dbe6bfa50..2d8316905 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.02")
+            from("androidx.gradle:gradle-version-catalog:2024.10.00")
         }
     }
 }