Bladeren bron

Rearranged main router methods

Vadik Sirekanyan 7 jaren geleden
bovenliggende
commit
f635a42ef3

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

@@ -101,6 +101,20 @@ class MainActivity : BaseActivity(), MainPresenter.Router {
         }
     }
 
+    override fun onBackPressed() {
+        if (!presenter.back()) {
+            super.onBackPressed()
+        }
+    }
+
+    override fun openProfileScreen() {
+        startActivity(createProfileIntent())
+    }
+
+    override fun openNewBookScreen() {
+        startActivityForResult(createNewBookIntent(), BOOK_REQUEST_CODE)
+    }
+
     override fun openBookScreen(book: BookDataModel) {
         startActivityForResult(createEditBookIntent(book), BOOK_REQUEST_CODE)
     }
@@ -113,24 +127,10 @@ class MainActivity : BaseActivity(), MainPresenter.Router {
         startActivityOrNull(Intent(ACTION_VIEW, uri)) ?: toast(R.string.users_info_no_browser)
     }
 
-    override fun onBackPressed() {
-        if (!presenter.back()) {
-            super.onBackPressed()
-        }
-    }
-
-    override fun openProfileScreen() {
-        startActivity(createProfileIntent())
-    }
-
     override fun reopenScreen() {
         recreate()
     }
 
-    override fun openNewBookScreen() {
-        startActivityForResult(createNewBookIntent(), BOOK_REQUEST_CODE)
-    }
-
     override fun login() {
         RxPermissions(this).requestEach(READ_PHONE_STATE).bind({
             when {

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/feature/MainPresenter.kt

@@ -28,13 +28,13 @@ interface MainPresenter : Presenter {
     fun showPage(tab: CurrentTab, isForce: Boolean)
 
     interface Router {
-        fun login()
         fun openProfileScreen()
-        fun reopenScreen()
         fun openNewBookScreen()
         fun openBookScreen(book: BookDataModel)
         fun openUserScreen(id: String, name: String, image: String?)
         fun openWebPage(uri: Uri)
+        fun reopenScreen()
+        fun login()
     }
 }