Update time based on current display language (#3856)

MozillaReality · Aug 21, 2020 · f6e0604 · f6e0604
1 parent e24b726
commit f6e0604
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/viewmodel/TrayViewModel.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/viewmodel/TrayViewModel.java
@@ -112,15 +112,15 @@ public MutableLiveData<ObservableInt> getDownloadsNumber() {
     }
 
     public void setTime(String time) {
-        this.time.postValue(time);
+        this.time.setValue(time);
     }
 
     public MutableLiveData<String> getTime() {
         return time;
     }
 
     public void setPm(String pm) {
-        this.pm.postValue(pm);
+        this.pm.setValue(pm);
     }
 
     public MutableLiveData<String> getPm() {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java
@@ -48,6 +48,7 @@
 import org.mozilla.vrbrowser.ui.widgets.settings.SettingsWidget;
 import org.mozilla.vrbrowser.utils.ConnectivityReceiver;
 import org.mozilla.vrbrowser.utils.DeviceType;
+import org.mozilla.vrbrowser.utils.LocaleUtils;
 import org.mozilla.vrbrowser.utils.ViewUtils;
 
 import java.text.SimpleDateFormat;
@@ -56,7 +57,6 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 
 public class TrayWidget extends UIWidget implements WidgetManagerDelegate.UpdateListener, DownloadsManager.DownloadsListener, ConnectivityReceiver.Delegate {
 
@@ -245,7 +245,7 @@ public void updateUI() {
                         .withView(mBinding.leftController)
                         .withDensity(R.dimen.tray_tooltip_density)
                         .withLayout(R.layout.tooltip)
-                        .withString(String.format(Locale.getDefault(), "%d%%", mLeftControllerBatteryLevel))
+                        .withString(String.format(LocaleUtils.getDisplayLanguage(getContext()).getLocale(), "%d%%", mLeftControllerBatteryLevel))
                         .withAutoHide(false)
                         .withMargin(-15.0f)
                         .withPosition(NotificationManager.Notification.TOP).build();
@@ -264,7 +264,7 @@ public void updateUI() {
                         .withView(mBinding.rightController)
                         .withDensity(R.dimen.tray_tooltip_density)
                         .withLayout(R.layout.tooltip)
-                        .withString(String.format(Locale.getDefault(), "%d%%", mRightControllerBatteryLevel))
+                        .withString(String.format(LocaleUtils.getDisplayLanguage(getContext()).getLocale(), "%d%%", mRightControllerBatteryLevel))
                         .withAutoHide(false)
                         .withMargin(-15.0f)
                         .withPosition(NotificationManager.Notification.TOP).build();
@@ -283,7 +283,7 @@ public void updateUI() {
                         .withView(mBinding.headset)
                         .withDensity(R.dimen.tray_tooltip_density)
                         .withLayout(R.layout.tooltip)
-                        .withString(String.format(Locale.getDefault(), "%d%%", mHeadsetBatteryLevel))
+                        .withString(String.format(LocaleUtils.getDisplayLanguage(getContext()).getLocale(), "%d%%", mHeadsetBatteryLevel))
                         .withAutoHide(false)
                         .withMargin(-15.0f)
                         .withPosition(NotificationManager.Notification.TOP).build();
@@ -732,7 +732,7 @@ private void updateTime() {
         Date currentTime = Calendar.getInstance().getTime();
         String androidDateTime = DateFormat.getTimeFormat(getContext()).format(currentTime);
         String AmPm = "";
-        SimpleDateFormat format = new SimpleDateFormat("HH:mm", Locale.getDefault());
+        SimpleDateFormat format = new SimpleDateFormat("HH:mm", LocaleUtils.getDisplayLanguage(getContext()).getLocale());
         if (!Character.isDigit(androidDateTime.charAt(androidDateTime.length() - 1))) {
             if (androidDateTime.contains(format.getDateFormatSymbols().getAmPmStrings()[Calendar.AM])) {
                 AmPm = " " + format.getDateFormatSymbols().getAmPmStrings()[Calendar.AM];
@@ -852,7 +852,7 @@ public void setBatteryLevels(final int headset, final boolean isCharging, final
 
     @NonNull
     private String getFormattedDate() {
-        SimpleDateFormat format = new SimpleDateFormat("EEEE, dd MMMM yyyy", Locale.getDefault());
+        SimpleDateFormat format = new SimpleDateFormat("EEEE, dd MMMM yyyy", LocaleUtils.getDisplayLanguage(getContext()).getLocale());
         return format.format(new Date());
     }
 }
diff --git a/app/src/main/res/layout/tray.xml b/app/src/main/res/layout/tray.xml
@@ -31,7 +31,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="12dp"
+                android:layout_marginEnd="5dp"
                 android:orientation="horizontal">
                 <TextView
                     android:id="@+id/time_text"
@@ -50,6 +50,7 @@
                     android:gravity="bottom"
                     android:textColor="@color/concrete"
                     android:text="@{traymodel.pm}"
+                    app:visibleGone="@{!traymodel.pm.isEmpty}"
                     tool:text="pm"/>
             </LinearLayout>
             <FrameLayout