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

Merge pull request #3525 from kiwix/Issue#3523

Browse Source 
Fixed the redundancy of the 'All-Books-Mode' option for Bookmarks, Notes, and History in custom apps.
This commit is contained in:
Kelson 2023-11-12 18:04:52 +01:00 committed by GitHub
commit ae413559fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/kiwix/kiwixmobile/core/extensions/ActivityExtensions.kt
View File

@ -164,4 +164,10 @@ object ActivityExtensions {
) )
} }
} }
/**
* Checks if the package name of the current activity's application is not equal to 'org.kiwix.kiwixmobile',
* indicating that it is a custom application.
*/
fun Activity.isCustomApp(): Boolean = packageName != "org.kiwix.kiwixmobile"
} }

9
core/src/main/java/org/kiwix/kiwixmobile/core/page/PageFragment.kt
View File

@ -43,6 +43,7 @@ import org.kiwix.kiwixmobile.core.R
import org.kiwix.kiwixmobile.core.base.BaseFragment import org.kiwix.kiwixmobile.core.base.BaseFragment
import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions
import org.kiwix.kiwixmobile.core.databinding.FragmentPageBinding import org.kiwix.kiwixmobile.core.databinding.FragmentPageBinding
import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.isCustomApp
import org.kiwix.kiwixmobile.core.extensions.closeKeyboard import org.kiwix.kiwixmobile.core.extensions.closeKeyboard
import org.kiwix.kiwixmobile.core.main.CoreMainActivity import org.kiwix.kiwixmobile.core.main.CoreMainActivity
import org.kiwix.kiwixmobile.core.page.adapter.OnItemClickListener import org.kiwix.kiwixmobile.core.page.adapter.OnItemClickListener
@ -141,8 +142,12 @@ abstract class PageFragment : OnItemClickListener, BaseFragment(), FragmentActiv
fragmentPageBinding?.recyclerView?.adapter = pageAdapter fragmentPageBinding?.recyclerView?.adapter = pageAdapter
fragmentPageBinding?.noPage?.text = noItemsString fragmentPageBinding?.noPage?.text = noItemsString
fragmentPageBinding?.pageSwitch?.text = switchString fragmentPageBinding?.pageSwitch?.apply {
fragmentPageBinding?.pageSwitch?.isChecked = switchIsChecked text = switchString
isChecked = switchIsChecked
// hide switches for custom apps, see more info here https://github.com/kiwix/kiwix-android/issues/3523
visibility = if (requireActivity().isCustomApp()) GONE else VISIBLE
}
compositeDisposable.add(pageViewModel.effects.subscribe { it.invokeWith(activity) }) compositeDisposable.add(pageViewModel.effects.subscribe { it.invokeWith(activity) })
fragmentPageBinding?.pageSwitch?.setOnCheckedChangeListener { _, isChecked -> fragmentPageBinding?.pageSwitch?.setOnCheckedChangeListener { _, isChecked ->
pageViewModel.actions.offer(Action.UserClickedShowAllToggle(isChecked)) pageViewModel.actions.offer(Action.UserClickedShowAllToggle(isChecked))