kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-11 16:37:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: The switch was not displaying the previously saved value. For example, if it was unchecked before, reopening the fragment would incorrectly show it as checked instead of unchecked.

Browse Source
This commit is contained in:
MohitMaliFtechiz 2025-04-14 14:24:54 +05:30
parent 1d3944dab5
commit ad9d43b455
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@
package org.kiwix.kiwixmobile.core.page package org.kiwix.kiwixmobile.core.page
import android.os.Bundle import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.Menu import android.view.Menu
import android.view.MenuInflater import android.view.MenuInflater
@ -182,7 +183,6 @@ abstract class PageFragment : OnItemClickListener, BaseFragment(), FragmentActiv
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
pageScreenState.value = pageScreenState.value.copy( pageScreenState.value = pageScreenState.value.copy(
isSearchActive = pageScreenState.value.isSearchActive,
searchQueryHint = searchQueryHint, searchQueryHint = searchQueryHint,
searchText = "", searchText = "",
searchValueChangedListener = { onTextChanged(it) }, searchValueChangedListener = { onTextChanged(it) },
@ -190,30 +190,12 @@ abstract class PageFragment : OnItemClickListener, BaseFragment(), FragmentActiv
screenTitle = screenTitle, screenTitle = screenTitle,
noItemsString = noItemsString, noItemsString = noItemsString,
switchString = switchString, switchString = switchString,
switchIsChecked = pageScreenState.value.switchIsChecked, switchIsChecked = switchIsChecked,
onSwitchCheckedChanged = { onSwitchCheckedChanged(it) }, onSwitchCheckedChanged = { onSwitchCheckedChanged(it).invoke() },
deleteIconTitle = deleteIconTitle deleteIconTitle = deleteIconTitle
) )
// setupMenu()
val activity = requireActivity() as CoreMainActivity val activity = requireActivity() as CoreMainActivity
// fragmentPageBinding?.recyclerView?.apply {
// layoutManager =
// LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
// adapter = pageAdapter
// fragmentTitle?.let(::setToolTipWithContentDescription)
// }
// fragmentPageBinding?.noPage?.text = noItemsString
// fragmentPageBinding?.pageSwitch?.apply {
// 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 ->
// pageViewModel.actions.offer(Action.UserClickedShowAllToggle(isChecked))
// }
pageViewModel.state.observe(viewLifecycleOwner, Observer(::render)) pageViewModel.state.observe(viewLifecycleOwner, Observer(::render))
// hides keyboard when scrolled // hides keyboard when scrolled
@ -260,6 +242,7 @@ abstract class PageFragment : OnItemClickListener, BaseFragment(), FragmentActiv
} }
private fun onSwitchCheckedChanged(isChecked: Boolean): () -> Unit = { private fun onSwitchCheckedChanged(isChecked: Boolean): () -> Unit = {
Log.e("PAGE_FRAGMENT", "onSwitchCheckedChanged: $isChecked")
pageScreenState.value = pageScreenState.value.copy(switchIsChecked = isChecked) pageScreenState.value = pageScreenState.value.copy(switchIsChecked = isChecked)
pageViewModel.actions.offer(Action.UserClickedShowAllToggle(isChecked)) pageViewModel.actions.offer(Action.UserClickedShowAllToggle(isChecked))
} }
@ -313,7 +296,7 @@ abstract class PageFragment : OnItemClickListener, BaseFragment(), FragmentActiv
private fun render(state: PageState<*>) { private fun render(state: PageState<*>) {
pageScreenState.value = pageScreenState.value.copy( pageScreenState.value = pageScreenState.value.copy(
switchIsEnabled = !state.isInSelectionState, switchIsEnabled = !state.isInSelectionState,
pageState = state, pageState = state
) )
if (state.isInSelectionState) { if (state.isInSelectionState) {
if (actionMode == null) { if (actionMode == null) {