Bug 1391177 - Part 7: TabCounter refinements. r?nechen,walkingice draft
authorJing-wei Wu <topwu.tw@gmail.com>
Mon, 21 Aug 2017 18:31:09 +0800
changeset 653775 1ecfb164a9d4dabf9c13252381eecc0af59255d4
parent 653774 f5a62f89d9a55cd8192c3f8811715b1433da8072
child 653776 c948a4775905010edb928f1c2cfc7a4d375c3a83
child 653780 32e677fba66164691d3dd44e66db98d999988658
push id76402
push userbmo:topwu.tw@gmail.com
push dateMon, 28 Aug 2017 00:49:54 +0000
reviewersnechen, walkingice
bugs1391177
milestone57.0a1
Bug 1391177 - Part 7: TabCounter refinements. r?nechen,walkingice 1. Ratio of one digit is changed from 0.7 to 0.5. 2. Decorate text with 'sans-serif-medium' & 'bold'. 3. Change border thinkness from 2.5dp to 2.3dp. MozReview-Commit-ID: 9ghdkBAFx9r
mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/TabCounter.java
mobile/android/app/src/photon/res/drawable/tabs_counter_box.xml
mobile/android/app/src/photon/res/layout/tabs_counter.xml
mobile/android/app/src/photon/res/values/colors.xml
mobile/android/app/src/photon/res/values/styles.xml
--- a/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/TabCounter.java
+++ b/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/TabCounter.java
@@ -26,17 +26,17 @@ public class TabCounter extends ThemedRe
     private final ThemedTextView text;
 
     private final AnimatorSet animationSet;
     private int count;
 
     public static final int MAX_VISIBLE_TABS = 99;
     public static final String SO_MANY_TABS_OPEN = "∞";
 
-    private static final float ONE_DIGIT_SIZE_RATIO = 0.7f;
+    private static final float ONE_DIGIT_SIZE_RATIO = 0.6f;
     private static final float TWO_DIGITS_SIZE_RATIO = 0.5f;
 
     public TabCounter(Context context) {
         this(context, null);
     }
 
     public TabCounter(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
--- a/mobile/android/app/src/photon/res/drawable/tabs_counter_box.xml
+++ b/mobile/android/app/src/photon/res/drawable/tabs_counter_box.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke
-        android:width="2.5dp"
+        android:width="2.3dp"
         android:color="@color/tabs_counter_fg"/>
     <corners android:radius="2dp"/>
     <solid android:color="@android:color/transparent"/>
 </shape>
--- a/mobile/android/app/src/photon/res/layout/tabs_counter.xml
+++ b/mobile/android/app/src/photon/res/layout/tabs_counter.xml
@@ -23,16 +23,17 @@
             android:id="@+id/counter_box"
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:src="@drawable/tabs_counter_box"
             gecko:drawableTintList="@color/tabs_counter_fg"/>
 
         <org.mozilla.gecko.widget.themed.ThemedTextView
             android:id="@+id/counter_text"
+            style="@style/UrlBar.TabCounter.Text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:textColor="@color/tabs_counter_text"
             android:textSize="12sp"
             tools:text="18"/>
     </FrameLayout>
 
--- a/mobile/android/app/src/photon/res/values/colors.xml
+++ b/mobile/android/app/src/photon/res/values/colors.xml
@@ -55,17 +55,17 @@
     <color name="photon_icon_private_pressed">@color/photon_icon_private</color>
     <color name="photon_icon_lock">#16DA00</color>
 
     <color name="photon_notification_bg">#0096DD</color>
 
     <!-- opacity: 20% -->
     <color name="photon_notification_bg_pressed">#33000000</color>
 
-    <color name="photon_toolbar_text_color">#3B3B3B</color>
+    <color name="photon_toolbar_text_color">#272727</color>
     <color name="photon_toolbar_text_color_private">#FFFFFF</color>
     <color name="photon_toolbar_image_tint">@color/photon_toolbar_text_color</color>
     <color name="photon_toolbar_image_tint_private">@color/photon_toolbar_text_color_private</color>
     <color name="photon_toolbar_bg">#F7FAFC</color>
     <color name="photon_toolbar_bg_private">#38383D</color>
 
     <color name="photon_two_line_page_row_bg">#FFFFFF</color>
     <color name="photon_two_line_page_row_bg_private">#414146</color>
--- a/mobile/android/app/src/photon/res/values/styles.xml
+++ b/mobile/android/app/src/photon/res/values/styles.xml
@@ -855,16 +855,21 @@
     <style name="UrlBar.TabCounter" parent="UrlBar.V15.TabCounter"/>
     <style name="UrlBar.Base.TabCounter" parent="UrlBar.ImageButton"/>
     <style name="UrlBar.V15.TabCounter" parent="UrlBar.Base.TabCounter">
         <item name="android:layout_alignLeft">@id/tabs</item>
         <item name="android:layout_alignRight">@id/tabs</item>
         <item name="android:layout_toLeftOf">@id/menu</item>
     </style>
 
+    <style name="UrlBar.TabCounter.Text">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
     <style name="UrlBar.EditCancel" parent="UrlBar.V15.EditCancel"/>
     <style name="UrlBar.Base.EditCancel" parent="UrlBar.ImageButton"/>
     <style name="UrlBar.V15.EditCancel" parent="UrlBar.Base.EditCancel">
         <item name="android:layout_alignParentRight">true</item>
     </style>
 
     <style name="UrlBar.EditLayout" parent="UrlBar.V15.EditLayout"/>
     <style name="UrlBar.Base.EditLayout" parent="UrlBar.Button"/>