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

removed double bang

Browse Source
This commit is contained in:
Sonu Sourav 2020-04-15 13:29:36 +05:30
parent 493061a36a
commit e37c0dd0cd
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/detekt/detekt.yml
View File

@ -94,6 +94,17 @@ complexity:
ignoreAnnotation: true ignoreAnnotation: true
excludeStringsWithLessThan5Characters: true excludeStringsWithLessThan5Characters: true
ignoreStringsRegex: '$^' ignoreStringsRegex: '$^'
TooManyFunctions:
active: false
excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
thresholdInFiles: 11
thresholdInClasses: 11
thresholdInInterfaces: 11
thresholdInObjects: 11
thresholdInEnums: 11
ignoreDeprecated: false
ignorePrivate: false
ignoreOverridden: false
coroutines: coroutines:
active: true active: true

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

@ -26,9 +26,7 @@ import android.widget.CompoundButton
import android.widget.ImageView import android.widget.ImageView
import androidx.appcompat.view.ActionMode import androidx.appcompat.view.ActionMode
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.activity_bookmarks.bookmarks_switch import kotlinx.android.synthetic.main.activity_bookmarks.bookmarks_switch
import kotlinx.android.synthetic.main.activity_bookmarks.no_bookmarks import kotlinx.android.synthetic.main.activity_bookmarks.no_bookmarks
import kotlinx.android.synthetic.main.activity_bookmarks.recycler_view import kotlinx.android.synthetic.main.activity_bookmarks.recycler_view
@ -37,8 +35,11 @@ import org.kiwix.kiwixmobile.core.Intents.internal
import org.kiwix.kiwixmobile.core.R import org.kiwix.kiwixmobile.core.R
import org.kiwix.kiwixmobile.core.base.BaseActivity import org.kiwix.kiwixmobile.core.base.BaseActivity
import org.kiwix.kiwixmobile.core.di.components.CoreComponent import org.kiwix.kiwixmobile.core.di.components.CoreComponent
import org.kiwix.kiwixmobile.core.downloader.model.Base64String
import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.coreActivityComponent import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.coreActivityComponent
import org.kiwix.kiwixmobile.core.extensions.setBitmapFromString import org.kiwix.kiwixmobile.core.extensions.setBitmap
import org.kiwix.kiwixmobile.core.extensions.setImageDrawableCompat
import org.kiwix.kiwixmobile.core.extensions.snack
import org.kiwix.kiwixmobile.core.main.CoreMainActivity import org.kiwix.kiwixmobile.core.main.CoreMainActivity
import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer
import org.kiwix.kiwixmobile.core.utils.DialogShower import org.kiwix.kiwixmobile.core.utils.DialogShower
@ -74,7 +75,7 @@ class BookmarksActivity : BaseActivity(),
menu: Menu menu: Menu
): Boolean { ): Boolean {
mode.menuInflater.inflate(R.menu.menu_context_delete, menu) mode.menuInflater.inflate(R.menu.menu_context_delete, menu)
bookmarks_switch!!.isEnabled = false bookmarks_switch.isEnabled = false
return true return true
} }
@ -132,12 +133,12 @@ class BookmarksActivity : BaseActivity(),
actionBar.setTitle(R.string.bookmarks) actionBar.setTitle(R.string.bookmarks)
} }
setupBookmarksAdapter() setupBookmarksAdapter()
recycler_view!!.adapter = bookmarksAdapter recycler_view.adapter = bookmarksAdapter
bookmarks_switch!!.setOnCheckedChangeListener { _: CompoundButton?, isChecked: Boolean -> bookmarks_switch.setOnCheckedChangeListener { _: CompoundButton?, isChecked: Boolean ->
sharedPreferenceUtil.showBookmarksCurrentBook = !isChecked sharedPreferenceUtil.showBookmarksCurrentBook = !isChecked
presenter.loadBookmarks(sharedPreferenceUtil.showBookmarksCurrentBook) presenter.loadBookmarks(sharedPreferenceUtil.showBookmarksCurrentBook)
} }
bookmarks_switch!!.isChecked = !sharedPreferenceUtil.showBookmarksCurrentBook bookmarks_switch.isChecked = !sharedPreferenceUtil.showBookmarksCurrentBook
} }
private fun setupBookmarksAdapter() { private fun setupBookmarksAdapter() {
@ -145,7 +146,7 @@ class BookmarksActivity : BaseActivity(),
bookmarksAdapter!!.registerAdapterDataObserver(object : AdapterDataObserver() { bookmarksAdapter!!.registerAdapterDataObserver(object : AdapterDataObserver() {
override fun onChanged() { override fun onChanged() {
super.onChanged() super.onChanged()
no_bookmarks!!.visibility = if (bookmarksList.size == 0) View.VISIBLE else View.GONE no_bookmarks.visibility = if (bookmarksList.size == 0) View.VISIBLE else View.GONE
} }
}) })
} }
@ -189,8 +190,7 @@ class BookmarksActivity : BaseActivity(),
allBookmarks.clear() allBookmarks.clear()
bookmarksList.clear() bookmarksList.clear()
bookmarksAdapter!!.notifyDataSetChanged() bookmarksAdapter!!.notifyDataSetChanged()
Snackbar.make(no_bookmarks!!, R.string.all_bookmarks_cleared, Snackbar.LENGTH_SHORT) no_bookmarks.snack(R.string.all_bookmarks_cleared)
.show()
}) })
} }
else -> return super.onOptionsItemSelected(item) else -> return super.onOptionsItemSelected(item)
@ -258,11 +258,9 @@ class BookmarksActivity : BaseActivity(),
bookmark: BookmarkItem bookmark: BookmarkItem
) { ) {
if (deleteList.remove(bookmark)) { if (deleteList.remove(bookmark)) {
favicon.setBitmapFromString(bookmark.favicon) favicon.setBitmap(Base64String(bookmark.favicon))
} else { } else {
favicon.setImageDrawable( favicon.setImageDrawableCompat(R.drawable.ic_check_circle_blue_24dp)
ContextCompat.getDrawable(this, R.drawable.ic_check_circle_blue_24dp)
)
deleteList.add(bookmark) deleteList.add(bookmark)
} }
actionMode!!.title = getString(R.string.selected_items, deleteList.size) actionMode!!.title = getString(R.string.selected_items, deleteList.size)