Refresh books list when new book was added or modified

app/src/main/java/me/vadik/knigopis/BookActivity.kt

@@ -92,7 +92,10 @@ class BookActivity : AppCompatActivity() {
                 notesTextArea.text.toString()
             ))
           }.io2main().subscribe(
-              { finish() },
+              {
+                setResult(RESULT_OK)
+                finish()
+              },
               { logError("cannot post planned book", it) }
           )
           true

app/src/main/java/me/vadik/knigopis/MainActivity.kt

@@ -23,8 +23,9 @@ import me.vadik.knigopis.model.*
 import me.vadik.knigopis.model.CurrentTab.*
 
 private const val ULOGIN_REQUEST_CODE = 0
+private const val BOOK_REQUEST_CODE = 1
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(), Router {
 
   private val api by lazy { app().baseApi.create(Endpoint::class.java) }
   private val auth by lazy { KAuthImpl(applicationContext, api) as KAuth }
@@ -33,12 +34,14 @@ class MainActivity : AppCompatActivity() {
     BooksAdapter(BookCoverSearchImpl(
         app().imageApi.create(ImageEndpoint::class.java),
         getSharedPreferences("knigopis", MODE_PRIVATE)
-    ), api, auth)
+    ), api, auth, this)
   }
   private val allBooksAdapter by lazy { booksAdapter.build(allBooks) }
+  private val navigation by lazy { findView<BottomNavigationView>(R.id.navigation) }
   private val fab by lazy { findView<FloatingActionButton>(R.id.add_book_button) }
   private val progressBar by lazy { findView<View>(R.id.books_progress_bar) }
   private val booksNotFoundView by lazy { findView<View>(R.id.books_not_found) }
+  private var needUpdate = false
   private lateinit var booksRecyclerView: RecyclerView
   private lateinit var loginOption: MenuItem
   private lateinit var currentTab: CurrentTab
@@ -47,10 +50,10 @@ class MainActivity : AppCompatActivity() {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_main)
     booksRecyclerView = initRecyclerView(findView(R.id.books_recycler_view))
-    initNavigationView(findView(R.id.navigation))
+    initNavigationView()
     initToolbar(findView(R.id.toolbar))
     fab.setOnClickListener {
-      startActivity(createNewBookIntent())
+      startActivityForResult(createNewBookIntent(), BOOK_REQUEST_CODE)
     }
   }
 
@@ -60,6 +63,10 @@ class MainActivity : AppCompatActivity() {
     auth.requestAccessToken {
       refreshOptionsMenu()
     }
+    if (needUpdate) {
+      refreshCurrentTab(currentTab)
+      navigation.selectedItemId = currentTab.itemId
+    }
   }
 
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -69,14 +76,21 @@ class MainActivity : AppCompatActivity() {
           auth.saveTokenResponse(data)
         }
       }
+      BOOK_REQUEST_CODE -> {
+        needUpdate = resultCode == RESULT_OK
+      }
     }
   }
 
-  private fun initNavigationView(navigation: BottomNavigationView) {
-    setCurrentTab(HOME_TAB)
-    navigation.selectedItemId = currentTab.itemId
+  override fun openEditBookScreen(book: Book) {
+    startActivityForResult(createEditBookIntent(book.id, book is FinishedBook), BOOK_REQUEST_CODE)
+  }
+
+  private fun initNavigationView() {
+    refreshCurrentTab(HOME_TAB)
+    navigation.selectedItemId = HOME_TAB.itemId
     navigation.setOnNavigationItemSelectedListener { item ->
-      setCurrentTab(CurrentTab.getByItemId(item.itemId))
+      refreshCurrentTab(CurrentTab.getByItemId(item.itemId))
       true
     }
   }
@@ -123,7 +137,8 @@ class MainActivity : AppCompatActivity() {
     }
   }
 
-  private fun setCurrentTab(tab: CurrentTab) {
+  private fun refreshCurrentTab(tab: CurrentTab) {
+    needUpdate = false
     fab.hide()
     currentTab = tab
     when (tab) {

app/src/main/java/me/vadik/knigopis/Router.kt

@@ -0,0 +1,7 @@
+package me.vadik.knigopis
+
+import me.vadik.knigopis.model.Book
+
+interface Router {
+  fun openEditBookScreen(book: Book)
+}

app/src/main/java/me/vadik/knigopis/adapters/BooksAdapter.kt

@@ -18,7 +18,8 @@ import me.vadik.knigopis.model.PlannedBook
 class BooksAdapter(
     private val coverSearch: BookCoverSearch,
     private val api: Endpoint,
-    private val auth: KAuth
+    private val auth: KAuth,
+    private val router: Router
 ) {
 
   fun build(books: MutableList<Book>) = Adapter(books) {
@@ -46,9 +47,6 @@ class BooksAdapter(
             adapter.notifyItemRemoved(index)
           }
         }
-        val onEditClicked = { book: Book ->
-          context.startActivity(context.createEditBookIntent(book.id, book is FinishedBook))
-        }
         val onDeleteClicked = { book: Book ->
           AlertDialog.Builder(context)
               .setTitle(R.string.book_delete_confirmation_title)
@@ -66,7 +64,7 @@ class BooksAdapter(
               .setTitle(book.fullTitle)
               .setItems(R.array.book_context_menu) { dialog, menu ->
                 when (menu) {
-                  0 -> onEditClicked(book)
+                  0 -> router.openEditBookScreen(book)
                   1 -> onDeleteClicked(book)
                 }
                 dialog.dismiss()