Merge pull request #52 from gaeun5744/develop

[FIX/#50] mvvm git 충돌 해결
Team-Puzzling · Jul 19, 2023 · ea476c7 · ea476c7
2 parents 2e0a128 + 73b6b32
commit ea476c7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 26 deletions.
diff --git a/app/src/main/java/com/puzzling/puzzlingaos/di/ApiModule.kt b/app/src/main/java/com/puzzling/puzzlingaos/di/ApiModule.kt
@@ -27,14 +27,14 @@ object ApiModule {
 
     @Provides
     @Singleton
-    fun sendProjectRegister(@PuzzlingRetrofit retrofit: Retrofit): ProjectService =
+    fun provideProjectRegister(@PuzzlingRetrofit retrofit: Retrofit): ProjectService =
         retrofit.create(ProjectService::class.java)
 
     @Provides
     @Singleton
     fun provideTeamRetroList(@PuzzlingRetrofit retrofit: Retrofit): TeamReviewService =
         retrofit.create(TeamReviewService::class.java)
-        
+
     @Provides
     @Singleton
     fun provideWriteReviewService(@PuzzlingRetrofit retrofit: Retrofit): WriteReviewService =

diff --git a/app/src/main/java/com/puzzling/puzzlingaos/di/DataSourceModule.kt b/app/src/main/java/com/puzzling/puzzlingaos/di/DataSourceModule.kt
@@ -1,16 +1,15 @@
 package com.puzzling.puzzlingaos.di
 
 import com.puzzling.puzzlingaos.data.source.remote.MyDashBoardDataSource
+import com.puzzling.puzzlingaos.data.source.remote.MyPageDataSource
 import com.puzzling.puzzlingaos.data.source.remote.ProjectDataSource
 import com.puzzling.puzzlingaos.data.source.remote.TeamReviewDataSource
 import com.puzzling.puzzlingaos.data.source.remote.WriteReviewDataSource
 import com.puzzling.puzzlingaos.data.source.remote.impl.MyDashBoardDataSourceImpl
+import com.puzzling.puzzlingaos.data.source.remote.impl.MyPageDataSourceImpl
 import com.puzzling.puzzlingaos.data.source.remote.impl.ProjectDataSourceImpl
 import com.puzzling.puzzlingaos.data.source.remote.impl.TeamReviewDataSourceImpl
-import com.puzzling.puzzlingaos.data.source.remote.MyPageDataSource
 import com.puzzling.puzzlingaos.data.source.remote.impl.WriteReviewDataSourceImpl
-import com.puzzling.puzzlingaos.data.source.remote.impl.MyPageDataSourceImpl
-
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -34,11 +33,7 @@ abstract class DataSourceModule {
 
     @Singleton
     @Binds
-    abstract fun sendProjectRegisterDataSource(DataSourceImpl: ProjectDataSourceImpl): ProjectDataSource
-
-    @Singleton
-    @Binds
-    abstract fun provideTeamRetroDataSource(DataSourceImpl: TeamReviewDataSourceImpl): TeamReviewDataSource
+    abstract fun providesTeamRetroDataSource(DataSourceImpl: TeamReviewDataSourceImpl): TeamReviewDataSource
 
     @Singleton
     @Binds

diff --git a/app/src/main/java/com/puzzling/puzzlingaos/di/RepositoryModule.kt b/app/src/main/java/com/puzzling/puzzlingaos/di/RepositoryModule.kt
@@ -1,15 +1,14 @@
 package com.puzzling.puzzlingaos.di
 
 import com.puzzling.puzzlingaos.data.repository.MyBoardRepositoryImpl
+import com.puzzling.puzzlingaos.data.repository.MyPageRepositoryImpl
 import com.puzzling.puzzlingaos.data.repository.ProjectRepositoryImpl
 import com.puzzling.puzzlingaos.data.repository.TeamReviewRepositoryImpl
 import com.puzzling.puzzlingaos.data.repository.WriteReviewRepositoryImpl
 import com.puzzling.puzzlingaos.domain.repository.MyBoardRepository
 import com.puzzling.puzzlingaos.domain.repository.MyPageRepository
 import com.puzzling.puzzlingaos.domain.repository.ProjectRepository
 import com.puzzling.puzzlingaos.domain.repository.TeamReviewRepository
-import com.puzzling.puzzlingaos.data.repository.MyPageRepositoryImpl
-import com.puzzling.puzzlingaos.data.repository.WriteReviewRepositoryImpl
 import com.puzzling.puzzlingaos.domain.repository.WriteReviewRepository
 import dagger.Binds
 import dagger.Module
@@ -24,6 +23,7 @@ abstract class RepositoryModule {
     @Binds
     abstract fun providesMyBoardRepository(repoImpl: MyBoardRepositoryImpl): MyBoardRepository
 
+    @Singleton
     @Binds
     abstract fun providesMyPageRepository(repoImpl: MyPageRepositoryImpl): MyPageRepository
 
@@ -33,14 +33,9 @@ abstract class RepositoryModule {
 
     @Singleton
     @Binds
-    abstract fun sendProjectRepository(repoImpl: ProjectRepositoryImpl): ProjectRepository
+    abstract fun provideTeamRetroRepository(repoImpl: TeamReviewRepositoryImpl): TeamReviewRepository
 
-    @Singleton
-    @Binds
-    abstract fun proveideTeamRetroRepository(repoImpl: TeamReviewRepositoryImpl): TeamReviewRepository
-
     @Singleton
     @Binds
     abstract fun providesWriteReviewRepository(repoImpl: WriteReviewRepositoryImpl): WriteReviewRepository
-
 }
diff --git a/app/src/main/java/com/puzzling/puzzlingaos/util/ViewModelFactory.kt b/app/src/main/java/com/puzzling/puzzlingaos/util/ViewModelFactory.kt
@@ -4,16 +4,8 @@ import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import com.puzzling.puzzlingaos.data.service.KakaoLoginService
-import com.puzzling.puzzlingaos.presentation.detailRetrospect.DetailRetroViewModel
 import com.puzzling.puzzlingaos.presentation.invitationCode.InvitationCodeViewModel
 import com.puzzling.puzzlingaos.presentation.onboarding.LoginViewModel
-import com.puzzling.puzzlingaos.data.repository.TeamCurrentSituationRepositoryImpl
-import com.puzzling.puzzlingaos.data.service.KakaoLoginService
-import com.puzzling.puzzlingaos.data.source.remote.TeamCurrentSituationRemoteDataSource
-import com.puzzling.puzzlingaos.presentation.invitationCode.InvitationCodeViewModel
-import com.puzzling.puzzlingaos.presentation.onboarding.LoginViewModel
-import com.puzzling.puzzlingaos.presentation.team.currentSituation.TeamCurrentSituationViewModel
-
 
 class ViewModelFactory(private val context: Context) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {