wip

MozillaReality · Dec 17, 2018 · 1d42aae · 1d42aae
1 parent ca36507
commit 1d42aae
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 11 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/DoubleEditSetting.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/DoubleEditSetting.java
@@ -51,6 +51,11 @@ private void initialize(Context aContext) {
             }
             return view.onTouchEvent(motionEvent);
         });
+        mEdit2.setOnFocusChangeListener((v, hasFocus) -> {
+            if (mEdit2.getSelectionStart() == mEdit2.getSelectionEnd()) {
+                mEdit2.setTextColor(mEditTextColor);
+            }
+        });
         mEdit2.addTextChangedListener(new TextColorTextWatcher(mEdit2));
         mEdit2.setOnClickListener(v -> mEdit2.selectAll());
         if (mMaxLength != 0) {
@@ -90,4 +95,12 @@ public void setHint2(String hint) {
         mEdit2.setHint(hint);
     }
 
+    @Override
+    public void cancel() {
+        super.cancel();
+
+        mText2.setVisibility(VISIBLE);
+        mEdit2.setVisibility(View.GONE);
+    }
+
 }
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
@@ -36,8 +36,8 @@ public class SingleEditSetting extends LinearLayout {
     protected EditText mEdit1;
     protected TextView mButton;
     private OnClickListener mListener;
-    private int mEditTextSelectedColor;
-    private int mEditTextColor;
+    protected int mEditTextSelectedColor;
+    protected int mEditTextColor;
 
     public SingleEditSetting(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
@@ -75,11 +75,11 @@ private void initialize(Context aContext) {
         mEditTextColor = colors.getColorForState(View.EMPTY_STATE_SET, R.color.asphalt);
         final GestureDetector gestureDetector = new GestureDetector(getContext(), new GestureListener());
         gestureDetector.setOnDoubleTapListener(new DoubleTapListener(mEdit1));
-        mEdit1.setOnTouchListener((view, motionEvent) -> {
-            if (gestureDetector.onTouchEvent(motionEvent)) {
-                return true;
+        mEdit1.setOnTouchListener((view, motionEvent) -> gestureDetector.onTouchEvent(motionEvent));
+        mEdit1.setOnFocusChangeListener((v, hasFocus) -> {
+            if (mEdit1.getSelectionStart() == mEdit1.getSelectionEnd()) {
+                mEdit1.setTextColor(mEditTextColor);
             }
-            return view.onTouchEvent(motionEvent);
         });
         mEdit1.addTextChangedListener(new TextColorTextWatcher(mEdit1));
         if (mMaxLength != 0) {
@@ -208,6 +208,7 @@ public boolean onSingleTapConfirmed(MotionEvent motionEvent) {
 
         @Override
         public boolean onDoubleTap(MotionEvent motionEvent) {
+            mEditText.selectAll();
             mEditText.setTextColor(mEditTextSelectedColor);
             return false;
         }

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
@@ -162,7 +162,7 @@ protected void onDismiss() {
         if (mHomepageEdit.isEditing()) {
             mHomepageEdit.setFirstText(settings.getHomepage());
             mHomepageEdit.cancel();
-
+            
         } else {
             super.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
@@ -156,26 +156,38 @@ public void show() {
 
     @Override
     protected void onDismiss() {
+        boolean dismiss = true;
+
         SettingsStore settings = SettingsStore.getInstance(getContext());
+
         if (mDensityEdit.isEditing()) {
+            dismiss = false;
             mDensityEdit.setFirstText(String.valueOf(settings.getDisplayDensity()));
             mDensityEdit.cancel();
+        }
 
-        } else if (mDpiEdit.isEditing()) {
+        if (mDpiEdit.isEditing()) {
+            dismiss = false;
             mDpiEdit.setFirstText(String.valueOf(settings.getDisplayDpi()));
             mDpiEdit.cancel();
+        }
 
-        } else if (mWindowSizeEdit.isEditing()) {
+        if (mWindowSizeEdit.isEditing()) {
+            dismiss = false;
             mWindowSizeEdit.setFirstText(String.valueOf(settings.getWindowWidth()));
             mWindowSizeEdit.setSecondText(String.valueOf(settings.getWindowHeight()));
             mWindowSizeEdit.cancel();
+        }
 
-        } else if (mMaxWindowSizeEdit.isEditing()) {
+        if (mMaxWindowSizeEdit.isEditing()) {
+            dismiss = false;
             mMaxWindowSizeEdit.setFirstText(String.valueOf(settings.getMaxWindowWidth()));
             mMaxWindowSizeEdit.setSecondText(String.valueOf(settings.getMaxWindowHeight()));
             mMaxWindowSizeEdit.cancel();
 
-        } else {
+        }
+
+        if (dismiss) {
             super.onDismiss();
         }
     }