Skip to content

Commit 111af50

Browse files
committed
add retroactive tracking mode support to wear
1 parent 4626c4a commit 111af50

File tree

59 files changed

+842
-144
lines changed

Some content is hidden

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

59 files changed

+842
-144
lines changed

data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class PrefsRepoImpl @Inject constructor(
129129
)
130130

131131
override var retroactiveTrackingMode: Boolean by prefs.delegate(
132-
KEY_RETROACTIVE_TRACKING_MODE, false
132+
KEY_RETROACTIVE_TRACKING_MODE, false,
133133
)
134134

135135
override var firstDayOfWeek: Int by prefs.delegate(

data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/RecordRepoImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class RecordRepoImpl @Inject constructor(
7373
logMessage = "get",
7474
accessCache = { recordCache[id] },
7575
accessSource = { recordDao.get(id)?.let(::mapItem) },
76-
afterSourceAccess = { it?.let { recordCache.put(id, it) } }
76+
afterSourceAccess = { it?.let { recordCache.put(id, it) } },
7777
)
7878

7979
override suspend fun getFromRange(range: Range): List<Record> {

data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/RunningRecordRepoImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class RunningRecordRepoImpl @Inject constructor(
4444
logMessage = "has",
4545
accessCache = { cache?.any { it.id == id } },
4646
accessSource = { dao.get(id) != null },
47-
afterSourceAccess = { initializeCache() }
47+
afterSourceAccess = { initializeCache() },
4848
)
4949

5050
override suspend fun add(runningRecord: RunningRecord): Long = mutex.withLockedCache(

domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/RemoveRunningRecordMediator.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class RemoveRunningRecordMediator @Inject constructor(
2828
// No need to update widgets and notification because it will be done in running record remove.
2929
recordInteractor.addFromRunning(
3030
runningRecord = runningRecord,
31-
timeEnded = recordTimeEnded
31+
timeEnded = recordTimeEnded,
3232
)
3333
}
3434
activityStartedStoppedBroadcastInteractor.onActivityStopped(
@@ -53,7 +53,7 @@ class RemoveRunningRecordMediator @Inject constructor(
5353
updateExternalViewsInteractor.onRunningRecordRemove(
5454
typeId = typeId,
5555
updateWidgets = updateWidgets,
56-
updateNotificationSwitch = updateNotificationSwitch
56+
updateNotificationSwitch = updateNotificationSwitch,
5757
)
5858
}
5959
}

domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/ShouldShowRecordDataSelectionInteractor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ShouldShowRecordDataSelectionInteractor @Inject constructor(
1919
if (needToShowComment(typeId, commentInputAvailable)) {
2020
fields += RecordDataSelectionDialogResult.Field.Comment
2121
}
22-
return RecordDataSelectionDialogResult(fields)
22+
return RecordDataSelectionDialogResult(fields)
2323
}
2424

2525
private suspend fun needToShowTags(typeId: Long): Boolean {

domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/UpdateExternalViewsInteractor.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class UpdateExternalViewsInteractor @Inject constructor(
3232
Update.WidgetSingleTypes.takeIf { getRetroactiveTrackingMode() }
3333
?: Update.WidgetSingleType(typeId),
3434
Update.WidgetUniversal.takeIf { getRetroactiveTrackingMode() },
35-
Update.Wear.takeIf { !fromArchive },
35+
Update.Wear.takeIf { !fromArchive || getRetroactiveTrackingMode() },
3636
Update.NotificationTypes.takeIf { !fromArchive },
3737
Update.NotificationWithControls.takeIf { !fromArchive },
3838
)
@@ -139,6 +139,7 @@ class UpdateExternalViewsInteractor @Inject constructor(
139139
Update.WidgetSingleTypes.takeIf { getRetroactiveTrackingMode() }
140140
?: Update.WidgetSingleType(typeId),
141141
Update.WidgetUniversal.takeIf { getRetroactiveTrackingMode() },
142+
Update.Wear.takeIf { getRetroactiveTrackingMode() },
142143
)
143144
}
144145

@@ -154,6 +155,7 @@ class UpdateExternalViewsInteractor @Inject constructor(
154155
Update.WidgetSingleTypes.takeIf { getRetroactiveTrackingMode() }
155156
?: Update.WidgetSingleType(typeId),
156157
Update.WidgetUniversal.takeIf { getRetroactiveTrackingMode() },
158+
Update.Wear.takeIf { getRetroactiveTrackingMode() },
157159
)
158160
}
159161

@@ -320,7 +322,7 @@ class UpdateExternalViewsInteractor @Inject constructor(
320322
Update.WidgetSingleTypes,
321323
Update.WidgetUniversal,
322324
Update.NotificationWithControls,
323-
Update.Wear
325+
Update.Wear,
324326
)
325327
}
326328

features/feature_archive/src/main/java/com/example/util/simpletimetracker/feature_archive/viewModel/ArchiveViewModel.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ import androidx.lifecycle.ViewModel
66
import androidx.lifecycle.viewModelScope
77
import com.example.util.simpletimetracker.core.extension.set
88
import com.example.util.simpletimetracker.core.repo.ResourceRepo
9-
import com.example.util.simpletimetracker.domain.interactor.NotificationActivitySwitchInteractor
10-
import com.example.util.simpletimetracker.domain.interactor.NotificationTypeInteractor
119
import com.example.util.simpletimetracker.domain.interactor.RecordTagInteractor
1210
import com.example.util.simpletimetracker.domain.interactor.RecordTypeInteractor
1311
import com.example.util.simpletimetracker.domain.interactor.RemoveRecordTagMediator
1412
import com.example.util.simpletimetracker.domain.interactor.RemoveRecordTypeMediator
1513
import com.example.util.simpletimetracker.domain.interactor.UpdateExternalViewsInteractor
16-
import com.example.util.simpletimetracker.domain.interactor.WearInteractor
1714
import com.example.util.simpletimetracker.feature_archive.R
1815
import com.example.util.simpletimetracker.feature_archive.interactor.ArchiveViewDataInteractor
1916
import com.example.util.simpletimetracker.feature_archive.viewData.ArchiveViewData

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class ChangeRecordCore(
115115
),
116116
createChangeRecordTimeAdjustmentAdapterDelegate(viewModel::onTimeAdjustmentClick),
117117
createChangeRecordButtonAdapterDelegate(viewModel::onItemButtonClick),
118-
createChangeRecordSliderAdapterDelegate(viewModel::onSliderValueChanged)
118+
createChangeRecordSliderAdapterDelegate(viewModel::onSliderValueChanged),
119119
)
120120
}
121121

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordActionsRepeatDelegate.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ChangeRecordActionsRepeatDelegate @Inject constructor(
4040
comment = params.newComment,
4141
tagIds = params.newCategoryIds,
4242
)
43-
}
43+
},
4444
)
4545
}
4646

features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/defaultTypesSelection/viewModel/DefaultTypesSelectionViewModel.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import com.example.util.simpletimetracker.core.repo.ResourceRepo
1111
import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
1212
import com.example.util.simpletimetracker.domain.interactor.RecordTypeInteractor
1313
import com.example.util.simpletimetracker.domain.interactor.UpdateExternalViewsInteractor
14-
import com.example.util.simpletimetracker.domain.interactor.WearInteractor
1514
import com.example.util.simpletimetracker.domain.model.CardOrder
1615
import com.example.util.simpletimetracker.domain.model.RecordType
1716
import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType

0 commit comments

Comments
 (0)