From c0398da9be9ef6b351218d0466b5a9f07d9327a0 Mon Sep 17 00:00:00 2001
From: AllenTom <qweasdzxczse2@gmail.com>
Date: Tue, 16 Jul 2024 16:09:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aiosman/riderpro/BottomNavigationPlaceholder.kt   |  2 +-
 .../main/java/com/aiosman/riderpro/CommentsScreen.kt  |  2 +-
 app/src/main/java/com/aiosman/riderpro/LikePage.kt    |  2 +-
 .../main/java/com/aiosman/riderpro/MainActivity.kt    | 11 ++---------
 .../main/java/com/aiosman/riderpro/StatusBarMask.kt   |  6 ++++++
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/aiosman/riderpro/BottomNavigationPlaceholder.kt b/app/src/main/java/com/aiosman/riderpro/BottomNavigationPlaceholder.kt
index 903036d..130ccb3 100644
--- a/app/src/main/java/com/aiosman/riderpro/BottomNavigationPlaceholder.kt
+++ b/app/src/main/java/com/aiosman/riderpro/BottomNavigationPlaceholder.kt
@@ -9,7 +9,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
 
 @Composable
-fun BottomNavigationPlaceholder(){
+fun BottomNavigationPlaceholder() {
     val navigationBarHeight = with(LocalDensity.current) {
         WindowInsets.navigationBars.getBottom(this).toDp()
     }
diff --git a/app/src/main/java/com/aiosman/riderpro/CommentsScreen.kt b/app/src/main/java/com/aiosman/riderpro/CommentsScreen.kt
index 5c41ba3..8f36364 100644
--- a/app/src/main/java/com/aiosman/riderpro/CommentsScreen.kt
+++ b/app/src/main/java/com/aiosman/riderpro/CommentsScreen.kt
@@ -36,7 +36,7 @@ fun CommentsScreen() {
     ) {
         Column(
             modifier = Modifier
-                .fillMaxSize()
+                .weight(1f)
                 .background(color = Color(0xFFFFFFFF))
                 .padding(horizontal = 16.dp)
         ) {
diff --git a/app/src/main/java/com/aiosman/riderpro/LikePage.kt b/app/src/main/java/com/aiosman/riderpro/LikePage.kt
index 69db909..b5decf9 100644
--- a/app/src/main/java/com/aiosman/riderpro/LikePage.kt
+++ b/app/src/main/java/com/aiosman/riderpro/LikePage.kt
@@ -36,7 +36,7 @@ fun LikePage() {
     ) {
         Column(
             modifier = Modifier
-                .fillMaxSize()
+                .weight(1f)
                 .background(color = Color(0xFFFFFFFF))
                 .padding(horizontal = 16.dp)
         ) {
diff --git a/app/src/main/java/com/aiosman/riderpro/MainActivity.kt b/app/src/main/java/com/aiosman/riderpro/MainActivity.kt
index e3d5396..6b784a5 100644
--- a/app/src/main/java/com/aiosman/riderpro/MainActivity.kt
+++ b/app/src/main/java/com/aiosman/riderpro/MainActivity.kt
@@ -140,9 +140,7 @@ fun NavigationController(navController: NavHostController) {
 
         }
         composable(route = "Comments") {
-
-                CommentsScreen()
-
+            CommentsScreen()
         }
         composable(route = "Likes") {
 
@@ -150,12 +148,7 @@ fun NavigationController(navController: NavHostController) {
 
         }
         composable(route = "Followers") {
-            Box(
-                modifier = Modifier.padding(bottom = navigationBarHeight)
-            ) {
-
-                FollowerPage()
-            }
+            FollowerPage()
         }
         composable(route = "NewPost") {
 
diff --git a/app/src/main/java/com/aiosman/riderpro/StatusBarMask.kt b/app/src/main/java/com/aiosman/riderpro/StatusBarMask.kt
index a05fb5b..0181aad 100644
--- a/app/src/main/java/com/aiosman/riderpro/StatusBarMask.kt
+++ b/app/src/main/java/com/aiosman/riderpro/StatusBarMask.kt
@@ -59,5 +59,11 @@ fun StatusBarMaskLayout(
 
         }
         content()
+        if (navigationBarPaddings > 24.dp) {
+            Box(
+                modifier = Modifier
+                    .height(navigationBarPaddings).fillMaxWidth().background(Color.White)
+            )
+        }
     }
 }
\ No newline at end of file