Merge pull request #6549 from seadowg/theme-strings

Remove theme from settings description and access control
getodk · Dec 17, 2024 · 1fdc79f · 1fdc79f
2 parents f3b1b13 + cb54f90
commit 1fdc79f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/...va/org/odk/collect/android/preferences/screens/UserSettingsAccessPreferencesFragment.java b/...va/org/odk/collect/android/preferences/screens/UserSettingsAccessPreferencesFragment.java
@@ -2,13 +2,22 @@
 
 import android.os.Bundle;
 
+import androidx.preference.PreferenceCategory;
+
 import org.odk.collect.android.R;
+import org.odk.collect.android.application.FeatureFlags;
+import org.odk.collect.settings.keys.ProtectedProjectKeys;
 
 public class UserSettingsAccessPreferencesFragment extends BaseAdminPreferencesFragment {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         super.onCreatePreferences(savedInstanceState, rootKey);
         setPreferencesFromResource(R.xml.user_settings_access_preferences, rootKey);
+
+        if (FeatureFlags.NO_THEME_SETTING) {
+            PreferenceCategory category = (PreferenceCategory) getPreferenceScreen().getPreference(0);
+            category.removePreference(findPreference(ProtectedProjectKeys.KEY_APP_THEME));
+        }
     }
 }
diff --git a/strings/src/main/res/values/strings.xml b/strings/src/main/res/values/strings.xml
@@ -790,7 +790,7 @@
     <!-- Title of a settings section -->
     <string name="client">User interface</string>
     <!-- Subtext of a settings section -->
-    <string name="user_interface_settings_subtext">App language, theme, font size</string>
+    <string name="user_interface_settings_subtext">App language, font size, navigation</string>
     <!-- Title of a settings section -->
     <string name="maps">Maps</string>
     <!-- Subtext of a settings section -->