Update version catalog

This commit is contained in:
Sad Ellie 2023-12-07 17:49:16 +03:00
parent 7e178cede6
commit ffff1ae187
5 changed files with 19 additions and 13 deletions

View File

@ -34,8 +34,8 @@ android {
applicationId = "com.sadellie.unitto"
minSdk = 21
targetSdk = 34
versionCode = libs.versions.appCode.get().toInt()
versionName = "Popstar"
versionCode = libs.versions.versionCode.get().toInt()
versionName = libs.versions.versionName.get()
resourceConfigurations += setOf(
"en",
"en-rGB",

View File

@ -25,16 +25,22 @@ android {
namespace = "com.sadellie.unitto.core.base"
defaultConfig {
buildConfigField("String", "APP_NAME", """"${libs.versions.appName.get()}"""")
buildConfigField("String", "APP_CODE", """"${libs.versions.appCode.get()}"""")
stringConfigField("VERSION_NAME", libs.versions.versionName.get())
stringConfigField("VERSION_CODE", libs.versions.versionCode.get())
}
productFlavors {
getByName("playStore") {
storeLink("http://play.google.com/store/apps/details?id=com.sadellie.unitto")
stringConfigField(
"STORE_LINK",
"http://play.google.com/store/apps/details?id=com.sadellie.unitto"
)
}
getByName("fdroid") {
storeLink("https://github.com/sadellie/unitto")
stringConfigField(
"STORE_LINK",
"https://github.com/sadellie/unitto"
)
}
}
@ -47,10 +53,8 @@ android {
lint.warning.add("MissingTranslation")
}
fun com.android.build.api.dsl.VariantDimension.storeLink(url: String) {
fun com.android.build.api.dsl.VariantDimension.stringConfigField(name: String, url: String) {
buildConfigField(
"String",
"STORE_LINK",
"\"${url}\""
"String", name, "\"${url}\""
)
}

View File

@ -156,10 +156,12 @@ private fun SettingsScreen(
expanded = showMenu,
onDismissRequest = { showMenu = false }
) {
// TODO Translate
DropdownMenuItem(
onClick = { showMenu = false; backup() },
text = { Text("Backup") }
)
// TODO Translate
DropdownMenuItem(
onClick = { showMenu = false; launcher.launch(arrayOf(backupMimeType)) },
text = { Text("Restore") }

View File

@ -155,7 +155,7 @@ private fun AboutScreen(
UnittoListItem(
icon = Icons.Default.Info,
headlineText = stringResource(R.string.settings_version_name),
supportingText = "${BuildConfig.APP_NAME} (${BuildConfig.APP_CODE})",
supportingText = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})",
modifier = Modifier.combinedClickable {
if (prefs.enableToolsExperiment) {
showToast(mContext, "Experiments features are already enabled!", Toast.LENGTH_LONG)

View File

@ -1,6 +1,6 @@
[versions]
appCode = "31"
appName = "Popstar"
versionCode = "31"
versionName = "Popstar"
androidxBrowserBrowser = "1.7.0"
androidGradlePlugin = "8.2.0"