Introduce updated locale picker

RELEASE-NOTES.txt

@@ -2,6 +2,8 @@
 
 19.8
 -----
+* [*] App Settings: updated look and functionality of Locale Picker [https://github.com/wordpress-mobile/WordPress-Android/pull/16331]
+* [*] Fix issue that prevented Jetpack customers with standalone VideoPress subs uploading >5min videos [https://github.com/wordpress-mobile/WordPress-Android/pull/16322]
 * [*] On self-hosted sites, allow previewing unsaved changes to draft posts [https://github.com/wordpress-mobile/WordPress-Android/pull/16296]
 * [*] Editor: Fix issue that caused previews on atomic sites to sometimes be out-of-date. [https://github.com/wordpress-mobile/WordPress-Android/pull/16332]
 * [*] Fixes Media Picker video selection Accessibility issue [https://github.com/wordpress-mobile/WordPress-Android/pull/16426]

WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java

@@ -148,6 +148,7 @@
 import org.wordpress.android.ui.prefs.categories.detail.CategoryDetailFragment;
 import org.wordpress.android.ui.prefs.categories.list.CategoriesListFragment;
 import org.wordpress.android.ui.prefs.homepage.HomepageSettingsDialog;
+import org.wordpress.android.ui.prefs.language.LocalePickerBottomSheet;
 import org.wordpress.android.ui.prefs.notifications.NotificationsSettingsFragment;
 import org.wordpress.android.ui.prefs.timezone.SiteSettingsTimezoneBottomSheet;
 import org.wordpress.android.ui.publicize.PublicizeAccountChooserListAdapter;
@@ -660,6 +661,8 @@ public interface AppComponent {
     void inject(EditCancelDialogFragment object);
 
     void inject(BloggingReminderBottomSheetFragment object);
+
+    void inject(LocalePickerBottomSheet object);
 
     void inject(CategoriesListFragment object);
 

WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java

@@ -50,6 +50,7 @@
 import org.wordpress.android.ui.prefs.categories.detail.CategoryDetailViewModel;
 import org.wordpress.android.ui.prefs.categories.list.CategoriesListViewModel;
 import org.wordpress.android.ui.prefs.homepage.HomepageSettingsViewModel;
+import org.wordpress.android.ui.prefs.language.LocalePickerViewModel;
 import org.wordpress.android.ui.prefs.timezone.SiteSettingsTimezoneViewModel;
 import org.wordpress.android.ui.reader.ReaderCommentListViewModel;
 import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel;
@@ -582,6 +583,11 @@ abstract class ViewModelModule {
     @ViewModelKey(CategoriesListViewModel.class)
     abstract ViewModel categoriesViewModel(CategoriesListViewModel viewModel);
 
+    @Binds
+    @IntoMap
+    @ViewModelKey(LocalePickerViewModel.class)
+    abstract ViewModel localePickerViewModel(LocalePickerViewModel viewModel);
+
     @Binds
     @IntoMap
     @ViewModelKey(CategoryDetailViewModel.class)

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java

@@ -13,7 +13,6 @@
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.text.TextUtils;
-import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -26,6 +25,7 @@
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import org.jetbrains.annotations.NotNull;
 import org.wordpress.android.BuildConfig;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
@@ -42,6 +42,8 @@
 import org.wordpress.android.fluxc.store.WhatsNewStore.OnWhatsNewFetched;
 import org.wordpress.android.fluxc.store.WhatsNewStore.WhatsNewAppId;
 import org.wordpress.android.fluxc.store.WhatsNewStore.WhatsNewFetchPayload;
+import org.wordpress.android.ui.prefs.language.LocalePickerBottomSheet;
+import org.wordpress.android.ui.prefs.language.LocalePickerBottomSheet.LocalePickerCallback;
 import org.wordpress.android.ui.about.UnifiedAboutActivity;
 import org.wordpress.android.ui.debug.DebugSettingsActivity;
 import org.wordpress.android.ui.mysite.tabs.MySiteDefaultTabExperiment;
@@ -72,10 +74,10 @@
 import javax.inject.Inject;
 
 public class AppSettingsFragment extends PreferenceFragment
-        implements OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
+        implements OnPreferenceClickListener, Preference.OnPreferenceChangeListener, LocalePickerCallback {
     public static final int LANGUAGE_CHANGED = 1000;
 
-    private DetailListPreference mLanguagePreference;
+    private WPPreference mLanguagePreference;
     private ListPreference mAppThemePreference;
     private ListPreference mInitialScreenPreference;
 
@@ -136,8 +138,9 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
         );
         updateAnalyticsSyncUI();
 
-        mLanguagePreference = (DetailListPreference) findPreference(getString(R.string.pref_key_language));
+        mLanguagePreference = (WPPreference) findPreference(getString(R.string.pref_key_language));
         mLanguagePreference.setOnPreferenceChangeListener(this);
+        mLanguagePreference.setOnPreferenceClickListener(this);
 
         mAppThemePreference = (ListPreference) findPreference(getString(R.string.pref_key_app_theme));
         mAppThemePreference.setOnPreferenceChangeListener(this);
@@ -302,8 +305,7 @@ public void onStop() {
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-
-        updateLanguagePreference(getResources().getConfiguration().locale.toString());
+        reattachLocalePickerCallback();
         // flush gathered events (if any)
         AnalyticsTracker.flush();
     }
@@ -385,6 +387,8 @@ public boolean onPreferenceClick(Preference preference) {
             return handlePrivacyClick();
         } else if (preference == mWhatsNew) {
             return handleFeatureAnnouncementClick();
+        } else if (preference == mLanguagePreference) {
+            return handleAppLocalePickerClick();
         }
 
         return false;
@@ -480,7 +484,6 @@ private void changeLanguage(String languageCode) {
 
         LocaleManager.setNewLocale(WordPress.getContext(), languageCode);
         WordPress.updateContextLocale();
-        updateLanguagePreference(languageCode);
         mContextProvider.refreshContext();
 
         // Track language change on Analytics because we have both the device language and app selected language
@@ -503,33 +506,6 @@ private void changeLanguage(String languageCode) {
         ReaderUpdateServiceStarter.startService(WordPress.getContext(), EnumSet.of(ReaderUpdateLogic.UpdateTask.TAGS));
     }
 
-    private void updateLanguagePreference(String languageCode) {
-        if (mLanguagePreference == null || TextUtils.isEmpty(languageCode)) {
-            return;
-        }
-
-        Locale languageLocale = LocaleManager.languageLocale(languageCode);
-        String[] availableLocales = getResources().getStringArray(R.array.available_languages);
-
-        Pair<String[], String[]> pair =
-                LocaleManager.createSortedLanguageDisplayStrings(availableLocales, languageLocale);
-        // check for a possible NPE
-        if (pair == null) {
-            return;
-        }
-
-        String[] sortedEntries = pair.first;
-        String[] sortedValues = pair.second;
-
-        mLanguagePreference.setEntries(sortedEntries);
-        mLanguagePreference.setEntryValues(sortedValues);
-        mLanguagePreference.setDetails(LocaleManager.createLanguageDetailDisplayStrings(sortedValues));
-
-        mLanguagePreference.setValue(languageCode);
-        mLanguagePreference.setSummary(LocaleManager.getLanguageString(languageCode, languageLocale));
-        mLanguagePreference.refreshAdapter();
-    }
-
     private boolean handleAboutPreferenceClick() {
         // Temporarily limiting this feature to the WordPress app
         if (mUnifiedAboutFeatureConfig.isEnabled() && !BuildConfig.IS_JETPACK_APP) {
@@ -651,4 +627,33 @@ private boolean handleFeatureAnnouncementClick() {
                     + "using support fragment manager from AppCompatActivity.");
         }
     }
+
+    private boolean handleAppLocalePickerClick() {
+        if (getActivity() instanceof AppCompatActivity) {
+            LocalePickerBottomSheet bottomSheet = LocalePickerBottomSheet.newInstance();
+            bottomSheet.setLocalePickerCallback(this);
+            bottomSheet.show(((AppCompatActivity) getActivity()).getSupportFragmentManager(),
+                    LocalePickerBottomSheet.TAG);
+            return true;
+        } else {
+            throw new IllegalArgumentException(
+                    "Parent activity is not AppCompatActivity. LocalePickerBottomSheet must be called "
+                    + "using support fragment manager from AppCompatActivity.");
+        }
+    }
+
+    private void reattachLocalePickerCallback() {
+        if (getActivity() instanceof AppCompatActivity) {
+            LocalePickerBottomSheet bottomSheet = (LocalePickerBottomSheet) (((AppCompatActivity) getActivity()))
+                    .getSupportFragmentManager().findFragmentByTag(LocalePickerBottomSheet.TAG);
+            if (bottomSheet != null) {
+                bottomSheet.setLocalePickerCallback(this);
+            }
+        }
+    }
+
+    @Override
+    public void onLocaleSelected(@NotNull String languageCode) {
+        onPreferenceChange(mLanguagePreference, languageCode);
+    }
 }

WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java

@@ -17,7 +17,6 @@
 import android.preference.PreferenceScreen;
 import android.provider.ContactsContract;
 import android.text.TextUtils;
-import android.util.Pair;
 import android.util.SparseBooleanArray;
 import android.view.ActionMode;
 import android.view.HapticFeedbackConstants;
@@ -114,6 +113,8 @@
 
 import static org.wordpress.android.ui.prefs.WPComSiteSettings.supportsJetpackSiteAcceleratorSettings;
 
+import kotlin.Triple;
+
 /**
  * Allows interfacing with WordPress site settings. Works with WP.com and WP.org v4.5+ (pending).
  * <p>
@@ -1654,15 +1655,16 @@ private void sortLanguages() {
             return;
         }
 
-        Pair<String[], String[]> pair = LocaleManager
+        Triple<String[], String[], String[]> supportedLocales = LocaleManager
                 .createSortedLanguageDisplayStrings(mLanguagePref.getEntryValues(), LocaleManager.languageLocale(null));
-        if (pair != null) {
-            String[] sortedEntries = pair.first;
-            String[] sortedValues = pair.second;
+        if (supportedLocales != null) {
+            String[] sortedEntries = supportedLocales.component1();
+            String[] sortedValues = supportedLocales.component2();
+            String[] localizedEntries = supportedLocales.component3();
 
             mLanguagePref.setEntries(sortedEntries);
             mLanguagePref.setEntryValues(sortedValues);
-            mLanguagePref.setDetails(LocaleManager.createLanguageDetailDisplayStrings(sortedValues));
+            mLanguagePref.setDetails(localizedEntries);
         }
     }
 

WordPress/src/main/java/org/wordpress/android/ui/prefs/language/LocalePickerAdapter.kt

@@ -0,0 +1,41 @@
+package org.wordpress.android.ui.prefs.language
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import org.wordpress.android.ui.prefs.language.LocalePickerListItem.LocalePickerListViewType.LOCALE
+import org.wordpress.android.ui.prefs.language.LocalePickerListItem.LocaleRow
+
+class LocalePickerAdapter : ListAdapter<LocalePickerListItem, LocalePickerListViewHolder<*>>(DIFF_CALLBACK) {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LocalePickerListViewHolder<*> {
+        return when (viewType) {
+            LOCALE.ordinal -> LocalePickerListItemViewHolder(parent)
+            else -> throw IllegalArgumentException("Unexpected view holder in LocalePickerAdapter")
+        }
+    }
+
+    override fun onBindViewHolder(holder: LocalePickerListViewHolder<*>, position: Int) {
+        val item = getItem(position)
+        when (holder) {
+            is LocalePickerListItemViewHolder -> holder.bind(item as LocaleRow)
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return getItem(position)!!.type.ordinal
+    }
+
+    companion object {
+        val DIFF_CALLBACK = object : DiffUtil.ItemCallback<LocalePickerListItem>() {
+            override fun areItemsTheSame(oldItem: LocalePickerListItem, newItem: LocalePickerListItem): Boolean {
+                return when {
+                    oldItem is LocaleRow && newItem is LocaleRow -> oldItem.label == newItem.label
+                    else -> false
+                }
+            }
+
+            override fun areContentsTheSame(oldItem: LocalePickerListItem, newItem: LocalePickerListItem) =
+                    oldItem == newItem
+        }
+    }
+}