diff --git a/core/src/main/java/com/terning/core/designsystem/topappbar/BackButtonTopAppBar.kt b/core/src/main/java/com/terning/core/designsystem/component/topappbar/BackButtonTopAppBar.kt similarity index 82% rename from core/src/main/java/com/terning/core/designsystem/topappbar/BackButtonTopAppBar.kt rename to core/src/main/java/com/terning/core/designsystem/component/topappbar/BackButtonTopAppBar.kt index aeb7f1b00..28f6b9064 100644 --- a/core/src/main/java/com/terning/core/designsystem/topappbar/BackButtonTopAppBar.kt +++ b/core/src/main/java/com/terning/core/designsystem/component/topappbar/BackButtonTopAppBar.kt @@ -1,4 +1,4 @@ -package com.terning.core.designsystem.topappbar +package com.terning.core.designsystem.component.topappbar import androidx.compose.runtime.Composable diff --git a/core/src/main/java/com/terning/core/designsystem/topappbar/LogoTopAppBar.kt b/core/src/main/java/com/terning/core/designsystem/component/topappbar/LogoTopAppBar.kt similarity index 89% rename from core/src/main/java/com/terning/core/designsystem/topappbar/LogoTopAppBar.kt rename to core/src/main/java/com/terning/core/designsystem/component/topappbar/LogoTopAppBar.kt index a5b6e68e5..fcc5c62c3 100644 --- a/core/src/main/java/com/terning/core/designsystem/topappbar/LogoTopAppBar.kt +++ b/core/src/main/java/com/terning/core/designsystem/component/topappbar/LogoTopAppBar.kt @@ -1,4 +1,4 @@ -package com.terning.core.designsystem.topappbar +package com.terning.core.designsystem.component.topappbar import androidx.compose.material3.Icon import androidx.compose.runtime.Composable diff --git a/core/src/main/java/com/terning/core/designsystem/topappbar/MyPageTopAppBar.kt b/core/src/main/java/com/terning/core/designsystem/component/topappbar/MyPageTopAppBar.kt similarity index 95% rename from core/src/main/java/com/terning/core/designsystem/topappbar/MyPageTopAppBar.kt rename to core/src/main/java/com/terning/core/designsystem/component/topappbar/MyPageTopAppBar.kt index 295c5aabd..7366dc1ee 100644 --- a/core/src/main/java/com/terning/core/designsystem/topappbar/MyPageTopAppBar.kt +++ b/core/src/main/java/com/terning/core/designsystem/component/topappbar/MyPageTopAppBar.kt @@ -1,4 +1,4 @@ -package com.terning.core.designsystem.topappbar +package com.terning.core.designsystem.component.topappbar import androidx.compose.foundation.layout.Row import androidx.compose.material3.Icon diff --git a/core/src/main/java/com/terning/core/designsystem/topappbar/TerningTopAppBar.kt b/core/src/main/java/com/terning/core/designsystem/component/topappbar/TerningTopAppBar.kt similarity index 87% rename from core/src/main/java/com/terning/core/designsystem/topappbar/TerningTopAppBar.kt rename to core/src/main/java/com/terning/core/designsystem/component/topappbar/TerningTopAppBar.kt index 0e164edc5..6a319cade 100644 --- a/core/src/main/java/com/terning/core/designsystem/topappbar/TerningTopAppBar.kt +++ b/core/src/main/java/com/terning/core/designsystem/component/topappbar/TerningTopAppBar.kt @@ -1,15 +1,11 @@ -package com.terning.core.designsystem.topappbar +package com.terning.core.designsystem.component.topappbar -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material3.CenterAlignedTopAppBar import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign diff --git a/feature/src/main/java/com/terning/feature/main/MainScreen.kt b/feature/src/main/java/com/terning/feature/main/MainScreen.kt index 9d51ef625..448463b14 100644 --- a/feature/src/main/java/com/terning/feature/main/MainScreen.kt +++ b/feature/src/main/java/com/terning/feature/main/MainScreen.kt @@ -21,10 +21,10 @@ import androidx.navigation.compose.NavHost import com.terning.core.designsystem.theme.Grey300 import com.terning.core.designsystem.theme.TerningMain import com.terning.core.designsystem.theme.White -import com.terning.core.designsystem.topappbar.BackButtonTopAppBar -import com.terning.core.designsystem.topappbar.LogoTopAppBar -import com.terning.core.designsystem.topappbar.MyPageTopAppBar -import com.terning.core.designsystem.topappbar.TerningTopAppBar +import com.terning.core.designsystem.component.topappbar.BackButtonTopAppBar +import com.terning.core.designsystem.component.topappbar.LogoTopAppBar +import com.terning.core.designsystem.component.topappbar.MyPageTopAppBar +import com.terning.core.designsystem.component.topappbar.TerningTopAppBar import com.terning.feature.calendar.navigation.calendarNavGraph import com.terning.feature.home.navigation.homeNavGraph import com.terning.feature.mypage.navigation.myPageNavGraph @@ -45,7 +45,6 @@ fun MainScreen( MainTab.CALENDAR -> BackButtonTopAppBar( title = "dkssud", onBackButtonClick = { navigator.navigateUp() }) - MainTab.SEARCH -> LogoTopAppBar() MainTab.MY_PAGE -> MyPageTopAppBar() null -> TerningTopAppBar() diff --git a/feature/src/main/java/com/terning/feature/mypage/MyPageRoute.kt b/feature/src/main/java/com/terning/feature/mypage/MyPageRoute.kt index f22dd2d0e..90dcbcaf1 100644 --- a/feature/src/main/java/com/terning/feature/mypage/MyPageRoute.kt +++ b/feature/src/main/java/com/terning/feature/mypage/MyPageRoute.kt @@ -14,7 +14,6 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle -import com.terning.core.designsystem.topappbar.MyPageTopAppBar import com.terning.core.extension.toast import com.terning.core.state.UiState import com.terning.domain.entity.response.MockResponseModel diff --git a/feature/src/main/java/com/terning/feature/search/SearchRoute.kt b/feature/src/main/java/com/terning/feature/search/SearchRoute.kt index 3ba7af3d4..1e374e3b7 100644 --- a/feature/src/main/java/com/terning/feature/search/SearchRoute.kt +++ b/feature/src/main/java/com/terning/feature/search/SearchRoute.kt @@ -2,12 +2,9 @@ package com.terning.feature.search import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth -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 -import com.terning.core.designsystem.topappbar.LogoTopAppBar @Composable fun SearchRoute() { diff --git a/project.dot.png b/project.dot.png new file mode 100644 index 000000000..0f06e042b Binary files /dev/null and b/project.dot.png differ