diff options
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/styles.xml | 18 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 12 |
2 files changed, 23 insertions, 7 deletions
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 4b7b84c56..0818bbd5b 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -55,8 +55,20 @@ <item name="android:textSize">?TextSizeBody1</item> </style> - <style name="Widget.Conversations.Button.Borderless" parent="@style/Widget.AppCompat.Button.Borderless"> + <style name="Widget.Conversations.Button.Borderless" parent="@style/Widget.MaterialComponents.Button.TextButton"> <item name="android:textSize">?TextSizeBody2</item> + <item name="android:textColor">?attr/colorAccent</item> + </style> + + <style name="Widget.Conversations.Button.Outline" parent="@style/Widget.MaterialComponents.Button.OutlinedButton"> + <item name="android:textSize">?TextSizeBody2</item> + <item name="strokeColor">?attr/colorAccent</item> + <item name="android:textColor">?attr/colorAccent</item> + </style> + + <style name="Widget.Conversations.Button" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton"> + <item name="android:textSize">?TextSizeBody2</item> + <item name="android:textColor">@color/realwhite</item> </style> <style name="TextAppearance.Conversations.Design.Hint" parent="TextAppearance.Design.Hint"> @@ -138,4 +150,8 @@ <style name="TextAppearance.Conversations.Body1.Secondary.OnDark" parent="TextAppearance.Conversations.Body1"> <item name="android:textColor">@color/white70</item> </style> + + <style name="Conversations.Dialog" parent="ThemeOverlay.MaterialComponents.Dialog.Alert" > + <item name="android:buttonStyle">@style/Widget.Conversations.Button.Borderless</item> + </style> </resources>
\ No newline at end of file diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index de0a449a6..54e6a4356 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:tools="http://schemas.android.com/tools"> - <style name="ConversationsTheme" parent="Theme.AppCompat.Light.NoActionBar"> + <style name="ConversationsTheme" parent="Theme.MaterialComponents.Light.NoActionBar"> <item name="colorPrimary">@color/primary</item> <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> @@ -159,7 +159,7 @@ <item name="ic_settings_about" type="reference">@drawable/ic_help_black_24dp</item> </style> - <style name="ConversationsTheme.Dark" parent="Theme.AppCompat.NoActionBar"> + <style name="ConversationsTheme.Dark" parent="Theme.MaterialComponents.NoActionBar"> <item name="colorPrimary">@color/primary</item> <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> @@ -345,7 +345,7 @@ <item name="color_bubble_warning">@color/darkred</item> </style> - <style name="ConversationsTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog"> + <style name="ConversationsTheme.Dialog" parent="Theme.MaterialComponents.Light.Dialog"> <item name="colorPrimary">@color/primary</item> <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> @@ -363,7 +363,7 @@ <item name="colorAccent">@color/accent_orange</item> </style> - <style name="ConversationsTheme.Dark.Dialog" parent="@style/Theme.AppCompat.Dialog"> + <style name="ConversationsTheme.Dark.Dialog" parent="Theme.MaterialComponents.Dialog"> <item name="colorPrimary">@color/primary</item> <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> @@ -420,7 +420,7 @@ <item name="TextSizeTitle">56sp</item> </style> - <style name="ConversationsTheme.FullScreen" parent="@style/Theme.AppCompat.Light"> + <style name="ConversationsTheme.FullScreen" parent="Theme.MaterialComponents.Light"> <item name="colorPrimary">@color/primary</item> <item name="colorPrimaryDark">@color/primary_dark</item> <item name="android:windowNoTitle">true</item> @@ -431,7 +431,7 @@ <item name="android:navigationBarColor" tools:targetApi="21">@color/black</item> </style> - <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> + <style name="SplashTheme" parent="Theme.MaterialComponents.NoActionBar"> <item name="colorPrimaryDark">@android:color/transparent</item> <item name="android:windowBackground">@drawable/background</item> </style> |