Fixes #772 Localization UI adjustments (#827)

MozillaReality · Nov 26, 2018 · 4a3d928 · 4a3d928
1 parent 17467e1
commit 4a3d928
Show file tree

Hide file tree

Showing 21 changed files with 258 additions and 115 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -61,6 +61,9 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {
+            pseudoLocalesEnabled true
+        }
     }
 
     externalNativeBuild {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/ButtonSetting.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/ButtonSetting.java
@@ -46,12 +46,7 @@ private void initialize(Context aContext) {
         mButton.setOnClickListener(mInternalClickListener);
     }
 
-    private View.OnClickListener mInternalClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            onClickListener(v);
-        }
-    };
+    private View.OnClickListener mInternalClickListener = v -> onClickListener(v);
 
     protected void onClickListener(View v) {
         if (mAudio != null) {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/SingleEditSetting.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/SingleEditSetting.java
@@ -140,7 +140,7 @@ protected boolean updateTouchTextSelection(View v) {
         }
 
         editText.requestFocusFromTouch();
-
+        
         return false;
     }
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/SettingsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/SettingsWidget.java
@@ -361,16 +361,7 @@ private void onOptionsDialogDismissed() {
     // WindowManagerDelegate.FocusChangeListener
     @Override
     public void onGlobalFocusChanged(View oldFocus, View newFocus) {
-        boolean dismiss = false;
-        UIWidget widget = getChild(mCurrentlyOpenedDialogHandle);
-        if (widget != null && oldFocus == widget && widget.isVisible()) {
-            dismiss = true;
-
-        } else if (oldFocus == this && isVisible()) {
-            dismiss = true;
-        }
-
-        if (dismiss) {
+        if (oldFocus == this && isVisible()) {
             onDismiss();
         }
     }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/DeveloperOptionsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/DeveloperOptionsWidget.java
@@ -18,13 +18,16 @@
 import org.mozilla.vrbrowser.ui.views.settings.ButtonSetting;
 import org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting;
 import org.mozilla.vrbrowser.ui.views.settings.SwitchSetting;
+import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
 import org.mozilla.vrbrowser.ui.widgets.dialogs.RestartDialogWidget;
 import org.mozilla.vrbrowser.ui.widgets.UIWidget;
 import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
 
 import static org.mozilla.vrbrowser.utils.ServoUtils.isServoAvailable;
 
-public class DeveloperOptionsWidget extends UIWidget {
+public class DeveloperOptionsWidget extends UIWidget implements
+        WidgetManagerDelegate.WorldClickListener,
+        WidgetManagerDelegate.FocusChangeListener {
 
     private AudioEngine mAudio;
     private UIButton mBackButton;
@@ -63,8 +66,11 @@ private void initialize(Context aContext) {
 
         mAudio = AudioEngine.fromContext(aContext);
 
+        mWidgetManager.addFocusChangeListener(this);
+        mWidgetManager.addWorldClickListener(this);
+
         mBackButton = findViewById(R.id.backButton);
-        mBackButton.setOnClickListener((OnClickListener) view -> {
+        mBackButton.setOnClickListener(view -> {
             if (mAudio != null) {
                 mAudio.playSound(AudioEngine.Sound.CLICK);
             }
@@ -125,6 +131,14 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         aPlacement.translationZ = WidgetPlacement.unitFromMeters(getContext(), R.dimen.restart_dialog_world_z);
     }
 
+    @Override
+    public void releaseWidget() {
+        mWidgetManager.removeFocusChangeListener(this);
+        mWidgetManager.removeWorldClickListener(this);
+
+        super.releaseWidget();
+    }
+
     @Override
     public void show() {
         super.show();
@@ -282,4 +296,22 @@ private void setPointerColor(int checkedId, boolean doApply) {
         }
     }
 
+    // WindowManagerDelegate.FocusChangeListener
+
+    @Override
+    public void onGlobalFocusChanged(View oldFocus, View newFocus) {
+        if (oldFocus == this && isVisible() && findViewById(newFocus.getId()) == null) {
+            onDismiss();
+        }
+    }
+
+    // WorldClickListener
+
+    @Override
+    public void onWorldClick() {
+        if (isVisible()) {
+            onDismiss();
+        }
+    }
+
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/DisplayOptionsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/DisplayOptionsWidget.java
@@ -7,6 +7,7 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.ScrollView;
 
 import org.mozilla.vrbrowser.R;
@@ -18,11 +19,14 @@
 import org.mozilla.vrbrowser.ui.views.settings.DoubleEditSetting;
 import org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting;
 import org.mozilla.vrbrowser.ui.views.settings.SingleEditSetting;
+import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
 import org.mozilla.vrbrowser.ui.widgets.dialogs.RestartDialogWidget;
 import org.mozilla.vrbrowser.ui.widgets.UIWidget;
 import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
 
-public class DisplayOptionsWidget extends UIWidget {
+public class DisplayOptionsWidget extends UIWidget implements
+        WidgetManagerDelegate.WorldClickListener,
+        WidgetManagerDelegate.FocusChangeListener {
 
     private AudioEngine mAudio;
     private UIButton mBackButton;
@@ -60,8 +64,11 @@ private void initialize(Context aContext) {
 
         mAudio = AudioEngine.fromContext(aContext);
 
+        mWidgetManager.addFocusChangeListener(this);
+        mWidgetManager.addWorldClickListener(this);
+
         mBackButton = findViewById(R.id.backButton);
-        mBackButton.setOnClickListener((OnClickListener) view -> {
+        mBackButton.setOnClickListener(view -> {
             if (mAudio != null) {
                 mAudio.playSound(AudioEngine.Sound.CLICK);
             }
@@ -126,6 +133,14 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         aPlacement.translationZ = WidgetPlacement.unitFromMeters(getContext(), R.dimen.restart_dialog_world_z);
     }
 
+    @Override
+    public void releaseWidget() {
+        mWidgetManager.removeFocusChangeListener(this);
+        mWidgetManager.removeWorldClickListener(this);
+
+        super.releaseWidget();
+    }
+
     @Override
     public void show() {
         super.show();
@@ -329,4 +344,22 @@ private void setMaxWindowSize(int newMaxWindowWidth, int newMaxWindowHeight, boo
         String newMaxWindowHeightStr = Integer.toString(newMaxWindowHeight);
         mMaxWindowSizeEdit.setSecondText(newMaxWindowHeightStr);
     }
+
+    // WindowManagerDelegate.FocusChangeListener
+
+    @Override
+    public void onGlobalFocusChanged(View oldFocus, View newFocus) {
+        if (oldFocus == this && isVisible() && findViewById(newFocus.getId()) == null) {
+            onDismiss();
+        }
+    }
+
+    // WorldClickListener
+
+    @Override
+    public void onWorldClick() {
+        if (isVisible()) {
+            onDismiss();
+        }
+    }
 }
diff --git a/...mon/shared/org/mozilla/vrbrowser/ui/widgets/options/VoiceSearchLanguageOptionsWidget.java b/...mon/shared/org/mozilla/vrbrowser/ui/widgets/options/VoiceSearchLanguageOptionsWidget.java
@@ -7,6 +7,7 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.ScrollView;
 
 import org.mozilla.vrbrowser.R;
@@ -16,10 +17,13 @@
 import org.mozilla.vrbrowser.ui.views.settings.ButtonSetting;
 import org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting;
 import org.mozilla.vrbrowser.ui.widgets.UIWidget;
+import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
 import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
 import org.mozilla.vrbrowser.utils.LocaleUtils;
 
-public class VoiceSearchLanguageOptionsWidget extends UIWidget {
+public class VoiceSearchLanguageOptionsWidget extends UIWidget implements
+        WidgetManagerDelegate.WorldClickListener,
+        WidgetManagerDelegate.FocusChangeListener {
 
     private AudioEngine mAudio;
     private UIButton mBackButton;
@@ -50,6 +54,9 @@ private void initialize(Context aContext) {
 
         mAudio = AudioEngine.fromContext(aContext);
 
+        mWidgetManager.addFocusChangeListener(this);
+        mWidgetManager.addWorldClickListener(this);
+
         mBackButton = findViewById(R.id.backButton);
         mBackButton.setOnClickListener(view -> {
             if (mAudio != null) {
@@ -83,6 +90,14 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         aPlacement.translationZ = WidgetPlacement.unitFromMeters(getContext(), R.dimen.restart_dialog_world_z);
     }
 
+    @Override
+    public void releaseWidget() {
+        mWidgetManager.removeFocusChangeListener(this);
+        mWidgetManager.removeWorldClickListener(this);
+
+        super.releaseWidget();
+    }
+
     @Override
     public void show() {
         super.show();
@@ -109,4 +124,22 @@ private void setLanguage(int checkedId, boolean doApply) {
         SettingsStore.getInstance(getContext()).setVoiceSearchLanguage(mLanguage.getValueForId(checkedId).toString());
     }
 
+    // WindowManagerDelegate.FocusChangeListener
+
+    @Override
+    public void onGlobalFocusChanged(View oldFocus, View newFocus) {
+        if (oldFocus == this && isVisible() && findViewById(newFocus.getId()) == null) {
+            onDismiss();
+        }
+    }
+
+    // WorldClickListener
+
+    @Override
+    public void onWorldClick() {
+        if (isVisible()) {
+            onDismiss();
+        }
+    }
+
 }
diff --git a/app/src/main/res/layout/crash_dialog.xml b/app/src/main/res/layout/crash_dialog.xml
@@ -72,21 +72,21 @@
 
         <Button
             android:id="@+id/learnMoreButton"
-            style="@style/dialogButtonRegular"
+            style="@style/dialogButtonWide"
             android:layout_marginEnd="@dimen/dialog_button_margin_end"
             android:text="@string/learn_more_button"
             tools:text="@string/learn_more_button" />
 
         <Button
             android:id="@+id/dontSendButton"
-            style="@style/dialogButtonRegular"
+            style="@style/dialogButtonWide"
             android:layout_marginEnd="@dimen/dialog_button_margin_end"
             android:text="@string/do_not_sent_button"
             tools:text="@string/do_not_sent_button" />
 
         <Button
             android:id="@+id/sendDataButton"
-            style="@style/dialogButtonHighlighted"
+            style="@style/dialogButtonWideHighlighted"
             android:text="@string/send_data_button"
             tools:text="@string/send_data_button" />
     </LinearLayout>

diff --git a/app/src/main/res/layout/honeycomb_button.xml b/app/src/main/res/layout/honeycomb_button.xml
@@ -19,22 +19,23 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:fontFamily="sans-serif-light"
             android:gravity="center"
             android:text="@string/settings_privacy"
-            android:textSize="@dimen/text_smaller_size"
-            android:fontFamily="sans-serif-light"/>
+            android:textSize="@dimen/text_smaller_size" />
+
         <TextView
             android:id="@+id/settings_secondary_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="5dp"
+            android:fontFamily="sans-serif-light"
             android:gravity="center"
             android:text="Secondary text"
-            android:textSize="@dimen/text_smaller_size"
-            android:fontFamily="sans-serif-light"/>
+            android:textSize="@dimen/text_smaller_size" />
     </LinearLayout>
 </merge>
diff --git a/app/src/main/res/layout/honeycomb_switch.xml b/app/src/main/res/layout/honeycomb_switch.xml
@@ -1,16 +1,19 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tool="http://schemas.android.com/tools">
+
     <TextView
         android:id="@+id/honeycombSwitchText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:fontFamily="sans-serif-light"
         android:gravity="center"
         android:paddingBottom="5dp"
         android:textColor="@color/white"
         android:textSize="@dimen/text_smaller_size"
-        tool:text="Description"/>
+        tool:text="Description" />
 
     <Switch
         android:id="@+id/honeycombSwitchButton"