kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 10:46:53 -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 {
val itemId = item.itemId
if (itemId == android.R.id.home) {
onBackPressed()
return true
} else if (itemId == R.id.menu_bookmarks_clear) {
dialogShower!!.show(KiwixDialog.DeleteBookmarks, {
presenter!!.deleteBookmarks(ArrayList(allBookmarks))
allBookmarks.clear()
bookmarksList.clear()
bookmarksAdapter!!.notifyDataSetChanged()
Snackbar.make(noBookmarks!!, R.string.all_bookmarks_cleared, Snackbar.LENGTH_SHORT).show()
})
return true
when (item.itemId) {
android.R.id.home -> {
onBackPressed()
}
R.id.menu_bookmarks_clear -> {
dialogShower!!.show(KiwixDialog.DeleteBookmarks, {
presenter!!.deleteBookmarks(ArrayList(allBookmarks))
allBookmarks.clear()
bookmarksList.clear()
bookmarksAdapter!!.notifyDataSetChanged()
Snackbar.make(noBookmarks!!, R.string.all_bookmarks_cleared, Snackbar.LENGTH_SHORT).show()
})
}
else -> return super.onOptionsItemSelected(item)
}
return super.onOptionsItemSelected(item)
return true
}
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.di.modules.ApplicationModule
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.NetworkModule
import org.kiwix.kiwixmobile.core.di.modules.SearchModule
@ -67,8 +66,7 @@ import javax.inject.Singleton
JNIModule::class,
DataModule::class,
CoreViewModelModule::class,
SearchModule::class,
DialogModule::class
SearchModule::class
]
)
interface CoreComponent {