diff options
| author | cyberta <cyberta@riseup.net> | 2023-11-01 03:52:50 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2023-11-01 03:52:50 +0000 |
| commit | 85eb52e62b55d4fbe9434b250f3a6cecc70d77ec (patch) | |
| tree | e320ddae310ea2fea65f563205e9d75e3839858d /app/src/main/res/values | |
| parent | d173064257b150b3ac344c2e0fd1f892e85edbbc (diff) | |
| parent | cdd18e62f6a6fa0821445068049cb0b1de9e00f9 (diff) | |
Merge branch 'last_tweaks_before_release' into 'master'
Last tweaks before release
See merge request leap/bitmask_android!262
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0ad20a63..84a2d9f0 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,7 +3,8 @@ <color name="colorPrimary">#ff1b8b</color> <color name="colorPrimaryLight">#FF69B4</color> <color name="colorPrimaryDark">#ef0072</color> - <color name="colorPrimary_transparent">#0B000000</color> + <color name="colorPrimary_transparent">#0D000000</color> + <color name="colorPrimary_transparent_dark">#1F000000</color> <color name="colorBackground">#fffafafa</color> <color name="colorError">#ef9a9a</color> <color name="colorSuccess">#a5d6a7</color> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index edda28c7..94f9339f 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -42,9 +42,13 @@ <dimen name="toast_bottom_padding">20dp</dimen> <dimen name="button_bevel">3dp</dimen> + <dimen name="button_bevel_pressed">1dp</dimen> <dimen name="button_radius">16dp</dimen> <dimen name="mainbutton_padding">8dp</dimen> <dimen name="donation_reminder_padding">8dp</dimen> <dimen name="setup_bottom_bar">50dp</dimen> + <dimen name="setup_button_top_padding">5dp</dimen> + <dimen name="tor_icon_margin_start">0dp</dimen> + <dimen name="snowflake_icon_margin_start">2dp</dimen> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8ee40614..3a4dbe40 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -68,7 +68,7 @@ <item name="android:textColor">@color/color_font_btn</item> </style> - <style name="BitmaskSetupButton" parent="Widget.AppCompat.Button"> + <style name="BitmaskSetupButton" parent="Widget.AppCompat.Button.Borderless"> <item name="android:background">@drawable/cust_setup_button_primary</item> <item name="android:textAllCaps">false</item> <item name="android:height">36dp</item> |