瀏覽代碼

Updated appcompat library to 1.4.0

Vadik Sirekanyan 4 年之前
父節點
當前提交
87225ea0af
共有 2 個文件被更改,包括 7 次插入13 次删除
  1. 1 1
      app/build.gradle.kts
  2. 6 12
      app/src/main/java/com/sirekanyan/knigopis/feature/MainActivity.kt

+ 1 - 1
app/build.gradle.kts

@@ -43,7 +43,7 @@ android {
 
 dependencies {
     // androidx libraries
-    implementation("androidx.appcompat:appcompat:1.2.0")
+    implementation("androidx.appcompat:appcompat:1.4.0")
     implementation("androidx.constraintlayout:constraintlayout:2.0.1")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("androidx.browser:browser:1.2.0")

+ 6 - 12
app/src/main/java/com/sirekanyan/knigopis/feature/MainActivity.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.content.Intent.*
 import android.net.Uri
 import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.BaseActivity
 import com.sirekanyan.knigopis.common.extensions.app
@@ -24,8 +25,6 @@ import com.sirekanyan.knigopis.feature.users.getMainState
 import com.sirekanyan.knigopis.feature.users.saveMainState
 import com.sirekanyan.knigopis.model.*
 
-private const val BOOK_REQUEST_CODE = 1
-
 fun Context.startMainActivity() {
     startActivity(
         Intent(this, MainActivity::class.java)
@@ -83,14 +82,9 @@ class MainActivity : BaseActivity(),
         presenter.state?.let { outState.saveMainState(it) }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        when (requestCode) {
-            BOOK_REQUEST_CODE -> {
-                if (resultCode == RESULT_OK) {
-                    presenter.onBookScreenResult()
-                }
-            }
+    private val resultLauncher = registerForActivityResult(StartActivityForResult()) { result ->
+        if (result.resultCode == RESULT_OK) {
+            presenter.onBookScreenResult()
         }
     }
 
@@ -109,11 +103,11 @@ class MainActivity : BaseActivity(),
     }
 
     override fun openNewBookScreen() {
-        startActivityForResult(createBookIntent(EMPTY_BOOK), BOOK_REQUEST_CODE)
+        resultLauncher.launch(createBookIntent(EMPTY_BOOK))
     }
 
     override fun openBookScreen(book: BookDataModel) {
-        startActivityForResult(createBookIntent(book.toEditModel()), BOOK_REQUEST_CODE)
+        resultLauncher.launch(createBookIntent(book.toEditModel()))
     }
 
     override fun openUserScreen(user: UserModel) {