Minecon724/CoinCounter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Localization

Browse source
This commit is contained in:
Minecon724 2024-10-01 15:52:45 +02:00
parent 3f09577411
commit 3d6fe3bcb2
Signed by: Minecon724
GPG key ID: 3CCC4D267742C8E8
8 changed files with 51 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle.kts
View file

@ -56,6 +56,10 @@ android {
excludes += "/META-INF/{AL2.0,LGPL2.1}" excludes += "/META-INF/{AL2.0,LGPL2.1}"
} }
} }
androidResources {
generateLocaleConfig = true
}
} }
dependencies { dependencies {

3
app/src/main/java/eu/m724/coincounter/MainActivity.kt
View file

@ -46,6 +46,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.rotate import androidx.compose.ui.draw.rotate
import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
@ -262,7 +263,7 @@ fun AddWalletButton(
) { ) {
Icon( Icon(
imageVector = Icons.Filled.Add, imageVector = Icons.Filled.Add,
contentDescription = "Add wallet", contentDescription = stringResource(R.string.home_add_wallet),
modifier = Modifier.rotate(angle) modifier = Modifier.rotate(angle)
) )
} }

7
app/src/main/java/eu/m724/coincounter/wallet/WalletActivity.kt
View file

@ -18,7 +18,9 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import eu.m724.coincounter.R
import eu.m724.coincounter.ui.theme.CoinCounterTheme import eu.m724.coincounter.ui.theme.CoinCounterTheme
import eu.m724.coincounter.wallet.compose.TransactionDialog import eu.m724.coincounter.wallet.compose.TransactionDialog
import eu.m724.coincounter.wallet.compose.WalletActivityView import eu.m724.coincounter.wallet.compose.WalletActivityView
@ -52,7 +54,10 @@ class WalletActivity : ComponentActivity() {
FloatingActionButton(onClick = { FloatingActionButton(onClick = {
transactionDialogShown = true transactionDialogShown = true
}) { }) {
Icon(Icons.Filled.Create, "New transaction") Icon(
imageVector = Icons.Filled.Create,
contentDescription = stringResource(R.string.wallet_new_transaction)
)
} }
} }
) { innerPadding -> ) { innerPadding ->

20
app/src/main/java/eu/m724/coincounter/wallet/compose/TransactionDialog.kt
View file

@ -34,6 +34,7 @@ import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
@ -87,7 +88,7 @@ fun TransactionDialog(
.weight(1f) .weight(1f)
.focusRequester(firstFocus) .focusRequester(firstFocus)
.focusProperties { next = secondFocus }, .focusProperties { next = secondFocus },
supportingText = { Text("Label") }, supportingText = { Text(stringResource(R.string.create_transaction_label)) },
keyboardOptions = KeyboardOptions.Default.copy( keyboardOptions = KeyboardOptions.Default.copy(
imeAction = ImeAction.Next imeAction = ImeAction.Next
), ),
@ -106,7 +107,7 @@ fun TransactionDialog(
.focusRequester(secondFocus), .focusRequester(secondFocus),
supportingText = { supportingText = {
Text( Text(
text = "Value", text = stringResource(R.string.create_transaction_value),
color = if (!valueValid) MaterialTheme.colorScheme.error else Color.Unspecified color = if (!valueValid) MaterialTheme.colorScheme.error else Color.Unspecified
) )
}, },
@ -117,7 +118,11 @@ fun TransactionDialog(
isError = !valueValid, isError = !valueValid,
trailingIcon = { trailingIcon = {
if (!valueValid) if (!valueValid)
Icon(painterResource(id = R.drawable.baseline_error_24), "error", tint = MaterialTheme.colorScheme.error) Icon(
painter = painterResource(id = R.drawable.baseline_error_24),
contentDescription = stringResource(R.string.create_transaction_value_error),
tint = MaterialTheme.colorScheme.error
)
}, },
singleLine = true singleLine = true
) )
@ -129,7 +134,7 @@ fun TransactionDialog(
checked = absoluteChecked, checked = absoluteChecked,
onCheckedChange = { absoluteChecked = it } onCheckedChange = { absoluteChecked = it }
) )
Text(text = "Absolute") Text(text = stringResource(R.string.create_transaction_absolute))
} }
} }
Row( Row(
@ -142,7 +147,7 @@ fun TransactionDialog(
onDismiss() onDismiss()
} }
) { ) {
Text(text = "Cancel") Text(text = stringResource(R.string.create_transaction_cancel))
} }
TextButton( TextButton(
onClick = { onClick = {
@ -150,11 +155,12 @@ fun TransactionDialog(
if (doubleValue != null) { if (doubleValue != null) {
onConfirm(label, (doubleValue * 100).toInt(), absoluteChecked) // TODO handle fixed point onConfirm(label, (doubleValue * 100).toInt(), absoluteChecked) // TODO handle fixed point
} else { } else {
Toast.makeText(context, "Value is not a number", Toast.LENGTH_SHORT).show() Toast.makeText(context,
context.getString(R.string.create_transaction_nan), Toast.LENGTH_SHORT).show()
} }
} }
) { ) {
Text("Create transaction") Text(stringResource(R.string.create_transaction_confirm))
} }
} }
} }

8
app/src/main/java/eu/m724/coincounter/wallet/compose/WalletActionsDialog.kt
View file

@ -8,8 +8,10 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.Dialog
import eu.m724.coincounter.R
/** /**
* A dialog that's shown when you long click on wallet name * A dialog that's shown when you long click on wallet name
@ -37,13 +39,13 @@ fun ActionsDialog(
modifier = Modifier.padding(16.dp) modifier = Modifier.padding(16.dp)
) { ) {
TextButton(onClick = onRename) { TextButton(onClick = onRename) {
Text("Rename wallet") Text(stringResource(R.string.wallet_actions_rename))
} }
TextButton(onClick = onDelete) { TextButton(onClick = onDelete) {
Text("Delete wallet") Text(stringResource(R.string.wallet_actions_delete))
} }
TextButton(onClick = onDismiss) { TextButton(onClick = onDismiss) {
Text("Cancel") Text(stringResource(R.string.wallet_actions_cancel))
} }
} }
} }

8
app/src/main/java/eu/m724/coincounter/wallet/compose/WalletRenameDialog.kt
View file

@ -19,8 +19,10 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.Dialog
import eu.m724.coincounter.R
@Composable @Composable
fun RenameDialog( fun RenameDialog(
@ -52,7 +54,7 @@ fun RenameDialog(
.fillMaxWidth() .fillMaxWidth()
.weight(1f) .weight(1f)
.focusRequester(focusRequester), .focusRequester(focusRequester),
supportingText = { Text("New name") }, supportingText = { Text(stringResource(R.string.wallet_rename_name)) },
singleLine = true singleLine = true
) )
} }
@ -66,14 +68,14 @@ fun RenameDialog(
onDismiss() onDismiss()
} }
) { ) {
Text(text = "Cancel") Text(text = stringResource(R.string.wallet_rename_cancel))
} }
TextButton( TextButton(
onClick = { onClick = {
onRename(value) onRename(value)
} }
) { ) {
Text("Rename") Text(stringResource(R.string.wallet_rename_confirm))
} }
} }
} }

1
app/src/main/res/resources.properties Normal file
View file

@ -0,0 +1 @@
unqualifiedResLocale=en

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

@ -2,4 +2,19 @@
<string name="app_name">Coin Counter</string> <string name="app_name">Coin Counter</string>
<string name="title_activity_main">Coin Counter</string> <string name="title_activity_main">Coin Counter</string>
<string name="title_activity_wallet">WalletActivity</string> <string name="title_activity_wallet">WalletActivity</string>
<string name="create_transaction_confirm">Create transaction</string>
<string name="create_transaction_nan">Value must be a number</string>
<string name="create_transaction_cancel">Cancel</string>
<string name="create_transaction_absolute">Absolute</string>
<string name="create_transaction_value_error">Error</string>
<string name="create_transaction_value">Value</string>
<string name="create_transaction_label">Label</string>
<string name="wallet_actions_rename">Rename wallet</string>
<string name="wallet_actions_delete">Delete wallet</string>
<string name="wallet_actions_cancel">Cancel</string>
<string name="wallet_rename_name">New name</string>
<string name="wallet_rename_cancel">Cancel</string>
<string name="wallet_rename_confirm">Rename</string>
<string name="wallet_new_transaction">New transaction</string>
<string name="home_add_wallet">Create wallet</string>
</resources> </resources>