Enhance carinfo display

BimmerGestalt · Feb 5, 2025 · 1bddc5c · 1bddc5c
1 parent 2f8e3c9
commit 1bddc5c
Show file tree

Hide file tree

Showing 6 changed files with 184 additions and 134 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -50,7 +50,7 @@ android {
         compileSdk 34
         minSdkVersion 23
         targetSdkVersion 34
-        multiDexEnabled false
+        multiDexEnabled true
         versionCode androidGitVersion.code() + 1
         versionName androidGitVersion.name()
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -176,6 +176,7 @@ android {
         }
     }
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
@@ -266,6 +267,7 @@ repositories {
 }
 
 dependencies {
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.4"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"

diff --git a/app/src/main/java/me/hufman/androidautoidrive/carapp/L.kt b/app/src/main/java/me/hufman/androidautoidrive/carapp/L.kt
@@ -21,6 +21,7 @@ object L {
 	val CARINFO_TITLE_GPS by StringResourceDelegate("GPS Info")
 	val CARINFO_TITLE_WINDOWS by StringResourceDelegate("Windows Info")
 	val CARINFO_TITLE_AC by StringResourceDelegate("Air Condition Info")
+	val CARINFO_TITLE_TRAVEL by StringResourceDelegate("Travel Info")
 	val CARINFO_ENGINE by StringResourceDelegate("Engine")
 	val CARINFO_OIL by StringResourceDelegate("Oil")
 	val CARINFO_EXCHANGER by StringResourceDelegate("HVAC")
@@ -32,6 +33,7 @@ object L {
 	val CARINFO_ACC_BATTERY by StringResourceDelegate("Acc. Battery")
 	val CARINFO_EV_BATTERY by StringResourceDelegate("EV Battery")
 	val CARINFO_FUEL by StringResourceDelegate("Fuel")
+	val CARINFO_RANGE by StringResourceDelegate("Range")
 	val CARINFO_ACCEL by StringResourceDelegate("Accel")
 	val CARINFO_STEERING by StringResourceDelegate("Steering")
 	val CARINFO_RPM by StringResourceDelegate("RPM")
@@ -70,6 +72,8 @@ object L {
 	val CARINFO_GPSLONGITUDE by StringResourceDelegate("Long")
 	val CARINFO_STATE_OFF by StringResourceDelegate("Off")
 	val CARINFO_STATE_ON by StringResourceDelegate("On")
+	val CARINFO_NAV_DISTANCE by StringResourceDelegate("Distance")
+	val CARINFO_NAV_ETA by StringResourceDelegate("ETA")
 	val NOTIFICATIONS_TITLE by StringResourceDelegate("Notifications")
 	val NOTIFICATIONS_EMPTY_LIST by StringResourceDelegate("No Notifications")
 	val NOTIFICATION_CLEAR_ACTION by StringResourceDelegate("Clear")