Преглед на файлове

Moved callbacks setup to view

Vadik Sirekanyan преди 7 години
родител
ревизия
25400366af

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

@@ -7,7 +7,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.provider.Settings
 import android.support.v7.app.AlertDialog
-import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.Toolbar
 import android.view.MenuItem
 import com.sirekanyan.knigopis.BuildConfig
@@ -30,7 +29,6 @@ import com.sirekanyan.knigopis.model.CurrentTab.NOTES_TAB
 import com.sirekanyan.knigopis.repository.*
 import com.tbruyelle.rxpermissions2.RxPermissions
 import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.books_page.*
 import org.koin.android.ext.android.inject
 
 private const val ULOGIN_REQUEST_CODE = 0
@@ -73,17 +71,6 @@ class MainActivity : BaseActivity(), Router, MainPresenter.Router {
         refresh(currentTab ?: defaultTab)
         initNavigationView()
         initToolbar(toolbar)
-        booksRecyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                when {
-                    dy > 0 -> addBookButton.hide()
-                    dy < 0 -> addBookButton.show()
-                }
-            }
-        })
-        swipeRefresh.setOnRefreshListener {
-            refresh(isForce = true)
-        }
     }
 
     override fun onStart() {

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

@@ -82,6 +82,10 @@ class MainPresenterImpl(
         router.openNewBookScreen()
     }
 
+    override fun onRefreshSwiped() {
+        router.forceRefresh()
+    }
+
     override fun onBookClicked(book: BookDataModel) {
         router.openBookScreen(book)
     }

+ 10 - 0
app/src/main/java/com/sirekanyan/knigopis/feature/MainView.kt

@@ -45,6 +45,7 @@ interface MainView : BooksView, UsersView, NotesView {
         fun onAboutOptionClicked()
         fun onDarkThemeOptionClicked(isChecked: Boolean)
         fun onAddBookClicked()
+        fun onRefreshSwiped()
     }
 
 }
@@ -98,6 +99,15 @@ class MainViewImpl(
         addBookButton.setOnClickListener {
             callbacks.onAddBookClicked()
         }
+        booksRecyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                when {
+                    dy > 0 -> addBookButton.hide()
+                    dy < 0 -> addBookButton.show()
+                }
+            }
+        })
+        swipeRefresh.setOnRefreshListener(callbacks::onRefreshSwiped)
     }
 
     override fun showAboutDialog() {