mirror of
https://github.com/vector-im/element-android.git
synced 2024-11-16 02:05:06 +08:00
Clean after Benoits review
This commit is contained in:
parent
d1ab116b1d
commit
1ba97fa9be
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<attr name="jumpToUnreadStyle" format="reference" />
|
<attr name="vctr_jump_to_unread_style" format="reference" />
|
||||||
|
|
||||||
<style name="Widget.Vector.JumpToUnread.Base" parent="Widget.MaterialComponents.Chip.Action">
|
<style name="Widget.Vector.JumpToUnread.Base" parent="Widget.MaterialComponents.Chip.Action">
|
||||||
<item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
|
<item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
|
||||||
|
@ -86,7 +86,6 @@
|
|||||||
<item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
|
<item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
|
||||||
<item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
|
<item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
|
||||||
<item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
|
<item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
|
||||||
<item name="jumpToUnreadStyle">@style/Widget.Vector.JumpToUnread.Dark</item>
|
|
||||||
|
|
||||||
<!-- Default theme -->
|
<!-- Default theme -->
|
||||||
<item name="bottomSheetDialogTheme">@style/Theme.Vector.BottomSheetDialog.Dark</item>
|
<item name="bottomSheetDialogTheme">@style/Theme.Vector.BottomSheetDialog.Dark</item>
|
||||||
@ -133,6 +132,9 @@
|
|||||||
<item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark</item>
|
<item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark</item>
|
||||||
<item name="vctr_social_login_button_apple_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Dark</item>
|
<item name="vctr_social_login_button_apple_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Dark</item>
|
||||||
<item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark</item>
|
<item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark</item>
|
||||||
|
|
||||||
|
<item name="vctr_jump_to_unread_style">@style/Widget.Vector.JumpToUnread.Dark</item>
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.Vector.Dark" parent="Base.Theme.Vector.Dark" />
|
<style name="Theme.Vector.Dark" parent="Base.Theme.Vector.Dark" />
|
||||||
|
@ -86,7 +86,6 @@
|
|||||||
<item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
|
<item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
|
||||||
<item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
|
<item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
|
||||||
<item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
|
<item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
|
||||||
<item name="jumpToUnreadStyle">@style/Widget.Vector.JumpToUnread.Light</item>
|
|
||||||
|
|
||||||
<!-- Default theme -->
|
<!-- Default theme -->
|
||||||
<item name="bottomSheetDialogTheme">@style/Theme.Vector.BottomSheetDialog.Light</item>
|
<item name="bottomSheetDialogTheme">@style/Theme.Vector.BottomSheetDialog.Light</item>
|
||||||
@ -135,6 +134,9 @@
|
|||||||
<item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Light</item>
|
<item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Light</item>
|
||||||
<item name="vctr_social_login_button_apple_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Light</item>
|
<item name="vctr_social_login_button_apple_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Light</item>
|
||||||
<item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light</item>
|
<item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light</item>
|
||||||
|
|
||||||
|
<item name="vctr_jump_to_unread_style">@style/Widget.Vector.JumpToUnread.Light</item>
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.Vector.Light" parent="Base.Theme.Vector.Light" />
|
<style name="Theme.Vector.Light" parent="Base.Theme.Vector.Light" />
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 686 B |
Binary file not shown.
Before Width: | Height: | Size: 414 B |
Binary file not shown.
Before Width: | Height: | Size: 869 B |
Binary file not shown.
Before Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.9 KiB |
@ -129,7 +129,7 @@
|
|||||||
|
|
||||||
<com.google.android.material.chip.Chip
|
<com.google.android.material.chip.Chip
|
||||||
android:id="@+id/jumpToReadMarkerView"
|
android:id="@+id/jumpToReadMarkerView"
|
||||||
style="?attr/jumpToUnreadStyle"
|
style="?vctr_jump_to_unread_style"
|
||||||
app:chipIcon="@drawable/ic_jump_to_unread"
|
app:chipIcon="@drawable/ic_jump_to_unread"
|
||||||
app:closeIcon="@drawable/ic_close_24dp"
|
app:closeIcon="@drawable/ic_close_24dp"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
Loading…
Reference in New Issue
Block a user