Fix systembar borders & add back reader settings

Signed-off-by: starry-shivam <[email protected]>
Pool-Of-Tears · Oct 10, 2024 · 90b74b0 · 90b74b0
1 parent b62d804
commit 90b74b0
Show file tree

Hide file tree

Showing 17 changed files with 352 additions and 31 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -93,7 +93,7 @@ aboutLibraries {
 
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.09.02')
+    def composeBom = platform('androidx.compose:compose-bom:2024.09.03')
     implementation composeBom
     androidTestImplementation composeBom
 
@@ -111,7 +111,7 @@ dependencies {
     implementation "androidx.compose.runtime:runtime-livedata"
     implementation "androidx.compose.material3:material3"
     // Material icons.
-    implementation 'androidx.compose.material:material-icons-extended:1.7.2'
+    implementation 'androidx.compose.material:material-icons-extended:1.7.3'
     // Material theme for main activity.
     implementation 'com.google.android.material:material:1.12.0'
     // Android 12+ splash API.

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -39,7 +39,8 @@
         <activity
             android:name=".ui.screens.reader.main.activities.ReaderActivity"
             android:configChanges="orientation|screenSize|uiMode|locale|layoutDirection|screenLayout"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Theme.Myne.ReaderActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />

diff --git a/app/src/main/java/com/starry/myne/ui/screens/main/MainScreen.kt b/app/src/main/java/com/starry/myne/ui/screens/main/MainScreen.kt
@@ -79,7 +79,8 @@ fun MainScreen(
     Scaffold(
         bottomBar = {
             BottomBar(navController = navController)
-        }, containerColor = MaterialTheme.colorScheme.background
+        },
+        containerColor = MaterialTheme.colorScheme.background,
     ) {
         NavGraph(
             startDestination = startDestination,

diff --git a/app/src/main/java/com/starry/myne/ui/screens/reader/main/activities/ReaderActivity.kt b/app/src/main/java/com/starry/myne/ui/screens/reader/main/activities/ReaderActivity.kt
@@ -116,11 +116,13 @@ class ReaderActivity : AppCompatActivity() {
                         ChaptersContent(
                             state = state,
                             lazyListState = lazyListState,
-                            onToggleReaderMenu = {
-                                viewModel.toggleReaderMenu()
-                                toggleSystemBars(state.showReaderMenu)
-                            }
+                            onToggleReaderMenu = { viewModel.toggleReaderMenu() }
                         )
+
+                        // Toggle system bars based on reader menu visibility.
+                        LaunchedEffect(state.showReaderMenu) {
+                            toggleSystemBars(state.showReaderMenu)
+                        }
                     })
             }
         }

diff --git a/app/src/main/java/com/starry/myne/ui/screens/reader/main/composables/ChaptersContent.kt b/app/src/main/java/com/starry/myne/ui/screens/reader/main/composables/ChaptersContent.kt
@@ -93,7 +93,10 @@ private fun ChapterLazyItemItem(
     val context = LocalContext.current
     val paragraphs = remember { chunkText(chapter.body) }
 
-    val targetFontSize = (state.fontSize / 10) * 1.8f
+    val targetFontSize = remember(state.fontSize) {
+        (state.fontSize / 10) * 1.8f
+    }
+
     val fontSize by animateFloatAsState(
         targetValue = targetFontSize,
         animationSpec = tween(durationMillis = 300),