Fix private notification url bar button style (#3516)

Author: keianhzo

app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChinesePinyinKeyboard.java

@@ -5,6 +5,9 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.readystatesoftware.sqliteasset.SQLiteAssetHelper;
 
 import org.mozilla.vrbrowser.R;
@@ -13,16 +16,12 @@
 import org.mozilla.vrbrowser.utils.SystemUtils;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import jp.co.omronsoft.openwnn.ComposingText;
 import jp.co.omronsoft.openwnn.SymbolList;
 import jp.co.omronsoft.openwnn.WnnWord;

app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChineseZhuyinKeyboard.java

@@ -3,8 +3,11 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
 import android.inputmethodservice.Keyboard.Key;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.readystatesoftware.sqliteasset.SQLiteAssetHelper;
 
@@ -21,9 +24,6 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import jp.co.omronsoft.openwnn.ComposingText;
 import jp.co.omronsoft.openwnn.SymbolList;
 import jp.co.omronsoft.openwnn.WnnWord;
@@ -229,7 +229,7 @@ private List<Words> getDisplays(String aKey) {
         // Allow completion of uppercase/lowercase letters numbers, and symbols
         // aKey.length() > 1 only happens when switching from other keyboard.
         if (aKey.matches(nonZhuyinReg) ||
-            (aKey.length() > 1 && mKeymaps.size() == 0)) {
+                (aKey.length() > 1 && mKeymaps.size() == 0)) {
             return Collections.singletonList(new Words(1, aKey, aKey));
         }
 
@@ -248,9 +248,9 @@ private List<Words> getDisplays(String aKey) {
         final String lastChar = "" + aKey.charAt(aKey.length()-1);
         if (map != null && lastChar.matches(nonZhuyinReg))
         {
-           Words word = map.displays.get(0);
-           return Collections.singletonList(new Words(1,
-                   word.code + lastChar, word.value + lastChar));
+            Words word = map.displays.get(0);
+            return Collections.singletonList(new Words(1,
+                    word.code + lastChar, word.value + lastChar));
         }
         return map.displays;
     }

app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java

@@ -46,6 +46,7 @@ public class UIButton extends AppCompatImageButton implements CustomUIButton {
     private @IdRes int mPrivateModeTintColorListRes;
     private @IdRes int mActiveModeTintColorListRes;
     private @IdRes int mNotificationModeTintColorListRes;
+    private @IdRes int mPrivateNotificationModeTintColorListRes;
     private TooltipWidget mTooltipView;
     private String mTooltipText;
     private int mTooltipDelay;
@@ -76,6 +77,7 @@ public UIButton(Context context, AttributeSet attrs, int defStyleAttr) {
         mPrivateModeTintColorListRes = attributes.getResourceId(R.styleable.UIButton_privateModeTintColorList, 0);
         mActiveModeTintColorListRes = attributes.getResourceId(R.styleable.UIButton_activeModeTintColorList, 0);
         mNotificationModeTintColorListRes = attributes.getResourceId(R.styleable.UIButton_notificationModeTintColorList, 0);
+        mPrivateNotificationModeTintColorListRes = attributes.getResourceId(R.styleable.UIButton_privateNotificationModeTintColorList, 0);
         mTooltipDelay = attributes.getInt(R.styleable.UIButton_tooltipDelay, getResources().getInteger(R.integer.tooltip_delay));
         mTooltipPosition = ViewUtils.TooltipPosition.fromId(attributes.getInt(R.styleable.UIButton_tooltipPosition, ViewUtils.TooltipPosition.BOTTOM.ordinal()));
         TypedValue densityValue = new TypedValue();
@@ -263,7 +265,10 @@ private void setActive() {
     }
 
     private void setNotification() {
-        if (mActiveModeTintColorListRes != 0) {
+        if (mIsPrivate && mPrivateNotificationModeTintColorListRes != 0) {
+            setTintColorList(mPrivateNotificationModeTintColorListRes);
+
+        } else if (mNotificationModeTintColorListRes != 0) {
             setTintColorList(mNotificationModeTintColorListRes);
         }
     }

app/src/main/res/drawable/main_button_icon_color_notification_private.xml

@@ -0,0 +1,9 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+        android:color="@color/blackberry"/>
+    <item android:state_pressed="true"
+        android:color="@color/azure"/>
+    <item android:state_hovered="true"
+        android:color="@color/eggplant"/>
+    <item android:color="@color/azure"/>
+</selector>

app/src/main/res/values/attrs.xml

@@ -22,6 +22,7 @@
         <attr name="privateModeTintColorList" format="reference|color" />
         <attr name="activeModeTintColorList" format="reference|color" />
         <attr name="notificationModeTintColorList" format="reference|color" />
+        <attr name="privateNotificationModeTintColorList" format="reference|color" />
         <attr name="privateModeBackground" format="integer" />
         <attr name="activeModeBackground" format="integer" />
         <attr name="regularModeBackground" format="integer" />

app/src/main/res/values/styles.xml

@@ -58,6 +58,7 @@
         <item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
         <item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
         <item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
+        <item name="privateNotificationModeTintColorList">@drawable/main_button_icon_color_notification_private</item>
         <item name="clipColor">@color/azure</item>
     </style>
 
@@ -184,6 +185,7 @@
         <item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
         <item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
         <item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
+        <item name="privateNotificationModeTintColorList">@drawable/main_button_icon_color_notification_private</item>
     </style>
 
     <style name="urlBarIconThemeStart">
@@ -197,6 +199,7 @@
         <item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
         <item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
         <item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
+        <item name="privateNotificationModeTintColorList">@drawable/main_button_icon_color_notification_private</item>
     </style>
 
     <style name="urlBarIconThemeEnd">
@@ -210,6 +213,7 @@
         <item name="privateModeTintColorList">@drawable/main_button_icon_color_private</item>
         <item name="activeModeTintColorList">@drawable/main_button_icon_color_active</item>
         <item name="notificationModeTintColorList">@drawable/main_button_icon_color_notification</item>
+        <item name="privateNotificationModeTintColorList">@drawable/main_button_icon_color_notification_private</item>
     </style>
 
     <style name="scrollbar">