diff options
| author | cyberta <cyberta@riseup.net> | 2022-12-16 01:05:57 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-12-16 01:05:57 +0000 |
| commit | b4b5d98fe0bc0498773870990df2442f800158c4 (patch) | |
| tree | 739de8a232d539804f8b61143879505271f52858 /app/src/main/res/drawable | |
| parent | 62d9effae8fe5983056a7b225535ec763f03d87b (diff) | |
| parent | d988fb9e977a78c31fa902a99308d97d95b8487b (diff) | |
Merge branch 'rc_review' into 'master'
Bugfixes after Release Candidate Review
Closes #9121, #8934, and #9052
See merge request leap/bitmask_android!226
Diffstat (limited to 'app/src/main/res/drawable')
7 files changed, 27 insertions, 40 deletions
diff --git a/app/src/main/res/drawable/button_circle_cancel_pressed.xml b/app/src/main/res/drawable/button_circle_cancel_pressed.xml index b2efa78b..6b280959 100644 --- a/app/src/main/res/drawable/button_circle_cancel_pressed.xml +++ b/app/src/main/res/drawable/button_circle_cancel_pressed.xml @@ -51,10 +51,10 @@ </shape> </item> <item - android:top="68dp" - android:bottom="62dp" - android:left="50dp" - android:right="50dp" + android:top="88dp" + android:bottom="82dp" + android:left="70dp" + android:right="70dp" android:drawable="@drawable/ic_btn_cancel" /> </layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/button_circle_cancel_released.xml b/app/src/main/res/drawable/button_circle_cancel_released.xml index 70d47257..cd93ab2b 100644 --- a/app/src/main/res/drawable/button_circle_cancel_released.xml +++ b/app/src/main/res/drawable/button_circle_cancel_released.xml @@ -44,7 +44,7 @@ android:type="radial" android:gradientRadius="125dp" android:centerX="0.51" - android:centerY="0.58" + android:centerY="0.55" android:startColor="#000000" android:centerColor="#000000" android:endColor="@color/transparent" /> @@ -52,10 +52,10 @@ </shape> </item> <item - android:top="65dp" - android:bottom="65dp" - android:left="50dp" - android:right="50dp" + android:top="85dp" + android:bottom="85dp" + android:left="70dp" + android:right="70dp" android:drawable="@drawable/ic_btn_cancel" /> </layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/button_circle_start_pressed.xml b/app/src/main/res/drawable/button_circle_start_pressed.xml index dd8496c3..08712c47 100644 --- a/app/src/main/res/drawable/button_circle_start_pressed.xml +++ b/app/src/main/res/drawable/button_circle_start_pressed.xml @@ -36,9 +36,9 @@ </shape> </item> <item - android:top="68dp" - android:bottom="62dp" - android:left="50dp" - android:right="50dp" + android:top="78dp" + android:bottom="72dp" + android:left="60dp" + android:right="60dp" android:drawable="@drawable/ic_btn_on" /> </layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/button_circle_start_released.xml b/app/src/main/res/drawable/button_circle_start_released.xml index ad748e9c..c47d1019 100644 --- a/app/src/main/res/drawable/button_circle_start_released.xml +++ b/app/src/main/res/drawable/button_circle_start_released.xml @@ -28,7 +28,7 @@ android:type="radial" android:gradientRadius="125dp" android:centerX="0.51" - android:centerY="0.58" + android:centerY="0.55" android:startColor="#000000" android:centerColor="#000000" android:endColor="@color/transparent" /> @@ -36,9 +36,9 @@ </shape> </item> <item - android:top="65dp" - android:bottom="65dp" - android:left="50dp" - android:right="50dp" + android:top="75dp" + android:bottom="75dp" + android:left="60dp" + android:right="60dp" android:drawable="@drawable/ic_btn_on" /> </layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/button_circle_stop_pressed.xml b/app/src/main/res/drawable/button_circle_stop_pressed.xml index 79f794b2..52a5a88e 100644 --- a/app/src/main/res/drawable/button_circle_stop_pressed.xml +++ b/app/src/main/res/drawable/button_circle_stop_pressed.xml @@ -36,9 +36,9 @@ </shape> </item> <item - android:top="68dp" - android:bottom="62dp" - android:left="50dp" - android:right="50dp" + android:top="88dp" + android:bottom="82dp" + android:left="70dp" + android:right="70dp" android:drawable="@drawable/ic_btn_cancel" /> </layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/button_circle_stop_released.xml b/app/src/main/res/drawable/button_circle_stop_released.xml index 62827b66..d29bfe1e 100644 --- a/app/src/main/res/drawable/button_circle_stop_released.xml +++ b/app/src/main/res/drawable/button_circle_stop_released.xml @@ -28,7 +28,7 @@ android:type="radial" android:gradientRadius="125dp" android:centerX="0.51" - android:centerY="0.58" + android:centerY="0.55" android:startColor="#000000" android:centerColor="#000000" android:endColor="@color/transparent" /> @@ -36,10 +36,10 @@ </shape> </item> <item - android:top="65dp" - android:bottom="65dp" - android:left="50dp" - android:right="50dp" + android:top="85dp" + android:bottom="85dp" + android:left="70dp" + android:right="70dp" android:drawable="@drawable/ic_btn_cancel" /> </layer-list>
\ No newline at end of file diff --git a/app/src/main/res/drawable/cust_button_light_rect.xml b/app/src/main/res/drawable/cust_button_light_rect.xml index dd66c739..9840d7e1 100644 --- a/app/src/main/res/drawable/cust_button_light_rect.xml +++ b/app/src/main/res/drawable/cust_button_light_rect.xml @@ -61,19 +61,6 @@ <corners android:radius="@dimen/stdpadding"/> </shape> </item> - <!-- gradient --> - <item - android:bottom="@dimen/button_bevel" - android:right="1dp" - > - <shape android:shape="rectangle"> - <gradient android:startColor="@color/btn_light_transparent_dark" - android:endColor="@color/white_transparent" - android:angle="90" - /> - <corners android:radius="@dimen/stdpadding"/> - </shape> - </item> </layer-list> </item> </selector>
\ No newline at end of file |