Merge branch 'feature/restore_feed_list' into develop

app/src/main/java/com/biganto/visual/roompark/presentation/screen/feed_list/ScreenController.kt

@@ -89,7 +89,6 @@ class ArticlesScreenController  :
     lateinit var emptyListNotice: MaterialTextView
 
 
-
     private fun setToolbar() {
         articlesRecyclerView.isNestedScrollingEnabled = false
 

app/src/main/java/com/biganto/visual/roompark/presentation/screen/feed_list/ScreenPresenter.kt

@@ -54,18 +54,18 @@ class ArticlesScreenPresenter @Inject constructor(
             }
 
         val fetchSubscription = interactor.getSubscriptions(feedId)
-            .doOnNext { Timber.w("got smthng: $it") }
             .doAfterNext { restoreModel.sub = it }
             .map<ArticlesScreenViewState> { ArticlesScreenViewState.SubscriptionStatus(it.state) }
             .startWith(Observable.just<ArticlesScreenViewState>(ArticlesScreenViewState.Idle()))
 
         val prefetchCards = interactor.fetchArticles(feedId)
+            .doOnNext { restoreModel.articles.addAll(it.articles) }
             .map<ArticlesScreenViewState> { ArticlesScreenViewState.ArticlesLoaded(it.articles) }
             .startWith(Observable.just<ArticlesScreenViewState>(ArticlesScreenViewState.Idle()))
 
         val getNewArticlesPage = intent(ArticlesScreen::requsetsNewArticles)
-            .flatMap {
-                interactor.fetchArticlesPage(feedId, FEED_PAGE_SIZE, it)
+            .flatMap {currentItem ->
+                interactor.fetchArticlesPage(feedId, FEED_PAGE_SIZE, currentItem)
                     .map<ArticlesScreenViewState> { articlePage ->
                         articlePage.articles
                             .asSequence()

app/src/main/java/com/biganto/visual/roompark/presentation/screen/feed_list/ScreenViewState.kt

@@ -18,3 +18,4 @@ sealed class ArticlesScreenViewState : BigantoBaseViewState() {
     class SubscriptionStatus(val subState: Boolean) : ArticlesScreenViewState()
     class SubscriptionError(val subState: Boolean) : ArticlesScreenViewState()
 }
+

app/src/main/java/com/biganto/visual/roompark/presentation/screen/to_flat/ScreenController.kt

@@ -17,6 +17,7 @@ import com.bluelinelabs.conductor.changehandler.FadeChangeHandler
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.textfield.TextInputLayout
+import com.jakewharton.rxbinding3.material.selections
 import com.jakewharton.rxbinding3.view.clicks
 import com.jakewharton.rxbinding3.view.keys
 import com.jakewharton.rxbinding3.widget.afterTextChangeEvents
@@ -55,10 +56,13 @@ class FindFlatScreenController  :
 
     override fun getFlat(): Observable<FlatRequestModel> =
         flatNumberEditor.afterTextChangeEvents()// keys{ it.keyCode == KeyEvent.KEYCODE_ENTER }
+            .map { 1 }
+            .mergeWith(
+                flatTabs.selections().map { 1 }
+            )
             .filter { flatNumberInput.editText?.text?.isNotEmpty()?:false }
-            .map {
-                flatModel
-            }
+            .mergeWith(flatTabs.clicks().map { 1 })
+            .map {flatModel}
             .debounce (120,TimeUnit.MILLISECONDS)
             .observeOn(AndroidSchedulers.mainThread())