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" applicationId = "com.sadellie.unitto"
minSdk = 21 minSdk = 21
targetSdk = 34 targetSdk = 34
versionCode = libs.versions.appCode.get().toInt() versionCode = libs.versions.versionCode.get().toInt()
versionName = "Popstar" versionName = libs.versions.versionName.get()
resourceConfigurations += setOf( resourceConfigurations += setOf(
"en", "en",
"en-rGB", "en-rGB",

View File

@ -25,16 +25,22 @@ android {
namespace = "com.sadellie.unitto.core.base" namespace = "com.sadellie.unitto.core.base"
defaultConfig { defaultConfig {
buildConfigField("String", "APP_NAME", """"${libs.versions.appName.get()}"""") stringConfigField("VERSION_NAME", libs.versions.versionName.get())
buildConfigField("String", "APP_CODE", """"${libs.versions.appCode.get()}"""") stringConfigField("VERSION_CODE", libs.versions.versionCode.get())
} }
productFlavors { productFlavors {
getByName("playStore") { 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") { 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") 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( buildConfigField(
"String", "String", name, "\"${url}\""
"STORE_LINK",
"\"${url}\""
) )
} }

View File

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

View File

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

View File

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