Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/bg_add_variation_button.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/color_text_secondary" />
<corners android:radius="10dp" />
<corners android:radius="@dimen/radius_s" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/color_text_primary" />
<corners android:radius="10dp" />
<corners android:radius="@dimen/radius_s" />
</shape>
</item>
</selector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_avatar_placeholder.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_bg_tertiary" />
<corners android:radius="10dp" />
<corners android:radius="@dimen/radius_s" />
<stroke android:width="2dp" android:color="@color/color_bg_white" />
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_badge_lightning.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_badge_lightning_bg" />
<corners android:radius="20dp" />
<corners android:radius="@dimen/radius_search" />
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_badge_success.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_success_green" />
<corners android:radius="4dp" />
<corners android:radius="@dimen/radius_xs" />
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_badge_success_pill.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_success_green" />
<corners android:radius="100dp" />
<corners android:radius="@dimen/radius_button_pill" />
</shape>
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/bg_basket_name_chip.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<!-- Pressed state -->
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="18dp" />
<corners android:radius="@dimen/radius_chip" />
<solid android:color="@color/color_accent_blue_light" />
</shape>
</item>
<!-- Default state -->
<item>
<shape android:shape="rectangle">
<corners android:radius="18dp" />
<corners android:radius="@dimen/radius_chip" />
<solid android:color="@color/color_bg_secondary" />
</shape>
</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_bottom_sheet.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/color_bg_white"/>
<corners android:topLeftRadius="16dp" android:topRightRadius="16dp"/>
<corners android:topLeftRadius="@dimen/radius_button" android:topRightRadius="@dimen/radius_button"/>
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_bottom_sheet_handle.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/color_divider"/>
<corners android:radius="2dp"/>
<corners android:radius="@dimen/radius_micro"/>
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_btcmap_banner.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/white" />
<corners android:radius="16dp" />
<corners android:radius="@dimen/radius_card" />
</shape>
6 changes: 3 additions & 3 deletions app/src/main/res/drawable/bg_button_black.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<!-- Disabled state - black with 20% opacity -->
<item android:state_enabled="false">
<shape android:shape="rectangle">
<corners android:radius="26dp" />
<corners android:radius="@dimen/radius_pill" />
<solid android:color="@color/color_black_20" />
</shape>
</item>
<!-- Pressed state - slightly lighter black -->
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="26dp" />
<corners android:radius="@dimen/radius_pill" />
<solid android:color="@color/color_button_primary_pressed" />
</shape>
</item>
<!-- Enabled state - 100% black -->
<item>
<shape android:shape="rectangle">
<corners android:radius="26dp" />
<corners android:radius="@dimen/radius_pill" />
<solid android:color="@color/black" />
</shape>
</item>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/drawable/bg_button_charge.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<!-- Disabled state - black with 30% opacity (brighter than before) -->
<item android:state_enabled="false">
<shape android:shape="rectangle">
<corners android:radius="26dp" />
<corners android:radius="@dimen/radius_pill" />
<solid android:color="@color/color_black_30" />
</shape>
</item>
<!-- Pressed state - white with 15% opacity (slightly less for feedback) -->
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="26dp" />
<corners android:radius="@dimen/radius_pill" />
<solid android:color="@color/color_white_15" />
</shape>
</item>
<!-- Enabled state - white with 15% opacity (darker than before) with border -->
<item>
<shape android:shape="rectangle">
<corners android:radius="26dp" />
<corners android:radius="@dimen/radius_pill" />
<solid android:color="@color/color_white_34" />
</shape>
</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_button_destructive.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<item>
<shape android:shape="rectangle">
<solid android:color="@color/color_warning_red" />
<corners android:radius="28dp" />
<corners android:radius="@dimen/radius_button" />
</shape>
</item>
</ripple>
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/bg_button_empty_state_primary.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<!-- Pressed state -->
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="26dp" />
<corners android:radius="@dimen/radius_pill" />
<solid android:color="@color/empty_state_button_primary_bg" />
<stroke android:width="0dp" android:color="@android:color/transparent" />
</shape>
</item>
<!-- Default state -->
<item>
<shape android:shape="rectangle">
<corners android:radius="26dp" />
<corners android:radius="@dimen/radius_pill" />
<solid android:color="@color/empty_state_button_primary_bg" />
</shape>
</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_button_icon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<item>
<shape android:shape="rectangle">
<solid android:color="@color/color_bg_secondary" />
<corners android:radius="12dp" />
<corners android:radius="@dimen/radius_input" />
<stroke
android:width="1dp"
android:color="@color/color_divider" />
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_button_primary_black.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<item>
<shape android:shape="rectangle">
<solid android:color="@color/color_text_primary" />
<corners android:radius="14dp" />
<corners android:radius="@dimen/radius_button_compact" />
</shape>
</item>
</ripple>
6 changes: 3 additions & 3 deletions app/src/main/res/drawable/bg_button_primary_green.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<!-- Disabled state -->
<item android:state_enabled="false">
<shape android:shape="rectangle">
<corners android:radius="100dp" />
<corners android:radius="@dimen/radius_button_pill" />
<solid android:color="@color/color_button_primary_disabled" />
</shape>
</item>
<!-- Pressed state -->
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="100dp" />
<corners android:radius="@dimen/radius_button_pill" />
<solid android:color="@color/color_button_primary_pressed" />
</shape>
</item>
<!-- Enabled state -->
<item>
<shape android:shape="rectangle">
<corners android:radius="100dp" />
<corners android:radius="@dimen/radius_button_pill" />
<solid android:color="@color/color_primary_green" />
</shape>
</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_button_secondary.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<item>
<shape android:shape="rectangle">
<solid android:color="@color/color_bg_tertiary" />
<corners android:radius="10dp" />
<corners android:radius="@dimen/radius_s" />
</shape>
</item>
</ripple>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_button_secondary_gray.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="26dp" />
<corners android:radius="@dimen/radius_pill" />
<solid android:color="@color/color_text_secondary" />
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_button_secondary_outlined.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="12dp" />
<corners android:radius="@dimen/radius_input" />
<solid android:color="@android:color/transparent" />
<stroke android:width="1dp" android:color="@color/color_divider"
android:dashWidth="6dp" android:dashGap="4dp" />
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_button_secondary_pill.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="26dp" />
<corners android:radius="@dimen/radius_pill" />
<solid android:color="@color/color_bg_white" />
<stroke
android:width="1dp"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/bg_button_tertiary_dark.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<!-- Pressed state -->
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="28dp" />
<corners android:radius="@dimen/radius_button" />
<solid android:color="@color/color_white_10" />
</shape>
</item>
<!-- Default state -->
<item>
<shape android:shape="rectangle">
<corners android:radius="28dp" />
<corners android:radius="@dimen/radius_button" />
<solid android:color="@android:color/transparent" />
</shape>
</item>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/drawable/bg_button_white.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<!-- Disabled state — subtle on dark bg -->
<item android:state_enabled="false">
<shape android:shape="rectangle">
<corners android:radius="28dp" />
<corners android:radius="@dimen/radius_button" />
<solid android:color="@color/color_white_10" />
</shape>
</item>
<!-- Pressed state -->
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="28dp" />
<corners android:radius="@dimen/radius_button" />
<solid android:color="@color/color_white_80" />
</shape>
</item>
<!-- Enabled state -->
<item>
<shape android:shape="rectangle">
<corners android:radius="28dp" />
<corners android:radius="@dimen/radius_button" />
<solid android:color="@color/white" />
</shape>
</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_card_rounded.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_bg_card" />
<corners android:radius="12dp" />
<corners android:radius="@dimen/radius_input" />
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_category_badge.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="6dp" />
<corners android:radius="@dimen/radius_badge" />
<solid android:color="@color/color_text_primary" />
</shape>
6 changes: 3 additions & 3 deletions app/src/main/res/drawable/bg_category_chip.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Selected state: green background like bg_category_tag_selected -->
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="16dp" />
<corners android:radius="@dimen/radius_card" />
<solid android:color="@color/color_primary_green" />
<padding
android:left="12dp"
Expand All @@ -15,7 +15,7 @@
<!-- Pressed state -->
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="16dp" />
<corners android:radius="@dimen/radius_card" />
<solid android:color="@color/color_bg_secondary" />
<padding
android:left="12dp"
Expand All @@ -27,7 +27,7 @@
<!-- Default state: tertiary background like bg_category_tag -->
<item>
<shape android:shape="rectangle">
<corners android:radius="16dp" />
<corners android:radius="@dimen/radius_card" />
<solid android:color="@color/color_bg_tertiary" />
<padding
android:left="12dp"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_category_tag.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="16dp" />
<corners android:radius="@dimen/radius_card" />
<solid android:color="@color/color_bg_tertiary" />
<padding
android:left="12dp"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_category_tag_add.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="16dp" />
<corners android:radius="@dimen/radius_card" />
<stroke
android:width="1dp"
android:color="@color/color_primary_green"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_category_tag_selected.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="16dp" />
<corners android:radius="@dimen/radius_card" />
<solid android:color="@color/color_primary_green" />
<padding
android:left="12dp"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_checkout_button.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<item>
<shape android:shape="rectangle">
<solid android:color="@color/color_success_green" />
<corners android:radius="100dp" />
<corners android:radius="@dimen/radius_button_pill" />
</shape>
</item>
</ripple>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_chip_outlined.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="18dp" />
<corners android:radius="@dimen/radius_chip" />
<solid android:color="@color/color_bg_white" />
<stroke android:width="1dp" android:color="@color/color_chip_border" />
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_close_button_scanner.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<item>
<shape android:shape="rectangle">
<solid android:color="@color/color_black_80" />
<corners android:radius="28dp" />
<corners android:radius="@dimen/radius_button" />
</shape>
</item>
</ripple>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_dialog_rounded.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_bg_white" />
<corners android:radius="20dp" />
<corners android:radius="@dimen/radius_button" />
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_dynamic_island.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black" />
<corners android:radius="28dp" />
<corners android:radius="@dimen/radius_button" />
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_dynamic_island_error.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_dynamic_island_error" />
<corners android:radius="28dp" />
<corners android:radius="@dimen/radius_button" />
</shape>
Loading
Loading