Merge branch '3.5.1-hotfix'

kylecorry31 · Feb 8, 2022 · 353e6fe · 353e6fe
2 parents 99cd79b + f620a31
commit 353e6fe
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,7 +14,7 @@ android {
         minSdk = 23
         targetSdk = 30
         versionCode = 68
-        versionName = "3.6.0"
+        versionName = "3.5.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {
@@ -73,7 +73,7 @@ dependencies {
     implementation("androidx.room:room-runtime:2.4.1")
     implementation("androidx.room:room-ktx:2.4.1")
     implementation("androidx.lifecycle:lifecycle-service:2.4.0")
-    val cameraxVersion = "1.0.1"
+    val cameraxVersion = "1.1.0-beta01"
     implementation("androidx.camera:camera-camera2:$cameraxVersion")
     implementation("androidx.camera:camera-lifecycle:$cameraxVersion")
     implementation("androidx.camera:camera-view:1.1.0-beta01")
@@ -85,7 +85,7 @@ dependencies {
     implementation("com.github.kylecorry31:sol:5.7.0")
 
     // Andromeda
-    val andromedaVersion = "2.7.1"
+    val andromedaVersion = "2.7.2"
     implementation("com.github.kylecorry31.andromeda:core:$andromedaVersion")
     implementation("com.github.kylecorry31.andromeda:fragments:$andromedaVersion")
     implementation("com.github.kylecorry31.andromeda:forms:$andromedaVersion")

diff --git a/app/src/main/java/com/kylecorry/trail_sense/TrailSenseApplication.kt b/app/src/main/java/com/kylecorry/trail_sense/TrailSenseApplication.kt
@@ -2,11 +2,14 @@ package com.kylecorry.trail_sense
 
 import android.app.Application
 import android.util.Log
+import androidx.camera.camera2.Camera2Config
+import androidx.camera.core.CameraSelector
+import androidx.camera.core.CameraXConfig
 import com.kylecorry.trail_sense.settings.migrations.PreferenceMigrator
 import com.kylecorry.trail_sense.shared.database.RepoCleanupWorker
 import java.time.Duration
 
-class TrailSenseApplication : Application() {
+class TrailSenseApplication : Application(), CameraXConfig.Provider {
 
     override fun onCreate() {
         super.onCreate()
@@ -16,4 +19,10 @@ class TrailSenseApplication : Application() {
         RepoCleanupWorker.scheduler(this).interval(Duration.ofHours(6))
     }
 
+    override fun getCameraXConfig(): CameraXConfig {
+        return CameraXConfig.Builder.fromConfig(Camera2Config.defaultConfig())
+            .setAvailableCamerasLimiter(CameraSelector.DEFAULT_BACK_CAMERA)
+            .setMinimumLoggingLevel(Log.ERROR).build()
+    }
+
 }
diff --git a/fastlane/metadata/android/en-US/changelogs/68.txt b/fastlane/metadata/android/en-US/changelogs/68.txt
@@ -0,0 +1,12 @@
+Pedometer
+- Replace Speedometer / Odometer with Pedometer
+- Add pedometer distance travelled notification
+- Add pedometer based speedometer (current, average since reset)
+- Add stride length estimator to pedometer settings
+
+Navigation
+- Update layout
+- Update navigation sheet layout
+
+Misc
+- Bug fixes