Merge branch 'show-environment' into 'dev'
Show environment See merge request sminnovations/hpos!25
This commit is contained in:
@@ -16,11 +16,11 @@ android {
|
|||||||
|
|
||||||
// prod - production, preprod - preproduction, quality - qc
|
// prod - production, preprod - preproduction, quality - qc
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "in.sminnovations.hpostesting"
|
applicationId "in.sminnovations.hpostesting.dev"
|
||||||
minSdk 21
|
minSdk 21
|
||||||
targetSdk 34
|
targetSdk 34
|
||||||
versionCode 68
|
versionCode 75
|
||||||
versionName "2.1.68"
|
versionName "2.1.75"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -282,7 +282,7 @@ object Constants {
|
|||||||
|
|
||||||
const val INCUBATION_TIME_MIN = 0
|
const val INCUBATION_TIME_MIN = 0
|
||||||
const val INCUBATION_TIME_MAX = 1400
|
const val INCUBATION_TIME_MAX = 1400
|
||||||
const val BATTERY_LEVEL_MIN = 0
|
const val BATTERY_LEVEL_MIN = Int.MIN_VALUE
|
||||||
const val READINGS_PER_SAMPLE = 3
|
const val READINGS_PER_SAMPLE = 3
|
||||||
|
|
||||||
const val MINIMUM_BATTERY_LEVEL = 0
|
const val MINIMUM_BATTERY_LEVEL = 0
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ class SlideshowFragment : PreferenceFragmentCompat() {
|
|||||||
// App Version Preference
|
// App Version Preference
|
||||||
val appVersionPreference = Preference(requireContext())
|
val appVersionPreference = Preference(requireContext())
|
||||||
appVersionPreference.title = "App Version"
|
appVersionPreference.title = "App Version"
|
||||||
appVersionPreference.summary = getAppVersion(requireContext())
|
appVersionPreference.summary = getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + " ]"
|
||||||
|
|
||||||
preferenceScreen.addPreference(languagePreference)
|
preferenceScreen.addPreference(languagePreference)
|
||||||
preferenceScreen.addPreference(appVersionPreference)
|
preferenceScreen.addPreference(appVersionPreference)
|
||||||
@@ -63,4 +63,13 @@ class SlideshowFragment : PreferenceFragmentCompat() {
|
|||||||
"N/A"
|
"N/A"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun getAppEnvironment(context: Context): String {
|
||||||
|
return try {
|
||||||
|
val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
|
||||||
|
pInfo.packageName.substringAfterLast('.')
|
||||||
|
} catch (e: PackageManager.NameNotFoundException) {
|
||||||
|
"N/A"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user