Skip to content

Commit dbb7025

Browse files
chuvalniychuvalniy
committed
minor fixes
1 parent 07d9bc7 commit dbb7025

File tree

38 files changed

+66
-163
lines changed

38 files changed

+66
-163
lines changed

‎app/src/main/java/com/example/kode_test_app/MainActivity.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import androidx.core.view.WindowInsetsControllerCompat
88
import androidx.navigation.NavController
99
import androidx.navigation.NavOptions
1010
import androidx.navigation.findNavController
11-
import com.example.core_navigation.NavCommand
12-
import com.example.core_navigation.NavigationProvider
11+
import com.example.core_navigation.navigation.NavCommand
12+
import com.example.core_navigation.navigation.NavCommands
13+
import com.example.core_navigation.navigation.NavigationProvider
1314

1415
class MainActivity : AppCompatActivity(), NavigationProvider {
1516

@@ -29,12 +30,12 @@ class MainActivity : AppCompatActivity(), NavigationProvider {
2930

3031
override fun launch(navCommand: NavCommand) {
3132
when (val target = navCommand.target) {
32-
is com.example.core_navigation.NavCommands.DeepLink -> openDeepLink(
33+
is NavCommands.DeepLink -> openDeepLink(
3334
url = target.url,
3435
isModal = target.isModal,
3536
isSingleTop = target.isSingleTop
3637
)
37-
is com.example.core_navigation.NavCommands.Browser -> Unit
38+
is NavCommands.Browser -> Unit
3839
}
3940
}
4041

‎app/src/main/java/com/example/kode_test_app/di/AppComponent.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ package com.example.kode_test_app.di
33
import android.content.Context
44
import com.bumptech.glide.RequestManager
55
import com.example.core.core.ConnectivityObserver
6-
import com.example.core.core.NetworkConnectivityObserver
7-
import com.example.core_data.repository.DetailsRepository
6+
import com.example.core_data.repository.DetailRepository
87
import com.example.core_data.repository.HomeRepository
98
import com.example.core_preferences.UserPreferences
109
import com.example.feature.di.HomeDeps
@@ -22,7 +21,7 @@ annotation class AppScope
2221
interface AppComponent : HomeDeps, DetailsDeps {
2322

2423
override val glide: RequestManager
25-
override val detailsRepository: DetailsRepository
24+
override val detailRepository: DetailRepository
2625
override val homeRepository: HomeRepository
2726
override val connectivityObserver: ConnectivityObserver
2827
override val userPreferences: UserPreferences

‎app/src/main/java/com/example/kode_test_app/di/AppModule.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
88
import com.bumptech.glide.request.RequestOptions
99
import com.example.core.core.ConnectivityObserver
1010
import com.example.core.core.NetworkConnectivityObserver
11-
import com.example.core_data.repository.DetailsRepository
12-
import com.example.core_data.repository.DetailsRepositoryImpl
11+
import com.example.core_data.repository.DetailRepository
12+
import com.example.core_data.repository.DetailRepositoryImpl
1313
import com.example.core_data.repository.HomeRepository
1414
import com.example.core_data.repository.HomeRepositoryImpl
1515
import com.example.core_database.database.CacheDataSource
@@ -91,5 +91,5 @@ interface AppBindModule {
9191

9292
@Binds
9393
@AppScope
94-
fun bindDetailsRepository(detailsRepositoryImpl: DetailsRepositoryImpl): DetailsRepository
94+
fun bindDetailsRepository(detailsRepositoryImpl: DetailRepositoryImpl): DetailRepository
9595
}

‎core-common/src/main/java/com/example/core/utils/UtilsExtension.kt

+1
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ inline fun <T> Flow<Resource<T>>.onEachResource(
4747
is Resource.Success -> result.data?.let(onSuccess)
4848
}
4949
}
50+

‎core-data/src/main/java/com/example/core_data/mapper/CacheMapper.kt

+2-21
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.example.core.utils.fromTimestampToBirthday
66
import com.example.core.utils.fromTimestampToBirthdayFull
77
import com.example.core.utils.toTimestamp
88
import com.example.core_database.model.CacheUser
9-
import com.example.core_model.DomainUser
9+
import com.example.core_model.model.DomainUser
1010
import javax.inject.Inject
1111

1212
class CacheMapper @Inject constructor(): Mapper<CacheUser, DomainUser> {
@@ -17,7 +17,7 @@ class CacheMapper @Inject constructor(): Mapper<CacheUser, DomainUser> {
1717
birthdayDay = data.birthday.toTimestamp().fromTimestampToBirthday(),
1818
age = data.birthday.toTimestamp().fromTimestampToAge(),
1919
birthdayFull = data.birthday.toTimestamp().fromTimestampToBirthdayFull(),
20-
department = data.department.toUiDepartment(),
20+
department = data.department,
2121
name = "${data.firstName} ${data.lastName}",
2222
id = data.id,
2323
position = data.position,
@@ -26,22 +26,3 @@ class CacheMapper @Inject constructor(): Mapper<CacheUser, DomainUser> {
2626
)
2727
}
2828
}
29-
30-
// TODO?
31-
private fun String.toUiDepartment(): String {
32-
return when (this) {
33-
"android" -> "Android"
34-
"ios" -> "iOS"
35-
"design" -> "Design"
36-
"management" -> "Management"
37-
"qa" -> "QA"
38-
"hr" -> "HR"
39-
"pr" -> "PR"
40-
"backend" -> "Backend"
41-
"frontend" -> "frontend"
42-
"back_office" -> "Back ofice"
43-
"support" -> "Support"
44-
"analytics" -> "Analytics"
45-
else -> "All"
46-
}
47-
}

‎core-data/src/main/java/com/example/core_data/repository/DetailsRepository.kt ‎core-data/src/main/java/com/example/core_data/repository/DetailRepository.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.example.core_data.repository
22

3-
import com.example.core_model.DomainUser
3+
import com.example.core_model.model.DomainUser
44
import kotlinx.coroutines.flow.Flow
55

6-
interface DetailsRepository {
6+
interface DetailRepository {
77

88
fun fetchData(id: String): Flow<DomainUser>
99
}

‎core-data/src/main/java/com/example/core_data/repository/DetailsRepositoryImpl.kt ‎core-data/src/main/java/com/example/core_data/repository/DetailRepositoryImpl.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ package com.example.core_data.repository
22

33
import com.example.core_data.mapper.CacheMapper
44
import com.example.core_database.database.CacheDataSource
5-
import com.example.core_model.DomainUser
5+
import com.example.core_model.model.DomainUser
66
import kotlinx.coroutines.flow.Flow
77
import kotlinx.coroutines.flow.map
88
import javax.inject.Inject
99

10-
class DetailsRepositoryImpl @Inject constructor(
10+
class DetailRepositoryImpl @Inject constructor(
1111
private val database: CacheDataSource,
1212
private val cacheMapper: CacheMapper
13-
) : DetailsRepository {
13+
) : DetailRepository {
1414

1515
override fun fetchData(id: String): Flow<DomainUser> {
1616
val data = database.fetchSingleData(id)

‎core-data/src/main/java/com/example/core_data/repository/HomeRepository.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.example.core_data.repository
22

33
import com.example.core.core.Resource
44
import com.example.core.utils.SortType
5-
import com.example.core_model.DomainUser
5+
import com.example.core_model.model.DomainUser
66
import kotlinx.coroutines.flow.Flow
77

88
interface HomeRepository {

‎core-data/src/main/java/com/example/core_data/repository/HomeRepositoryImpl.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package com.example.core_data.repository
22

3-
import android.util.Log
43
import com.example.core.core.UiText
54
import com.example.core.core.Resource
65
import com.example.core.utils.SortType
76
import com.example.core_data.mapper.CacheMapper
87
import com.example.core_data.mapper.NetworkMapper
98
import com.example.core_database.database.CacheDataSource
10-
import com.example.core_model.DomainUser
9+
import com.example.core_model.model.DomainUser
1110
import com.example.core_network.network.NetworkDataSource
1211
import kotlinx.coroutines.flow.Flow
1312
import kotlinx.coroutines.flow.flow

‎core-database/src/main/java/com/example/core_database/di/DatabaseComponent.kt

-7
This file was deleted.

‎core-database/src/main/java/com/example/core_database/di/DatabaseModule.kt

-23
This file was deleted.

‎core-model/src/main/java/com/example/core_model/DomainUser.kt ‎core-model/src/main/java/com/example/core_model/model/DomainUser.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.core_model
1+
package com.example.core_model.model
22

33
data class DomainUser(
44
val avatarUrl: String,

‎core-navigation/src/main/java/com/example/core_navigation/Fragment+Navigation.kt ‎core-navigation/src/main/java/com/example/core_navigation/navigation/Fragment+Navigation.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.core_navigation
1+
package com.example.core_navigation.navigation
22

33
import androidx.fragment.app.Fragment
44

‎core-navigation/src/main/java/com/example/core_navigation/NavCommand.kt ‎core-navigation/src/main/java/com/example/core_navigation/navigation/NavCommand.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.core_navigation
1+
package com.example.core_navigation.navigation
22

33
import android.os.Bundle
44
import androidx.navigation.NavOptions

‎core-navigation/src/main/java/com/example/core_navigation/NavCommands.kt ‎core-navigation/src/main/java/com/example/core_navigation/navigation/NavCommands.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.core_navigation
1+
package com.example.core_navigation.navigation
22

33
import android.net.Uri
44

‎core-navigation/src/main/java/com/example/core_navigation/NavigationProvider.kt ‎core-navigation/src/main/java/com/example/core_navigation/navigation/NavigationProvider.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.core_navigation
1+
package com.example.core_navigation.navigation
22

33
interface NavigationProvider {
44
fun launch(navCommand: NavCommand)

‎core-network/src/main/java/com/example/core_network/di/NetworkComponent.kt

-12
This file was deleted.

‎core-network/src/main/java/com/example/core_network/di/NetworkModule.kt

-21
This file was deleted.

‎core-preferences/src/main/java/com/example/core_preferences/UserUserPreferencesImpl.kt ‎core-preferences/src/main/java/com/example/core_preferences/UserPreferencesImpl.kt

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import javax.inject.Inject
77
private const val SHARED_PREFS_NAME = "user_settings"
88
private const val KEY_SORT_TYPE = "sort_type"
99

10-
11-
// TODO
1210
class UserUserPreferencesImpl @Inject constructor(
1311
context: Context
1412
) : UserPreferences {

‎feature-details/src/main/java/com/example/feature_details/di/DetailComponent.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ package com.example.feature_details.di
22

33
import androidx.annotation.RestrictTo
44
import com.bumptech.glide.RequestManager
5-
import com.example.core_data.repository.DetailsRepository
5+
import com.example.core_data.repository.DetailRepository
66
import com.example.feature_details.fragment.DetailFragment
77
import dagger.Component
88
import javax.inject.Scope
9-
import kotlin.properties.Delegates
109
import kotlin.properties.Delegates.notNull
1110

1211
@Scope
@@ -29,7 +28,7 @@ internal interface DetailsComponent {
2928

3029
interface DetailsDeps {
3130
val glide: RequestManager
32-
val detailsRepository: DetailsRepository
31+
val detailRepository: DetailRepository
3332
}
3433

3534
interface DetailsDepsProvider {

‎feature-details/src/main/java/com/example/feature_details/di/DetailModuleBinds.kt

-11
This file was deleted.

‎feature-details/src/main/java/com/example/feature_details/model/DetailState.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.example.feature_details.model
22

33
import com.example.core.presentation.UiState
4-
import com.example.core_model.DomainUser
4+
import com.example.core_model.model.DomainUser
55

66
data class DetailState(
77
val data: DomainUser? = null

‎feature-details/src/main/java/com/example/feature_details/view_model/DetailViewModel.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.example.feature_details.view_model
33
import androidx.lifecycle.SavedStateHandle
44
import androidx.lifecycle.viewModelScope
55
import com.example.core.presentation.BaseViewModel
6-
import com.example.core_data.repository.DetailsRepository
6+
import com.example.core_data.repository.DetailRepository
77
import com.example.feature_details.model.DetailEvent
88
import com.example.feature_details.model.DetailSideEffect
99
import com.example.feature_details.model.DetailState
@@ -15,7 +15,7 @@ import javax.inject.Inject
1515

1616

1717
class DetailViewModel @Inject constructor(
18-
private val repository: DetailsRepository,
18+
private val repository: DetailRepository,
1919
private val savedState: SavedStateHandle
2020
) : BaseViewModel<DetailEvent, DetailState, DetailSideEffect>(DetailState()) {
2121

‎feature-details/src/main/java/com/example/feature_details/view_model/DetailViewModelFactory.kt

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@ import android.os.Bundle
44
import androidx.lifecycle.AbstractSavedStateViewModelFactory
55
import androidx.lifecycle.SavedStateHandle
66
import androidx.lifecycle.ViewModel
7-
import androidx.lifecycle.ViewModelProvider
87
import androidx.savedstate.SavedStateRegistryOwner
9-
import com.example.core_data.repository.DetailsRepository
10-
import com.example.core_data.repository.HomeRepository
8+
import com.example.core_data.repository.DetailRepository
119
import dagger.assisted.Assisted
1210
import dagger.assisted.AssistedFactory
1311
import dagger.assisted.AssistedInject
14-
import javax.inject.Inject
1512

1613
class DetailViewModelFactory @AssistedInject constructor(
17-
private val repository: DetailsRepository,
14+
private val repository: DetailRepository,
1815
@Assisted owner: SavedStateRegistryOwner,
1916
@Assisted defaultArgs: Bundle? = null
2017
) : AbstractSavedStateViewModelFactory(owner, defaultArgs) {

‎feature-home/src/main/java/com/example/feature/di/HomeModuleBinds.kt

-8
This file was deleted.

‎feature-home/src/main/java/com/example/feature/domain/model/DepartmentList.kt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.example.feature.domain.model
22

33

4-
// TODO
54
object DepartmentList {
65
val departmentListUi = listOf(
76
"All",

‎feature-home/src/main/java/com/example/feature/epoxy/HomeEpoxyController.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.example.feature.epoxy
22

33
import com.airbnb.epoxy.TypedEpoxyController
4-
import com.example.core_model.DomainUser
4+
import com.example.core_model.model.DomainUser
55
import com.example.feature.epoxy.model.HomeLoadingHeaderModel
66
import com.example.feature.epoxy.model.HomeUserItem
77
import com.example.feature.epoxy.model.ShimmerUserItemModel

0 commit comments

Comments
 (0)