Merge pull request #62 from PawWithU/refactor/refactor

Refactor/refactor: 1차 리팩토링
PawWithU · Feb 17, 2024 · 42c2ab6 · 42c2ab6
2 parents b99db12 + 74983d7
commit 42c2ab6
Show file tree

Hide file tree

Showing 58 changed files with 418 additions and 592 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
         </activity>
 
         <activity
-            android:name=".feature.LoginActivity"
+            android:name=".feature.main.MainActivity"
             android:exported="true"
             android:theme="@style/Theme.ConnectDog.Splash">
             <intent-filter>
@@ -41,10 +41,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".feature.main.MainActivity"
-            android:exported="true">
-        </activity>
         <activity
             android:name=".feature.intermediator.IntermediatorActivity"
             android:exported="true">

diff --git a/core/designsystem/build/reports/ktlint/ktlintKotlinScriptFormat/ktlintKotlinScriptFormat.txt b/core/designsystem/build/reports/ktlint/ktlintKotlinScriptFormat/ktlintKotlinScriptFormat.txt
diff --git a/...designsystem/build/reports/ktlint/ktlintMainSourceSetFormat/ktlintMainSourceSetFormat.txt b/...designsystem/build/reports/ktlint/ktlintMainSourceSetFormat/ktlintMainSourceSetFormat.txt
diff --git a/core/designsystem/src/main/java/com/kusitms/connectdog/core/designsystem/component/Button.kt b/core/designsystem/src/main/java/com/kusitms/connectdog/core/designsystem/component/Button.kt
@@ -78,7 +78,7 @@ fun ConnectDogIconBottomButton(
 }
 
 @Composable
-fun NormalButton(
+fun ConnectDogNormalButton(
     content: String,
     color: Color = MaterialTheme.colorScheme.primary,
     onClick: () -> Unit = {},

diff --git a/core/model/build/reports/ktlint/ktlintKotlinScriptFormat/ktlintKotlinScriptFormat.txt b/core/model/build/reports/ktlint/ktlintKotlinScriptFormat/ktlintKotlinScriptFormat.txt
diff --git a/core/model/build/reports/ktlint/ktlintMainSourceSetFormat/ktlintMainSourceSetFormat.txt b/core/model/build/reports/ktlint/ktlintMainSourceSetFormat/ktlintMainSourceSetFormat.txt
diff --git a/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/ApplyScreen.kt b/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/ApplyScreen.kt
@@ -29,8 +29,8 @@ import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.kusitms.connectdog.core.data.api.model.volunteer.ApplyBody
 import com.kusitms.connectdog.core.designsystem.R
+import com.kusitms.connectdog.core.designsystem.component.ConnectDogNormalButton
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogTopAppBar
-import com.kusitms.connectdog.core.designsystem.component.NormalButton
 import com.kusitms.connectdog.core.designsystem.component.NormalTextField
 import com.kusitms.connectdog.core.designsystem.component.TopAppBarNavigationType
 import com.kusitms.connectdog.core.designsystem.theme.Gray2
@@ -158,7 +158,7 @@ private fun Content(
             onTextChanged = onContentChanged
         )
 
-        NormalButton(
+        ConnectDogNormalButton(
             content = "완료",
             onClick = {
                 viewModel.postApplyVolunteer(
@@ -176,24 +176,6 @@ private fun Content(
     }
 }
 
-// @Composable
-// private fun BottomButton(
-//    onClick: () -> Unit,
-// ) {
-//    Box(
-//        modifier = Modifier
-//            .fillMaxWidth()
-//            .height(112.dp)
-//            .background(Color.White)
-//    ) {
-//        Row(
-//            modifier = Modifier.align(Alignment.Center)
-//        ) {
-//
-//        }
-//    }
-// }
-
 @Composable
 fun NoticeCard() {
     Card(

diff --git a/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/CertificationScreen.kt b/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/CertificationScreen.kt
@@ -24,11 +24,10 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.kusitms.connectdog.core.designsystem.R
+import com.kusitms.connectdog.core.designsystem.component.ConnectDogNormalButton
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogTextFieldWithButton
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogTopAppBar
-import com.kusitms.connectdog.core.designsystem.component.NormalButton
 import com.kusitms.connectdog.core.designsystem.component.NormalTextField
 import com.kusitms.connectdog.core.designsystem.component.TopAppBarNavigationType
 import com.kusitms.connectdog.core.designsystem.theme.Orange40
@@ -130,7 +129,7 @@ private fun Content(
             }
         )
         Spacer(modifier = Modifier.weight(1f))
-        NormalButton(
+        ConnectDogNormalButton(
             content = "다음",
             color = buttonColor,
             modifier = Modifier

diff --git a/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/CompleteApplyScreen.kt b/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/CompleteApplyScreen.kt
@@ -27,7 +27,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.kusitms.connectdog.core.designsystem.R
-import com.kusitms.connectdog.core.designsystem.component.NormalButton
+import com.kusitms.connectdog.core.designsystem.component.ConnectDogNormalButton
 import com.kusitms.connectdog.core.designsystem.theme.ConnectDogTheme
 import com.kusitms.connectdog.core.designsystem.theme.Gray2
 
@@ -83,7 +83,7 @@ fun CompleteApplyScreen(
                 color = Gray2
             )
         }
-        NormalButton(
+        ConnectDogNormalButton(
             content = "확인",
             modifier =
             Modifier

diff --git a/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/DetailScreen.kt b/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/DetailScreen.kt
@@ -43,11 +43,11 @@ import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.kusitms.connectdog.core.data.api.model.volunteer.NoticeDetailResponseItem
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogInformationCard
+import com.kusitms.connectdog.core.designsystem.component.ConnectDogNormalButton
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogTag
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogTopAppBar
 import com.kusitms.connectdog.core.designsystem.component.DetailInfo
 import com.kusitms.connectdog.core.designsystem.component.NetworkImage
-import com.kusitms.connectdog.core.designsystem.component.NormalButton
 import com.kusitms.connectdog.core.designsystem.component.TopAppBarNavigationType
 import com.kusitms.connectdog.core.designsystem.theme.Gray2
 import com.kusitms.connectdog.core.designsystem.theme.Gray5
@@ -298,7 +298,7 @@ private fun BottomButton(
         ) {
             BookmarkButton(isBookmark, onSaveClick, onDeleteClick)
             Spacer(modifier = Modifier.width(10.dp))
-            NormalButton(content = "신청하기", onClick = onClick)
+            ConnectDogNormalButton(content = "신청하기", onClick = onClick)
         }
     }
 }

diff --git a/...g/feature/intermediator/InterManagementViewModel$createUiStateFlow$$inlined$map$1$2.class b/...g/feature/intermediator/InterManagementViewModel$createUiStateFlow$$inlined$map$1$2.class
diff --git a/...sitms/connectdog/feature/intermediator/InterManagementViewModel$createUiStateFlow$1.class b/...sitms/connectdog/feature/intermediator/InterManagementViewModel$createUiStateFlow$1.class
diff --git a/...sitms/connectdog/feature/intermediator/InterManagementViewModel$createUiStateFlow$3.class b/...sitms/connectdog/feature/intermediator/InterManagementViewModel$createUiStateFlow$3.class
diff --git a/...om/kusitms/connectdog/feature/intermediator/InterManagementViewModel$getVolunteer$1.class b/...om/kusitms/connectdog/feature/intermediator/InterManagementViewModel$getVolunteer$1.class
diff --git a/...sitms/connectdog/feature/intermediator/InterManagementViewModel$recruitingUiState$1.class b/...sitms/connectdog/feature/intermediator/InterManagementViewModel$recruitingUiState$1.class
diff --git a/...sWithAsm/dirs/com/kusitms/connectdog/feature/intermediator/InterManagementViewModel.class b/...sWithAsm/dirs/com/kusitms/connectdog/feature/intermediator/InterManagementViewModel.class
diff --git a/...om/kusitms/connectdog/feature/intermediator/LiveLiterals$InterManagementViewModelKt.class b/...om/kusitms/connectdog/feature/intermediator/LiveLiterals$InterManagementViewModelKt.class
diff --git a/...g/feature/intermediator/InterManagementViewModel$createUiStateFlow$$inlined$map$1$2.class b/...g/feature/intermediator/InterManagementViewModel$createUiStateFlow$$inlined$map$1$2.class
diff --git a/...sitms/connectdog/feature/intermediator/InterManagementViewModel$createUiStateFlow$1.class b/...sitms/connectdog/feature/intermediator/InterManagementViewModel$createUiStateFlow$1.class
diff --git a/...sitms/connectdog/feature/intermediator/InterManagementViewModel$createUiStateFlow$3.class b/...sitms/connectdog/feature/intermediator/InterManagementViewModel$createUiStateFlow$3.class
diff --git a/...om/kusitms/connectdog/feature/intermediator/InterManagementViewModel$getVolunteer$1.class b/...om/kusitms/connectdog/feature/intermediator/InterManagementViewModel$getVolunteer$1.class
diff --git a/...sitms/connectdog/feature/intermediator/InterManagementViewModel$recruitingUiState$1.class b/...sitms/connectdog/feature/intermediator/InterManagementViewModel$recruitingUiState$1.class
diff --git a/...ses_dir/debug/com/kusitms/connectdog/feature/intermediator/InterManagementViewModel.class b/...ses_dir/debug/com/kusitms/connectdog/feature/intermediator/InterManagementViewModel.class
diff --git a/...om/kusitms/connectdog/feature/intermediator/LiveLiterals$InterManagementViewModelKt.class b/...om/kusitms/connectdog/feature/intermediator/LiveLiterals$InterManagementViewModelKt.class
diff --git a/feature/intermediator/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/feature/intermediator/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
diff --git a/...t3/stubs/debug/com/kusitms/connectdog/feature/intermediator/InterManagementViewModel.java b/...t3/stubs/debug/com/kusitms/connectdog/feature/intermediator/InterManagementViewModel.java
@@ -4,7 +4,6 @@
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
-import com.kusitms.connectdog.core.data.api.model.intermediator.IntermediatorInfoResponseItem;
 import com.kusitms.connectdog.core.data.api.model.intermediator.IntermediatorProfileInfoResponseItem;
 import com.kusitms.connectdog.core.data.repository.InterManagementRepository;
 import com.kusitms.connectdog.core.model.DataUiState;

diff --git a/...debug/com/kusitms/connectdog/feature/intermediator/InterManagementViewModel.kapt_metadata b/...debug/com/kusitms/connectdog/feature/intermediator/InterManagementViewModel.kapt_metadata
diff --git a/...g/feature/intermediator/InterManagementViewModel$createUiStateFlow$$inlined$map$1$2.class b/...g/feature/intermediator/InterManagementViewModel$createUiStateFlow$$inlined$map$1$2.class
diff --git a/...sitms/connectdog/feature/intermediator/InterManagementViewModel$createUiStateFlow$1.class b/...sitms/connectdog/feature/intermediator/InterManagementViewModel$createUiStateFlow$1.class
diff --git a/...sitms/connectdog/feature/intermediator/InterManagementViewModel$createUiStateFlow$3.class b/...sitms/connectdog/feature/intermediator/InterManagementViewModel$createUiStateFlow$3.class
diff --git a/...om/kusitms/connectdog/feature/intermediator/InterManagementViewModel$getVolunteer$1.class b/...om/kusitms/connectdog/feature/intermediator/InterManagementViewModel$getVolunteer$1.class
diff --git a/...sitms/connectdog/feature/intermediator/InterManagementViewModel$recruitingUiState$1.class b/...sitms/connectdog/feature/intermediator/InterManagementViewModel$recruitingUiState$1.class
diff --git a/...classes/debug/com/kusitms/connectdog/feature/intermediator/InterManagementViewModel.class b/...classes/debug/com/kusitms/connectdog/feature/intermediator/InterManagementViewModel.class
diff --git a/...om/kusitms/connectdog/feature/intermediator/LiveLiterals$InterManagementViewModelKt.class b/...om/kusitms/connectdog/feature/intermediator/LiveLiterals$InterManagementViewModelKt.class
diff --git a/...diator/src/main/java/com/kusitms/connectdog/feature/intermediator/screen/ProfileScreen.kt b/...diator/src/main/java/com/kusitms/connectdog/feature/intermediator/screen/ProfileScreen.kt
@@ -30,11 +30,11 @@ import com.google.accompanist.pager.ExperimentalPagerApi
 import com.google.accompanist.pager.HorizontalPager
 import com.google.accompanist.pager.rememberPagerState
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogInformationCard
+import com.kusitms.connectdog.core.designsystem.component.ConnectDogNormalButton
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogOutlinedButton
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogTopAppBar
 import com.kusitms.connectdog.core.designsystem.component.DetailInfo
 import com.kusitms.connectdog.core.designsystem.component.NetworkImage
-import com.kusitms.connectdog.core.designsystem.component.NormalButton
 import com.kusitms.connectdog.core.designsystem.component.TopAppBarNavigationType
 import com.kusitms.connectdog.core.designsystem.theme.ConnectDogTheme
 import com.kusitms.connectdog.core.designsystem.theme.Gray1
@@ -156,7 +156,7 @@ private fun Information() {
     ) {
         IntermediatorInformation()
         Spacer(modifier = Modifier.weight(1f))
-        NormalButton(content = "수정하기", modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp))
+        ConnectDogNormalButton(content = "수정하기", modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp))
         Spacer(modifier = Modifier.height(32.dp))
     }
 }

diff --git a/feature/login/build.gradle.kts b/feature/login/build.gradle.kts
@@ -45,7 +45,6 @@ android {
 
 dependencies {
 
-    implementation(project(":feature:main"))
     implementation(project(":core:designsystem"))
     implementation(project(":core:util"))
     implementation(project(":feature:intermediator"))

diff --git a/feature/login/src/main/java/com/kusitms/connectdog/feature/LoginActivity.kt b/feature/login/src/main/java/com/kusitms/connectdog/feature/LoginActivity.kt
diff --git a/feature/login/src/main/java/com/kusitms/connectdog/feature/login/LoginNavigation.kt b/feature/login/src/main/java/com/kusitms/connectdog/feature/login/LoginNavigation.kt
@@ -0,0 +1,53 @@
+package com.kusitms.connectdog.feature.login
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
+import com.kusitms.connectdog.feature.signup.VolunteerSignupScreen
+
+fun NavController.navigateLogin() {
+    navigate(LoginRoute.route)
+}
+
+fun NavController.navigateSignup() {
+    navigate(LoginRoute.signup)
+}
+
+fun NavController.navigateNormalLogin() {
+    navigate(LoginRoute.normal_login)
+}
+
+fun NavGraphBuilder.loginNavGraph(
+    onBackClick: () -> Unit,
+    onNavigateToNormalLogin: () -> Unit,
+    onNavigateToVolunteer: () -> Unit,
+    onNavigateToSignup: () -> Unit
+) {
+    composable(route = LoginRoute.route) {
+        LoginRoute(
+            onNavigateToNormalLogin,
+            onNavigateToSignup
+        )
+    }
+
+    composable(route = LoginRoute.normal_login) {
+        NormalLoginScreen(
+            onBackClick = onBackClick,
+            initVolunteer = {},
+            initIntermediator = {},
+            test = onNavigateToVolunteer
+        )
+    }
+
+    composable(route = LoginRoute.signup) {
+        VolunteerSignupScreen(
+//            onBackClick = onBackClick
+        )
+    }
+}
+
+object LoginRoute {
+    const val route = "login"
+    const val normal_login = "normal_login"
+    const val signup = "signup"
+}