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

Merge pull request #2531 from kiwix/feature/macgills/2530-remove-activity-finishing

Browse Source 
#2530 Remove activity finishing from IntroFragment and rely on default behaviour
This commit is contained in:
Seán Mac Gillicuddy 2020-12-01 13:20:43 +00:00 committed by GitHub
commit 2a54e16a04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,8 +23,8 @@ import android.os.Looper
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isVisible
import androidx.navigation.fragment.findNavController
import androidx.viewpager.widget.ViewPager
import kotlinx.android.synthetic.main.fragment_intro.get_started
import kotlinx.android.synthetic.main.fragment_intro.tab_indicator
@ -35,7 +35,6 @@ import org.kiwix.kiwixmobile.cachedComponent
import org.kiwix.kiwixmobile.core.base.BaseActivity
import org.kiwix.kiwixmobile.core.base.BaseFragment
import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions
import org.kiwix.kiwixmobile.main.KiwixMainActivity
import org.kiwix.kiwixmobile.zim_manager.SimplePageChangeListener
import java.util.Timer
import java.util.TimerTask
@ -103,15 +102,10 @@ class IntroFragment : BaseFragment(), IntroContract.View, FragmentActivityExtens
views = emptyArray()
}
override fun onBackPressed(activity: AppCompatActivity): FragmentActivityExtensions.Super {
activity.finish()
return super.onBackPressed(activity)
}
private fun navigateToLibrary() {
dismissAutoRotate()
presenter.setIntroShown()
(requireActivity() as KiwixMainActivity).navController.popBackStack()
findNavController().navigate(IntroFragmentDirections.actionIntrofragmentToLibraryFragment())
}
private fun updateView(position: Int) {

3
app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
View File

@ -38,6 +38,7 @@ import org.kiwix.kiwixmobile.core.base.FragmentActivityExtensions
import org.kiwix.kiwixmobile.core.di.components.CoreComponent
import org.kiwix.kiwixmobile.core.main.CoreMainActivity
import org.kiwix.kiwixmobile.kiwixActivityComponent
import org.kiwix.kiwixmobile.nav.destination.library.LocalLibraryFragmentDirections
const val NAVIGATE_TO_ZIM_HOST_FRAGMENT = "navigate_to_zim_host_fragment"
@ -94,7 +95,7 @@ class KiwixMainActivity : CoreMainActivity() {
}
}
if (sharedPreferenceUtil.showIntro()) {
navigate(R.id.introFragment)
navigate(LocalLibraryFragmentDirections.actionLibraryFragmentToIntrofragment())
}
}

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

@ -69,6 +69,11 @@
<action
android:id="@+id/action_libraryFragment_to_localFileTransferFragment"
app:destination="@id/localFileTransferFragment" />
<action
android:id="@+id/action_libraryFragment_to_introfragment"
app:destination="@id/introFragment"
app:popUpTo="@id/libraryFragment"
app:popUpToInclusive="true" />
</fragment>
<fragment
@ -85,7 +90,13 @@
android:id="@+id/introFragment"
android:name="org.kiwix.kiwixmobile.intro.IntroFragment"
android:label="IntroFragment"
tools:layout="@layout/fragment_intro" />
tools:layout="@layout/fragment_intro">
<action
android:id="@+id/action_introfragment_to_libraryFragment"
app:destination="@id/libraryFragment"
app:popUpTo="@id/introFragment"
app:popUpToInclusive="true" />
</fragment>
<fragment
android:id="@+id/historyFragment"
android:name="org.kiwix.kiwixmobile.core.page.history.HistoryFragment"