mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-09-15 18:36:01 -04:00
Reformatted code
This commit is contained in:
parent
dff32eb535
commit
1e2a165537
@ -69,7 +69,7 @@ class BookmarksActivity : BaseActivity(),
|
|||||||
var bookmarksSwitch: Switch? = null
|
var bookmarksSwitch: Switch? = null
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
private var presenter: BookmarksContract.Presenter? = null
|
var presenter: BookmarksContract.Presenter? = null
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
var zimReaderContainer: ZimReaderContainer? = null
|
var zimReaderContainer: ZimReaderContainer? = null
|
||||||
@ -79,48 +79,55 @@ class BookmarksActivity : BaseActivity(),
|
|||||||
private var refreshAdapter = true
|
private var refreshAdapter = true
|
||||||
private var bookmarksAdapter: BookmarksAdapter? = null
|
private var bookmarksAdapter: BookmarksAdapter? = null
|
||||||
private var actionMode: ActionMode? = null
|
private var actionMode: ActionMode? = null
|
||||||
private val actionModeCallback: ActionMode.Callback = object : ActionMode.Callback {
|
private val actionModeCallback: ActionMode.Callback =
|
||||||
override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
|
object : ActionMode.Callback {
|
||||||
mode.menuInflater.inflate(R.menu.menu_context_delete, menu)
|
override fun onCreateActionMode(
|
||||||
bookmarksSwitch!!.isEnabled = false
|
mode: ActionMode,
|
||||||
return true
|
menu: Menu
|
||||||
}
|
): Boolean {
|
||||||
|
mode.menuInflater.inflate(R.menu.menu_context_delete, menu)
|
||||||
override fun onPrepareActionMode(
|
bookmarksSwitch!!.isEnabled = false
|
||||||
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 true
|
||||||
}
|
}
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onDestroyActionMode(mode: ActionMode) {
|
override fun onPrepareActionMode(
|
||||||
if (deleteList.size != 0) {
|
mode: ActionMode,
|
||||||
deleteList.clear()
|
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) {
|
override fun onDestroyActionMode(mode: ActionMode) {
|
||||||
bookmarksAdapter!!.notifyDataSetChanged()
|
if (deleteList.size != 0) {
|
||||||
|
deleteList.clear()
|
||||||
|
}
|
||||||
|
actionMode = null
|
||||||
|
if (refreshAdapter) {
|
||||||
|
bookmarksAdapter!!.notifyDataSetChanged()
|
||||||
|
}
|
||||||
|
bookmarksSwitch!!.isEnabled = true
|
||||||
}
|
}
|
||||||
bookmarksSwitch!!.isEnabled = true
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
override fun injection(coreComponent: CoreComponent) {
|
override fun injection(coreComponent: CoreComponent) {
|
||||||
coreComponent.activityComponentBuilder().activity(this).build().inject(this)
|
coreComponent.activityComponentBuilder().activity(this).build().inject(this)
|
||||||
@ -138,7 +145,7 @@ class BookmarksActivity : BaseActivity(),
|
|||||||
}
|
}
|
||||||
setupBookmarksAdapter()
|
setupBookmarksAdapter()
|
||||||
recyclerView!!.adapter = bookmarksAdapter
|
recyclerView!!.adapter = bookmarksAdapter
|
||||||
bookmarksSwitch!!.setOnCheckedChangeListener { buttonView: CompoundButton?, isChecked: Boolean ->
|
bookmarksSwitch!!.setOnCheckedChangeListener { _: CompoundButton?, isChecked: Boolean ->
|
||||||
sharedPreferenceUtil.showBookmarksCurrentBook = !isChecked
|
sharedPreferenceUtil.showBookmarksCurrentBook = !isChecked
|
||||||
presenter!!.loadBookmarks(sharedPreferenceUtil.showBookmarksCurrentBook)
|
presenter!!.loadBookmarks(sharedPreferenceUtil.showBookmarksCurrentBook)
|
||||||
}
|
}
|
||||||
@ -231,7 +238,8 @@ class BookmarksActivity : BaseActivity(),
|
|||||||
} else {
|
} else {
|
||||||
intent.putExtra(EXTRA_CHOSE_X_URL, bookmark.bookmarkUrl)
|
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)
|
intent.putExtra(EXTRA_CHOSE_X_FILE, bookmark.zimFilePath)
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@ package org.kiwix.kiwixmobile.core.bookmark
|
|||||||
|
|
||||||
import org.kiwix.kiwixmobile.core.base.BaseContract
|
import org.kiwix.kiwixmobile.core.base.BaseContract
|
||||||
|
|
||||||
internal interface BookmarksContract {
|
interface BookmarksContract {
|
||||||
interface View : BaseContract.View<Presenter> {
|
interface View : BaseContract.View<Presenter> {
|
||||||
fun updateBookmarksList(bookmarks: List<BookmarkItem>)
|
fun updateBookmarksList(bookmarks: List<BookmarkItem>)
|
||||||
fun notifyBookmarksListFiltered(bookmarks: List<BookmarkItem>)
|
fun notifyBookmarksListFiltered(bookmarks: List<BookmarkItem>)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user