Commit 80bb4cab authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Merge branch 'Q_1921' into 'v1-q'

Add blue in Q

See merge request !13
parents dc8e1e60 294a4967
<?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"/>
<size android:width="8dp" android:height="8dp"/>
</shape>
<?xml version="1.0" encoding="utf-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"/>
<!-- Set the same value for both width and height to get a circular shape -->
<size android:width="40dp" android:height="40dp"/>
</shape>
</item>
</selector>
......@@ -19,7 +19,9 @@
android:height="24dp"
android:width="24dp"
android:viewportHeight="24"
android:viewportWidth="24">
android:viewportWidth="24"
android:tint="@color/color_default_blue1"
>
<path
android:fillColor="@color/pad_button_text_color"
android:pathData="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41
......
......@@ -25,6 +25,11 @@
layout="@layout/display"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<View
android:background="@color/color_default_blue1"
android:layout_width="match_parent"
android:layout_height="1dp"/>
<LinearLayout
android:layout_width="match_parent"
......
......@@ -22,6 +22,10 @@
android:orientation="vertical">
<include layout="@layout/display" />
<View
android:background="@color/color_default_blue1"
android:layout_width="match_parent"
android:layout_height="1dp"/>
<com.android.calculator2.CalculatorPadViewPager
android:id="@+id/pad_pager"
......
......@@ -101,12 +101,39 @@
app:layout_row="3"
app:layout_column="1" />
<Button
android:id="@+id/eq"
style="@style/PadButtonStyle.Numeric.Equals"
android:contentDescription="@string/desc_eq"
android:text="@string/eq"
<!-- <Button-->
<!-- android:layout_width="30dp"-->
<!-- android:layout_height="30dp"-->
<!-- android:textColor="@color/color_default_foreground"-->
<!-- android:background="@drawable/circle_bg"-->
<!-- android:id="@+id/eq"-->
<!-- style="@style/PadButtonStyle.Numeric.Equals"-->
<!-- android:contentDescription="@string/desc_eq"-->
<!-- android:text="@string/eq"-->
<!-- app:layout_row="3"-->
<!-- app:layout_column="2" />-->
<RelativeLayout
android:layout_width="0dp"
android:layout_height="0dip"
app:layout_column="2"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_row="3"
app:layout_column="2" />
app:layout_rowWeight="1"
android:onClick="onButtonClick">
<Button
android:id="@+id/eq"
style="@style/PadButtonStyle.Numeric.Equals"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_centerInParent="true"
android:background="@drawable/circle_bg"
android:contentDescription="@string/desc_eq"
android:text="@string/eq"
android:textColor="@color/color_default_foreground" />
</RelativeLayout>
</androidx.gridlayout.widget.GridLayout>
......@@ -73,12 +73,40 @@
app:layout_row="3"
app:layout_column="0" />
<Button
android:id="@+id/eq"
style="@style/PadButtonStyle.Operator"
android:contentDescription="@string/desc_eq"
android:text="@string/eq"
<!-- <Button-->
<!-- android:layout_width="30dp"-->
<!-- android:layout_height="30dp"-->
<!-- android:textColor="@color/color_default_foreground"-->
<!-- android:background="@drawable/circle_bg"-->
<!-- android:id="@+id/eq"-->
<!-- style="@style/PadButtonStyle.Operator"-->
<!-- android:contentDescription="@string/desc_eq"-->
<!-- android:text="@string/eq"-->
<!-- app:layout_row="3"-->
<!-- app:layout_column="1" />-->
<RelativeLayout
android:layout_width="0dp"
android:layout_height="0dip"
app:layout_rowWeight="1"
app:layout_columnWeight="1"
app:layout_row="3"
app:layout_column="1" />
app:layout_column="1"
android:onClick="onButtonClick"
app:layout_gravity="fill">
<Button
android:textColor="@color/color_default_foreground"
android:id="@+id/eq"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/circle_bg"
android:contentDescription="@string/desc_eq"
android:text="@string/eq"
android:layout_centerInParent="true"
style="@style/PadButtonStyle.Operator"
/>
</RelativeLayout>
</androidx.gridlayout.widget.GridLayout>
......@@ -65,8 +65,8 @@
<style name="PadLayoutStyle.Operator">
<item name="android:layout_width">0dip</item>
<item name="android:layout_weight">3</item>
<item name="android:paddingTop">8dip</item>
<item name="android:paddingBottom">24dip</item>
<item name="android:paddingTop">12dip</item>
<item name="android:paddingBottom">20dip</item>
<item name="android:paddingStart">4dip</item>
<item name="android:paddingEnd">28dip</item>
</style>
......
......@@ -65,8 +65,8 @@
<style name="PadLayoutStyle.Operator">
<item name="android:layout_width">0dip</item>
<item name="android:layout_weight">3</item>
<item name="android:paddingTop">8dip</item>
<item name="android:paddingBottom">24dip</item>
<item name="android:paddingTop">12dip</item>
<item name="android:paddingBottom">20dip</item>
<item name="android:paddingStart">4dip</item>
<item name="android:paddingEnd">28dip</item>
</style>
......
......@@ -66,8 +66,8 @@
<style name="PadLayoutStyle.Operator">
<item name="android:layout_width">0dip</item>
<item name="android:layout_weight">3</item>
<item name="android:paddingTop">8dip</item>
<item name="android:paddingBottom">24dip</item>
<item name="android:paddingTop">12dip</item>
<item name="android:paddingBottom">20dip</item>
<item name="android:paddingStart">12dip</item>
<item name="android:paddingEnd">12dip</item>
</style>
......
......@@ -48,13 +48,15 @@
<color name="pad_operator_background_color">@color/calculator_statusbar_color</color>
<!-- Background color for the advanced pad. -->
<color name="pad_advanced_background_color">@lineageos.platform:color/color_default_gray2</color>
<color name="pad_advanced_background_color">#ececec</color>
<!-- Text color for a button in a pad. -->
<color name="pad_button_text_color">#333</color>
<!-- Text color for a button in the advanced pad. -->
<color name="pad_button_advanced_text_color">@lineageos.platform:color/color_default_foreground</color>
<color name="pad_button_advanced_text_color">@lineageos.platform:color/color_default_primary_text</color>
<color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
<!-- Ripple color when a button is pressed in a pad. -->
<color name="pad_button_ripple_color">#33000000</color>
......@@ -65,4 +67,6 @@
<!-- Background color for empty history view. -->
<color name="empty_history_color">@color/calculator_primary_color</color>
<color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
</resources>
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