lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Re-add currency converter disclaimer

Browse Source
This commit is contained in:
MM20 2021-12-11 19:05:42 +01:00
parent 98f64deb91
commit 28303b9276
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
3 changed files with 51 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i18n/src/main/res/values-de/strings.xml
View File

@ -378,7 +378,7 @@
<string name="preference_cards_stroke_width">Rahmenstärke</string> <string name="preference_cards_stroke_width">Rahmenstärke</string>
<string name="preference_cards_opacity">Deckkraft</string> <string name="preference_cards_opacity">Deckkraft</string>
<string name="disclaimer">Haftungsausschluss</string> <string name="disclaimer">Haftungsausschluss</string>
<string name="disclaimer_currency_converter">Wechselkurse so wie sie einmal täglich von der Europäischen Zentralbank herausgegeben werden. Alle Angaben sind ohne Gewähr. Es wird keine Haftung für die hier dargestellten Informationen übernommen.</string> <string name="disclaimer_currency_converter">Wechselkurse so wie sie einmal täglich von der Europäischen Zentralbank herausgegeben werden. Alle Angaben sind ohne Gewähr. Es wird keine Haftung für die hier dargestellten Informationen übernommen.\n\nLetzte Aktualisierung: %1$s</string>
<string name="unit_converter_show_all">Alle anzeigen</string> <string name="unit_converter_show_all">Alle anzeigen</string>
<string name="preference_card_background">Hintergrund</string> <string name="preference_card_background">Hintergrund</string>
<string name="preference_card_background_default">Standard</string> <string name="preference_card_background_default">Standard</string>

2
i18n/src/main/res/values/strings.xml
View File

@ -378,7 +378,7 @@
<string name="preference_cards_stroke_width">Stroke width</string> <string name="preference_cards_stroke_width">Stroke width</string>
<string name="preference_cards_opacity">Opacity</string> <string name="preference_cards_opacity">Opacity</string>
<string name="disclaimer">Disclaimer</string> <string name="disclaimer">Disclaimer</string>
<string name="disclaimer_currency_converter">"Exchange rates as published once per day by the European Central Bank. All information is provided \"as is\" without any kind of guarantee. No liability is assumed for these information."</string> <string name="disclaimer_currency_converter">"Exchange rates as published once per day by the European Central Bank. All information is provided \"as is\" without any kind of guarantee. No liability is assumed for these information.\n\nLast update: %1$s"</string>
<string name="unit_converter_show_all">Show all</string> <string name="unit_converter_show_all">Show all</string>
<string name="preference_card_background">Background</string> <string name="preference_card_background">Background</string>
<string name="preference_card_background_default">Default</string> <string name="preference_card_background_default">Default</string>

55
ui/src/main/java/de/mm20/launcher2/ui/search/UnitConverterItem.kt
View File

@ -1,5 +1,7 @@
package de.mm20.launcher2.ui.search package de.mm20.launcher2.ui.search
import android.icu.text.DateFormat
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
@ -14,9 +16,12 @@ import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import de.mm20.launcher2.search.data.CurrencyUnitConverter
import de.mm20.launcher2.search.data.UnitConverter import de.mm20.launcher2.search.data.UnitConverter
import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.R
import de.mm20.launcher2.unitconverter.Dimension import de.mm20.launcher2.unitconverter.Dimension
import java.util.*
@Composable @Composable
fun UnitConverterItem( fun UnitConverterItem(
@ -89,14 +94,52 @@ fun UnitConverterItem(
} }
} }
if (!showAll && unitConverter.values.size > 5) { Row(
TextButton( horizontalArrangement = Arrangement.End,
onClick = { showAll = true }, verticalAlignment = Alignment.CenterVertically
) {
Row(
modifier = Modifier modifier = Modifier
.align(Alignment.End) .weight(1f)
.padding(horizontal = 12.dp) .padding(horizontal = 16.dp, vertical = 8.dp)
) { ) {
Text(text = stringResource(id = R.string.unit_converter_show_all)) var showDisclaimer by remember { mutableStateOf(false) }
(unitConverter as? CurrencyUnitConverter)?.let {
val df = DateFormat.getDateInstance(DateFormat.SHORT)
Text(
text = "${df.format(Date(it.updateTimestamp))} • ",
style = MaterialTheme.typography.labelSmall,
)
Text(
text = stringResource(id = R.string.disclaimer),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.primary,
modifier = Modifier.clickable {
showDisclaimer = true
}
)
if (showDisclaimer) {
AlertDialog(
onDismissRequest = { showDisclaimer = false },
confirmButton = {
TextButton(onClick = { showDisclaimer = false }) {
Text(text = stringResource(id = R.string.close))
}
},
title = { Text(stringResource(id = R.string.disclaimer)) },
text = { Text(stringResource(id = R.string.disclaimer_currency_converter, df.format(Date(it.updateTimestamp)))) }
)
}
}
}
if (!showAll && unitConverter.values.size > 5) {
TextButton(
onClick = { showAll = true },
modifier = Modifier
.padding(horizontal = 12.dp)
) {
Text(text = stringResource(id = R.string.unit_converter_show_all))
}
} }
} }
} }