AB2-772-1 fixing all the remaining values (styles, dimensions, colors)

ghostery · spacifici · Feb 1, 2019 · Jan 31, 2019 · Jan 31, 2019 · Jan 31, 2019
commit 073cb7b31d9ac7436f4b28f8b60babc567762504
diff --git a/mozilla-release/mobile/android/app/src/main/res/values-large/dimens.xml b/mozilla-release/mobile/android/app/src/main/res/values-large/dimens.xml
@@ -21,10 +21,17 @@
     <dimen name="browser_toolbar_image_button_v_spacing">10dp</dimen>
     <dimen name="browser_toolbar_image_button_h_spacing">10dp</dimen>
 
-    <dimen name="browser_toolbar_site_security_width">34dp</dimen>
+    <!-- Cliqz start -->
+    <!-- Reduce the lock logo size -->
+    <dimen name="browser_toolbar_site_security_width">30dp</dimen>
+    <dimen name="browser_toolbar_site_security_height">30dp</dimen>
+    <dimen name="browser_toolbar_site_security_margin_start">10dp</dimen>
+    <!-- Cliqz end -->
     <dimen name="browser_toolbar_site_security_margin_end">6dp</dimen>
-
-    <dimen name="browser_toolbar_url_height">36dp</dimen>
+    <!-- Cliqz start +->
+         increase the url bar height -->
+    <dimen name="browser_toolbar_url_height">42dp</dimen>
+    <!-- Cliqz end -->
 
     <dimen name="firstrun_background_height">300dp</dimen>
 
@@ -46,4 +53,9 @@
 
     <dimen name="tablet_tab_strip_height_pwa">48dp</dimen>
 
+    <!-- Cliqz start -->
+    <!-- Tabs Overview -->
+    <dimen name="tab_panel_text_size">32sp</dimen>
+    <!-- Cliqz end -->
+
 </resources>
diff --git a/mozilla-release/mobile/android/app/src/main/res/values-large/styles.xml b/mozilla-release/mobile/android/app/src/main/res/values-large/styles.xml
@@ -119,7 +119,9 @@
     <style name="UrlBar.Base.MenuItem" />
 
     <style name="UrlBar.V15.MenuItem" parent="UrlBar.Base.MenuItem">
-        <item name="android:layout_toLeftOf">@id/tabs</item>
+        <!-- Cliqz start ->
+        <item name="android:layout_toLeftOf">@id/ghosty</item>
+        <!-- Cliqz end -->
     </style>
 
     <style name="UrlBar.Tabs" parent="UrlBar.V15.Tabs" />
@@ -156,8 +158,11 @@
 
     <style name="UrlBar.V15.ForwardButton" parent="UrlBar.Base.ForwardButton">
         <item name="android:layout_toRightOf">@id/back</item>
+        <!-- Cliqz start +->
+         remove not needed padding
         <item name="android:paddingLeft">@dimen/tablet_fwd_button_padding_start</item>
         <item name="android:paddingRight">@dimen/tablet_fwd_button_padding_end</item>
+        <!+- cliqz end -->
     </style>
 
     <style name="UrlBar.BackButton" parent="UrlBar.V15.BackButton" />
@@ -181,6 +186,10 @@
     <style name="UrlBar.EditLayout.Title" parent="UrlBar.V15.EditLayout.Title"/>
     <style name="UrlBar.V15.EditLayout.Title" parent="UrlBar.Title">
         <item name="android:paddingRight">8dp</item>
+        <!-- Cliqz start -->
+        <!-- add padding at start to the urlBar edit text-->
+        <item name="android:paddingLeft">@dimen/padding_10</item>
+        <!-- Cliqz end -->
     </style>
 
     <style name="UrlBar.DisplayLayout" parent="UrlBar.V15.DisplayLayout" />
@@ -194,7 +203,11 @@
 
     <style name="UrlBar.EditCancel" parent="UrlBar.V15.EditCancel" />
 
-    <style name="UrlBar.Base.EditCancel" parent="UrlBar.ImageButton" />
+    <!-- Cliqz start -->
+    <style name="UrlBar.Base.EditCancel" parent="UrlBar.ImageButton">
+        <item name="drawableTintList">@null</item>
+    </style>
+    <!-- Cliqz end -->
 
     <style name="UrlBar.V15.EditCancel" parent="UrlBar.Base.EditCancel">
         <item name="android:layout_alignParentRight">true</item>
@@ -209,13 +222,19 @@
     <style name="UrlBar.SiteIdentity" parent="UrlBar.V15.SiteIdentity" />
 
     <style name="UrlBar.V15.SiteIdentity" parent="UrlBar.Base.SiteIdentity">
-        <item name="android:paddingLeft">3dp</item>
+        <!-- Cliqz start -->
+        <item name="android:paddingLeft">@dimen/browser_toolbar_site_security_margin_start</item>
         <item name="android:paddingRight">@dimen/browser_toolbar_site_security_margin_end</item>
+        <!-- Cliqz end -->
     </style>
 
 
     <style name="TabsTray.AddTab" parent="TabsTray.V15.AddTab"/>
-    <style name="TabsTray.V15.AddTab" parent="TabsTray.Base.AddTab"/>
+    <style name="TabsTray.V15.AddTab" parent="TabsTray.Base.AddTab">
+        <!-- Cliqz start -->
+        <item name="android:layout_marginLeft">@dimen/padding_10</item>
+        <!-- Cliqz end -->
+    </style>
 
     <style name="TabsTray.Menu" parent="TabsTray.V15.Menu"/>
     <style name="TabsTray.V15.Menu" parent="TabsTray.Base.Menu">

diff --git a/mozilla-release/mobile/android/app/src/main/res/values-sw400dp/dimens.xml b/mozilla-release/mobile/android/app/src/main/res/values-sw400dp/dimens.xml
@@ -7,4 +7,10 @@
 <resources>
     <dimen name="tab_panel_item_width_autofit">176dip</dimen>
     <dimen name="tab_thumbnail_width">137dip</dimen>
+
+    <!-- Cliqz start -->
+    <dimen name="cliqz_intro_title_size">20sp</dimen>
+    <dimen name="cliqz_intro_content_size">15sp</dimen>
+    <dimen name="cliqz_intro_radio_button_height">50dp</dimen>
+    <!-- Cliqz end -->
 </resources>
diff --git a/mozilla-release/mobile/android/app/src/main/res/values-v17/styles.xml b/mozilla-release/mobile/android/app/src/main/res/values-v17/styles.xml
@@ -9,14 +9,19 @@
     <style name="UrlBar.SiteIdentity" parent="UrlBar.V17.SiteIdentity" />
 
     <style name="UrlBar.V17.SiteIdentity" parent="UrlBar.Base.SiteIdentity">
+        <!-- Cliqz start -->
+        <item name="android:paddingStart">@dimen/browser_toolbar_site_security_margin_start</item>
+        <!-- Cliqz end -->
         <item name="android:paddingEnd">@dimen/browser_toolbar_site_security_margin_end</item>
     </style>
 
     <style name="UrlBar.Entry" parent="UrlBar.V17.Entry" />
 
     <style name="UrlBar.V17.Entry" parent="UrlBar.Base.Entry">
         <item name="android:layout_marginStart">5dp</item>
-        <item name="android:layout_toStartOf">@+id/tabs</item>
+        <!-- Cliqz start -->
+        <item name="android:layout_toStartOf">@+id/ghosty</item>
+        <!-- Cliqz end -->
     </style>
 
     <style name="UrlBar.Edge" parent="UrlBar.V17.Edge" />
@@ -55,17 +60,23 @@
 
     <style name="UrlBar.EditLayout" parent="UrlBar.V17.EditLayout" />
 
+    <!-- Cliqz start -->
+    <!-- cancel button moved inside the urlBar, remove dependencies of outer layout-->
     <style name="UrlBar.V17.EditLayout" parent="UrlBar.Base.EditLayout">
-        <item name="android:layout_alignStart">@id/url_bar_entry</item>
-        <item name="android:layout_toStartOf">@id/edit_cancel</item>
+        <!--<item name="android:layout_alignStart">@id/url_bar_entry</item>-->
+        <!--<item name="android:layout_toStartOf">@id/edit_cancel</item>-->
         <item name="android:paddingStart">5dp</item>
-        <item name="android:paddingEnd">0dp</item>
-        <item name="android:layout_marginEnd">-3dp</item>
+        <item name="android:paddingEnd">5dp</item>
+        <!--<item name="android:layout_marginEnd">-3dp</item>-->
     </style>
+    <!-- Cliqz end -->
 
     <style name="UrlBar.EditLayout.Title" parent="UrlBar.V17.EditLayout.Title"/>
     <style name="UrlBar.V17.EditLayout.Title" parent="UrlBar.Title">
-        <item name="android:paddingStart">5dp</item>
+        <!-- Cliqz start -->
+        <!-- increase padding at the beginning of the titleBar -->
+        <item name="android:paddingStart">@dimen/padding_10</item>
+        <!-- Cliqz end -->
         <item name="android:paddingEnd">8dp</item>
     </style>
 
@@ -92,7 +103,10 @@
 
     <style name="TabsTray.AddTab" parent="TabsTray.V17.AddTab" />
     <style name="TabsTray.V17.AddTab" parent="TabsTray.Base.AddTab">
-        <item name="android:layout_marginEnd">-3dp</item>
+        <!-- Cliqz start -->
+        <item name="android:layout_marginLeft">@dimen/padding_10</item>
+        <!--<item name="android:layout_marginRight">-3dp</item>
+        <!+- Cliqz end -->
     </style>
 
     <style name="TabsTray.Menu" parent="TabsTray.V17.Menu" />

diff --git a/mozilla-release/mobile/android/app/src/main/res/values/colors.xml b/mozilla-release/mobile/android/app/src/main/res/values/colors.xml
@@ -94,9 +94,13 @@
     <color name="tab_strip_title_lwt">#272727</color>
 
     <!-- Status bar background color -->
-    <color name="status_bar_bg_color">#F9F9FA</color>
+    <!-- Cliqz start -->
+    <color name="status_bar_bg_color">#38383D</color>
+    <!-- Cliqz end -->
     <color name="status_bar_bg_color_private">#38383D</color>
-    <color name="status_bar_bg_color_tabs_tray">@color/photon_tabs_tray_bg</color>
+    <!-- Cliqz start -->
+    <color name="status_bar_bg_color_tabs_tray">@android:color/black</color>
+    <!-- Cliqz end -->
     <color name="status_bar_bg_color_tablet">@color/photon_tabs_tray_bg</color>
 
     <!-- Toolbar menu item tint color -->
@@ -225,7 +229,10 @@
     <color name="url_bar_urltext">#737373</color>
     <color name="url_bar_urltext_private">#B2B2B2</color>
     <color name="url_bar_domaintext">@color/photon_url_bar_domain</color>
-    <color name="url_bar_domaintext_private">@color/photon_url_bar_domain_private</color>
+    <!-- Cliqz start -->
+    <!-- make url bar domain color as normal tab url domain color -->
+    <color name="url_bar_domaintext_private">@color/url_bar_domaintext</color>
+    <!-- Cliqz end -->
     <color name="url_bar_blockedtext">@color/photon_url_bar_blocked</color>
     <color name="url_bar_blockedtext_private">@color/photon_url_bar_blocked_private</color>
     <color name="url_bar_shadow">#12000000</color>
@@ -276,4 +283,81 @@
     <color name="dtp_header_text_inactive">#B2B2B2</color>
     <color name="dtp_selection">#FFFFFF</color>
 
+    <!-- Cliqz start -->
+    <!-- General -->
+    <color name="general_blue_color">#00aef0</color>
+    <color name="general_light_blue_color">#4dc6f4</color>
+    <color name="general_dark_blue_color">#0080b3</color>
+    <color name="general_dark_color">#424242</color>
+    <color name="inactive_tab_color">#E2F0FC</color>
+    <color name="home_panel_background_overlay">#40000000</color>
+    <color name="history_list_divider_color">#97A4AE</color>
+    <color name="inactive_icon_color">#97A4AE</color>
+    <color name="background_ghost_mode">#0080b1</color>
+    <!-- news -->
+    <color name="news_bg_color_press">#cdcdcd</color>
+    <color name="news_bg_color">#40000000</color>
+    <color name="news_url_text">#FFFFFF</color>
+    <color name="news_title_text">#FFFFFF</color>
+    <color name="news_local_span">@color/general_blue_color</color>
+
+    <!-- URL Bar -->
+    <color name="url_bar">@color/general_blue_color</color>
+
+    <!-- MyOffrz -->
+    <color name="myoffrz_icon_tint">@color/general_blue_color</color>
+    <color name="myoffrz_bg_text">#FFFFFF</color>
+    <color name="myoffrz_bg">#E7ECEE</color>
+    <color name="myoffrz_onboarding_bg">#b8dfee</color>
+    <color name="myoffrz_deactivated_layout">#40000000</color>
+
+    <!-- ControlCenter -->
+    <color name="cc_advertising">#CB55CD</color>
+    <color name="cc_audio_video_player">#EF671E</color>
+    <color name="cc_comments">#43B7C5</color>
+    <color name="cc_customer_interaction">#FDC257</color>
+    <color name="cc_essential">#FC9734</color>
+    <color name="cc_pornvertising">#ECAFC2</color>
+    <color name="cc_site_analytics">#87D7EF</color>
+    <color name="cc_social_media">#388EE8</color>
+    <color name="cc_default_category">#E8E8E8</color>
+    <color name="cc_advertising_disabled">#97A4AE</color>
+    <color name="cc_audio_video_player_disabled">#A1ADB6</color>
+    <color name="cc_comments_disabled">#ACB6BE</color>
+    <color name="cc_customer_interaction_disabled">#B6BFC6</color>
+    <color name="cc_essential_disabled">#C1C8CE</color>
+    <color name="cc_pornvertising_disabled">#CBD1D6</color>
+    <color name="cc_site_analytics_disabled">#D5DBDF</color>
+    <color name="cc_social_media_disabled">#DFE3E6</color>
+    <color name="cc_default_category_disabled">#EAEDEF</color>
+    <color name="cc_advertising_blocked">#E74055</color>
+    <color name="cc_audio_video_player_blocked">#E95366</color>
+    <color name="cc_comments_blocked">#EC6677</color>
+    <color name="cc_customer_interaction_blocked">#EE7988</color>
+    <color name="cc_essential_blocked">#F18C99</color>
+    <color name="cc_pornvertising_blocked">#F39FAA</color>
+    <color name="cc_site_analytics_blocked">#F5B3BB</color>
+    <color name="cc_social_media_blocked">#F7C5CC</color>
+    <color name="cc_default_category_blocked">#FAD9DD</color>
+    <color name="cc_text_color">#4A4A4A</color>
+    <color name="cc_restricted">#BE4948</color>
+    <color name="cc_transparency">#FAFFFFFF</color>
+
+    <!-- History and Favorites -->
+    <color name="history_favorites_row">@android:color/white</color>
+    <color name="history_favorites_row_private">@android:color/white</color>
+    <color name="history_favorites_row_shadow">@android:color/darker_gray</color>
+    <color name="history_favorites_row_private_shadow">@android:color/darker_gray</color>
+
+    <!-- Browser toolbar icons -->
+    <color name="cliqz_icon">@android:color/black</color>
+    <color name="cliqz_icon_disabled">@color/disabled_grey</color>
+
+    <!-- Query Suggestions -->
+    <color name="query_suggestion_bg">#eeeeee</color>
+
+    <!-- Intro -->
+    <color name="cliqz_intro_text_color">@android:color/white</color>
+    <!-- Cliqz end -->
+
 </resources>