diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
index 47e6c5af0..75c852385 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt
@@ -63,11 +63,12 @@ class KiwixMainActivity : CoreMainActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_kiwix_new_navigation)
if (savedInstanceState != null) {
return
}
supportFragmentManager.beginTransaction()
- .add(R.id.fragment_custom_app_container, KiwixMainFragment()).commit()
+ .add(R.id.kiwix_fragment_containter, KiwixMainFragment()).commit()
}
}
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainFragment.kt
index 27bac4e68..205ba2018 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainFragment.kt
@@ -87,7 +87,7 @@ class KiwixMainFragment : CoreReaderFragment() {
) = KiwixWebViewClient(webViewCallback, zimReaderContainer)
override fun onNewNavigationMenuClicked() {
- // do nothing
+ startActivity(Intent(activity, KiwixNewNavigationActivity::class.java))
}
private fun manageExternalLaunchAndRestoringViewState() {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt
index 7449312c1..f833c4ac9 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixNewNavigationActivity.kt
@@ -42,7 +42,6 @@ class KiwixNewNavigationActivity : CoreNewNavigationActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_new_navigation)
val navView: BottomNavigationView = findViewById(R.id.nav_view)
navController = findNavController(R.id.nav_host_fragment)
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/NavigationHostFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/main/NavigationHostFragment.kt
index 399d8158e..3c0c69bf5 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/NavigationHostFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/NavigationHostFragment.kt
@@ -18,8 +18,12 @@
package org.kiwix.kiwixmobile.main
-import androidx.fragment.app.Fragment
-
-class NavigationHostFragment : Fragment() {
+import android.content.Intent
+import androidx.navigation.fragment.NavHostFragment
+class NavigationHostFragment : NavHostFragment() {
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ super.onActivityResult(requestCode, resultCode, data)
+ childFragmentManager.fragments.forEach { it.onActivityResult(requestCode, resultCode, data) }
+ }
}
diff --git a/app/src/main/res/layout/activity_kiwix_new_navigation.xml b/app/src/main/res/layout/activity_kiwix_new_navigation.xml
new file mode 100644
index 000000000..262a79c8a
--- /dev/null
+++ b/app/src/main/res/layout/activity_kiwix_new_navigation.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
diff --git a/core/src/main/res/layout/activity_new_navigation.xml b/core/src/main/res/layout/activity_new_navigation.xml
index 9e54490d0..7bb96347f 100644
--- a/core/src/main/res/layout/activity_new_navigation.xml
+++ b/core/src/main/res/layout/activity_new_navigation.xml
@@ -23,7 +23,7 @@
android:layout_height="match_parent">