[ADD/#16] pull from develop

teamterning · Jul 7, 2024 · 4f0bff5 · 4f0bff5
1 parent 738ac30
commit 4f0bff5
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 17 deletions.
diff --git a/...gnsystem/topappbar/BackButtonTopAppBar.kt → ...omponent/topappbar/BackButtonTopAppBar.kt b/...gnsystem/topappbar/BackButtonTopAppBar.kt → ...omponent/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/...e/designsystem/topappbar/LogoTopAppBar.kt → ...stem/component/topappbar/LogoTopAppBar.kt b/...e/designsystem/topappbar/LogoTopAppBar.kt → ...stem/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/...designsystem/topappbar/MyPageTopAppBar.kt → ...em/component/topappbar/MyPageTopAppBar.kt b/...designsystem/topappbar/MyPageTopAppBar.kt → ...em/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/...esignsystem/topappbar/TerningTopAppBar.kt → ...m/component/topappbar/TerningTopAppBar.kt b/...esignsystem/topappbar/TerningTopAppBar.kt → ...m/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
@@ -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
@@ -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
@@ -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