Horis 1 tahun lalu
induk
melakukan
10aca054ff
1 mengubah file dengan 6 tambahan dan 0 penghapusan
  1. 6 0
      app/src/main/java/io/legado/app/base/BaseActivity.kt

+ 6 - 0
app/src/main/java/io/legado/app/base/BaseActivity.kt

@@ -12,6 +12,7 @@ import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.MotionEvent
 import android.view.View
 import android.view.View
 import android.widget.FrameLayout
 import android.widget.FrameLayout
+import androidx.activity.addCallback
 import androidx.annotation.RequiresApi
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
 import androidx.viewbinding.ViewBinding
@@ -87,6 +88,9 @@ abstract class BaseActivity<VB : ViewBinding>(
             findViewById<TitleBar>(R.id.title_bar)
             findViewById<TitleBar>(R.id.title_bar)
                 ?.onMultiWindowModeChanged(isInMultiWindowMode, fullScreen)
                 ?.onMultiWindowModeChanged(isInMultiWindowMode, fullScreen)
         }
         }
+        onBackPressedDispatcher.addCallback(this) {
+            finish()
+        }
         observeLiveBus()
         observeLiveBus()
         onActivityCreated(savedInstanceState)
         onActivityCreated(savedInstanceState)
     }
     }
@@ -138,10 +142,12 @@ abstract class BaseActivity<VB : ViewBinding>(
                 setTheme(R.style.AppTheme_Dark)
                 setTheme(R.style.AppTheme_Dark)
                 window.decorView.applyBackgroundTint(backgroundColor)
                 window.decorView.applyBackgroundTint(backgroundColor)
             }
             }
+
             Theme.Light -> {
             Theme.Light -> {
                 setTheme(R.style.AppTheme_Light)
                 setTheme(R.style.AppTheme_Light)
                 window.decorView.applyBackgroundTint(backgroundColor)
                 window.decorView.applyBackgroundTint(backgroundColor)
             }
             }
+
             else -> {
             else -> {
                 if (ColorUtils.isColorLight(primaryColor)) {
                 if (ColorUtils.isColorLight(primaryColor)) {
                     setTheme(R.style.AppTheme_Light)
                     setTheme(R.style.AppTheme_Light)