Skip to content

Commit b73815f

Browse files
RazeemanRazeeman
committed
fix german translation and fix wear cutting text on small font size
1 parent 6075116 commit b73815f

9 files changed

Lines changed: 26 additions & 20 deletions

File tree

‎resources/src/main/res/values-de/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<!-- Categories -->
8484
<string name="categories_title">Kategorien und Tags</string>
8585
<string name="categories_edit_hint">Klicken Sie zum Bearbeiten auf die Karte</string>
86-
<string name="categories_record_type_hint">Weise verschiedenen Aktivitäten denselben Kategorie zu, um gruppierten Statistiken anzuzeigen</string>
86+
<string name="categories_record_type_hint">Weise verschiedenen Aktivitäten dieselbe Kategorie zu, um gruppierte Statistiken zu erstellen</string>
8787
<string name="categories_record_hint">Ordne den Datensätzen verschiedene Tags zu, um sie zu unterscheiden</string>
8888
<string name="categories_add_category">Kategorie hinzufügen</string>
8989
<string name="categories_add_record_tag">Datensatz-Tag hinzufügen</string>

‎wear/src/main/java/com/example/util/simpletimetracker/features/activities/ui/ActivityChip.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import com.example.util.simpletimetracker.presentation.remember.rememberDuration
3333
import com.example.util.simpletimetracker.presentation.ui.ACTIVITY_RUNNING_VIEW_HEIGHT
3434
import com.example.util.simpletimetracker.presentation.ui.ACTIVITY_VIEW_HEIGHT
3535
import com.example.util.simpletimetracker.utils.durationToLabel
36+
import com.example.util.simpletimetracker.utils.getCoercedFontScale
3637
import java.time.Instant
3738

3839
@Immutable
@@ -74,7 +75,7 @@ fun ActivityChip(
7475
ACTIVITY_RUNNING_VIEW_HEIGHT
7576
} else {
7677
ACTIVITY_VIEW_HEIGHT
77-
} * LocalDensity.current.fontScale
78+
} * getCoercedFontScale()
7879
Chip(
7980
modifier = Modifier
8081
.height(height.dp)

‎wear/src/main/java/com/example/util/simpletimetracker/features/activities/ui/OpenOnPhoneButton.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ import androidx.wear.compose.material.OutlinedCompactChip
2020
import androidx.wear.compose.material.Text
2121
import androidx.wear.tooling.preview.devices.WearDevices
2222
import com.example.util.simpletimetracker.R
23+
import com.example.util.simpletimetracker.utils.getCoercedFontScale
2324
import com.example.util.simpletimetracker.utils.getString
2425

2526
@Composable
2627
fun OpenOnPhoneButton(
2728
onClick: () -> Unit = {},
2829
) {
29-
val height = 56.dp * LocalDensity.current.fontScale
30+
val height = 56.dp * getCoercedFontScale()
3031
OutlinedCompactChip(
3132
modifier = Modifier
3233
.height(height)

‎wear/src/main/java/com/example/util/simpletimetracker/features/statistics/mapper/StatisticsViewDataMapper.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ class StatisticsViewDataMapper @Inject constructor(
179179
): StatisticsChipState {
180180
return StatisticsChipState(
181181
id = 0,
182-
name = resourceRepo.getString(R.string.statistics_total_tracked),
182+
name = resourceRepo.getString(R.string.statistics_total_tracked_short),
183183
icon = null,
184184
color = ColorInactive.toArgb().toLong(),
185185
duration = total,

‎wear/src/main/java/com/example/util/simpletimetracker/features/statistics/screen/StatisticsList.kt‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import com.example.util.simpletimetracker.presentation.ui.ACTIVITY_RUNNING_VIEW_
3737
import com.example.util.simpletimetracker.presentation.ui.ErrorState
3838
import com.example.util.simpletimetracker.presentation.ui.RenderLoading
3939
import com.example.util.simpletimetracker.presentation.ui.renderError
40+
import com.example.util.simpletimetracker.utils.getCoercedFontScale
4041
import com.example.util.simpletimetracker.utils.getString
4142
import java.util.UUID
4243

@@ -75,7 +76,6 @@ fun StatisticsList(
7576
onPrevClick: () -> Unit = {},
7677
onNextClick: () -> Unit = {},
7778
) {
78-
val density = LocalDensity.current
7979
Box {
8080
ScaffoldedScrollingColumn {
8181
when (state) {
@@ -91,15 +91,13 @@ fun StatisticsList(
9191
is StatisticsListState.Empty -> {
9292
renderEmptyState(
9393
state = state,
94-
density = density,
9594
onTitleClick = onTitleClick,
9695
onTitleLongClick = onTitleLongClick,
9796
)
9897
}
9998
is StatisticsListState.Content -> {
10099
renderContent(
101100
state = state,
102-
density = density,
103101
onTitleClick = onTitleClick,
104102
onTitleLongClick = onTitleLongClick,
105103
)
@@ -120,7 +118,6 @@ fun StatisticsList(
120118

121119
private fun ScalingLazyListScope.renderEmptyState(
122120
state: StatisticsListState.Empty,
123-
density: Density,
124121
onTitleClick: () -> Unit,
125122
onTitleLongClick: () -> Unit,
126123
) {
@@ -133,7 +130,7 @@ private fun ScalingLazyListScope.renderEmptyState(
133130
}
134131
item {
135132
val height = ACTIVITY_RUNNING_VIEW_HEIGHT *
136-
density.fontScale
133+
getCoercedFontScale()
137134
Box(
138135
modifier = Modifier.height(height.dp),
139136
contentAlignment = Alignment.Center,
@@ -148,7 +145,6 @@ private fun ScalingLazyListScope.renderEmptyState(
148145

149146
private fun ScalingLazyListScope.renderContent(
150147
state: StatisticsListState.Content,
151-
density: Density,
152148
onTitleClick: () -> Unit,
153149
onTitleLongClick: () -> Unit,
154150
) {
@@ -162,9 +158,9 @@ private fun ScalingLazyListScope.renderContent(
162158
for (itemState in state.items) {
163159
when (itemState) {
164160
is StatisticsListState.Content.Item.Loader -> {
165-
val height = ACTIVITY_RUNNING_VIEW_HEIGHT *
166-
density.fontScale
167161
item {
162+
val height = ACTIVITY_RUNNING_VIEW_HEIGHT *
163+
getCoercedFontScale()
168164
Box(
169165
modifier = Modifier.height(height.dp),
170166
contentAlignment = Alignment.Center,
@@ -222,7 +218,7 @@ private fun BoxScope.StatisticsButtons(
222218
}
223219
}
224220

225-
@Preview(device = WearDevices.LARGE_ROUND)
221+
@Preview(device = WearDevices.LARGE_ROUND, fontScale = 1f)
226222
@Composable
227223
private fun Loading() {
228224
StatisticsList(
@@ -240,7 +236,7 @@ private fun Error() {
240236
)
241237
}
242238

243-
@Preview(device = WearDevices.LARGE_ROUND)
239+
@Preview(device = WearDevices.LARGE_ROUND, fontScale = 1f)
244240
@Composable
245241
private fun NoData() {
246242
StatisticsList(
@@ -251,7 +247,7 @@ private fun NoData() {
251247
)
252248
}
253249

254-
@Preview(device = WearDevices.LARGE_ROUND)
250+
@Preview(device = WearDevices.LARGE_ROUND, fontScale = 1f)
255251
@Composable
256252
private fun Content() {
257253
val items = List(5) {
@@ -274,7 +270,7 @@ private fun Content() {
274270
)
275271
}
276272

277-
@Preview(device = WearDevices.LARGE_ROUND)
273+
@Preview(device = WearDevices.LARGE_ROUND, fontScale = 1f)
278274
@Composable
279275
private fun ContentLoading() {
280276
val items = List(1) {

‎wear/src/main/java/com/example/util/simpletimetracker/features/statistics/ui/StatisticsChip.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import com.example.util.simpletimetracker.R
2525
import com.example.util.simpletimetracker.domain.model.WearActivityIcon
2626
import com.example.util.simpletimetracker.features.activities.ui.ActivityIcon
2727
import com.example.util.simpletimetracker.presentation.ui.ACTIVITY_RUNNING_VIEW_HEIGHT
28+
import com.example.util.simpletimetracker.utils.getCoercedFontScale
2829

2930
@Immutable
3031
data class StatisticsChipState(
@@ -41,7 +42,7 @@ fun StatisticsChip(
4142
state: StatisticsChipState,
4243
) {
4344
val height = ACTIVITY_RUNNING_VIEW_HEIGHT *
44-
LocalDensity.current.fontScale
45+
getCoercedFontScale()
4546
Chip(
4647
modifier = Modifier
4748
.height(height.dp)

‎wear/src/main/java/com/example/util/simpletimetracker/features/tagsSelection/ui/TagChip.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import androidx.wear.compose.material.Text
2727
import androidx.wear.compose.material.ToggleChipDefaults
2828
import androidx.wear.tooling.preview.devices.WearDevices
2929
import com.example.util.simpletimetracker.presentation.ui.ACTIVITY_VIEW_HEIGHT
30+
import com.example.util.simpletimetracker.utils.getCoercedFontScale
3031

3132
@Immutable
3233
data class TagChipState(
@@ -74,7 +75,7 @@ private fun SingleSelectTagChip(
7475
{ onClick(state.id) }
7576
}
7677
val height = ACTIVITY_VIEW_HEIGHT.dp *
77-
LocalDensity.current.fontScale
78+
getCoercedFontScale()
7879
Chip(
7980
modifier = Modifier
8081
.height(height)
@@ -111,7 +112,7 @@ private fun MultiSelectTagChip(
111112
{ onClick(state.id) }
112113
}
113114
val height = ACTIVITY_VIEW_HEIGHT.dp *
114-
LocalDensity.current.fontScale
115+
getCoercedFontScale()
115116
SplitToggleChip(
116117
modifier = Modifier
117118
.height(height)

‎wear/src/main/java/com/example/util/simpletimetracker/features/tagsSelection/ui/TagSelectionButton.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import com.example.util.simpletimetracker.features.tagsSelection.screen.TagListS
2727
import com.example.util.simpletimetracker.presentation.theme.ColorActive
2828
import com.example.util.simpletimetracker.presentation.theme.ColorInactive
2929
import com.example.util.simpletimetracker.presentation.ui.ACTIVITY_VIEW_HEIGHT
30+
import com.example.util.simpletimetracker.utils.getCoercedFontScale
3031

3132
@Immutable
3233
data class TagSelectionButtonState(
@@ -45,7 +46,7 @@ fun TagSelectionButton(
4546
{ onClick(state.buttonType) }
4647
}
4748
val height = ACTIVITY_VIEW_HEIGHT.dp *
48-
LocalDensity.current.fontScale
49+
getCoercedFontScale()
4950
Chip(
5051
modifier = Modifier
5152
.height(height)

‎wear/src/main/java/com/example/util/simpletimetracker/utils/UiUtils.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,9 @@ fun Int.scaledSp(): TextUnit {
1313
val textSize = value / fontScale
1414
textSize.sp
1515
}
16+
}
17+
18+
@Composable
19+
fun getCoercedFontScale(): Float {
20+
return LocalDensity.current.fontScale.coerceAtLeast(1f)
1621
}

0 commit comments

Comments
 (0)