Branch 최신화

app/build.gradle.kts

@@ -49,6 +49,7 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.navigation.compose)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

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

@@ -5,9 +5,6 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -22,12 +19,13 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             ThipTheme {
-                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+                /*Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
                     Greeting(
                         name = "Android",
                         modifier = Modifier.padding(innerPadding)
                     )
-                }
+                }*/
+                MainScreen()
             }
         }
     }

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

@@ -0,0 +1,31 @@
+package com.texthip.thip
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
+import com.texthip.thip.ui.navigator.BottomNavigationBar
+import com.texthip.thip.ui.navigator.MainNavHost
+import com.texthip.thip.ui.navigator.NavBarItems
+
+@Composable
+fun MainScreen() {
+    val navController = rememberNavController()
+    val navBackStackEntry by navController.currentBackStackEntryAsState()
+    val currentRoute = navBackStackEntry?.destination?.route
+    val showBottomBar = currentRoute in NavBarItems.BarItems.map { it.route }
+
+    Scaffold(
+        bottomBar = {
+            if (showBottomBar) BottomNavigationBar(navController)
+        }
+    ) { innerPadding ->
+        Box(modifier = Modifier.padding(innerPadding)) {
+            MainNavHost (navController)
+        }
+    }
+}

app/src/main/java/com/texthip/thip/ui/bookSearch/screen/BookSearchScreen.kt

@@ -0,0 +1,19 @@
+package com.texthip.thip.ui.bookSearch.screen
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavController
+
+@Composable
+fun BookSearchScreen(navController: NavController) {
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center
+    ) {
+        Text(text = "Book Search Screen")
+    }
+}

app/src/main/java/com/texthip/thip/ui/common/header/AuthorHeader.kt

@@ -0,0 +1,109 @@
+package com.texthip.thip.ui.common.header
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.texthip.thip.ui.theme.ThipTheme
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+import com.texthip.thip.R
+import com.texthip.thip.ui.theme.Grey02
+
+@Composable
+fun AuthorHeader(
+    modifier: Modifier = Modifier,
+    profileImage: Painter?,
+    nickname: String,
+    badgeText: String,
+    onSubscribeClick: () -> Unit
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 20.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        if (profileImage != null) {
+            Image(
+                painter = profileImage,
+                contentDescription = "작성자 장르이미지",
+                modifier = Modifier
+                    .size(48.dp)
+                    .clip(CircleShape)
+            )
+        } else {
+            Box(
+                modifier = Modifier
+                    .size(48.dp)
+                    .clip(CircleShape)
+                    .background(colors.Grey)
+            )
+        }
+        Spacer(modifier = Modifier.width(8.dp))
+        Column(
+            modifier = Modifier.weight(1f)
+        ) {
+            Text(
+                text = nickname,
+                style = typography.smalltitle_sb600_s18_h24,
+                color = colors.White,
+                maxLines = 1
+            )
+            Text(
+                text = badgeText,
+                style = typography.feedcopy_r400_s14_h20,
+                color = colors.NeonGreen,
+                maxLines = 1
+            )
+        }
+
+        Box(
+            modifier = Modifier
+                .clip(RoundedCornerShape(20.dp))
+                .border(1.dp, Grey02, RoundedCornerShape(20.dp))
+                .background(Color.Transparent)
+                .clickable { onSubscribeClick() }
+                .padding(horizontal = 12.dp, vertical = 8.dp)
+        ) {
+            Text(
+                text = stringResource(R.string.subscribe),
+                style = typography.menu_m500_s14_h24,
+                color = colors.White
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun PreviewAuthorHeader() {
+    ThipTheme {
+        AuthorHeader(
+            profileImage = null,
+            nickname = "열자자제한열열자제한",
+            badgeText = "칭호칭호칭호",
+            onSubscribeClick = { println("구독") }
+        )
+    }
+}

app/src/main/java/com/texthip/thip/ui/common/header/ProfileBar.kt

@@ -0,0 +1,127 @@
+package com.texthip.thip.ui.common.header
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.texthip.thip.R
+import com.texthip.thip.ui.theme.Grey
+import com.texthip.thip.ui.theme.ThipTheme
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+
+@Composable
+fun ProfileBar(
+    modifier: Modifier = Modifier,
+    profileImage: Painter?,
+    topText: String,
+    bottomText: String,
+    showSubscriberInfo: Boolean,
+    subscriberCount: Int = 0,
+    hoursAgo: Int = 0
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp, vertical = 12.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        if (profileImage != null) {
+            Image(
+                painter = profileImage,
+                contentDescription = "프로필 이미지",
+                modifier = Modifier
+                    .size(36.dp)
+                    .clip(CircleShape)
+            )
+        } else {
+            Box(
+                modifier = Modifier
+                    .size(36.dp)
+                    .clip(CircleShape)
+                    .background(Grey)
+            )
+        }
+        Spacer(modifier = Modifier.width(8.dp))
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = topText,
+                style = typography.view_m500_s14,
+                color = colors.White
+            )
+            Text(
+                text = bottomText,
+                style = typography.info_r400_s12,
+                color = colors.NeonGreen
+            )
+        }
+        if (showSubscriberInfo) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    text = stringResource(R.string.subscriber_num,subscriberCount),
+                    style = typography.timedate_r400_s11,
+                    color = colors.Grey01
+                )
+                Spacer(modifier = Modifier.width(4.dp))
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_chevron_right),
+                    contentDescription = "화살표",
+                    modifier = Modifier.size(16.dp),
+                    tint = Color.Unspecified
+                )
+            }
+        } else {
+            Text(
+                text = stringResource(R.string.hours_ago,hoursAgo),
+                style = typography.timedate_r400_s11,
+                color = colors.Grey01
+            )
+        }
+    }
+}
+
+@Composable
+@Preview(showBackground = true)
+fun PreviewProfileBar() {
+    ThipTheme {
+        Column {
+            ProfileBar(
+                profileImage = null,
+                topText = "user.01",
+                bottomText = stringResource(R.string.influencer),
+                showSubscriberInfo = true,
+                subscriberCount = 77
+            )
+            ProfileBar(
+                profileImage = null,
+                topText = "user.04",
+                bottomText = stringResource(R.string.influencer),
+                showSubscriberInfo = false,
+                hoursAgo = 7
+            )
+        }
+    }
+}
+