From 6c37b451c3c2001359722568047772ceab5149f4 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Sun, 16 Oct 2022 19:16:33 -0300
Subject: [PATCH] clean up view bindings

---
 .../java/com/geeksville/mesh/MainActivity.kt   | 18 ++++--------------
 .../java/com/geeksville/mesh/ui/MapFragment.kt | 10 +++-------
 app/src/main/res/layout/map_view.xml           |  1 +
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
index 8d728cd34..aa02eca0f 100644
--- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt
+++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
@@ -13,7 +13,6 @@ import android.text.method.LinkMovementMethod
 import android.view.Menu
 import android.view.MenuItem
 import android.view.MotionEvent
-import android.view.View
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
@@ -58,7 +57,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import java.nio.charset.Charset
 import java.text.DateFormat
-import java.util.*
+import java.util.Date
 import javax.inject.Inject
 
 /*
@@ -303,8 +302,7 @@ class MainActivity : BaseActivity(), Logging {
     }
 
     private fun initToolbar() {
-        val toolbar =
-            findViewById<View>(R.id.toolbar) as Toolbar
+        val toolbar = binding.toolbar as Toolbar
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayShowTitleEnabled(false)
     }
@@ -497,11 +495,7 @@ class MainActivity : BaseActivity(), Logging {
 
     private fun showSnackbar(msgId: Int) {
         try {
-            Snackbar.make(
-                findViewById(android.R.id.content),
-                msgId,
-                Snackbar.LENGTH_LONG
-            ).show()
+            Snackbar.make(binding.root, msgId, Snackbar.LENGTH_LONG).show()
         } catch (ex: IllegalStateException) {
             errormsg("Snackbar couldn't find view for msgId $msgId")
         }
@@ -509,11 +503,7 @@ class MainActivity : BaseActivity(), Logging {
 
     private fun showSnackbar(msg: String) {
         try {
-            Snackbar.make(
-                findViewById(android.R.id.content),
-                msg,
-                Snackbar.LENGTH_INDEFINITE
-            )
+            Snackbar.make(binding.root, msg, Snackbar.LENGTH_INDEFINITE)
                 .apply { view.findViewById<TextView>(R.id.snackbar_text).isSingleLine = false }
                 .setAction(R.string.okay) {
                     // dismiss
diff --git a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
index 4b44917a6..5bb19681c 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
@@ -24,7 +24,6 @@ import com.geeksville.mesh.model.map.CustomOverlayManager
 import com.geeksville.mesh.model.map.CustomTileSource
 import com.geeksville.mesh.util.formatAgo
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.floatingactionbutton.FloatingActionButton
 import dagger.hilt.android.AndroidEntryPoint
 import org.osmdroid.api.IMapController
 import org.osmdroid.config.Configuration
@@ -54,7 +53,6 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
     // UI Elements
     private lateinit var binding: MapViewBinding
     private lateinit var map: MapView
-    private lateinit var downloadBtn: FloatingActionButton
     private lateinit var cacheEstimate: TextView
     private lateinit var executeJob: Button
     private var downloadPrompt: AlertDialog? = null
@@ -92,8 +90,6 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
         binding = MapViewBinding.inflate(inflater)
-        downloadBtn = binding.root.findViewById(R.id.downloadButton)
-        binding.cacheLayout.visibility = View.GONE
         return binding.root
     }
 
@@ -134,7 +130,7 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
             }
             zoomToNodes(mapController)
         }
-        downloadBtn.setOnClickListener(this)
+        binding.downloadButton.setOnClickListener(this)
     }
 
     override fun onClick(v: View) {
@@ -384,9 +380,9 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
 
     private fun renderDownloadButton() {
         if (!(map.tileProvider.tileSource as OnlineTileSourceBase).tileSourcePolicy.acceptsBulkDownload()) {
-            downloadBtn.hide()
+            binding.downloadButton.hide()
         } else {
-            downloadBtn.show()
+            binding.downloadButton.show()
         }
     }
 
diff --git a/app/src/main/res/layout/map_view.xml b/app/src/main/res/layout/map_view.xml
index 85597ab6d..96d4a9543 100644
--- a/app/src/main/res/layout/map_view.xml
+++ b/app/src/main/res/layout/map_view.xml
@@ -28,6 +28,7 @@
         android:id="@+id/cache_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">