diff options
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/colors.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/values/fab.xml | 31 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 17 |
4 files changed, 18 insertions, 41 deletions
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9105fb22..06bcd143 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:tools="http://schemas.android.com/tools"> - <!-- TODO(msf): remove these 2 hard-coded colors and replace with theme colors --> - <color name="fab_label_text_color">#ffffff</color> - <color name="fab_label_background_color">#444444</color> - <!-- Base palette --> <color name="primary_color">#ffffffff</color> <color name="primary_light_color">#ffffffff</color> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 92be463c..c6abf8eb 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,4 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <dimen name="fab_margin">16dp</dimen> -</resources>
\ No newline at end of file + <dimen name="extra_margin">12dp</dimen> + <dimen name="bottom_sheet_item_height">56dp</dimen> + <dimen name="normal_margin">8dp</dimen> + <dimen name="bottom_sheet_top_padding">8dp</dimen> + <dimen name="bottom_sheet_icon_padding">16dp</dimen> +</resources> diff --git a/app/src/main/res/values/fab.xml b/app/src/main/res/values/fab.xml deleted file mode 100644 index 8fbdc724..00000000 --- a/app/src/main/res/values/fab.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <item name="fab_expand_menu_button" type="id" /> - <item name="fab_label" type="id" /> - - <dimen name="fab_shadow_offset">3dp</dimen> - <dimen name="fab_shadow_radius">9dp</dimen> - - <dimen name="fab_stroke_width">1dp</dimen> - - <dimen name="fab_actions_spacing">24dp</dimen> - <dimen name="fab_labels_margin">8dp</dimen> - - <declare-styleable name="LabeledFloatingActionButton"> - <attr name="fab_title" format="string" /> - </declare-styleable> - <declare-styleable name="FloatingActionsMenu"> - <attr name="fab_labelStyle" format="reference" /> - <attr name="fab_labelsPosition" format="enum"> - <enum name="left" value="0" /> - <enum name="right" value="1" /> - </attr> - <attr name="fab_expandDirection" format="enum"> - <enum name="up" value="0" /> - <enum name="down" value="1" /> - <enum name="left" value="2" /> - <enum name="right" value="3" /> - </attr> - </declare-styleable> - <integer name="label_position">0</integer> -</resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9f55fd3e..f5af8bce 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -28,6 +28,18 @@ <item name="android:windowBackground">?attr/colorBackground</item> </style> + <style name="BottomSheetDialogTheme" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog"> + <item name="android:windowIsFloating">false</item> + <item name="android:navigationBarColor">?attr/colorBackground</item> + <item name="android:statusBarColor">@android:color/transparent</item> + <item name="android:windowTranslucentNavigation">false</item> + <item name="android:windowIsTranslucent">false</item> + <item name="android:backgroundDimEnabled">true</item> + <item name="android:backgroundDimAmount">0.5</item> + <item name="android:windowTranslucentStatus">false</item> + <item name="android:colorBackground">@android:color/transparent</item> + </style> + <style name="NoBackgroundTheme" parent="AppTheme"> <item name="android:windowIsTranslucent">true</item> <item name="android:windowContentOverlay">@null</item> @@ -41,9 +53,4 @@ <item name="android:windowExitAnimation">@android:anim/fade_out</item> </style> - <style name="fab_label" parent="TextAppearance.AppCompat.Inverse"> - <item name="android:background">@drawable/fab_label_background</item> - <item name="android:textColor">@color/fab_label_text_color</item> - </style> - </resources> |