Skip to content

Commit c8d74ce

Browse files
RazeemanRazeeman
committed
refactor wear packages
1 parent c743707 commit c8d74ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+138
-115
lines changed

‎core/src/test/java/com/example/util/simpletimetracker/core/mapper/TimeMapperGetRangeStartAndEndTest.kt‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.example.util.simpletimetracker.core.mapper
22

3+
import com.example.util.simpletimetracker.core.mapper.TimeMapperGetRangeStartAndEndTest.Subject.commonTimeMapper
34
import com.example.util.simpletimetracker.core.mapper.TimeMapperGetRangeStartAndEndTest.Subject.currentTimestampProvider
45
import com.example.util.simpletimetracker.core.mapper.TimeMapperGetRangeStartAndEndTest.Subject.hourInMs
56
import com.example.util.simpletimetracker.core.mapper.TimeMapperGetRangeStartAndEndTest.Subject.localeProvider
@@ -22,6 +23,7 @@ import org.mockito.Mockito
2223
import org.mockito.Mockito.`when`
2324
import java.util.TimeZone
2425
import java.util.concurrent.TimeUnit
26+
import com.example.util.simpletimetracker.core.common.mapper.TimeMapper as CommonTimeMapper
2527

2628
@RunWith(Enclosed::class)
2729
class TimeMapperGetRangeStartAndEndTest {
@@ -30,6 +32,7 @@ class TimeMapperGetRangeStartAndEndTest {
3032
val resourceRepo: ResourceRepo = Mockito.mock(ResourceRepo::class.java)
3133
val currentTimestampProvider: CurrentTimestampProvider = Mockito.mock(CurrentTimestampProvider::class.java)
3234
val localeProvider: LocaleProvider = Mockito.mock(LocaleProvider::class.java)
35+
val commonTimeMapper: CommonTimeMapper = Mockito.mock(CommonTimeMapper::class.java)
3336
val hourInMs = TimeUnit.HOURS.toMillis(1)
3437
}
3538

@@ -44,7 +47,7 @@ class TimeMapperGetRangeStartAndEndTest {
4447
`when`(currentTimestampProvider.get()).thenReturn(input[4] as Long)
4548
`when`(localeProvider.get()).thenReturn(Locale.getDefault())
4649

47-
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider)
50+
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider, commonTimeMapper)
4851

4952
assertEquals(
5053
"Test failed for params $input",
@@ -132,7 +135,7 @@ class TimeMapperGetRangeStartAndEndTest {
132135
`when`(currentTimestampProvider.get()).thenReturn(input[4] as Long)
133136
`when`(localeProvider.get()).thenReturn(Locale.getDefault())
134137

135-
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider)
138+
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider, commonTimeMapper)
136139

137140
assertEquals(
138141
"Test failed for params $input",
@@ -304,7 +307,7 @@ class TimeMapperGetRangeStartAndEndTest {
304307
`when`(currentTimestampProvider.get()).thenReturn(input[4] as Long)
305308
`when`(localeProvider.get()).thenReturn(Locale.getDefault())
306309

307-
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider)
310+
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider, commonTimeMapper)
308311

309312
assertEquals(
310313
"Test failed for params $input",
@@ -446,7 +449,7 @@ class TimeMapperGetRangeStartAndEndTest {
446449
`when`(currentTimestampProvider.get()).thenReturn(input[4] as Long)
447450
`when`(localeProvider.get()).thenReturn(Locale.getDefault())
448451

449-
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider)
452+
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider, commonTimeMapper)
450453

451454
assertEquals(
452455
"Test failed for params $input",
@@ -588,7 +591,7 @@ class TimeMapperGetRangeStartAndEndTest {
588591
`when`(currentTimestampProvider.get()).thenReturn(input[4] as Long)
589592
`when`(localeProvider.get()).thenReturn(Locale.getDefault())
590593

591-
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider)
594+
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider, commonTimeMapper)
592595

593596
assertEquals(
594597
"Test failed for params $input",

‎core/src/test/java/com/example/util/simpletimetracker/core/mapper/TimeMapperTest.kt‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package com.example.util.simpletimetracker.core.mapper
22

33
import com.example.util.simpletimetracker.core.R
4-
import com.example.util.simpletimetracker.core.mapper.TimeMapperTest.Subject.currentTimestampProvider
4+
import com.example.util.simpletimetracker.core.common.mapper.TimeMapper
55
import com.example.util.simpletimetracker.core.mapper.TimeMapperTest.Subject.hourInMs
66
import com.example.util.simpletimetracker.core.mapper.TimeMapperTest.Subject.localeProvider
77
import com.example.util.simpletimetracker.core.mapper.TimeMapperTest.Subject.minuteInMs
88
import com.example.util.simpletimetracker.core.mapper.TimeMapperTest.Subject.resourceRepo
99
import com.example.util.simpletimetracker.core.mapper.TimeMapperTest.Subject.secondInMs
10-
import com.example.util.simpletimetracker.domain.base.CurrentTimestampProvider
1110
import com.example.util.simpletimetracker.core.provider.LocaleProvider
1211
import com.example.util.simpletimetracker.core.repo.ResourceRepo
1312
import org.junit.AfterClass
@@ -28,7 +27,6 @@ class TimeMapperTest {
2827

2928
private object Subject {
3029
val resourceRepo: ResourceRepo = Mockito.mock(ResourceRepo::class.java)
31-
val currentTimestampProvider: CurrentTimestampProvider = Mockito.mock(CurrentTimestampProvider::class.java)
3230
val localeProvider: LocaleProvider = Mockito.mock(LocaleProvider::class.java)
3331

3432
val secondInMs = TimeUnit.SECONDS.toMillis(1)
@@ -54,9 +52,7 @@ class TimeMapperTest {
5452
`when`(localeProvider.get()).thenReturn(Locale.getDefault())
5553

5654
val subject = TimeMapper(
57-
localeProvider = localeProvider,
5855
resourceRepo = resourceRepo,
59-
currentTimestampProvider = currentTimestampProvider,
6056
)
6157

6258
assertEquals(
@@ -108,9 +104,7 @@ class TimeMapperTest {
108104
`when`(localeProvider.get()).thenReturn(Locale.getDefault())
109105

110106
val subject = TimeMapper(
111-
localeProvider = localeProvider,
112107
resourceRepo = resourceRepo,
113-
currentTimestampProvider = currentTimestampProvider,
114108
)
115109

116110
assertEquals(
@@ -176,9 +170,7 @@ class TimeMapperTest {
176170
`when`(localeProvider.get()).thenReturn(Locale.getDefault())
177171

178172
val subject = TimeMapper(
179-
localeProvider = localeProvider,
180173
resourceRepo = resourceRepo,
181-
currentTimestampProvider = currentTimestampProvider,
182174
)
183175

184176
assertEquals(

‎core/src/test/java/com/example/util/simpletimetracker/core/mapper/TimeMapperTitleTest.kt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.example.util.simpletimetracker.core.mapper
22

33
import com.example.util.simpletimetracker.core.R
4+
import com.example.util.simpletimetracker.core.mapper.TimeMapperTitleTest.Subject.commonTimeMapper
45
import com.example.util.simpletimetracker.core.mapper.TimeMapperTitleTest.Subject.currentTimestampProvider
56
import com.example.util.simpletimetracker.core.mapper.TimeMapperTitleTest.Subject.hourInMs
67
import com.example.util.simpletimetracker.core.mapper.TimeMapperTitleTest.Subject.localeProvider
@@ -22,6 +23,7 @@ import org.mockito.Mockito.`when`
2223
import java.util.Locale
2324
import java.util.TimeZone
2425
import java.util.concurrent.TimeUnit
26+
import com.example.util.simpletimetracker.core.common.mapper.TimeMapper as CommonTimeMapper
2527

2628
@RunWith(Enclosed::class)
2729
class TimeMapperTitleTest {
@@ -30,6 +32,7 @@ class TimeMapperTitleTest {
3032
val resourceRepo: ResourceRepo = Mockito.mock(ResourceRepo::class.java)
3133
val currentTimestampProvider: CurrentTimestampProvider = Mockito.mock(CurrentTimestampProvider::class.java)
3234
val localeProvider: LocaleProvider = Mockito.mock(LocaleProvider::class.java)
35+
val commonTimeMapper: CommonTimeMapper = Mockito.mock(CommonTimeMapper::class.java)
3336
val hourInMs = TimeUnit.HOURS.toMillis(1)
3437
}
3538

@@ -51,7 +54,7 @@ class TimeMapperTitleTest {
5154
`when`(currentTimestampProvider.get()).thenReturn(input[2] as Long)
5255
`when`(localeProvider.get()).thenReturn(Locale.getDefault())
5356

54-
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider)
57+
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider, commonTimeMapper)
5558

5659
assertEquals(
5760
"Test failed for params $input",
@@ -127,7 +130,7 @@ class TimeMapperTitleTest {
127130
`when`(currentTimestampProvider.get()).thenReturn(input[3] as Long)
128131
`when`(localeProvider.get()).thenReturn(Locale.getDefault())
129132

130-
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider)
133+
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider, commonTimeMapper)
131134

132135
assertEquals(
133136
"Test failed for params $input",
@@ -260,7 +263,7 @@ class TimeMapperTitleTest {
260263
`when`(currentTimestampProvider.get()).thenReturn(input[2] as Long)
261264
`when`(localeProvider.get()).thenReturn(Locale.getDefault())
262265

263-
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider)
266+
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider, commonTimeMapper)
264267

265268
assertEquals(
266269
"Test failed for params $input",
@@ -354,7 +357,7 @@ class TimeMapperTitleTest {
354357
`when`(currentTimestampProvider.get()).thenReturn(input[2] as Long)
355358
`when`(localeProvider.get()).thenReturn(Locale.getDefault())
356359

357-
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider)
360+
val subject = TimeMapper(localeProvider, resourceRepo, currentTimestampProvider, commonTimeMapper)
358361

359362
assertEquals(
360363
"Test failed for params $input",

‎features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearDataRepo.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class WearDataRepo @Inject constructor(
109109
}
110110

111111
override suspend fun queryStatistics(request: WearStatisticsRequest): List<WearStatisticsDTO> {
112-
val filterType = when (request.filterType){
112+
val filterType = when (request.filterType) {
113113
WearChartFilterTypeDTO.ACTIVITY -> ChartFilterType.ACTIVITY
114114
WearChartFilterTypeDTO.CATEGORY -> ChartFilterType.CATEGORY
115115
WearChartFilterTypeDTO.RECORD_TAG -> ChartFilterType.RECORD_TAG

wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/activities/ActivitiesViewDataMapper.kt renamed to wear/src/main/java/com/example/util/simpletimetracker/features/activities/mapper/ActivitiesViewDataMapper.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.screens.activities
6+
package com.example.util.simpletimetracker.features.activities.mapper
77

88
import androidx.compose.ui.graphics.toArgb
99
import com.example.util.simpletimetracker.R
@@ -18,9 +18,9 @@ import com.example.util.simpletimetracker.domain.model.WearLastRecord
1818
import com.example.util.simpletimetracker.domain.model.WearSettings
1919
import com.example.util.simpletimetracker.domain.model.WearTag
2020
import com.example.util.simpletimetracker.presentation.theme.ColorInactive
21-
import com.example.util.simpletimetracker.presentation.ui.components.ActivitiesListState
22-
import com.example.util.simpletimetracker.presentation.ui.components.ActivityChipState
23-
import com.example.util.simpletimetracker.presentation.ui.components.ActivityChipType
21+
import com.example.util.simpletimetracker.features.activities.screen.ActivitiesListState
22+
import com.example.util.simpletimetracker.features.activities.ui.ActivityChipState
23+
import com.example.util.simpletimetracker.features.activities.ui.ActivityChipType
2424
import com.example.util.simpletimetracker.utils.orZero
2525
import javax.inject.Inject
2626

wear/src/main/java/com/example/util/simpletimetracker/presentation/ui/components/ActivitiesList.kt renamed to wear/src/main/java/com/example/util/simpletimetracker/features/activities/screen/ActivitiesList.kt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.ui.components
6+
package com.example.util.simpletimetracker.features.activities.screen
77

88
import androidx.annotation.StringRes
99
import androidx.compose.foundation.layout.Arrangement
@@ -30,8 +30,20 @@ import androidx.wear.compose.material.Text
3030
import androidx.wear.tooling.preview.devices.WearDevices
3131
import com.example.util.simpletimetracker.R
3232
import com.example.util.simpletimetracker.domain.model.WearActivityIcon
33+
import com.example.util.simpletimetracker.features.activities.ui.ActivityChip
34+
import com.example.util.simpletimetracker.features.activities.ui.ActivityChipCompact
35+
import com.example.util.simpletimetracker.features.activities.ui.ActivityChipCompatState
36+
import com.example.util.simpletimetracker.features.activities.ui.ActivityChipState
37+
import com.example.util.simpletimetracker.features.activities.ui.ActivityChipType
3338
import com.example.util.simpletimetracker.presentation.theme.ColorInactive
34-
import com.example.util.simpletimetracker.presentation.ui.layout.ScaffoldedScrollingColumn
39+
import com.example.util.simpletimetracker.presentation.layout.ScaffoldedScrollingColumn
40+
import com.example.util.simpletimetracker.presentation.ui.ACTIVITY_LIST_COMPACT_CHIP_COUNT
41+
import com.example.util.simpletimetracker.presentation.ui.Divider
42+
import com.example.util.simpletimetracker.presentation.ui.Hint
43+
import com.example.util.simpletimetracker.presentation.ui.HintState
44+
import com.example.util.simpletimetracker.features.activities.ui.NavigationButton
45+
import com.example.util.simpletimetracker.features.activities.ui.OpenOnPhoneButton
46+
import com.example.util.simpletimetracker.presentation.ui.RefreshButton
3547
import com.example.util.simpletimetracker.utils.getString
3648
import com.example.util.simpletimetracker.utils.orZero
3749
import java.time.Instant

wear/src/main/java/com/example/util/simpletimetracker/presentation/screens/activities/ActivitiesScreen.kt renamed to wear/src/main/java/com/example/util/simpletimetracker/features/activities/screen/ActivitiesScreen.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.screens.activities
6+
package com.example.util.simpletimetracker.features.activities.screen
77

88
import androidx.compose.runtime.Composable
99
import androidx.compose.runtime.getValue
1010
import androidx.hilt.navigation.compose.hiltViewModel
1111
import androidx.lifecycle.compose.collectAsStateWithLifecycle
12-
import com.example.util.simpletimetracker.presentation.screens.activities.ActivitiesViewModel.Effect
13-
import com.example.util.simpletimetracker.presentation.ui.components.ActivitiesList
12+
import com.example.util.simpletimetracker.features.activities.viewModel.ActivitiesViewModel
13+
import com.example.util.simpletimetracker.features.activities.viewModel.ActivitiesViewModel.Effect
1414
import com.example.util.simpletimetracker.utils.OnLifecycle
1515
import com.example.util.simpletimetracker.utils.collectEffects
1616

wear/src/main/java/com/example/util/simpletimetracker/presentation/ui/components/ActivityChip.kt renamed to wear/src/main/java/com/example/util/simpletimetracker/features/activities/ui/ActivityChip.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.ui.components
6+
package com.example.util.simpletimetracker.features.activities.ui
77

88
import androidx.compose.foundation.background
99
import androidx.compose.foundation.layout.Column
@@ -29,7 +29,9 @@ import androidx.wear.tooling.preview.devices.WearDevices
2929
import com.example.util.simpletimetracker.R
3030
import com.example.util.simpletimetracker.domain.model.WearActivityIcon
3131
import com.example.util.simpletimetracker.presentation.theme.ColorInactive
32-
import com.example.util.simpletimetracker.presentation.ui.remember.rememberDurationSince
32+
import com.example.util.simpletimetracker.presentation.remember.rememberDurationSince
33+
import com.example.util.simpletimetracker.presentation.ui.ACTIVITY_RUNNING_VIEW_HEIGHT
34+
import com.example.util.simpletimetracker.presentation.ui.ACTIVITY_VIEW_HEIGHT
3335
import com.example.util.simpletimetracker.utils.durationToLabel
3436
import java.time.Instant
3537

wear/src/main/java/com/example/util/simpletimetracker/presentation/ui/components/ActivityChipCompact.kt renamed to wear/src/main/java/com/example/util/simpletimetracker/features/activities/ui/ActivityChipCompact.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
55
*/
6-
package com.example.util.simpletimetracker.presentation.ui.components
6+
package com.example.util.simpletimetracker.features.activities.ui
77

88
import androidx.compose.foundation.background
99
import androidx.compose.foundation.layout.Box
@@ -30,7 +30,8 @@ import androidx.wear.compose.material.Text
3030
import androidx.wear.tooling.preview.devices.WearDevices
3131
import com.example.util.simpletimetracker.R
3232
import com.example.util.simpletimetracker.domain.model.WearActivityIcon
33-
import com.example.util.simpletimetracker.presentation.ui.remember.rememberDurationSince
33+
import com.example.util.simpletimetracker.presentation.remember.rememberDurationSince
34+
import com.example.util.simpletimetracker.utils.scaledSp
3435
import com.example.util.simpletimetracker.utils.durationToLabelShort
3536
import java.time.Instant
3637

wear/src/main/java/com/example/util/simpletimetracker/presentation/ui/components/ActivityChipType.kt renamed to wear/src/main/java/com/example/util/simpletimetracker/features/activities/ui/ActivityChipType.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.util.simpletimetracker.presentation.ui.components
1+
package com.example.util.simpletimetracker.features.activities.ui
22

33
sealed interface ActivityChipType {
44
data object Base : ActivityChipType

0 commit comments

Comments
 (0)