Skip to content

Commit 3bc625a

Browse files
committed
add wear force update message
1 parent e1d6522 commit 3bc625a

41 files changed

Lines changed: 80 additions & 9 deletions

File tree

Some content is hidden

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

app/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ android {
2020
versionName = Base.versionName
2121

2222
testInstrumentationRunner = "com.example.util.simpletimetracker.utils.CustomTestRunner"
23+
24+
buildConfigField("String", "WEAR_API_VERSION", "\"${Base.wearApiVersion}\"")
2325
}
2426

2527
buildTypes {

app/src/main/java/com/example/util/simpletimetracker/provider/ApplicationDataProviderImpl.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,8 @@ class ApplicationDataProviderImpl @Inject constructor(
2626
appVersion
2727
}
2828
}
29+
30+
override fun getWearApiVersion(): String {
31+
return BuildConfig.WEAR_API_VERSION
32+
}
2933
}

buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Base.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@ object Base {
1515
const val minSDKWear = 26
1616
const val currentSDKWear = currentSDK
1717
const val targetSDKWear = 34
18+
19+
// Raise after wear api changes.
20+
const val wearApiVersion = 1
1821
}

core/src/main/java/com/example/util/simpletimetracker/core/provider/ApplicationDataProvider.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ interface ApplicationDataProvider {
55
fun getPackageName(): String
66
fun getAppName(): String
77
fun getAppVersion(): String
8+
fun getWearApiVersion(): String
89
}

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/interactor/StatisticsDetailStatsInteractor.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,8 @@ class StatisticsDetailStatsInteractor @Inject constructor(
117117
resourceRepo.getString(R.string.statistics_detail_empty)
118118
}
119119
val recordsAllIcon = StatisticsDetailCardInternalViewData.Icon(
120-
iconDrawable = R.drawable.statistics_detail_records_all,
121-
iconColor = if (isDarkTheme) {
122-
R.color.colorInactiveDark
123-
} else {
124-
R.color.colorInactive
125-
}.let(resourceRepo::getColor),
120+
iconDrawable = R.drawable.arrow_right,
121+
iconColor = resourceRepo.getThemedAttr(R.attr.appInactiveColor, isDarkTheme)
126122
)
127123

128124
fun formatInterval(value: Long?): String {

features/feature_statistics_detail/src/main/res/layout/statistics_detail_card_internal_item.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
android:id="@+id/ivStatisticsDetailCardIcon"
8686
android:layout_width="wrap_content"
8787
android:layout_height="wrap_content"
88-
tools:src="@drawable/ic_list_24px"
88+
tools:src="@drawable/arrow_right"
8989
tools:tint="?appInactiveColor" />
9090

9191
</androidx.cardview.widget.CardView>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ class WearDataLocalMapper @Inject constructor(
107107
}
108108

109109
fun map(
110+
apiVersion: String,
110111
allowMultitasking: Boolean,
111112
recordTagSelectionCloseAfterOne: Boolean,
112113
enableRepeatButton: Boolean,
@@ -115,6 +116,7 @@ class WearDataLocalMapper @Inject constructor(
115116
firstDayOfWeek: DayOfWeek,
116117
): WearSettingsDTO {
117118
return WearSettingsDTO(
119+
apiVersion = apiVersion,
118120
allowMultitasking = allowMultitasking,
119121
recordTagSelectionCloseAfterOne = recordTagSelectionCloseAfterOne,
120122
enableRepeatButton = enableRepeatButton,

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package com.example.util.simpletimetracker.feature_wear
88
import com.example.util.simpletimetracker.core.interactor.RecordRepeatInteractor
99
import com.example.util.simpletimetracker.core.interactor.StatisticsMediator
1010
import com.example.util.simpletimetracker.core.mapper.TimeMapper
11+
import com.example.util.simpletimetracker.core.provider.ApplicationDataProvider
1112
import com.example.util.simpletimetracker.domain.activitySuggestion.interactor.GetCurrentActivitySuggestionsInteractor
1213
import com.example.util.simpletimetracker.domain.extension.orZero
1314
import com.example.util.simpletimetracker.domain.notifications.interactor.UpdateExternalViewsInteractor
@@ -69,6 +70,7 @@ class WearDataRepo @Inject constructor(
6970
private val wearDataLocalMapper: WearDataLocalMapper,
7071
private val getCurrentActivitySuggestionsInteractor: GetCurrentActivitySuggestionsInteractor,
7172
private val statisticsMediator: StatisticsMediator,
73+
private val applicationDataProvider: ApplicationDataProvider,
7274
) : WearCommunicationAPI {
7375

7476
override suspend fun queryActivities(): List<WearActivityDTO> {
@@ -221,6 +223,7 @@ class WearDataRepo @Inject constructor(
221223

222224
override suspend fun querySettings(): WearSettingsDTO {
223225
return wearDataLocalMapper.map(
226+
apiVersion = applicationDataProvider.getWearApiVersion(),
224227
allowMultitasking = prefsInteractor.getAllowMultitasking(),
225228
recordTagSelectionCloseAfterOne = prefsInteractor.getRecordTagSelectionCloseAfterOne(),
226229
enableRepeatButton = prefsInteractor.getEnableRepeatButton(),

resources/src/main/res/values-ar/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,7 @@
643643
<!-- Wear -->
644644
<string name="wear_loading_error">تحقق من اتصالك وحاول مرة أخرى</string>
645645
<string name="wear_open_on_phone">فتح على الهاتف</string>
646+
<string name="wear_update_required">قم بتحديث تطبيقات الهاتف والساعة إلى أحدث إصدار</string>
646647
<string name="wear_settings_title">إعدادات</string>
647648
<string name="wear_settings_title_show_compact_list">عرض القائمة المدمجة</string>
648649

resources/src/main/res/values-ca/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,7 @@ Exemple:<br/>
643643
<!-- Wear -->
644644
<string name="wear_loading_error">Comprova la teva connexió i torna-ho a provar</string>
645645
<string name="wear_open_on_phone">Obre al telèfon</string>
646+
<string name="wear_update_required">Actualitza les aplicacions del telèfon i del rellotge a la darrera versió</string>
646647
<string name="wear_settings_title">Configuració</string>
647648
<string name="wear_settings_title_show_compact_list">Mostra la llista compacta</string>
648649

0 commit comments

Comments
 (0)