Feature/small gui improvements

app/src/main/java/org/ttnmapper/phonesurveyor/ui/LinkChirpActivity.kt

@@ -25,6 +25,27 @@ class LinkChirpActivity : AppCompatActivity() {
 
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(SurveyorApp.instance)
 
+        // load old values as default values
+        if (sharedPreferences.getString(getString(R.string.PREF_NETWORK_SERVER),"").equals(getString(R.string.NS_CHIRP))) {
+            binding.editTextMqttUsername.setText(sharedPreferences.getString(getString(R.string.PREF_MQTT_USERNAME), ""))
+            binding.editTextMqttPassword.setText(sharedPreferences.getString(getString(R.string.PREF_MQTT_PASSWORD), ""))
+            binding.editTextMqttAddress.setText(sharedPreferences.getString(getString(R.string.PREF_MQTT_BROKER), ""))
+
+            var deviceEui: String = sharedPreferences.getString(getString(R.string.PREF_MQTT_TOPIC), "")!!
+            if (!deviceEui.equals("")) {
+                deviceEui = deviceEui.substring(0, deviceEui.length - 9)
+                deviceEui = deviceEui.substring(deviceEui.lastIndexOf('/') + 1)
+            }
+            binding.editTextDeviceEui.setText(deviceEui)
+
+            var appId: String = sharedPreferences.getString(getString(R.string.PREF_MQTT_TOPIC), "")!!
+            if (!appId.equals("")) {
+                appId = appId.substring(12)
+                appId = appId.substring(0, appId.indexOf('/'))
+            }
+            binding.editTextAppId.setText(appId)
+        }
+
         binding.buttonLinkDevice.setOnClickListener {
             val editor = sharedPreferences.edit()
 

app/src/main/java/org/ttnmapper/phonesurveyor/ui/LinkTtnV2Activity.kt

@@ -28,6 +28,19 @@ class LinkTtnV2Activity : AppCompatActivity() {
 
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(SurveyorApp.instance)
 
+        // load old values as default values
+        if (sharedPreferences.getString(getString(R.string.PREF_NETWORK_SERVER),"").equals(getString(R.string.NS_TTN_V2))) {
+            binding.editTextAppId.setText(sharedPreferences.getString(getString(R.string.PREF_MQTT_USERNAME), ""))
+            binding.editTextAccessKey.setText(sharedPreferences.getString(getString(R.string.PREF_MQTT_PASSWORD), ""))
+            binding.editTextMqttAddress.setText(sharedPreferences.getString(getString(R.string.PREF_MQTT_BROKER), ""))
+            var deviceId: String = sharedPreferences.getString(getString(R.string.PREF_MQTT_TOPIC), "")!!
+            if (!deviceId.equals("")) {
+                deviceId = deviceId.substring(0, deviceId.length - 3)
+                deviceId = deviceId.substring(deviceId.lastIndexOf('/') + 1)
+            }
+            binding.editTextDevId.setText(deviceId)
+        }
+
         binding.buttonLinkDevice.setOnClickListener {
             val editor = sharedPreferences.edit()
 

app/src/main/java/org/ttnmapper/phonesurveyor/ui/LinkTtsV3Activity.kt

@@ -23,6 +23,19 @@ class LinkTtsV3Activity : AppCompatActivity() {
 
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(SurveyorApp.instance)
 
+        // load old values as default values
+        if (sharedPreferences.getString(getString(R.string.PREF_NETWORK_SERVER),"").equals(getString(R.string.NS_TTS_V3))) {
+            binding.editTextUsername.setText(sharedPreferences.getString(getString(R.string.PREF_MQTT_USERNAME), ""))
+            binding.editTextPassword.setText(sharedPreferences.getString(getString(R.string.PREF_MQTT_PASSWORD), ""))
+            binding.editTextPublicAddress.setText(sharedPreferences.getString(getString(R.string.PREF_MQTT_BROKER), ""))
+            var deviceId: String = sharedPreferences.getString(getString(R.string.PREF_MQTT_TOPIC), "")!!
+            if (!deviceId.equals("")) {
+                deviceId = deviceId.substring(0, deviceId.length - 3)
+                deviceId = deviceId.substring(deviceId.lastIndexOf('/') + 1)
+            }
+            binding.editTextEndDeviceId.setText(deviceId)
+        }
+
         binding.buttonLinkDevice.setOnClickListener {
             val editor = sharedPreferences.edit()
 

app/src/main/java/org/ttnmapper/phonesurveyor/ui/MapFragment.kt

@@ -109,6 +109,7 @@ class MapFragment : Fragment()/*, View.OnTouchListener*/ {
                                 + mImageFilenameEnding)
                     }
                 })
+                this.setStatusMessageColor(Color.BLACK)
             }
 
             // Terrain
@@ -126,6 +127,7 @@ class MapFragment : Fragment()/*, View.OnTouchListener*/ {
                                 + mImageFilenameEnding)
                     }
                 })
+                this.setStatusMessageColor(Color.BLACK)
             }
 
             // Satellite
@@ -143,6 +145,7 @@ class MapFragment : Fragment()/*, View.OnTouchListener*/ {
                                 + mImageFilenameEnding)
                     }
                 })
+                this.setStatusMessageColor(Color.WHITE)
             }
 
             // OSM Mapnik
@@ -161,6 +164,7 @@ class MapFragment : Fragment()/*, View.OnTouchListener*/ {
                                 + mImageFilenameEnding)
                     }
                 })
+                this.setStatusMessageColor(Color.BLACK)
             }
 
             // OSM Mapnik greyscale
@@ -183,9 +187,10 @@ class MapFragment : Fragment()/*, View.OnTouchListener*/ {
                 // Apply grayscale filter
                 val matrix = ColorMatrix()
                 matrix.setSaturation(0.0f)
-                val filter = ColorMatrixColorFilter(matrix);
+                val filter = ColorMatrixColorFilter(matrix)
                 //map.getOverlayManager().getTilesOverlay().setColorFilter(TilesOverlay.INVERT_COLORS) //night mode
-                binding.map.getOverlayManager().getTilesOverlay().setColorFilter(filter);
+                binding.map.getOverlayManager().getTilesOverlay().setColorFilter(filter)
+                this.setStatusMessageColor(Color.BLACK)
             }
 
             // OSM Mapnik night mode
@@ -207,6 +212,7 @@ class MapFragment : Fragment()/*, View.OnTouchListener*/ {
 
                 // Apply grayscale filter
                 binding.map.getOverlayManager().getTilesOverlay().setColorFilter(TilesOverlay.INVERT_COLORS) //night mode
+                this.setStatusMessageColor(Color.WHITE)
             }
         }
 
@@ -445,4 +451,13 @@ class MapFragment : Fragment()/*, View.OnTouchListener*/ {
         binding.textViewGPSStatus.setText(message)
     }
 
+    fun setStatusMessageColor(color: Int) {
+        if(_binding == null) {
+            Log.w(TAG, "Binding is null, so fragment does not exist")
+            return
+        }
+        binding.textViewMQTTStatus.setTextColor(color)
+        binding.textViewGPSStatus.setTextColor(color)
+    }
+
 }

app/src/main/java/org/ttnmapper/phonesurveyor/ui/SessionListActivity.kt

@@ -149,19 +149,16 @@ class SessionListActivity : AppCompatActivity() {
     }
 
     private fun refreshUi() {
-
-        // Select new total count
-        val count = AppAggregate.db?.linkDao()?.getSessionCount()
-        runOnUiThread {
-            binding.textViewNumberSessions.text = "Number of recorded sessions: " + count.toString()
+        var sessionLinkCounts: List<SessionLinkCount>? = AppAggregate.db?.linkDao()?.getSessions()
+        if(sessionLinkCounts == null) {
+            sessionLinkCounts = emptyList()
         }
 
-        // Update list in UI
-//        val testList = AppAggregate.db?.linkDao()?.getSessionIDs()
+        // Select new total count and update list
         runOnUiThread {
-//            sessionAdapter.updateDataList(testList!!)
+            binding.textViewNumberSessions.text = "Number of recorded sessions: ${sessionLinkCounts.count()}"
+            sessionAdapter.updateDataList(sessionLinkCounts)
         }
-
     }
 
     private fun exportSession(sessionId: String) {