Commit a9897394 authored by narinder Rana's avatar narinder Rana
Browse files

Merge branch 'Q_2826-replace_color_default_blue1_with_color_default_accent' into 'v1-q'

replace 'color_default_blue1' with 'color_default_accent' in Q

See merge request !16
parents a67a07e9 928ea7c6
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="oval"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/color_default_blue1"/>
<solid android:color="@color/calculator_accent_color"/>
<size android:width="8dp" android:height="8dp"/>
</shape>
......@@ -2,8 +2,8 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="oval">
<solid android:color="@color/color_default_blue1"/>
<stroke android:color="@color/color_default_blue1" android:width="5dp"/>
<solid android:color="@color/calculator_accent_color"/>
<stroke android:color="@color/calculator_accent_color" android:width="5dp"/>
<!-- Set the same value for both width and height to get a circular shape -->
<size android:width="40dp" android:height="40dp"/>
</shape>
......
......@@ -20,7 +20,7 @@
android:width="24dp"
android:viewportHeight="24"
android:viewportWidth="24"
android:tint="@color/color_default_blue1"
android:tint="@color/calculator_accent_color"
>
<path
android:fillColor="@color/pad_button_text_color"
......
......@@ -26,7 +26,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<View
android:background="@color/color_default_blue1"
android:background="@color/calculator_accent_color"
android:layout_width="match_parent"
android:layout_height="1dp"/>
......
......@@ -23,7 +23,7 @@
<include layout="@layout/display" />
<View
android:background="@color/color_default_blue1"
android:background="@color/calculator_accent_color"
android:layout_width="match_parent"
android:layout_height="1dp"/>
......
......@@ -42,7 +42,7 @@
android:paddingStart="@dimen/result_padding_start"
android:paddingEnd="@dimen/result_padding_end"
android:text="@string/title_current_expression"
android:textColor="?android:attr/colorAccent"
android:textColor="@color/calculator_accent_color"
android:textSize="14dp" />
<com.android.calculator2.CalculatorScrollView
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment