Bug fixes and removal of redundant resources

Fixed: - permission handler not initialized - location was null in GPS handler - alarm handler for Android S update - storage navigation from advanced fragment - other minor issues Added: - build type to ignore firebase - update to Kotlin 1.6.10 - moved from secure.properties to local.properties and secret gradle
Foxpace · Dec 19, 2021 · dc224d5 · dc224d5
1 parent 230f38a
commit dc224d5
Show file tree

Hide file tree

Showing 71 changed files with 186 additions and 784 deletions.
diff --git a/CountDownDialog/build.gradle b/CountDownDialog/build.gradle
@@ -18,6 +18,9 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        nfrelease{
+            initWith release
+        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/CountDownDialog/src/main/AndroidManifest.xml b/CountDownDialog/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.motionapps.countdowndialog">
+<manifest package="com.motionapps.countdowndialog">
 
     <application>
     </application>

diff --git a/WearOsLib/build.gradle b/WearOsLib/build.gradle
@@ -18,6 +18,9 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        nfrelease{
+            initWith debug
+        }
     }
 
     compileOptions {

diff --git a/WearOsLib/src/main/res/font/roboto_family.xml b/WearOsLib/src/main/res/font/roboto_family.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+<font-family xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
        <font
            android:fontStyle="normal"
            android:fontWeight="400"
-           android:font="@font/roboto_regular" />
+           android:font="@font/roboto_regular"
+           tools:targetApi="o" />
 
 </font-family>
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,35 +4,38 @@ apply plugin: 'kotlin-android'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
+
+if (getGradle().getStartParameter().getTaskRequests().toString().contains("Release")) {
+    apply plugin: 'com.google.firebase.crashlytics'
+}
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "30.0.2"
+    buildToolsVersion '31.0.0'
 
 
     defaultConfig {
         applicationId "motionapps.sensorbox"
         minSdkVersion 19
         targetSdkVersion 31
-        versionCode 63
-        versionName "4.2.4"
+        versionCode 65
+        versionName "4.2.5"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        def secureProps = new Properties()
-        if (file("../secure.properties").exists()) {
-            file("../secure.properties")?.withInputStream { secureProps.load(it) }
-        }
-        resValue "string", "maps_api_key", (secureProps.getProperty("MAPS_API_KEY") ?: "")
+        signingConfig signingConfigs.debug
     }
 
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+
+        nfrelease{
+            initWith release
+        }
     }
 
 
@@ -76,8 +79,8 @@ dependencies {
     implementation 'com.google.android.gms:play-services-wearable:17.1.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
 
-    implementation 'com.google.firebase:firebase-analytics-ktx:20.0.1'
-    implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.6'
+    releaseImplementation 'com.google.firebase:firebase-analytics-ktx:20.0.2'
+    releaseImplementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.6'
 
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2-native-mt'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2-native-mt'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -143,7 +143,10 @@
 
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/maps_api_key" />
+            android:value="${MAPS_API_KEY}" />
+        <property
+            android:name="android.content.MEDIA_CAPABILITIES"
+            android:resource="@xml/media_capabilities" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/motionapps/sensorbox/activities/MeasurementActivity.kt b/app/src/main/java/com/motionapps/sensorbox/activities/MeasurementActivity.kt
@@ -1,5 +1,6 @@
 package com.motionapps.sensorbox.activities
 
+import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -206,7 +207,7 @@ class MeasurementActivity : AppCompatActivity() {
             when(measurementState){
                 is MeasurementStates.OnTick -> {
                     findViewById<TextView>(R.id.measurement_time)?.let {
-                        it.text = "${measurementState.tick} s"
+                        it.text = getString(R.string.second_formater).format(measurementState.tick)
                     }
                 }
                 is MeasurementStates.OnEndMeasurement ->{
@@ -334,6 +335,7 @@ class MeasurementActivity : AppCompatActivity() {
     /**
      * Annotation dialog to add notes during measurement
      */
+    @SuppressLint("CheckResult")
     private fun showDialogAnnotations(){
         // gets info from sharedPreferences - customized in settings
         val preferences = PreferenceManager.getDefaultSharedPreferences(this@MeasurementActivity)

diff --git a/app/src/main/java/com/motionapps/sensorbox/fragments/HomeFragment.kt b/app/src/main/java/com/motionapps/sensorbox/fragments/HomeFragment.kt
@@ -47,7 +47,7 @@ open class HomeFragment : Fragment() {
     private var dialog: MaterialDialog? = null
     private val wearOsViews: ArrayList<View> = ArrayList() // storing Wear Os views - can be deleted
     private val mainViewModel: MainViewModel by viewModels(ownerProducer = { requireActivity() })
-    protected lateinit var permissionHandler: PermissionHandler
+    protected var permissionHandler: PermissionHandler? = null
     private var wearShown = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -106,19 +106,21 @@ open class HomeFragment : Fragment() {
             // handling the button to add or remove to sensor for measurement
             // sensorViewHandler manages all sensors to measure
             imageButtons[i].setOnClickListener {
-
-                if(permissionHandler.checkHeartRateSensor(this, sensorsNeeds[i].id )){
-                    return@setOnClickListener
-                }
-
-                sensorViewHandler.sensorsToRecord[sensorsNeeds[i].id] =
-                    !sensorViewHandler.sensorsToRecord[sensorsNeeds[i].id]!!
-                if (sensorViewHandler.sensorsToRecord[sensorsNeeds[i].id]!!) {
-                    imageButtons[i].setImageResource(R.drawable.ic_ok)
-                } else {
-                    imageButtons[i].setImageResource(R.drawable.ic_circle)
+                permissionHandler?.let { permissionHandler ->
+
+                    if(permissionHandler.checkHeartRateSensor(this, sensorsNeeds[i].id )){
+                        return@setOnClickListener
+                    }
+
+                    sensorViewHandler.sensorsToRecord[sensorsNeeds[i].id] =
+                        !sensorViewHandler.sensorsToRecord[sensorsNeeds[i].id]!!
+                    if (sensorViewHandler.sensorsToRecord[sensorsNeeds[i].id]!!) {
+                        imageButtons[i].setImageResource(R.drawable.ic_ok)
+                    } else {
+                        imageButtons[i].setImageResource(R.drawable.ic_circle)
+                    }
+                    checkSensorsToMeasure()
                 }
-                checkSensorsToMeasure()
             }
 
             // for refresh reasons - button is updated by sensorViewHandler from ViewModel
@@ -185,11 +187,13 @@ open class HomeFragment : Fragment() {
             }
         } else {
             infoButton.setOnClickListener {
-                if(permissionHandler.checkHeartRateSensor(this, sensorNeeds.id)){
-                    return@setOnClickListener
+                permissionHandler?.let { permissionHandler ->
+                    if (permissionHandler.checkHeartRateSensor(this, sensorNeeds.id)) {
+                        return@setOnClickListener
+                    }
+                    val action: NavDirections = HomeFragmentDirections.homeInfoAction(resourceName)
+                    Navigation.findNavController(requireView()).navigate(action)
                 }
-                val action: NavDirections = HomeFragmentDirections.homeInfoAction(resourceName)
-                Navigation.findNavController(requireView()).navigate(action)
             }
         }
 
@@ -214,12 +218,13 @@ open class HomeFragment : Fragment() {
             val infoButton: ImageButton = view.findViewById(R.id.sensorrow_info)
 
             infoButton.setOnClickListener {
-
-                if(!permissionHandler.checkGPSPermission(this)){
-                    return@setOnClickListener
+                permissionHandler?.let { permissionHandler ->
+                    if(!permissionHandler.checkGPSPermission(this)){
+                        return@setOnClickListener
+                    }
+                    val action: NavDirections = HomeFragmentDirections.homeInfoAction(SensorNeeds.GPS)
+                    Navigation.findNavController(requireView()).navigate(action)
                 }
-                val action: NavDirections = HomeFragmentDirections.homeInfoAction(SensorNeeds.GPS)
-                Navigation.findNavController(requireView()).navigate(action)
             }
 
             icon.setImageResource(R.drawable.ic_gps)
@@ -232,19 +237,19 @@ open class HomeFragment : Fragment() {
             }
 
             imageButton.setOnClickListener {
-
-                if(!permissionHandler.checkGPSPermission(this)){
-                    return@setOnClickListener
-                }
-
-                sensorViewHandler.gpsMeasurement = !sensorViewHandler.gpsMeasurement
-                if (sensorViewHandler.gpsMeasurement) {
-                    imageButton.setImageResource(R.drawable.ic_ok)
-                } else {
-                    imageButton.setImageResource(R.drawable.ic_circle)
+                permissionHandler?.let { permissionHandler ->
+                    if(!permissionHandler.checkGPSPermission(this)){
+                        return@setOnClickListener
+                    }
+
+                    sensorViewHandler.gpsMeasurement = !sensorViewHandler.gpsMeasurement
+                    if (sensorViewHandler.gpsMeasurement) {
+                        imageButton.setImageResource(R.drawable.ic_ok)
+                    } else {
+                        imageButton.setImageResource(R.drawable.ic_circle)
+                    }
+                    checkSensorsToMeasure()
                 }
-                checkSensorsToMeasure()
-
             }
             container?.addView(view)
         }
@@ -260,7 +265,11 @@ open class HomeFragment : Fragment() {
     open fun initMainButton() {
         mainButton?.setOnClickListener {
 
-            if(StorageFunctions.checkStorageAccess(this, permissionHandler)){
+            if(permissionHandler == null){
+                return@setOnClickListener
+            }
+
+            if(StorageFunctions.checkStorageAccess(this, permissionHandler!!)){
                 return@setOnClickListener
             }
 
@@ -313,9 +322,7 @@ open class HomeFragment : Fragment() {
         super.onDestroyView()
         removeWearOs()
 
-        if(this::permissionHandler.isInitialized){
-            permissionHandler.onDestroy()
-        }
+        permissionHandler?.onDestroy()
 
         dialog?.dismiss()
         dialog = null

diff --git a/app/src/main/java/com/motionapps/sensorbox/fragments/advanced/AdvancedFragment.kt b/app/src/main/java/com/motionapps/sensorbox/fragments/advanced/AdvancedFragment.kt
@@ -33,8 +33,8 @@ class AdvancedFragment : HomeFragment() {
                         )
                     )
                     return@setOnClickListener
-                } else if(Build.VERSION_CODES.M <= Build.VERSION.SDK_INT){
-                    permissionHandler.showDialogStorage(this)
+                } else if(Build.VERSION_CODES.M <= Build.VERSION.SDK_INT && permissionHandler != null){
+                    permissionHandler?.showDialogStorage(this)
                     return@setOnClickListener
                 }
             }

diff --git a/app/src/main/java/com/motionapps/sensorbox/intro/IntroActivity.kt b/app/src/main/java/com/motionapps/sensorbox/intro/IntroActivity.kt
@@ -1,6 +1,5 @@
 package com.motionapps.sensorbox.intro
 
-import android.Manifest
 import android.content.Intent
 import android.graphics.Color
 import android.os.Build

diff --git a/app/src/main/java/com/motionapps/sensorbox/uiHandlers/GraphUpdater.kt b/app/src/main/java/com/motionapps/sensorbox/uiHandlers/GraphUpdater.kt
@@ -77,7 +77,7 @@ open class GraphUpdater @Inject constructor(): SensorEventListener{
         }
     }
 
-    fun restart(){
+    private fun restart(){
         for(series in chartData){
             series.resetData(arrayOf(DataPoint(0.0, 0.0)))
         }

diff --git a/app/src/main/java/com/motionapps/sensorbox/uiHandlers/SensorViewHandler.kt b/app/src/main/java/com/motionapps/sensorbox/uiHandlers/SensorViewHandler.kt
@@ -3,7 +3,6 @@ package com.motionapps.sensorbox.uiHandlers
 import android.content.Context
 import com.motionapps.sensorservices.types.SensorNeeds
 import dagger.hilt.android.qualifiers.ActivityContext
-import dagger.hilt.android.scopes.ActivityScoped
 import dagger.hilt.android.scopes.ViewModelScoped
 import javax.inject.Inject
 

diff --git a/app/src/main/java/com/motionapps/sensorbox/viewmodels/MainViewModel.kt b/app/src/main/java/com/motionapps/sensorbox/viewmodels/MainViewModel.kt
@@ -41,7 +41,6 @@ import javax.inject.Inject
 
 @HiltViewModel
 class MainViewModel @Inject constructor(
-    private val savedStateHandle: SavedStateHandle,
     private val repository: MainRepository
 ) : ViewModel(), CountDownInterface, WearOsListener {
 

diff --git a/app/src/main/java/com/motionapps/sensorbox/viewmodels/MeasurementViewModel.kt b/app/src/main/java/com/motionapps/sensorbox/viewmodels/MeasurementViewModel.kt
@@ -21,7 +21,6 @@ import com.motionapps.wearoslib.WearOsConstants
 import com.motionapps.wearoslib.WearOsListener
 import com.motionapps.wearoslib.WearOsStates
 import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.scopes.ActivityRetainedScoped
 import kotlinx.coroutines.*
 import javax.inject.Inject
 

diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml