ADS: Framework related colors 2 (#2574)

Task/Issue URL: https://app.asana.com/0/1174433894299346/1203412677059168 ### Description Update toolbar, statusbar and navigation bar colors to latest spec ### UI changes | Light | Dark| | ------ | ----- | ![Screenshot_20221125_151024](https://user-images.githubusercontent.com/531613/204002612-76f95631-0dea-4bb4-a84a-251150a0dfb5.png)|![Screenshot_20221125_150923](https://user-images.githubusercontent.com/531613/204002617-3e850e89-1ea1-416d-b97a-b1b1fc790278.png)| Co-authored-by: David González <malmstein@gmail.com>
duckduckgo · Jan 12, 2023 · 051f9fb · 051f9fb
1 parent 5d9dca3
commit 051f9fb
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 27 deletions.
diff --git a/...rc/main/java/com/duckduckgo/app/browser/omnibar/animations/TrackersLottieAssetDelegate.kt b/...rc/main/java/com/duckduckgo/app/browser/omnibar/animations/TrackersLottieAssetDelegate.kt
@@ -92,7 +92,7 @@ internal class TrackersLottieAssetDelegate(
             }
 
             private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-                color = context.getColorFromAttr(com.duckduckgo.mobile.android.R.attr.omnibarRoundedFieldBackgroundColor)
+                color = context.getColorFromAttr(com.duckduckgo.mobile.android.R.attr.daxColorContainer)
                 typeface = Typeface.SANS_SERIF
             }
 

diff --git a/app/src/main/res/layout/include_new_browser_tab.xml b/app/src/main/res/layout/include_new_browser_tab.xml
@@ -21,6 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
+    android:clipChildren="false"
     tools:context="com.duckduckgo.app.browser.BrowserActivity"
     tools:showIn="@layout/fragment_browser_tab">
 

diff --git a/common-ui/src/main/res/drawable/popup_menu_bg.xml b/common-ui/src/main/res/drawable/popup_menu_bg.xml
@@ -15,6 +15,6 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/dialogBgColor" />
-    <corners android:radius="@dimen/keyline_2" />
+    <solid android:color="?attr/daxColorSurface" />
+    <corners android:radius="@dimen/smallShapeCornerRadius" />
 </shape>
diff --git a/common-ui/src/main/res/layout/view_dax_dialog.xml b/common-ui/src/main/res/layout/view_dax_dialog.xml
@@ -25,7 +25,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:clipChildren="false">
 
         <View
             android:id="@+id/toolbarDialogLayout"
@@ -46,7 +47,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:typography="button"
-            android:textColor="?attr/axColorWhite"
+            android:textColor="?attr/daxColorWhite"
             android:layout_marginTop="52dp"
             android:layout_marginEnd="@dimen/keyline_4"
             android:padding="@dimen/keyline_3"
@@ -58,7 +59,7 @@
             android:id="@+id/logo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/keyline_5"
+            android:layout_marginStart="@dimen/keyline_2"
             android:layout_marginBottom="@dimen/keyline_4"
             app:layout_constraintBottom_toTopOf="@id/cardView"
             app:layout_constraintStart_toStartOf="@id/cardView"

diff --git a/common-ui/src/main/res/values/attrs.xml b/common-ui/src/main/res/values/attrs.xml
@@ -20,7 +20,6 @@
     <attr name="headerDescriptionColor" format="color" />
     <attr name="dialogBgColor" format="color" />
     <attr name="toolbarIconColor" format="color" />
-    <attr name="toolbarTextColor" format="color" />
     <attr name="toolbarBgColor" format="color" />
     <attr name="toolbarBgBorderColor" format="color" />
     <attr name="browserIconColorSelector" format="color" />

diff --git a/common-ui/src/main/res/values/design-system-theming.xml b/common-ui/src/main/res/values/design-system-theming.xml
@@ -137,19 +137,23 @@
         <!--Design System Colors theme independent-->
         <item name="daxColorDim">@color/black60</item>
         <item name="daxColorWhite">@color/white</item>
+        <item name="preferredStatusBarColor">?attr/daxColorSurface</item>
+        <item name="preferredNavigationBarColor">?attr/daxColorSurface</item>
+
+        <!--Refactoring colors (can be replaced once reviewed)-->
+        <item name="toolbarBgColor">?attr/daxColorSurface</item>
+        <item name="toolbarIconColor">?attr/daxColorPrimaryIcon</item>
+        <item name="omnibarTextColor">?attr/daxColorPrimaryText</item>
+        <item name="omnibarHintColor">?attr/daxColorSecondaryText</item>
     </style>
 
     <!-- The app theme will mostly contain values for colour attributes -->
     <style name="Theme.DuckDuckGo.Dark" parent="Theme.DuckDuckGo">
 
         <item name="preferDarkStatusBarIcons">false</item>
-        <item name="preferredStatusBarColor">?attr/toolbarBgColor</item>
         <item name="preferDarkNavigationBarIcons">false</item>
-        <item name="preferredNavigationBarColor">@color/black</item>
 
         <!-- Legacy colors to remove-->
-        <item name="colorPrimary">@color/darkThemePrimary</item>
-        <item name="colorPrimaryDark">@color/darkThemePrimaryDark</item>
         <item name="daxLogoTextColor">@color/white</item>
         <item name="normalTextColor">@color/white</item>
         <item name="secondaryTextColor">@color/gray50</item>
@@ -163,10 +167,6 @@
         <item name="listItemSecondaryTextColor">@color/grayishTwo</item>
         <item name="listItemDisabledColor">@color/warGreyTwo</item>
         <item name="subtitleTextColor">@color/grayishTwo</item>
-        <item name="toolbarIconColor">@color/white</item>
-        <item name="toolbarTextColor">@color/white</item>
-        <item name="toolbarBgColor">@color/newBlack</item>
-        <item name="toolbarBgBorderColor">@color/toolbarBorderColorDark</item>
         <item name="dialogBgColor">@color/almostBlackDark</item>
         <item name="browserIconColorSelector">@color/browser_icon_color_selector_dark</item>
         <item name="browserMenuTextColor">@color/white</item>
@@ -296,9 +296,7 @@
 
     <style name="Theme.DuckDuckGo.Light" parent="Theme.DuckDuckGo">
         <item name="preferDarkStatusBarIcons">true</item>
-        <item name="preferredStatusBarColor">@color/white</item>
         <item name="preferDarkNavigationBarIcons">true</item>
-        <item name="preferredNavigationBarColor">@color/white</item>
 
         <!-- Legacy colors to remove-->
         <item name="colorPrimary">@color/lightThemePrimary</item>
@@ -312,10 +310,6 @@
         <item name="secondaryIconColor">@color/gray40</item>
         <item name="accentIconColor">@color/gray30</item>
         <item name="chipBackgroundColor">@color/gray20</item>
-        <item name="toolbarIconColor">@color/almostBlackDark</item>
-        <item name="toolbarTextColor">@color/almostBlackDark</item>
-        <item name="toolbarBgColor">@color/white</item>
-        <item name="toolbarBgBorderColor">@color/toolbarBorderColorLight</item>
         <item name="dialogBgColor">@color/white</item>
         <item name="browserIconColorSelector">@color/browser_icon_color_selector_light</item>
         <item name="browserMenuTextColor">@color/almostBlackDark</item>

diff --git a/common-ui/src/main/res/values/styles.xml b/common-ui/src/main/res/values/styles.xml
@@ -309,7 +309,7 @@
     </style>
 
     <style name="LocationPermissionDialogSplitter">
-        <item name="android:background">?toolbarBgBorderColor</item>
+        <item name="android:background">?attr/daxColorLines</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1dp</item>
     </style>

diff --git a/common-ui/src/main/res/values/widgets.xml b/common-ui/src/main/res/values/widgets.xml
@@ -24,12 +24,12 @@
 
     <!-- Toolbar -->
     <style name="Widget.DuckDuckGo.ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="colorControlNormal">?attr/toolbarIconColor</item>
-        <item name="android:textColorPrimary">?attr/toolbarTextColor</item>
+        <item name="colorControlNormal">?attr/daxColorPrimaryIcon</item>
+        <item name="android:textColorPrimary">?attr/daxColorPrimaryText</item>
         <item name="colorControlHighlight">@color/subtleGrayTwo</item>
-        <item name="colorAccent">@color/cornflowerBlue</item>
-        <item name="colorControlActivated">@color/cornflowerBlue</item>
-        <item name="colorSwitchThumbNormal">@color/white</item>
+        <item name="colorAccent">?attr/daxColorAccentBlue</item>
+        <item name="colorControlActivated">?attr/daxColorAccentBlue</item>
+        <item name="colorSwitchThumbNormal">?attr/daxColorAccentBlue</item>
         <item name="android:colorForeground">@color/subtleGrayTwo</item>
     </style>