|
@@ -6,6 +6,7 @@ import android.content.Intent
|
|
|
import android.content.Intent.*
|
|
import android.content.Intent.*
|
|
|
import android.net.Uri
|
|
import android.net.Uri
|
|
|
import android.os.Bundle
|
|
import android.os.Bundle
|
|
|
|
|
+import androidx.activity.OnBackPressedCallback
|
|
|
import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
|
|
import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
|
|
|
import com.sirekanyan.knigopis.R
|
|
import com.sirekanyan.knigopis.R
|
|
|
import com.sirekanyan.knigopis.common.BaseActivity
|
|
import com.sirekanyan.knigopis.common.BaseActivity
|
|
@@ -40,6 +41,13 @@ class MainActivity : BaseActivity(),
|
|
|
|
|
|
|
|
private val presenter by lazy { providePresenter() }
|
|
private val presenter by lazy { providePresenter() }
|
|
|
private val api by lazy { app.endpoint }
|
|
private val api by lazy { app.endpoint }
|
|
|
|
|
+ private val onBackPressedCallback = object : OnBackPressedCallback(true) {
|
|
|
|
|
+ override fun handleOnBackPressed() {
|
|
|
|
|
+ if (!presenter.back()) {
|
|
|
|
|
+ finish()
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
setTheme(R.style.Theme_Knigopis)
|
|
setTheme(R.style.Theme_Knigopis)
|
|
@@ -47,6 +55,7 @@ class MainActivity : BaseActivity(),
|
|
|
setContentView(R.layout.activity_main)
|
|
setContentView(R.layout.activity_main)
|
|
|
val restoredCurrentTab = savedInstanceState?.getMainState()?.currentTab
|
|
val restoredCurrentTab = savedInstanceState?.getMainState()?.currentTab
|
|
|
presenter.init(restoredCurrentTab)
|
|
presenter.init(restoredCurrentTab)
|
|
|
|
|
+ onBackPressedDispatcher.addCallback(onBackPressedCallback)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
override fun onStart() {
|
|
override fun onStart() {
|
|
@@ -88,12 +97,6 @@ class MainActivity : BaseActivity(),
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- override fun onBackPressed() {
|
|
|
|
|
- if (!presenter.back()) {
|
|
|
|
|
- super.onBackPressed()
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
override fun openLoginScreen() {
|
|
override fun openLoginScreen() {
|
|
|
startLoginActivity()
|
|
startLoginActivity()
|
|
|
}
|
|
}
|