Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed that about screen app version is not correct app version #492

Merged
merged 7 commits into from Jan 15, 2019
Merged
Diff settings

Always

Just for now

@@ -3,4 +3,11 @@ package dependencies
private object Versions {
val androidCompileSdkVersion = 28
val androidMinSdkVersion = 21

private val versionMajor = 1
private val versionMinor = 0
private val versionPatch = 0
val androidVersionCode = versionMajor * 10000 + versionMinor * 100 + versionPatch

val androidVersionName = "$versionMajor.$versionMinor.$versionPatch"
}
Copy path View file
@@ -1,4 +1,5 @@
import dependencies.Dep
import dependencies.Versions

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
@@ -7,6 +8,11 @@ apply plugin: 'androidx.navigation.safeargs'

apply from: rootProject.file('gradle/android.gradle')
android.dataBinding.enabled = true
android {
defaultConfig {
resValue "string", "version_name", Versions.androidVersionName
}
}

dependencies {
implementation project(':frontendcomponent:androidcomponent')
@@ -10,7 +10,7 @@ import io.github.droidkaigi.confsched2019.about.databinding.ItemAboutBinding

class AboutItem(
@StringRes private val name: Int,
@StringRes private val description: Int,
private val description: Int,
private val isLektonCheckText: Boolean = false,
private val clickListener: ((Context) -> Unit)? = null
) : BindableItem<ItemAboutBinding>() {
@@ -46,7 +46,7 @@ class AboutSection @Inject constructor(
},
AboutItem(
name = R.string.about_app_version,
description = R.string.about_version_name,
description = R.string.version_name,
isLektonCheckText = true
)
)
@@ -9,5 +9,4 @@
<string name="about_privacy_policy">Privacy Policy</string>
<string name="about_license">Open Source Licenses</string>
<string name="about_app_version">Version</string>
<string name="about_version_name" translatable="false">1.0.0</string>
</resources>
Copy path View file
@@ -22,8 +22,8 @@ android {
applicationId "io.github.droidkaigi.confsched2019"
minSdkVersion Versions.androidMinSdkVersion
targetSdkVersion 28
versionCode 2
versionName "1.0"
versionCode Versions.androidVersionCode
versionName Versions.androidVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
resConfigs "ja"
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.