Не подтверждена Коммит e5744531 создал по автору Vitaly.Smirnov's avatar Vitaly.Smirnov Зафиксировано автором GitHub
Просмотр файлов

Add version overlay and prepare release (#368)

владелец 73cd0334
......@@ -84,8 +84,8 @@ android {
targetSdk = libs.versions.android.targetSdk.get().toInt()
applicationId = "band.effective.office.tablet"
versionCode = 2
versionName = "1.0.0"
versionCode = 3
versionName = "1.0.1"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
......@@ -136,11 +136,17 @@ android {
val apiUrlRelease: String = gradleLocalProperties(rootDir, providers).getProperty("api.url.release")
val apiUrlDebug: String = gradleLocalProperties(rootDir, providers).getProperty("api.url.debug")
val apiKey: String = gradleLocalProperties(rootDir, providers).getProperty("apiKey")
val appVersionName: String = android.defaultConfig.versionName!!
buildkonfig {
packageName = "band.effective.office.tablet"
exposeObjectWithName = "BuildKonfig"
defaultConfigs {
buildConfigField(
com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING,
"VERSION_NAME",
appVersionName,
)
buildConfigField(
com.codingfeline.buildkonfig.compiler.FieldSpec.Type.STRING,
"API_URL_RELEASE",
......
......@@ -4,8 +4,17 @@ import androidx.compose.runtime.Composable
import band.effective.office.tablet.core.ui.theme.AppTheme
import band.effective.office.tablet.root.Root
import band.effective.office.tablet.root.RootComponent
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.ui.Modifier
import band.effective.office.tablet.components.VersionOverlay
@Composable
fun App(rootComponent: RootComponent) {
AppTheme { Root(rootComponent) }
AppTheme {
Box(modifier = Modifier.fillMaxSize()) {
Root(rootComponent)
VersionOverlay()
}
}
}
package band.effective.office.tablet.components
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import band.effective.office.tablet.BuildKonfig
import androidx.compose.foundation.layout.BoxScope
@Composable
fun BoxScope.VersionOverlay(
modifier: Modifier = Modifier,
text: String = "v${BuildKonfig.VERSION_NAME}",
) {
Text(
text = text,
style = MaterialTheme.typography.labelSmall.copy(fontSize = 12.sp),
color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.35f),
textAlign = TextAlign.Start,
modifier = modifier
.align(Alignment.BottomEnd)
.padding(
end = 40.dp,
bottom = 10.dp
)
)
}
......@@ -9,6 +9,6 @@ kotlin.incremental=true
# Project properties
group=band.effective.office
version=1.0.0
version=1.0.1
android.useAndroidX=true
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать