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 c225ef338..91607033b 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/KiwixMainActivity.kt @@ -20,7 +20,6 @@ package org.kiwix.kiwixmobile.main import android.content.Intent import android.os.Bundle -import android.view.Menu import androidx.appcompat.view.ActionMode import androidx.navigation.NavController import androidx.navigation.findNavController @@ -62,12 +61,6 @@ class KiwixMainActivity : CoreMainActivity() { actionMode = mode } - override fun onCreateOptionsMenu(menu: Menu): Boolean { - val onCreateOptionsMenu = super.onCreateOptionsMenu(menu) - menu.findItem(R.id.menu_new_navigation)?.isVisible = false - return onCreateOptionsMenu - } - override fun onSupportNavigateUp(): Boolean { val navController = findNavController(R.id.nav_host_fragment) return navController.navigateUp() || diff --git a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt index cf8cf7255..2a4b31ee0 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt @@ -133,7 +133,6 @@ class ReaderFragment : CoreReaderFragment() { override fun onCreateOptionsMenu(menu: Menu, menuInflater: MenuInflater) { super.onCreateOptionsMenu(menu, menuInflater) - menu.findItem(R.id.menu_new_navigation)?.isVisible = false if (zimReaderContainer.zimFileReader == null) { mainMenu?.hideBookSpecificMenuItems() } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/MainMenu.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/MainMenu.kt index 44bd7c264..4e9786e04 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/MainMenu.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/MainMenu.kt @@ -94,7 +94,6 @@ class MainMenu( private val hostBooks = menu.findItem(R.id.menu_host_books) private val help = menu.findItem(R.id.menu_help) private val settings = menu.findItem(R.id.menu_settings) - private val newNavigation = menu.findItem(R.id.menu_new_navigation) private val supportKiwix = menu.findItem(R.id.menu_support_kiwix) private var isInTabSwitcher: Boolean = false @@ -110,8 +109,6 @@ class MainMenu( tabSwitcherTextView = null } - newNavigation.isVisible = BuildConfig.DEBUG - randomArticle.setShowAsAction( if (activity.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) MenuItem.SHOW_AS_ACTION_IF_ROOM @@ -139,7 +136,6 @@ class MainMenu( library.menuItemClickListener { menuClickListener.onLibraryMenuClicked() } readAloud.menuItemClickListener { menuClickListener.onReadAloudMenuClicked() } fullscreen.menuItemClickListener { menuClickListener.onFullscreenMenuClicked() } - newNavigation.menuItemClickListener { menuClickListener.onNewNavigationMenuClicked() } supportKiwix.menuItemClickListener { menuClickListener.onSupportKiwixMenuClicked() } addNote.menuItemClickListener { menuClickListener.onAddNoteMenuClicked() } diff --git a/core/src/main/res/menu/menu_main.xml b/core/src/main/res/menu/menu_main.xml index cd2062950..5640d4c65 100644 --- a/core/src/main/res/menu/menu_main.xml +++ b/core/src/main/res/menu/menu_main.xml @@ -77,11 +77,6 @@ android:title="@string/menu_settings" app:showAsAction="never" /> - - تعطيل تلقائي تفاصيل نظام الملفات - تصفح تجريبي diff --git a/core/src/main/res/values-cs/strings.xml b/core/src/main/res/values-cs/strings.xml index e15ecacdc..07fa78bc9 100644 --- a/core/src/main/res/values-cs/strings.xml +++ b/core/src/main/res/values-cs/strings.xml @@ -275,5 +275,4 @@ Zašlete prosím všechny následující podrobnosti, abychom mohli problém diagnostikovat %d%% Zvětšit text - Experimentální navigace diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml index 714869bc8..27e18acd7 100644 --- a/core/src/main/res/values-fr/strings.xml +++ b/core/src/main/res/values-fr/strings.xml @@ -280,5 +280,4 @@ Veuillez envoyer tous les détails suivants afin que nous puissions diagnostiquer le problème %d%% Zoomer le texte - Navigation expérimentale diff --git a/core/src/main/res/values-lb/strings.xml b/core/src/main/res/values-lb/strings.xml index 3e0f0d404..382ae9e0c 100644 --- a/core/src/main/res/values-lb/strings.xml +++ b/core/src/main/res/values-lb/strings.xml @@ -119,5 +119,4 @@ Un Aus Automatesch - Experimentell Naavigatioun diff --git a/core/src/main/res/values-mk/strings.xml b/core/src/main/res/values-mk/strings.xml index e02f3522f..251d2f90b 100644 --- a/core/src/main/res/values-mk/strings.xml +++ b/core/src/main/res/values-mk/strings.xml @@ -267,5 +267,4 @@ Испратете ги сите следни поединости за да можеме да го дијагностицираме проблемот %d%% Приближување на текст - Опитен прегледник diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml index a8e0cacf3..57354c6e7 100644 --- a/core/src/main/res/values-pt-rBR/strings.xml +++ b/core/src/main/res/values-pt-rBR/strings.xml @@ -273,5 +273,4 @@ Envie todos os detalhes a seguir para que possamos diagnosticar o problema %d%% Zoom de texto - Navegação experimental diff --git a/core/src/main/res/values-qq/strings.xml b/core/src/main/res/values-qq/strings.xml index a70271670..d377752cf 100644 --- a/core/src/main/res/values-qq/strings.xml +++ b/core/src/main/res/values-qq/strings.xml @@ -53,8 +53,7 @@ The action of opening the library destination, used on a button. The title of the fragment/place where books are downloaded. The title of the fragment/place where books are read. - This is a menu item that opens the applicaiton in a new experimental mode that uses different navigation. - Ask if the user wants to delete all history items. +Ask if the user wants to delete all history items. Ask if the user wants to delete a number of selected history items. Ask if the user wants to delete all bookmarks. Ask if the user wants to delete a number of selected bookmarks. diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml index 6bc7b1984..7e6d461e8 100644 --- a/core/src/main/res/values-ru/strings.xml +++ b/core/src/main/res/values-ru/strings.xml @@ -282,5 +282,4 @@ Пожалуйста, пришлите нам всю информацию ниже, чтобы мы смогли обнаружить проблему %d%% Масштаб Текста - Экспериментальная навигация diff --git a/core/src/main/res/values-tr/strings.xml b/core/src/main/res/values-tr/strings.xml index 82f02b1be..38b85a993 100644 --- a/core/src/main/res/values-tr/strings.xml +++ b/core/src/main/res/values-tr/strings.xml @@ -278,5 +278,4 @@ Sorunu teşhis edebilmemiz için lütfen aşağıdaki tüm ayrıntıları gönderin %%%d Metin Yakınlığı - Deneysel Gezintisi diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml index f6ced3f06..fd7eb127e 100644 --- a/core/src/main/res/values-zh-rTW/strings.xml +++ b/core/src/main/res/values-zh-rTW/strings.xml @@ -272,5 +272,4 @@ 請傳送所有以下詳細資訊，以讓我們可以方便診斷問題 %d%% 文字縮放 - 實現性導覽 diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index e878586c5..db2542338 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -279,8 +279,7 @@ Please send all the following details so we can diagnose the problem %d%% Text Zoom - Experimental Navigation - Reader +Reader No open book Open library diff --git a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt index 9b1e13902..c0acfcef4 100644 --- a/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt +++ b/custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt @@ -153,7 +153,6 @@ class CustomReaderFragment : CoreReaderFragment() { override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { super.onCreateOptionsMenu(menu, inflater) menu.findItem(R.id.menu_help)?.isVisible = false - menu.findItem(R.id.menu_new_navigation)?.isVisible = false menu.findItem(R.id.menu_openfile)?.isVisible = false menu.findItem(R.id.menu_host_books)?.isVisible = false }