Merge pull request #147 from Nico1eKim/refactor/#144-qa4

[REFACTOR] 4차 QA 진행

Author: rbqks529

app/src/main/AndroidManifest.xml

@@ -4,6 +4,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"
+        tools:ignore="AdvertisingIdPolicy" />
 
     <application
         android:name=".ThipApplication"

app/src/main/java/com/texthip/thip/MainActivity.kt

@@ -7,6 +7,8 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -177,7 +179,11 @@ fun RootNavHost(
 
     NavHost(
         navController = navController,
-        startDestination = CommonRoutes.Splash
+        startDestination = CommonRoutes.Splash,
+        enterTransition = { EnterTransition.None },
+        exitTransition = { ExitTransition.None },
+        popEnterTransition = { EnterTransition.None },
+        popExitTransition = { ExitTransition.None }
     ) {
         // --- 인증 관련 화면들 ---
         authNavigation(

app/src/main/java/com/texthip/thip/ui/common/cards/CardItemRoom.kt

@@ -45,6 +45,7 @@ fun CardItemRoom(
     imageUrl: String? = null,
     hasBorder: Boolean = false,
     isSecret: Boolean? = null,
+    isExpired: Boolean = false,
     onClick: () -> Unit = {}
 ) {
     Card(
@@ -161,19 +162,21 @@ fun CardItemRoom(
                             }
                         }
                     }
-                    endDate?.let {
-                        Spacer(modifier = Modifier.height(5.dp))
+                    if (!isExpired) {
+                        endDate?.let {
+                            Spacer(modifier = Modifier.height(5.dp))
 
-                        Text(
-                            text = endDate
-                                    + if (isRecruiting) stringResource(
-                                R.string.card_item_end
-                            ) else stringResource(R.string.card_item_finish),
+                            Text(
+                                text = endDate
+                                        + if (isRecruiting) stringResource(
+                                    R.string.card_item_end
+                                ) else stringResource(R.string.card_item_finish),
 
-                            color = if (isRecruiting) colors.Red else colors.Grey01,
-                            style = typography.menu_sb600_s12_h20,
-                            maxLines = 1
-                        )
+                                color = if (isRecruiting) colors.Red else colors.Grey01,
+                                style = typography.menu_sb600_s12_h20,
+                                maxLines = 1
+                            )
+                        }
                     }
                 }
             }

app/src/main/java/com/texthip/thip/ui/common/topappbar/LogoTopAppBar.kt

@@ -24,7 +24,7 @@ import com.texthip.thip.ui.theme.ThipTheme.colors
 @Composable
 fun LogoTopAppBar(
     modifier: Modifier = Modifier,
-    leftIcon: Painter,
+    leftIcon: Painter? = null,
     hasNotification: Boolean,
     onLeftClick: () -> Unit = {},
     onRightClick: () -> Unit = {}
@@ -56,12 +56,14 @@ fun LogoTopAppBar(
             horizontalArrangement = Arrangement.spacedBy(20.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            Icon(
-                painter = leftIcon,
-                contentDescription = "Left Icon",
-                tint = Color.Unspecified,
-                modifier = Modifier.clickable { onLeftClick() }
-            )
+            leftIcon?.let {
+                Icon(
+                    painter = it,
+                    contentDescription = "Left Icon",
+                    tint = Color.Unspecified,
+                    modifier = Modifier.clickable { onLeftClick() }
+                )
+            }
             Icon(
                 painter = rightIcon,
                 contentDescription = "Right Icon",

app/src/main/java/com/texthip/thip/ui/feed/component/FeedSubscribelistBar.kt

@@ -36,6 +36,7 @@ import com.texthip.thip.ui.theme.ThipTheme.typography
 @Composable
 fun FeedSubscribeBarlist(
     modifier: Modifier = Modifier,
+    followerNum: Int = 0,
     followerProfileImageUrls: List<String>,
     onClick: () -> Unit
 ) {
@@ -59,7 +60,8 @@ fun FeedSubscribeBarlist(
                         color = colors.White
                     )
                 ) {
-                    append(stringResource(R.string.thip_num, followerProfileImageUrls.size))                }
+                    append(stringResource(R.string.thip_num, followerNum))
+                }
                 withStyle(
                     style = SpanStyle(
                         color = colors.Grey

app/src/main/java/com/texthip/thip/ui/feed/screen/FeedMyScreen.kt

@@ -121,8 +121,8 @@ fun FeedMyContent(
                         Spacer(modifier = Modifier.height(16.dp))
                         FeedSubscribeBarlist(
                             modifier = Modifier.padding(horizontal = 20.dp),
-                            followerProfileImageUrls = userInfo.latestFollowerProfileImageUrls
-                                ?: emptyList(),
+                            followerNum = userInfo.followerCount,
+                            followerProfileImageUrls = userInfo.latestFollowerProfileImageUrls,
                             onClick = { onNavigateToSubscriptionList(userInfo.creatorId) }
                         )
                         Spacer(modifier = Modifier.height(40.dp))

app/src/main/java/com/texthip/thip/ui/feed/screen/FeedOthersScreen.kt

@@ -133,6 +133,7 @@ fun FeedOthersContent(
                         Spacer(modifier = Modifier.height(16.dp))
                         FeedSubscribeBarlist(
                             modifier = Modifier.padding(horizontal = 20.dp),
+                            followerNum = userInfo.followerCount,
                             followerProfileImageUrls = userInfo.latestFollowerProfileImageUrls,
                             onClick = { onNavigateToSubscriptionList(userInfo.creatorId) }
                         )