Fix lint errors

ForceTower · Nov 17, 2023 · 5535266 · 5535266
1 parent c7309c6
commit 5535266
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 50 deletions.
diff --git a/app/src/main/java/com/forcetower/uefs/feature/demand/DemandActivity.kt b/app/src/main/java/com/forcetower/uefs/feature/demand/DemandActivity.kt
@@ -28,7 +28,6 @@ import androidx.databinding.DataBindingUtil
 import com.forcetower.core.lifecycle.EventObserver
 import com.forcetower.uefs.R
 import com.forcetower.uefs.databinding.ActivityDemandBinding
-import com.forcetower.uefs.feature.shared.NavigationFragment
 import com.forcetower.uefs.feature.shared.UActivity
 import com.forcetower.uefs.feature.shared.extensions.config
 import com.forcetower.uefs.feature.shared.extensions.inTransaction
@@ -44,7 +43,6 @@ class DemandActivity : UActivity() {
     lateinit var analytics: FirebaseAnalytics
 
     private lateinit var binding: ActivityDemandBinding
-    private lateinit var currentFragment: NavigationFragment
     private val viewModel: DemandViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -54,7 +52,6 @@ class DemandActivity : UActivity() {
         if (savedInstanceState == null) {
             supportFragmentManager.inTransaction {
                 val fragment = DemandOffersFragment()
-                currentFragment = fragment
                 add(R.id.fragment_container, fragment)
             }
             analytics.logEvent("demand_entered_screen", null)
@@ -63,12 +60,6 @@ class DemandActivity : UActivity() {
         viewModel.snackbarMessage.observe(this, EventObserver { showSnack(it) })
     }
 
-    override fun onBackPressed() {
-        if (!::currentFragment.isInitialized || !currentFragment.onBackPressed()) {
-            super.onBackPressed()
-        }
-    }
-
     override fun showSnack(string: String, duration: Int) {
         Timber.d("Show snack called on activity")
         val snack = Snackbar.make(binding.snack, string, duration)

diff --git a/app/src/main/java/com/forcetower/uefs/feature/demand/DemandOffersFragment.kt b/app/src/main/java/com/forcetower/uefs/feature/demand/DemandOffersFragment.kt
@@ -25,17 +25,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.RecyclerView
 import com.forcetower.uefs.R
 import com.forcetower.uefs.databinding.FragmentDemandOffersBinding
-import com.forcetower.uefs.feature.shared.NavigationFragment
 import com.forcetower.uefs.feature.shared.UFragment
 import com.forcetower.uefs.feature.shared.getPixelsFromDp
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class DemandOffersFragment : UFragment(), NavigationFragment {
+class DemandOffersFragment : UFragment() {
     private val viewModel: DemandViewModel by activityViewModels()
     private lateinit var binding: FragmentDemandOffersBinding
 
@@ -67,13 +65,12 @@ class DemandOffersFragment : UFragment(), NavigationFragment {
             )
         }
         viewModel.offers.observe(
-            viewLifecycleOwner,
-            Observer {
-                val data = it.data
-                if (data != null) {
-                    offersAdapter.currentList = data
-                }
+            viewLifecycleOwner
+        ) {
+            val data = it.data
+            if (data != null) {
+                offersAdapter.currentList = data
             }
-        )
+        }
     }
 }
diff --git a/app/src/main/java/com/forcetower/uefs/feature/shared/NavigationFragment.kt b/app/src/main/java/com/forcetower/uefs/feature/shared/NavigationFragment.kt
diff --git a/...features/event/src/main/java/dev/forcetower/event/feature/details/EventDetailsActivity.kt b/...features/event/src/main/java/dev/forcetower/event/feature/details/EventDetailsActivity.kt
@@ -24,6 +24,7 @@ import android.app.Activity
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
@@ -151,6 +152,15 @@ class EventDetailsActivity : UActivity() {
             }
             back.setOnClickListener { finishAfterTransition() }
         }
+
+        onBackPressedDispatcher.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    finishAfterTransition()
+                }
+            }
+        )
     }
 
     override fun onResume() {
@@ -163,10 +173,6 @@ class EventDetailsActivity : UActivity() {
         super.onPause()
     }
 
-    override fun onBackPressed() {
-        finishAfterTransition()
-    }
-
     fun applyFullImagePalette(palette: Palette?) {
         // color the ripple on the image spacer (default is grey)
         binding.imageSpacer.background = ViewUtils.createRipple(