Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@
</intent-filter>
</activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/com/gdg/crowdzero_android/di/Qualifier.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,3 @@ import javax.inject.Qualifier
@Qualifier
@Retention(AnnotationRetention.BINARY)
annotation class CrowdZeroRetrofit

@Qualifier
@Retention(AnnotationRetention.BINARY)
annotation class AccessToken
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ fun NavController.navigateCalendar(navOptions: NavOptions? = null) {
}

fun NavGraphBuilder.calendarNavGraph(
paddingValues: PaddingValues,
navHostController: NavController
paddingValues: PaddingValues
) {
composable<Calendar> {
CalendarRoute(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -34,5 +34,5 @@ fun NavGraphBuilder.detailNavGraph(

@Serializable
data class Detail(
val id: Long
val id: Int
) : Route
Binary file removed app/src/main/res/drawable/user_1.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/user_2.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/user_3.PNG
Binary file not shown.
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<resources>
<string name="app_name">CrowdZero-Android</string>
<string name="app_name">혼잡제로</string>

<!-- Tab Row -->
<string name="main_tab_map">지도</string>
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/com/gdg/core/type/LocationType.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.gdg.core.R
import com.naver.maps.geometry.LatLng

enum class LocationType(
val id: Long,
val id: Int,
@StringRes val title: Int,
val latLng: LatLng
) {
Expand Down Expand Up @@ -36,11 +36,11 @@ enum class LocationType(
); // 여의도

companion object {
fun extractTitleResource(id: Long): Int {
fun extractTitleResource(id: Int): Int {
return entries.find { it.id == id }?.title ?: GWANGHWAMUN.title
}

fun extractLatLng(id: Long): LatLng {
fun extractLatLng(id: Int): LatLng {
return entries.find { it.id == id }?.latLng ?: GWANGHWAMUN.latLng
}
}
Expand Down
170 changes: 0 additions & 170 deletions core/src/main/res/drawable/ic_launcher_background.xml

This file was deleted.

30 changes: 0 additions & 30 deletions core/src/main/res/drawable/ic_launcher_foreground.xml

This file was deleted.

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions data/src/main/java/com/gdg/data/dto/ExampleBaseResponse.kt

This file was deleted.

Loading