kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-09 23:40:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

#2098 removed variable dialog type for history and bookmarks dialog

Browse Source
This commit is contained in:
HissPirat 2020-06-29 09:33:56 +02:00
parent eea7e4013e
commit f1dc6ece37
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialog.kt
View File

@ -25,7 +25,8 @@ import org.kiwix.kiwixmobile.core.dao.NewBookmarksDao
import org.kiwix.kiwixmobile.core.page.bookmark.BookmarksActivity import org.kiwix.kiwixmobile.core.page.bookmark.BookmarksActivity
import org.kiwix.kiwixmobile.core.page.bookmark.viewmodel.BookmarkState import org.kiwix.kiwixmobile.core.page.bookmark.viewmodel.BookmarkState
import org.kiwix.kiwixmobile.core.utils.DialogShower import org.kiwix.kiwixmobile.core.utils.DialogShower
import org.kiwix.kiwixmobile.core.utils.KiwixDialog import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteAllBookmarks
import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteSelectedBookmarks
import javax.inject.Inject import javax.inject.Inject
data class ShowDeleteBookmarksDialog( data class ShowDeleteBookmarksDialog(
@ -36,12 +37,7 @@ data class ShowDeleteBookmarksDialog(
@Inject lateinit var dialogShower: DialogShower @Inject lateinit var dialogShower: DialogShower
override fun invokeWith(activity: AppCompatActivity) { override fun invokeWith(activity: AppCompatActivity) {
(activity as BookmarksActivity).activityComponent.inject(this) (activity as BookmarksActivity).activityComponent.inject(this)
var dialogType: KiwixDialog = KiwixDialog.DeleteAllBookmarks dialogShower.show(if (state.isInSelectionState) DeleteSelectedBookmarks else DeleteAllBookmarks,
if (state.isInSelectionState) { { effects.offer(DeleteBookmarkItems(effects, state, bookmarksDao)) })
dialogType = KiwixDialog.DeleteSelectedBookmarks
}
dialogShower.show(dialogType, {
effects.offer(DeleteBookmarkItems(effects, state, bookmarksDao))
})
} }
} }

7
core/src/main/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/effects/ShowDeleteHistoryDialog.kt
View File

@ -25,7 +25,6 @@ import org.kiwix.kiwixmobile.core.dao.HistoryDao
import org.kiwix.kiwixmobile.core.page.history.HistoryActivity import org.kiwix.kiwixmobile.core.page.history.HistoryActivity
import org.kiwix.kiwixmobile.core.page.history.viewmodel.HistoryState import org.kiwix.kiwixmobile.core.page.history.viewmodel.HistoryState
import org.kiwix.kiwixmobile.core.utils.DialogShower import org.kiwix.kiwixmobile.core.utils.DialogShower
import org.kiwix.kiwixmobile.core.utils.KiwixDialog
import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteAllHistory import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteAllHistory
import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteSelectedHistory import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteSelectedHistory
import javax.inject.Inject import javax.inject.Inject
@ -38,11 +37,7 @@ data class ShowDeleteHistoryDialog(
@Inject lateinit var dialogShower: DialogShower @Inject lateinit var dialogShower: DialogShower
override fun invokeWith(activity: AppCompatActivity) { override fun invokeWith(activity: AppCompatActivity) {
(activity as HistoryActivity).activityComponent.inject(this) (activity as HistoryActivity).activityComponent.inject(this)
var dialogType: KiwixDialog = DeleteAllHistory dialogShower.show(if (state.isInSelectionState) DeleteSelectedHistory else DeleteAllHistory, {
if (state.isInSelectionState) {
dialogType = DeleteSelectedHistory
}
dialogShower.show(dialogType, {
effects.offer(DeleteHistoryItems(state, historyDao)) effects.offer(DeleteHistoryItems(state, historyDao))
}) })
} }