From bef22b204bed83c277aaba3351d1ff8434cc26e0 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Mon, 23 Sep 2024 03:00:37 +0900 Subject: [PATCH] feature #866: feat FortuneTopBar component --- .../official/feature/fortune/MainScreen.kt | 21 ++----------- .../fortune/component/FortuneTopBar.kt | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 feature/fortune/src/main/java/org/sopt/official/feature/fortune/component/FortuneTopBar.kt diff --git a/feature/fortune/src/main/java/org/sopt/official/feature/fortune/MainScreen.kt b/feature/fortune/src/main/java/org/sopt/official/feature/fortune/MainScreen.kt index 7475504d..a5d8f72a 100644 --- a/feature/fortune/src/main/java/org/sopt/official/feature/fortune/MainScreen.kt +++ b/feature/fortune/src/main/java/org/sopt/official/feature/fortune/MainScreen.kt @@ -25,25 +25,20 @@ package org.sopt.official.feature.fortune import androidx.compose.foundation.background -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Close -import androidx.compose.material3.Icon import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import androidx.navigation.toRoute import org.sopt.official.designsystem.SoptTheme +import org.sopt.official.feature.fortune.component.FortuneTopBar import org.sopt.official.feature.fortune.feature.fortundDetail.FortuneDetail import org.sopt.official.feature.fortune.feature.fortundDetail.FortuneDetailRoute import org.sopt.official.feature.fortune.feature.home.Home @@ -56,18 +51,8 @@ fun MainScreen( Scaffold( modifier = Modifier.fillMaxSize(), topBar = { - Box(modifier = Modifier.fillMaxWidth()) { - Icon( - imageVector = Icons.Filled.Close, - contentDescription = null, - modifier = Modifier - .padding(start = 8.dp, top = 2.dp, bottom = 2.dp) - .padding(8.dp) - .clickable { - // TODO: Navigate to NotificationActivity - }, - tint = SoptTheme.colors.onBackground - ) + FortuneTopBar { + // TODO: Navigate to NotificationActivity } }, content = { paddingValue -> diff --git a/feature/fortune/src/main/java/org/sopt/official/feature/fortune/component/FortuneTopBar.kt b/feature/fortune/src/main/java/org/sopt/official/feature/fortune/component/FortuneTopBar.kt new file mode 100644 index 00000000..b6c8df67 --- /dev/null +++ b/feature/fortune/src/main/java/org/sopt/official/feature/fortune/component/FortuneTopBar.kt @@ -0,0 +1,31 @@ +package org.sopt.official.feature.fortune.component + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import org.sopt.official.designsystem.SoptTheme + +@Composable +fun FortuneTopBar( + modifier: Modifier = Modifier, + onClickNavigationIcon: () -> Unit, +) { + Box(modifier = modifier.fillMaxWidth()) { + Icon( + imageVector = Icons.Filled.Close, + contentDescription = null, + modifier = Modifier + .padding(start = 8.dp, top = 2.dp, bottom = 2.dp) + .padding(8.dp) + .clickable(onClick = onClickNavigationIcon), + tint = SoptTheme.colors.onBackground + ) + } +}