[MOVE/#14] bottom sheet 위치 수정

teamterning · Jul 11, 2024 · 4ab493f · 4ab493f
1 parent af144e7
commit 4ab493f
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 8 deletions.
diff --git a/...ing/signup/component/SignUpBottomSheet.kt → ...omponent/bottomsheet/SignUpBottomSheet.kt b/...ing/signup/component/SignUpBottomSheet.kt → ...omponent/bottomsheet/SignUpBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.terning.feature.onboarding.signup.component
+package com.terning.core.designsystem.component.bottomsheet
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
@@ -20,11 +20,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.terning.core.designsystem.component.bottomsheet.TerningBasicBottomSheet
+import com.terning.core.R
 import com.terning.core.designsystem.component.button.RoundButton
 import com.terning.core.designsystem.theme.TerningTheme
 import com.terning.core.extension.noRippleClickable
-import com.terning.feature.R
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

diff --git a/...e/src/main/res/drawable/ic_character1.xml → core/src/main/res/drawable/ic_character1.xml b/...e/src/main/res/drawable/ic_character1.xml → core/src/main/res/drawable/ic_character1.xml
diff --git a/...e/src/main/res/drawable/ic_character2.xml → core/src/main/res/drawable/ic_character2.xml b/...e/src/main/res/drawable/ic_character2.xml → core/src/main/res/drawable/ic_character2.xml
diff --git a/...e/src/main/res/drawable/ic_character3.xml → core/src/main/res/drawable/ic_character3.xml b/...e/src/main/res/drawable/ic_character3.xml → core/src/main/res/drawable/ic_character3.xml
diff --git a/...e/src/main/res/drawable/ic_character4.xml → core/src/main/res/drawable/ic_character4.xml b/...e/src/main/res/drawable/ic_character4.xml → core/src/main/res/drawable/ic_character4.xml
diff --git a/...e/src/main/res/drawable/ic_character5.xml → core/src/main/res/drawable/ic_character5.xml b/...e/src/main/res/drawable/ic_character5.xml → core/src/main/res/drawable/ic_character5.xml
diff --git a/...e/src/main/res/drawable/ic_character6.xml → core/src/main/res/drawable/ic_character6.xml b/...e/src/main/res/drawable/ic_character6.xml → core/src/main/res/drawable/ic_character6.xml
diff --git a/...in/res/drawable/ic_selected_character.xml → ...in/res/drawable/ic_selected_character.xml b/...in/res/drawable/ic_selected_character.xml → ...in/res/drawable/ic_selected_character.xml
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
@@ -20,4 +20,9 @@
     <string name="sort_button_description">정렬 기준</string>
     <string name="sort_bottom_sheet_title">공고 정렬 순서</string>
 
+    <!--bottom_sheet-->
+    <string name="sign_up_bottom_sheet_title">프로필 이미지 선택</string>
+    <string name="sign_up_bottom_sheet_description">회원가입 바텀시트</string>
+    <string name="sign_up_dialog_start">저장하기</string>
+
 </resources>
diff --git a/feature/src/main/java/com/terning/feature/main/MainNavigator.kt b/feature/src/main/java/com/terning/feature/main/MainNavigator.kt
@@ -13,6 +13,7 @@ import com.terning.feature.calendar.navigation.navigateCalendar
 import com.terning.feature.home.navigation.navigateHome
 import com.terning.feature.mypage.navigation.navigateMyPage
 import com.terning.feature.onboarding.signin.navigation.SignIn
+import com.terning.feature.onboarding.signup.navigation.SignUp
 import com.terning.feature.search.search.navigation.navigateSearch
 
 class MainNavigator(
@@ -22,7 +23,7 @@ class MainNavigator(
         @Composable get() = navController
             .currentBackStackEntryAsState().value?.destination
 
-    val startDestination = SignIn
+    val startDestination = SignUp
 
     val currentTab: MainTab?
         @Composable get() = MainTab.find { tab ->

diff --git a/feature/src/main/java/com/terning/feature/onboarding/signup/SignUpRoute.kt b/feature/src/main/java/com/terning/feature/onboarding/signup/SignUpRoute.kt
@@ -25,7 +25,7 @@ import com.terning.core.extension.addFocusCleaner
 import com.terning.core.extension.noRippleClickable
 import com.terning.feature.R
 import com.terning.feature.onboarding.filtering.navigation.navigateFiltering
-import com.terning.feature.onboarding.signup.component.SignUpBottomSheet
+import com.terning.core.designsystem.component.bottomsheet.SignUpBottomSheet
 import com.terning.feature.onboarding.signup.component.SignUpProfile
 
 @Composable

diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml
@@ -17,9 +17,6 @@
     <string name="sign_in_kakao_cancel">로그인을 취소하였습니다</string>
 
     <!--sign_up-->
-    <string name="sign_up_bottom_sheet_title">프로필 이미지 선택</string>
-    <string name="sign_up_bottom_sheet_description">회원가입 바텀시트</string>
-    <string name="sign_up_dialog_start">저장하기</string>
     <string name="sign_up_title">반가워요!\n이름을 알려주세요</string>
     <string name="sign_up_profile_image">프로필 이미지</string>
     <string name="sign_up_profile_button">프로필 버튼</string>