Skip to content

Commit 1290fd3

Browse files
feat: added strings
1 parent 0892a7c commit 1290fd3

File tree

7 files changed

+25
-10
lines changed

7 files changed

+25
-10
lines changed

app/src/main/java/com/rk/taskmanager/screens/SelectWorkingMode.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import kotlinx.coroutines.GlobalScope
3737
import kotlinx.coroutines.launch
3838
import kotlinx.coroutines.withContext
3939

40-
enum class WorkingMode(val id:Int){
41-
ROOT(0),
42-
SHIZUKU(1)
40+
enum class WorkingMode(val id:Int,val nameRes: Int){
41+
ROOT(0,strings.root),
42+
SHIZUKU(1,strings.shizuku)
4343
}
4444

4545
@OptIn(DelicateCoroutinesApi::class)

app/src/main/java/com/rk/taskmanager/screens/SettingsScreen.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fun SettingsScreen(modifier: Modifier = Modifier, navController: NavController)
8080
PreferenceGroup(heading = stringResource(strings.working_mode)) {
8181
WorkingMode.entries.forEach { mode ->
8282
SettingsToggle(
83-
label = mode.name,
83+
label = stringResource(mode.nameRes),
8484
description = null,
8585
default = selectedMode.intValue == mode.id,
8686
sideEffect = {
@@ -138,7 +138,7 @@ fun SettingsScreen(modifier: Modifier = Modifier, navController: NavController)
138138
themes.forEach {
139139
SelectableCard(
140140
selected = currentTheme.intValue == it.key && !dynamicTheme.value,
141-
label = it.value::class.simpleName.toString(),
141+
label = stringResource(it.value.nameRes),
142142
description = null,
143143
onClick = {
144144
if (RewardedAds.isAdAvailable()){
@@ -187,7 +187,7 @@ fun SettingsScreen(modifier: Modifier = Modifier, navController: NavController)
187187

188188
PreferenceGroup {
189189
PreferenceTemplate(title = {
190-
Text("Graph update frequency")
190+
Text(stringResource(strings.graph_update))
191191
}) {
192192
val currentFreq = (minFreq + (sliderPosition * (maxFreq - minFreq))).toInt()
193193
Text("${currentFreq}ms")
@@ -205,8 +205,8 @@ fun SettingsScreen(modifier: Modifier = Modifier, navController: NavController)
205205

206206
PreferenceGroup {
207207
SettingsToggle(
208-
label = "Privacy Policy",
209-
description = "Privacy policy of ${strings.app_name.getString()}",
208+
label = stringResource(strings.privacy_policy),
209+
description = stringResource(strings.privacy_desc),
210210
isEnabled = true,
211211
showSwitch = false,
212212
default = false,

app/src/main/java/com/rk/taskmanager/ui/theme/Theme.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.rk.taskmanager.ui.theme
22

33
import android.os.Build
4+
import androidx.annotation.StringRes
45
import androidx.compose.foundation.isSystemInDarkTheme
56
import androidx.compose.material3.ColorScheme
67
import androidx.compose.material3.MaterialTheme
@@ -17,6 +18,7 @@ import com.rk.taskmanager.ui.theme.frostfall.Frostfall
1718
import com.rk.taskmanager.ui.theme.spring.Spring
1819

1920
abstract class Theme{
21+
abstract val nameRes:Int
2022
abstract val lightScheme: ColorScheme
2123
abstract val darkScheme: ColorScheme
2224
}

app/src/main/java/com/rk/taskmanager/ui/theme/autumn/Autumn.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ import android.graphics.Color
44
import androidx.annotation.Keep
55
import androidx.compose.material3.darkColorScheme
66
import androidx.compose.material3.lightColorScheme
7+
import com.rk.taskmanager.strings
78
import com.rk.taskmanager.ui.theme.Theme
89

910
@Keep
1011
object Autumn : Theme() {
11-
override val lightScheme = lightColorScheme(
12+
override val nameRes: Int = strings.autumn
13+
override val lightScheme = lightColorScheme(
1214
primary = primaryLight,
1315
onPrimary = onPrimaryLight,
1416
primaryContainer = primaryContainerLight,

app/src/main/java/com/rk/taskmanager/ui/theme/frostfall/Frostfall.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ package com.rk.taskmanager.ui.theme.frostfall
33
import androidx.annotation.Keep
44
import androidx.compose.material3.darkColorScheme
55
import androidx.compose.material3.lightColorScheme
6+
import com.rk.taskmanager.strings
67
import com.rk.taskmanager.ui.theme.Theme
78

89
@Keep
910
object Frostfall : Theme() {
1011

12+
override val nameRes: Int = strings.frostfall
1113
override val lightScheme = lightColorScheme(
1214
primary = primaryLight,
1315
onPrimary = onPrimaryLight,

app/src/main/java/com/rk/taskmanager/ui/theme/spring/Spring.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package com.rk.taskmanager.ui.theme.spring
33
import androidx.annotation.Keep
44
import androidx.compose.material3.darkColorScheme
55
import androidx.compose.material3.lightColorScheme
6+
import com.rk.taskmanager.strings
67
import com.rk.taskmanager.ui.theme.Theme
78

89
@Keep
910
object Spring : Theme() {
10-
11+
override val nameRes: Int = strings.spring
1112
override val lightScheme = lightColorScheme(
1213
primary = primaryLight,
1314
onPrimary = onPrimaryLight,

app/src/main/res/values/strings.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,13 @@
5454
<string name="ad_desc">To change the theme, please watch a short ad video. This helps keep the app free for everyone.</string>
5555
<string name="ok">Ok</string>
5656
<string name="ad">Ad</string>
57+
<string name="privacy_policy">Privacy Policy</string>
58+
<string name="privacy_desc">Privacy Policy of TaskManager</string>
59+
<string name="graph_update">Graph update delay</string>
60+
<string name="autumn">Autumn</string>
61+
<string name="frostfall">Frostfall</string>
62+
<string name="spring">Spring</string>
63+
<string name="root">Root</string>
64+
<string name="shizuku">Shizuku</string>
5765

5866
</resources>

0 commit comments

Comments
 (0)