[Android] Improve the network indexing wording

Nicolas Pomepuy git at videolan.org
Wed Nov 10 08:10:44 UTC 2021


vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Nov  4 07:49:38 2021 +0100| [7bb34779356e866e45ed69c886f41f58a04a3670] | committer: Nicolas Pomepuy

Improve the network indexing wording

> https://code.videolan.org/videolan/vlc-android/commit/7bb34779356e866e45ed69c886f41f58a04a3670
---

 application/resources/src/main/res/values/strings.xml                 | 4 ++--
 .../src/org/videolan/vlc/gui/browser/MLStorageBrowserFragment.kt      | 3 +--
 .../src/org/videolan/vlc/gui/browser/NetworkBrowserFragment.kt        | 3 +--
 .../vlc-android/src/org/videolan/vlc/util/FeatureFlagManager.kt       | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/application/resources/src/main/res/values/strings.xml b/application/resources/src/main/res/values/strings.xml
index 18a9bdbc1..eeb2ccf2d 100644
--- a/application/resources/src/main/res/values/strings.xml
+++ b/application/resources/src/main/res/values/strings.xml
@@ -856,8 +856,8 @@
     <string name="optional_features">Optional features</string>
     <string name="optional_features_summary">Beta features that are currently being tested and may not be stable</string>
     <string name="optional_features_warning">This feature is in beta and may cause crashes and instabilities</string>
-    <string name="network_indexation">Network indexation</string>
-    <string name="network_indexation_warning">Network indexation is currently in beta.\nKnown issues:\n• Slow performance\n\nIf you encounter some other issues, please report them on our forum.</string>
+    <string name="network_indexing">Network indexing</string>
+    <string name="network_indexing_warning">Network indexing is currently in beta.\nKnown issues:\n• Slow performance\n\nIf you encounter some other issues, please report them on our forum.</string>
     <string name="start_vlc">Start VLC</string>
     <string name="jump_delay">Forward/backward time delay</string>
     <string name="long_jump_delay">Long tap forward/backward time delay</string>
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/browser/MLStorageBrowserFragment.kt b/application/vlc-android/src/org/videolan/vlc/gui/browser/MLStorageBrowserFragment.kt
index 70c2470e9..4083cd19c 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/browser/MLStorageBrowserFragment.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/browser/MLStorageBrowserFragment.kt
@@ -26,7 +26,6 @@ package org.videolan.vlc.gui.browser
 
 import android.content.DialogInterface
 import android.os.Bundle
-import android.os.Handler
 import android.text.InputType
 import android.view.*
 import androidx.appcompat.app.AlertDialog
@@ -129,7 +128,7 @@ class MLStorageBrowserFragment : BaseFragment(), IStorageFragmentDelegate by Sto
         })
 
         networkEntry = view.findViewById(R.id.network_browser_entry)
-        networkEntry.visibility = if (FeatureFlagManager.isEnabled(requireActivity(), FeatureFlag.NETWORK_INDEXATION)) View.VISIBLE else View.GONE
+        networkEntry.visibility = if (FeatureFlagManager.isEnabled(requireActivity(), FeatureFlag.NETWORK_INDEXING)) View.VISIBLE else View.GONE
         networkEntry.loading.showNoMedia = false
         networkEntry.loading.emptyText = R.string.nomedia
         val networkAdapter = StorageBrowserAdapter(getBrowserContainer(true))
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/browser/NetworkBrowserFragment.kt b/application/vlc-android/src/org/videolan/vlc/gui/browser/NetworkBrowserFragment.kt
index 7eb20c4fb..b8841094e 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/browser/NetworkBrowserFragment.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/browser/NetworkBrowserFragment.kt
@@ -27,7 +27,6 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.View
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.snackbar.Snackbar
@@ -90,7 +89,7 @@ class NetworkBrowserFragment : BaseBrowserFragment(), IDialogManager {
             item.setTitle(if (isFavorite) R.string.favorites_remove else R.string.favorites_add)
             mrl?.let {
                 val isScanned = withContext(Dispatchers.IO) { MedialibraryUtils.isScanned(it) }
-                menu.findItem(R.id.ml_menu_scan)?.isVisible = !isRootDirectory && it.startsWith("smb") && !isScanned && FeatureFlagManager.isEnabled(requireActivity(), FeatureFlag.NETWORK_INDEXATION)
+                menu.findItem(R.id.ml_menu_scan)?.isVisible = !isRootDirectory && it.startsWith("smb") && !isScanned && FeatureFlagManager.isEnabled(requireActivity(), FeatureFlag.NETWORK_INDEXING)
             }
         }
 
diff --git a/application/vlc-android/src/org/videolan/vlc/util/FeatureFlagManager.kt b/application/vlc-android/src/org/videolan/vlc/util/FeatureFlagManager.kt
index e3e29f85d..a58023e18 100644
--- a/application/vlc-android/src/org/videolan/vlc/util/FeatureFlagManager.kt
+++ b/application/vlc-android/src/org/videolan/vlc/util/FeatureFlagManager.kt
@@ -53,7 +53,7 @@ object FeatureFlagManager {
  * @param title: a string reference for this feature's title
  */
 enum class FeatureFlag(var dependsOn:FeatureFlag?, @StringRes var title:Int, @StringRes var warning:Int?) {
-    NETWORK_INDEXATION(null, R.string.network_indexation, R.string.network_indexation_warning);
+    NETWORK_INDEXING(null, R.string.network_indexing, R.string.network_indexing_warning);
 
     @SuppressLint("DefaultLocale")
     fun getKey() = "ff_${name.toLowerCase()}"



More information about the Android mailing list