rfct: Adapt toolbar access to Backpack library

cyb3rko · Mar 30, 2023 · 753b0e8 · 753b0e8
1 parent 0a1bad0
commit 753b0e8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/app/src/main/kotlin/com/cyb3rko/pincredible/MainActivity.kt b/app/src/main/kotlin/com/cyb3rko/pincredible/MainActivity.kt
@@ -19,17 +19,30 @@ package com.cyb3rko.pincredible
 import android.os.Bundle
 import androidx.navigation.findNavController
 import com.cyb3rko.backpack.activities.BackpackMainActivity
+import com.cyb3rko.backpack.interfaces.BackpackMain
 import com.cyb3rko.pincredible.databinding.ActivityMainBinding
+import com.google.android.material.appbar.MaterialToolbar
 
-class MainActivity : BackpackMainActivity() {
+class MainActivity : BackpackMainActivity(), BackpackMain {
     private lateinit var binding: ActivityMainBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Thread.setDefaultUncaughtExceptionHandler(ExceptionHandler(this))
-
         binding = ActivityMainBinding.inflate(layoutInflater).asContentView()
-        setSupportActionBar(binding.toolbar)
+        bindInterface(this)
+    }
+
+    override fun onPostCreate(savedInstanceState: Bundle?) {
+        super.onPostCreate(savedInstanceState)
         findNavController(R.id.nav_host_fragment_content_main).applyToActionBar()
     }
+
+    override fun getToolbar(): MaterialToolbar {
+        return binding.toolbar
+    }
+
+    override fun getVersionName(): String {
+        return getString(R.string.version_name)
+    }
 }
diff --git a/app/src/main/kotlin/com/cyb3rko/pincredible/fragments/HomeFragment.kt b/app/src/main/kotlin/com/cyb3rko/pincredible/fragments/HomeFragment.kt
@@ -32,7 +32,7 @@ import com.cyb3rko.backpack.crypto.CryptoManager
 import com.cyb3rko.backpack.crypto.CryptoManager.EnDecryptionException
 import com.cyb3rko.backpack.data.BuildInfo
 import com.cyb3rko.backpack.fragments.BackpackMainFragment
-import com.cyb3rko.backpack.interfaces.BackpackMain
+import com.cyb3rko.backpack.interfaces.BackpackMainView
 import com.cyb3rko.backpack.modals.ErrorDialog
 import com.cyb3rko.backpack.utils.hide
 import com.cyb3rko.backpack.utils.show
@@ -51,7 +51,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
 
-class HomeFragment : BackpackMainFragment(), BackpackMain {
+class HomeFragment : BackpackMainFragment(), BackpackMainView {
     private var _binding: FragmentHomeBinding? = null
 
     // This property is only valid between onCreateView and onDestroyView.
@@ -132,11 +132,11 @@ class HomeFragment : BackpackMainFragment(), BackpackMain {
 
     override fun onStart() {
         super.onStart()
-//        (requireActivity() as MainActivity).showSubtitle()
+        (requireActivity() as MainActivity).showSubtitle()
     }
 
     private fun hideSubtitle() {
-//        (requireActivity() as MainActivity).showSubtitle(false)
+        (requireActivity() as MainActivity).showSubtitle(false)
     }
 
     private fun readAndShowPins() {