Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup theme again

Browse Source
This commit is contained in:
Benoit Marty 2021-06-10 21:51:52 +02:00 committed by Benoit Marty
parent 524c26b104
commit 0bac55ced7
3 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/res/values/styles_toolbar.xml
View File

@ -52,7 +52,7 @@
</style> </style>
<!-- Action mode style --> <!-- Action mode style -->
<style name="ActionModeTheme" parent="Widget.AppCompat.ActionMode"> <style name="VectorActionMode" parent="Widget.AppCompat.ActionMode">
<item name="background">?android:colorBackground</item> <item name="background">?android:colorBackground</item>
<item name="titleTextStyle">@style/Vector.Toolbar.Title</item> <item name="titleTextStyle">@style/Vector.Toolbar.Title</item>
<item name="subtitleTextStyle">@style/Vector.Toolbar.SubTitle</item> <item name="subtitleTextStyle">@style/Vector.Toolbar.SubTitle</item>

25
vector/src/main/res/values/theme_dark.xml
View File

@ -70,12 +70,14 @@
<item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark</item> <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark</item>
<item name="bottomNavigationStyle">@style/VectorBottomNavigation</item> <item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
<item name="searchViewStyle">@style/VectorSearchView</item> <item name="searchViewStyle">@style/VectorSearchView</item>
<!-- Default style for text input -->
<item name="textInputStyle">@style/VectorTextInputLayout</item> <item name="textInputStyle">@style/VectorTextInputLayout</item>
<!-- Default style for AppBarLayout -->
<item name="appBarLayoutStyle">@style/VectorAppBarLayoutStyle</item> <item name="appBarLayoutStyle">@style/VectorAppBarLayoutStyle</item>
<item name="popupMenuStyle">@style/Vector.PopupMenu</item>
<item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Dark</item>
<item name="snackbarStyle">@style/VectorSnackBarStyle</item>
<item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
<item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
<item name="actionModeStyle">@style/VectorActionMode</item>
<item name="android:textColorLink">@color/element_link_dark</item> <item name="android:textColorLink">@color/element_link_dark</item>
@ -95,24 +97,11 @@
<!-- remove the shadow under the actionbar --> <!-- remove the shadow under the actionbar -->
<item name="android:windowContentOverlay">@null</item> <item name="android:windowContentOverlay">@null</item>
<item name="popupMenuStyle">@style/Vector.PopupMenu</item>
<!-- no divider --> <!-- no divider -->
<item name="android:actionBarDivider">@null</item> <item name="android:actionBarDivider">@null</item>
<!-- Preference -->
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Dark</item>
<!-- SnackBar -->
<!-- Style to use for SnackBars in this theme. -->
<item name="snackbarStyle">@style/VectorSnackBarStyle</item>
<!-- Style to use for action button within a SnackBar in this theme. -->
<item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
<!-- Style to use for message text within a SnackBar in this theme. -->
<item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
<item name="pf_lock_screen">@style/PinCodeScreenStyle</item> <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
<item name="pf_key_button">@style/PinCodeKeyButtonStyle</item> <item name="pf_key_button">@style/PinCodeKeyButtonStyle</item>
<item name="pf_title">@style/PinCodeTitleStyle</item> <item name="pf_title">@style/PinCodeTitleStyle</item>
@ -138,8 +127,6 @@
<item name="vctr_social_login_button_twitter_style">@style/WidgetButtonSocialLogin.Twitter.Dark</item> <item name="vctr_social_login_button_twitter_style">@style/WidgetButtonSocialLogin.Twitter.Dark</item>
<item name="vctr_social_login_button_apple_style">@style/WidgetButtonSocialLogin.Apple.Dark</item> <item name="vctr_social_login_button_apple_style">@style/WidgetButtonSocialLogin.Apple.Dark</item>
<item name="vctr_social_login_button_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Dark</item> <item name="vctr_social_login_button_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Dark</item>
<item name="actionModeStyle">@style/ActionModeTheme</item>
</style> </style>
<style name="AppTheme.Dark" parent="AppTheme.Base.Dark" /> <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />

24
vector/src/main/res/values/theme_light.xml
View File

@ -70,12 +70,14 @@
<item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight</item> <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight</item>
<item name="bottomNavigationStyle">@style/VectorBottomNavigation</item> <item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
<item name="searchViewStyle">@style/VectorSearchView</item> <item name="searchViewStyle">@style/VectorSearchView</item>
<!-- Default style for text input -->
<item name="textInputStyle">@style/VectorTextInputLayout</item> <item name="textInputStyle">@style/VectorTextInputLayout</item>
<!-- Default style for AppBarLayout -->
<item name="appBarLayoutStyle">@style/VectorAppBarLayoutStyle</item> <item name="appBarLayoutStyle">@style/VectorAppBarLayoutStyle</item>
<item name="popupMenuStyle">@style/Vector.PopupMenu</item>
<item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Light</item>
<item name="snackbarStyle">@style/VectorSnackBarStyle</item>
<item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
<item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
<item name="actionModeStyle">@style/VectorActionMode</item>
<item name="android:textColorLink">@color/element_link_light</item> <item name="android:textColorLink">@color/element_link_light</item>
@ -95,24 +97,12 @@
<!-- remove the shadow under the actionbar --> <!-- remove the shadow under the actionbar -->
<item name="android:windowContentOverlay">@null</item> <item name="android:windowContentOverlay">@null</item>
<item name="popupMenuStyle">@style/Vector.PopupMenu</item>
<!-- no divider --> <!-- no divider -->
<item name="android:actionBarDivider">@null</item> <item name="android:actionBarDivider">@null</item>
<!-- Preference -->
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Light</item>
<!-- SnackBar -->
<!-- Style to use for SnackBars in this theme. -->
<item name="snackbarStyle">@style/VectorSnackBarStyle</item>
<!-- Style to use for action button within a SnackBar in this theme. -->
<item name="snackbarButtonStyle">@style/VectorSnackBarButton</item>
<!-- Style to use for message text within a SnackBar in this theme. -->
<item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
<item name="pf_lock_screen">@style/PinCodeScreenStyle</item> <item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
<item name="pf_key_button">@style/PinCodeKeyButtonStyle</item> <item name="pf_key_button">@style/PinCodeKeyButtonStyle</item>
<item name="pf_title">@style/PinCodeTitleStyle</item> <item name="pf_title">@style/PinCodeTitleStyle</item>
@ -140,8 +130,6 @@
<item name="vctr_social_login_button_twitter_style">@style/WidgetButtonSocialLogin.Twitter.Light</item> <item name="vctr_social_login_button_twitter_style">@style/WidgetButtonSocialLogin.Twitter.Light</item>
<item name="vctr_social_login_button_apple_style">@style/WidgetButtonSocialLogin.Apple.Light</item> <item name="vctr_social_login_button_apple_style">@style/WidgetButtonSocialLogin.Apple.Light</item>
<item name="vctr_social_login_button_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Light</item> <item name="vctr_social_login_button_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Light</item>
<item name="actionModeStyle">@style/ActionModeTheme</item>
</style> </style>
<style name="AppTheme.Light" parent="AppTheme.Base.Light" /> <style name="AppTheme.Light" parent="AppTheme.Base.Light" />