tdpeuter/2023SELab1-project-Studeez
tdpeuter/2023SELab1-project-Studeez
Archived
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

i18n for regenerate button

Browse source
This commit is contained in:
brreynie 2023-05-13 17:29:25 +02:00
parent 360fb122f7
commit df0325074d
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/be/ugent/sel/studeez/screens/subjects/form/SubjectFormScreen.kt
View file

@ -1,17 +1,16 @@
package be.ugent.sel.studeez.screens.subjects.form package be.ugent.sel.studeez.screens.subjects.form
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Button import androidx.compose.material.Button
import androidx.compose.material.ButtonDefaults import androidx.compose.material.ButtonDefaults
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import be.ugent.sel.studeez.common.composable.BasicButton import be.ugent.sel.studeez.common.composable.BasicButton
@ -104,10 +103,11 @@ fun ColorPicker(
modifier = Modifier.fieldModifier(), modifier = Modifier.fieldModifier(),
colors = ButtonDefaults.buttonColors( colors = ButtonDefaults.buttonColors(
backgroundColor = Color(uiState.color), backgroundColor = Color(uiState.color),
contentColor = Color.White,
), ),
shape = RoundedCornerShape(4.dp), shape = RoundedCornerShape(4.dp),
) { ) {
Text(text = "Regenerate color") Text(text = stringResource(id = AppText.regenerate_color))
} }
} }

1
app/src/main/res/values/strings.xml
View file

@ -46,6 +46,7 @@
<string name="delete_subject">Delete Subject</string> <string name="delete_subject">Delete Subject</string>
<string name="delete_task">Delete Task</string> <string name="delete_task">Delete Task</string>
<string name="view_tasks">View</string> <string name="view_tasks">View</string>
<string name="regenerate_color">Regenerate Color</string>
<!-- Sessions --> <!-- Sessions -->
<string name="sessions_temp_description">Looks like you found the sessions screen! In here, your upcoming studying sessions with friends will be listed. You can accept invites or edit your own.</string> <!-- TODO Remove this description line once implemented. --> <string name="sessions_temp_description">Looks like you found the sessions screen! In here, your upcoming studying sessions with friends will be listed. You can accept invites or edit your own.</string> <!-- TODO Remove this description line once implemented. -->