🔀 resolve conflict

woowacourse-teams · Aug 6, 2024 · 857ee9e · 857ee9e
1 parent fd9c790
commit 857ee9e
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 23 deletions.
diff --git a/android/app/src/main/java/net/pengcook/android/di/AppModule.kt b/android/app/src/main/java/net/pengcook/android/di/AppModule.kt
@@ -3,6 +3,7 @@ package net.pengcook.android.di
 import net.pengcook.android.data.repository.auth.AuthorizationRepository
 import net.pengcook.android.data.repository.auth.SessionRepository
 import net.pengcook.android.data.repository.feed.FeedRepository
+import net.pengcook.android.data.repository.making.step.RecipeStepMakingRepository
 
 interface AppModule {
     val authorizationRepository: AuthorizationRepository
@@ -11,5 +12,7 @@ interface AppModule {
 
     val feedRepository: FeedRepository
 
+    val recipeStepMakingRepository: RecipeStepMakingRepository
+
     fun <T> service(apiService: Class<T>): T
 }
diff --git a/android/app/src/main/java/net/pengcook/android/di/DefaultAppModule.kt b/android/app/src/main/java/net/pengcook/android/di/DefaultAppModule.kt
@@ -8,15 +8,19 @@ import net.pengcook.android.data.datasource.auth.DefaultSessionLocalDataSource
 import net.pengcook.android.data.datasource.auth.SessionLocalDataSource
 import net.pengcook.android.data.datasource.feed.DefaultFeedRemoteDataSource
 import net.pengcook.android.data.datasource.feed.FeedRemoteDataSource
+import net.pengcook.android.data.datasource.making.DefaultRecipeStepMakingDataSource
 import net.pengcook.android.data.local.preferences.dataStore
 import net.pengcook.android.data.remote.api.AuthorizationService
 import net.pengcook.android.data.remote.api.FeedService
+import net.pengcook.android.data.remote.api.StepMakingService
 import net.pengcook.android.data.repository.auth.AuthorizationRepository
 import net.pengcook.android.data.repository.auth.DefaultAuthorizationRepository
 import net.pengcook.android.data.repository.auth.DefaultSessionRepository
 import net.pengcook.android.data.repository.auth.SessionRepository
 import net.pengcook.android.data.repository.feed.DefaultFeedRepository
 import net.pengcook.android.data.repository.feed.FeedRepository
+import net.pengcook.android.data.repository.making.step.DefaultRecipeStepMakingRepository
+import net.pengcook.android.data.repository.making.step.RecipeStepMakingRepository
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
@@ -32,23 +36,24 @@ class DefaultAppModule(
         }
 
     private val client =
-        OkHttpClient.Builder().apply {
-            addInterceptor(interceptor)
-            connectTimeout(30, TimeUnit.SECONDS)
-            readTimeout(20, TimeUnit.SECONDS)
-            writeTimeout(25, TimeUnit.SECONDS)
-        }.build()
+        OkHttpClient
+            .Builder()
+            .apply {
+                addInterceptor(interceptor)
+                connectTimeout(30, TimeUnit.SECONDS)
+                readTimeout(20, TimeUnit.SECONDS)
+                writeTimeout(25, TimeUnit.SECONDS)
+            }.build()
 
     private val retrofit =
-        Retrofit.Builder()
+        Retrofit
+            .Builder()
             .baseUrl(BuildConfig.BASE_URL)
             .addConverterFactory(GsonConverterFactory.create())
             .client(client)
             .build()
 
-    override fun <T> service(apiService: Class<T>): T {
-        return retrofit.create(apiService)
-    }
+    override fun <T> service(apiService: Class<T>): T = retrofit.create(apiService)
 
     private val authorizationRemoteDataSource: AuthorizationRemoteDataSource =
         DefaultAuthorizationRemoteDataSource(service(AuthorizationService::class.java))
@@ -67,4 +72,10 @@ class DefaultAppModule(
 
     override val feedRepository: FeedRepository =
         DefaultFeedRepository(feedRemoteDataSource)
+
+    private val recipeStepMakingDatasource: DefaultRecipeStepMakingDataSource =
+        DefaultRecipeStepMakingDataSource(service(StepMakingService::class.java))
+
+    override val recipeStepMakingRepository: RecipeStepMakingRepository =
+        DefaultRecipeStepMakingRepository(recipeStepMakingDatasource)
 }
diff --git a/android/app/src/main/java/net/pengcook/android/presentation/BindingAdapters.kt b/android/app/src/main/java/net/pengcook/android/presentation/BindingAdapters.kt
@@ -92,7 +92,6 @@ fun categoryText(
     view.text = category.joinToString(context.getString(R.string.separator))
 }
 
-
 @BindingAdapter("bind:stepCount")
 fun stepCountText(
     view: TextView,

diff --git a/android/app/src/main/java/net/pengcook/android/presentation/signup/SignUpViewModel.kt b/android/app/src/main/java/net/pengcook/android/presentation/signup/SignUpViewModel.kt
@@ -14,7 +14,7 @@ import net.pengcook.android.domain.model.auth.SignUp
 import net.pengcook.android.domain.model.auth.UserSignUpForm
 import net.pengcook.android.domain.usecase.ValidateNicknameUseCase
 import net.pengcook.android.domain.usecase.ValidateUsernameUseCase
-import net.pengcook.android.presentation.core.listener.AppbarActionEventListener
+import net.pengcook.android.presentation.core.listener.AppbarSingleActionEventListener
 import net.pengcook.android.presentation.core.listener.SpinnerItemChangeListener
 import net.pengcook.android.presentation.core.util.Event
 
@@ -27,7 +27,7 @@ class SignUpViewModel(
 ) : ViewModel(),
     BottomButtonClickListener,
     SpinnerItemChangeListener,
-    AppbarActionEventListener {
+    AppbarSingleActionEventListener {
     val usernameContent: MutableLiveData<String> = MutableLiveData()
     val nicknameContent: MutableLiveData<String> = MutableLiveData()
     val country: MutableLiveData<String> = MutableLiveData()
@@ -83,18 +83,20 @@ class SignUpViewModel(
         nickname: String,
         username: String,
     ) {
-        authorizationRepository.signUp(
-            platformName,
-            UserSignUpForm(platformToken, country, nickname, username),
-        ).onSuccess { signUpResult ->
-            onSignUpSuccessful(signUpResult)
-        }.onFailure {
-            onSignUpFailure()
-        }
+        authorizationRepository
+            .signUp(
+                platformName,
+                UserSignUpForm(platformToken, country, nickname, username),
+            ).onSuccess { signUpResult ->
+                onSignUpSuccessful(signUpResult)
+            }.onFailure {
+                onSignUpFailure()
+            }
     }
 
     private suspend fun usernameAvailable(username: String): Boolean {
-        authorizationRepository.checkUsernameDuplication(username)
+        authorizationRepository
+            .checkUsernameDuplication(username)
             .onSuccess { available ->
                 if (!available) {
                     _signUpEvent.value = Event(SignUpEvent.NicknameDuplicated)

diff --git a/android/app/src/main/res/navigation/nav_graph.xml b/android/app/src/main/res/navigation/nav_graph.xml
@@ -126,7 +126,21 @@
     <fragment
         android:id="@+id/stepMakingFragment"
         android:name="net.pengcook.android.presentation.making.step.StepMakingFragment"
-        android:label="StepMakingFragment" />
+        android:label="StepMakingFragment" >
+        <action
+            android:id="@+id/action_stepMakingFragment_to_recipeMakingFragment"
+            app:destination="@id/recipeMakingFragment"
+            app:popUpTo="@id/recipeMakingFragment"
+            app:popUpToInclusive="false"
+            />
+        <action
+            android:id="@+id/action_stepMakingFragment_to_homeFragment"
+            app:destination="@id/homeFragment"
+            app:popUpTo="@id/homeFragment"
+            app:popUpToInclusive="false"
+            />
+
+    </fragment>
 
 
     <fragment