kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-08 06:42:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replaced if-else with when

Browse Source
This commit is contained in:
Sonu Sourav 2020-04-11 19:23:49 +05:30
parent 1e2a165537
commit ca5d704f3a
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.kt
View File

@ -191,21 +191,22 @@ class BookmarksActivity : BaseActivity(),
} }
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
val itemId = item.itemId when (item.itemId) {
if (itemId == android.R.id.home) { android.R.id.home -> {
onBackPressed() onBackPressed()
return true }
} else if (itemId == R.id.menu_bookmarks_clear) { R.id.menu_bookmarks_clear -> {
dialogShower!!.show(KiwixDialog.DeleteBookmarks, { dialogShower!!.show(KiwixDialog.DeleteBookmarks, {
presenter!!.deleteBookmarks(ArrayList(allBookmarks)) presenter!!.deleteBookmarks(ArrayList(allBookmarks))
allBookmarks.clear() allBookmarks.clear()
bookmarksList.clear() bookmarksList.clear()
bookmarksAdapter!!.notifyDataSetChanged() bookmarksAdapter!!.notifyDataSetChanged()
Snackbar.make(noBookmarks!!, R.string.all_bookmarks_cleared, Snackbar.LENGTH_SHORT).show() Snackbar.make(noBookmarks!!, R.string.all_bookmarks_cleared, Snackbar.LENGTH_SHORT).show()
}) })
return true }
else -> return super.onOptionsItemSelected(item)
} }
return super.onOptionsItemSelected(item) return true
} }
override fun onDestroy() { override fun onDestroy() {

4
core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt
View File

@ -39,7 +39,6 @@ import org.kiwix.kiwixmobile.core.data.local.dao.BookmarksDao
import org.kiwix.kiwixmobile.core.data.remote.KiwixService import org.kiwix.kiwixmobile.core.data.remote.KiwixService
import org.kiwix.kiwixmobile.core.di.modules.ApplicationModule import org.kiwix.kiwixmobile.core.di.modules.ApplicationModule
import org.kiwix.kiwixmobile.core.di.modules.CoreViewModelModule import org.kiwix.kiwixmobile.core.di.modules.CoreViewModelModule
import org.kiwix.kiwixmobile.core.di.modules.DialogModule
import org.kiwix.kiwixmobile.core.di.modules.JNIModule import org.kiwix.kiwixmobile.core.di.modules.JNIModule
import org.kiwix.kiwixmobile.core.di.modules.NetworkModule import org.kiwix.kiwixmobile.core.di.modules.NetworkModule
import org.kiwix.kiwixmobile.core.di.modules.SearchModule import org.kiwix.kiwixmobile.core.di.modules.SearchModule
@ -67,8 +66,7 @@ import javax.inject.Singleton
JNIModule::class, JNIModule::class,
DataModule::class, DataModule::class,
CoreViewModelModule::class, CoreViewModelModule::class,
SearchModule::class, SearchModule::class
DialogModule::class
] ]
) )
interface CoreComponent { interface CoreComponent {