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

#2199 removed experimental navigation menu item

Browse Source
This commit is contained in:
HissPirat 2020-07-14 15:30:14 +02:00
parent c4cbcb8080
commit f7828f7465
16 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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() ||

1
app/src/main/java/org/kiwix/kiwixmobile/nav/destination/reader/ReaderFragment.kt
View File

@ -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()
}

4
core/src/main/java/org/kiwix/kiwixmobile/core/main/MainMenu.kt
View File

@ -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() }

5
core/src/main/res/menu/menu_main.xml
View File

@ -77,11 +77,6 @@
android:title="@string/menu_settings"
app:showAsAction="never" />
<item
android:id="@+id/menu_new_navigation"
android:title="@string/experimental_navigation"
app:showAsAction="never" />
<item
android:id="@+id/menu_support_kiwix"
android:title="@string/menu_support_kiwix"

1
core/src/main/res/values-ar/strings.xml
View File

@ -267,5 +267,4 @@
<string name="off">تعطيل</string>
<string name="auto">تلقائي</string>
<string name="crash_checkbox_file_system">تفاصيل نظام الملفات</string>
<string name="experimental_navigation">تصفح تجريبي</string>
</resources>

1
core/src/main/res/values-cs/strings.xml
View File

@ -275,5 +275,4 @@
<string name="diagnostic_report_message">Zašlete prosím všechny následující podrobnosti, abychom mohli problém diagnostikovat</string>
<string name="percentage">%d%%</string>
<string name="pref_text_zoom_title">Zvětšit text</string>
<string name="experimental_navigation">Experimentální navigace</string>
</resources>

1
core/src/main/res/values-fr/strings.xml
View File

@ -280,5 +280,4 @@
<string name="diagnostic_report_message">Veuillez envoyer tous les détails suivants afin que nous puissions diagnostiquer le problème</string>
<string name="percentage">%d%%</string>
<string name="pref_text_zoom_title">Zoomer le texte</string>
<string name="experimental_navigation">Navigation expérimentale</string>
</resources>

1
core/src/main/res/values-lb/strings.xml
View File

@ -119,5 +119,4 @@
<string name="on">Un</string>
<string name="off">Aus</string>
<string name="auto">Automatesch</string>
<string name="experimental_navigation">Experimentell Naavigatioun</string>
</resources>

1
core/src/main/res/values-mk/strings.xml
View File

@ -267,5 +267,4 @@
<string name="diagnostic_report_message">Испратете ги сите следни поединости за да можеме да го дијагностицираме проблемот</string>
<string name="percentage">%d%%</string>
<string name="pref_text_zoom_title">Приближување на текст</string>
<string name="experimental_navigation">Опитен прегледник</string>
</resources>

1
core/src/main/res/values-pt-rBR/strings.xml
View File

@ -273,5 +273,4 @@
<string name="diagnostic_report_message">Envie todos os detalhes a seguir para que possamos diagnosticar o problema</string>
<string name="percentage">%d%%</string>
<string name="pref_text_zoom_title">Zoom de texto</string>
<string name="experimental_navigation">Navegação experimental</string>
</resources>

3
core/src/main/res/values-qq/strings.xml
View File

@ -53,8 +53,7 @@
<string name="open_library">The action of opening the library destination, used on a button.</string>
<string name="download">The title of the fragment/place where books are downloaded.</string>
<string name="reader">The title of the fragment/place where books are read.</string>
<string name="experimental_navigation">This is a menu item that opens the applicaiton in a new experimental mode that uses different navigation.</string>
<string name="delete_history">Ask if the user wants to delete all history items.</string>
<string name="delete_history">Ask if the user wants to delete all history items.</string>
<string name="delete_selected_history">Ask if the user wants to delete a number of selected history items.</string>
<string name="delete_bookmarks">Ask if the user wants to delete all bookmarks.</string>
<string name="delete_selected_bookmarks">Ask if the user wants to delete a number of selected bookmarks.</string>

1
core/src/main/res/values-ru/strings.xml
View File

@ -282,5 +282,4 @@
<string name="diagnostic_report_message">Пожалуйста, пришлите нам всю информацию ниже, чтобы мы смогли обнаружить проблему</string>
<string name="percentage">%d%%</string>
<string name="pref_text_zoom_title">Масштаб Текста</string>
<string name="experimental_navigation">Экспериментальная навигация</string>
</resources>

1
core/src/main/res/values-tr/strings.xml
View File

@ -278,5 +278,4 @@
<string name="diagnostic_report_message">Sorunu teşhis edebilmemiz için lütfen aşağıdaki tüm ayrıntıları gönderin</string>
<string name="percentage">%%%d</string>
<string name="pref_text_zoom_title">Metin Yakınlığı</string>
<string name="experimental_navigation">Deneysel Gezintisi</string>
</resources>

1
core/src/main/res/values-zh-rTW/strings.xml
View File

@ -272,5 +272,4 @@
<string name="diagnostic_report_message">請傳送所有以下詳細資訊，以讓我們可以方便診斷問題</string>
<string name="percentage">%d%%</string>
<string name="pref_text_zoom_title">文字縮放</string>
<string name="experimental_navigation">實現性導覽</string>
</resources>

3
core/src/main/res/values/strings.xml
View File

@ -279,8 +279,7 @@
<string name="diagnostic_report_message">Please send all the following details so we can diagnose the problem</string>
<string name="percentage">%d%%</string>
<string name="pref_text_zoom_title">Text Zoom</string>
<string name="experimental_navigation">Experimental Navigation</string>
<string name="reader">Reader</string>
<string name="reader">Reader</string>
<string name="no_open_book">No open book</string>
<string name="open_library">Open library</string>
<string-array name="pref_night_modes_entries">

1
custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
View File

@ -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
}