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

#2272 fixed circular navigation error between library and reader + lint

Browse Source
This commit is contained in:
HissPirat 2020-08-20 11:02:30 +02:00
parent e2a493fa21
commit 95b350e7da
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/kiwix/kiwixmobile/intro/IntroFragment.kt
View File

@ -36,7 +36,6 @@ import org.kiwix.kiwixmobile.core.Intents.internal
import org.kiwix.kiwixmobile.core.base.BaseActivity import org.kiwix.kiwixmobile.core.base.BaseActivity
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.extensions.ActivityExtensions.navigate
import org.kiwix.kiwixmobile.core.main.CoreMainActivity import org.kiwix.kiwixmobile.core.main.CoreMainActivity
import org.kiwix.kiwixmobile.main.KiwixMainActivity import org.kiwix.kiwixmobile.main.KiwixMainActivity
import org.kiwix.kiwixmobile.zim_manager.SimplePageChangeListener import org.kiwix.kiwixmobile.zim_manager.SimplePageChangeListener
@ -115,7 +114,8 @@ class IntroFragment : BaseFragment(), IntroContract.View, FragmentActivityExtens
dismissAutoRotate() dismissAutoRotate()
startActivity(internal(CoreMainActivity::class.java)) startActivity(internal(CoreMainActivity::class.java))
presenter.setIntroShown() presenter.setIntroShown()
(requireActivity() as KiwixMainActivity).navController.navigate(IntroFragmentDirections.actionIntroFragmentToLibraryFragment()) (requireActivity() as KiwixMainActivity).navController
.navigate(IntroFragmentDirections.actionIntroFragmentToLibraryFragment())
} }
private fun updateView(position: Int) { private fun updateView(position: Int) {

1
app/src/main/res/navigation/kiwix_nav_graph.xml
View File

@ -43,6 +43,7 @@
android:label="Library"> android:label="Library">
<action <action
android:id="@+id/action_navigation_library_to_navigation_reader" android:id="@+id/action_navigation_library_to_navigation_reader"
app:popUpTo="@id/readerFragment"
app:destination="@id/readerFragment" /> app:destination="@id/readerFragment" />
<action <action
android:id="@+id/action_navigation_library_to_navigation_downloads" android:id="@+id/action_navigation_library_to_navigation_downloads"