Merge pull request #22 from Team-CrowdZero/feature/#21-total-refactor

[Feature/#21] : 코드 리팩토링

Author: gaeulzzang

app/src/main/AndroidManifest.xml

@@ -29,5 +29,4 @@
             </intent-filter>
         </activity>
     </application>
-
 </manifest>

app/src/main/java/com/gdg/crowdzero_android/di/DataSourceModule.kt

@@ -1,9 +1,7 @@
 package com.gdg.crowdzero_android.di
 
 import com.gdg.data.datasource.CrowdZeroDataSource
-import com.gdg.data.datasource.ExampleDataSource
 import com.gdg.data.datasourceimpl.CrowdZeroDataSourceImpl
-import com.gdg.data.datasourceimpl.ExampleDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -14,10 +12,6 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 abstract class DataSourceModule {
 
-    @Binds
-    @Singleton
-    abstract fun bindExampleDataSource(exampleDataSourceImpl: ExampleDataSourceImpl): ExampleDataSource
-
     @Binds
     @Singleton
     abstract fun bindCrowdZeroDataSource(crowdZeroDataSourceImpl: CrowdZeroDataSourceImpl): CrowdZeroDataSource

app/src/main/java/com/gdg/crowdzero_android/di/Qualifier.kt

@@ -5,7 +5,3 @@ import javax.inject.Qualifier
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class CrowdZeroRetrofit
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class AccessToken

app/src/main/java/com/gdg/crowdzero_android/di/RepositoryModule.kt

@@ -1,9 +1,7 @@
 package com.gdg.crowdzero_android.di
 
 import com.gdg.data.repositoryimpl.CrowdZeroRepositoryImpl
-import com.gdg.data.repositoryimpl.ExampleRepositoryImpl
 import com.gdg.domain.repository.CrowdZeroRepository
-import com.gdg.domain.repository.ExampleRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -14,10 +12,6 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 abstract class RepositoryModule {
 
-    @Binds
-    @Singleton
-    abstract fun bindExampleRepository(exampleRepositoryImpl: ExampleRepositoryImpl): ExampleRepository
-
     @Binds
     @Singleton
     abstract fun bindCrowdZeroRepository(crowdZeroRepositoryImpl: CrowdZeroRepositoryImpl): CrowdZeroRepository

app/src/main/java/com/gdg/crowdzero_android/di/ServiceModule.kt

@@ -1,7 +1,6 @@
 package com.gdg.crowdzero_android.di
 
 import com.gdg.data.service.CrowdZeroService
-import com.gdg.data.service.ExampleService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -13,12 +12,6 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 object ServiceModule {
 
-    @Provides
-    @Singleton
-    fun provideExampleService(
-        @CrowdZeroRetrofit retrofit: Retrofit
-    ): ExampleService = retrofit.create(ExampleService::class.java)
-
     @Provides
     @Singleton
     fun provideCrowdZeroService(

app/src/main/java/com/gdg/crowdzero_android/main/MainScreen.kt

@@ -152,9 +152,7 @@ fun MainScreen(
                     startDestination = navigator.startDestination
                 ) {
                     mapNavGraph(navHostController = navigator.navController)
-                    calendarNavGraph(
-                        paddingValues = paddingValues, navHostController = navigator.navController
-                    )
+                    calendarNavGraph(paddingValues = paddingValues)
                     detailNavGraph(paddingValues = paddingValues)
                 }
             }

app/src/main/java/com/gdg/crowdzero_android/navigation/CalendarNavigation.kt

@@ -17,8 +17,7 @@ fun NavController.navigateCalendar(navOptions: NavOptions? = null) {
 }
 
 fun NavGraphBuilder.calendarNavGraph(
-    paddingValues: PaddingValues,
-    navHostController: NavController
+    paddingValues: PaddingValues
 ) {
     composable<Calendar> {
         CalendarRoute(

app/src/main/java/com/gdg/crowdzero_android/navigation/DetailNavigation.kt

@@ -11,7 +11,7 @@ import com.gdg.feature.detail.DetailRoute
 import kotlinx.serialization.Serializable
 
 fun NavController.navigateDetail(
-    id: Long,
+    id: Int,
     navOptions: NavOptions? = null
 ) {
     navigate(
@@ -34,5 +34,5 @@ fun NavGraphBuilder.detailNavGraph(
 
 @Serializable
 data class Detail(
-    val id: Long
+    val id: Int
 ) : Route