diff options
| author | cyberta <cyberta@riseup.net> | 2021-11-24 09:26:40 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2021-11-24 09:26:40 +0000 |
| commit | 68ca9c827da3c3fad9e70c74960f113560fd6711 (patch) | |
| tree | dda6f99c2ef2b222d4f07d0ef80d5d0cc373604e /app/src/main/res/drawable/cust_button_primary_rect.xml | |
| parent | 9b2b57d8617e60c0b69713e1e5f14dbb8e57c70a (diff) | |
| parent | e3cd28aa6ef16d9bde179a3e1117cdfa585939a4 (diff) | |
Merge branch 'simply_secure_UI_changes' into 'master'
Gateway selection UI overhaul
Closes #9047
See merge request leap/bitmask_android!140
Diffstat (limited to 'app/src/main/res/drawable/cust_button_primary_rect.xml')
| -rw-r--r-- | app/src/main/res/drawable/cust_button_primary_rect.xml | 85 |
1 files changed, 70 insertions, 15 deletions
diff --git a/app/src/main/res/drawable/cust_button_primary_rect.xml b/app/src/main/res/drawable/cust_button_primary_rect.xml index c83d4e62..1587caf4 100644 --- a/app/src/main/res/drawable/cust_button_primary_rect.xml +++ b/app/src/main/res/drawable/cust_button_primary_rect.xml @@ -1,24 +1,79 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android" > <item android:state_pressed="true" > - <shape android:shape="rectangle" > - <corners android:radius="8dp" /> - <padding android:left="8dp" android:right="8dp"/> - <solid android:color="@color/colorPrimaryDark"/> - </shape> + <layer-list + android:paddingLeft="@dimen/button_bevel" + android:paddingRight="@dimen/button_bevel"> + <item> + <shape android:shape="rectangle"> + <solid android:color="@color/colorPrimaryDark"/> + <corners android:radius="@dimen/stdpadding"/> + </shape> + </item> + <item> + <shape android:shape="rectangle"> + <solid android:color="@color/black_transparent"/> + <corners android:radius="@dimen/stdpadding"/> + </shape> + </item> + </layer-list> </item> <item android:state_focused="true"> - <shape android:shape="rectangle" > - <corners android:radius="8dp" /> - <padding android:left="8dp" android:right="8dp"/> - <solid android:color="@color/colorPrimaryDark"/> - </shape> + <layer-list + android:paddingLeft="@dimen/button_bevel" + android:paddingRight="@dimen/button_bevel"> + <item> + <shape android:shape="rectangle" > + <solid android:color="@color/colorPrimaryDark"/> + <corners android:radius="@dimen/stdpadding"/> + </shape> + </item> + <item> + <shape android:shape="rectangle"> + <solid android:color="@color/black_transparent"/> + <corners android:radius="@dimen/stdpadding"/> + </shape> + </item> + + </layer-list> </item> <item > - <shape android:shape="rectangle" > - <corners android:radius="8dp" /> - <padding android:left="8dp" android:right="8dp"/> - <solid android:color="@color/colorPrimary"/> - </shape> + <layer-list + android:paddingLeft="@dimen/button_bevel" + android:paddingRight="@dimen/button_bevel"> + <!-- shadow --> + <item + android:top="@dimen/button_bevel" + android:left="1dp" + > + <shape android:shape="rectangle" > + <corners android:radius="@dimen/stdpadding" /> + <solid android:color="@color/colorPrimary_transparent"/> + </shape> + </item> + <!-- fill --> + <item + android:bottom="@dimen/button_bevel" + android:right="1dp" + > + <shape android:shape="rectangle" > + <solid android:color="@color/colorPrimary"/> + <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/black_transparent" + 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 |