From 1e2a165537b3f706e1ec90b3e20dd9cf37163878 Mon Sep 17 00:00:00 2001 From: Sonu Sourav Date: Sat, 11 Apr 2020 17:16:07 +0530 Subject: [PATCH] Reformatted code --- .../core/bookmark/BookmarksActivity.kt | 86 ++++++++++--------- .../core/bookmark/BookmarksContract.kt | 2 +- 2 files changed, 48 insertions(+), 40 deletions(-) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.kt index 5a75255d5..1bbb42e38 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.kt @@ -69,7 +69,7 @@ class BookmarksActivity : BaseActivity(), var bookmarksSwitch: Switch? = null @Inject - private var presenter: BookmarksContract.Presenter? = null + var presenter: BookmarksContract.Presenter? = null @Inject var zimReaderContainer: ZimReaderContainer? = null @@ -79,48 +79,55 @@ class BookmarksActivity : BaseActivity(), private var refreshAdapter = true private var bookmarksAdapter: BookmarksAdapter? = null private var actionMode: ActionMode? = null - private val actionModeCallback: ActionMode.Callback = object : ActionMode.Callback { - override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean { - mode.menuInflater.inflate(R.menu.menu_context_delete, menu) - bookmarksSwitch!!.isEnabled = false - return true - } - - override fun onPrepareActionMode( - mode: ActionMode, - menu: Menu - ): Boolean = false - - override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean { - refreshAdapter = false - if (item.itemId == R.id.menu_context_delete) { - dialogShower!!.show(KiwixDialog.DeleteBookmarks, { - allBookmarks.removeAll(deleteList) - for (bookmark in deleteList) { - val position = bookmarksList.indexOf(bookmark) - bookmarksList.remove(bookmark) - bookmarksAdapter!!.notifyItemRemoved(position) - bookmarksAdapter!!.notifyItemRangeChanged(position, bookmarksAdapter!!.itemCount) - } - presenter!!.deleteBookmarks(ArrayList(deleteList)) - mode.finish() - }) + private val actionModeCallback: ActionMode.Callback = + object : ActionMode.Callback { + override fun onCreateActionMode( + mode: ActionMode, + menu: Menu + ): Boolean { + mode.menuInflater.inflate(R.menu.menu_context_delete, menu) + bookmarksSwitch!!.isEnabled = false return true } - return false - } - override fun onDestroyActionMode(mode: ActionMode) { - if (deleteList.size != 0) { - deleteList.clear() + override fun onPrepareActionMode( + mode: ActionMode, + menu: Menu + ): Boolean = false + + override fun onActionItemClicked( + mode: ActionMode, + item: MenuItem + ): Boolean { + refreshAdapter = false + if (item.itemId == R.id.menu_context_delete) { + dialogShower!!.show(KiwixDialog.DeleteBookmarks, { + allBookmarks.removeAll(deleteList) + for (bookmark in deleteList) { + val position = bookmarksList.indexOf(bookmark) + bookmarksList.remove(bookmark) + bookmarksAdapter!!.notifyItemRemoved(position) + bookmarksAdapter!!.notifyItemRangeChanged(position, bookmarksAdapter!!.itemCount) + } + presenter!!.deleteBookmarks(ArrayList(deleteList)) + mode.finish() + }) + return true + } + return false } - actionMode = null - if (refreshAdapter) { - bookmarksAdapter!!.notifyDataSetChanged() + + override fun onDestroyActionMode(mode: ActionMode) { + if (deleteList.size != 0) { + deleteList.clear() + } + actionMode = null + if (refreshAdapter) { + bookmarksAdapter!!.notifyDataSetChanged() + } + bookmarksSwitch!!.isEnabled = true } - bookmarksSwitch!!.isEnabled = true } - } override fun injection(coreComponent: CoreComponent) { coreComponent.activityComponentBuilder().activity(this).build().inject(this) @@ -138,7 +145,7 @@ class BookmarksActivity : BaseActivity(), } setupBookmarksAdapter() recyclerView!!.adapter = bookmarksAdapter - bookmarksSwitch!!.setOnCheckedChangeListener { buttonView: CompoundButton?, isChecked: Boolean -> + bookmarksSwitch!!.setOnCheckedChangeListener { _: CompoundButton?, isChecked: Boolean -> sharedPreferenceUtil.showBookmarksCurrentBook = !isChecked presenter!!.loadBookmarks(sharedPreferenceUtil.showBookmarksCurrentBook) } @@ -231,7 +238,8 @@ class BookmarksActivity : BaseActivity(), } else { intent.putExtra(EXTRA_CHOSE_X_URL, bookmark.bookmarkUrl) } - if (bookmark.zimFilePath != null && bookmark.zimFilePath != zimReaderContainer!!.zimCanonicalPath + if (bookmark.zimFilePath != null && + bookmark.zimFilePath != zimReaderContainer!!.zimCanonicalPath ) { intent.putExtra(EXTRA_CHOSE_X_FILE, bookmark.zimFilePath) } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksContract.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksContract.kt index d846500e0..d5777d9a8 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksContract.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksContract.kt @@ -19,7 +19,7 @@ package org.kiwix.kiwixmobile.core.bookmark import org.kiwix.kiwixmobile.core.base.BaseContract -internal interface BookmarksContract { +interface BookmarksContract { interface View : BaseContract.View { fun updateBookmarksList(bookmarks: List) fun notifyBookmarksListFiltered(bookmarks: List)