mobile/element-android
mobile/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-07-23 19:15:31 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Rename style to follow naming conventions

Browse source 
And move some files to the module
This commit is contained in:
Benoit Marty 2021-06-15 21:37:27 +02:00
parent 0590acd31a
commit 858bbfd8d2
295 changed files with 819 additions and 822 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
attachment-viewer/src/main/res/layout/item_video_attachment.xml
View file

@ -36,7 +36,7 @@
<TextView
android:id="@+id/videoMediaViewerErrorView"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"

2
library/ui-styles/build.gradle
View file

@ -58,4 +58,6 @@ dependencies {
implementation 'androidx.preference:preference-ktx:1.1.1'
// PFLockScreen attrs
implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'
// dialpad dimen
implementation 'im.dlg:android-dialer:1.2.5'
}

36
library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
View file

@ -12,100 +12,100 @@
android:orientation="vertical"
android:padding="16dp">
<!-- Note: Default style is @style/VectorButtonStyle in the theme -->
<!-- Note: Default style is @style/Button.Vector.Style in the theme -->
<Button
style="@style/VectorButtonStyle"
style="@style/Button.Vector.Style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Default" />
<Button
style="@style/VectorButtonStyle"
style="@style/Button.Vector.Style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Line1\nLine 2" />
<Button
style="@style/VectorButtonStyle"
style="@style/Button.Vector.Style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:enabled="false"
android:text="Default disabled" />
<Button
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Text" />
<Button
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:enabled="false"
android:text="Text disabled" />
<Button
style="@style/VectorButtonStyle.Positive"
style="@style/Button.Vector.Style.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Positive" />
<Button
style="@style/VectorButtonStyle.Positive"
style="@style/Button.Vector.Style.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:enabled="false"
android:text="Positive disabled" />
<Button
style="@style/VectorButtonStyle.Destructive"
style="@style/Button.Vector.Style.Destructive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Destructive" />
<Button
style="@style/VectorButtonStyle.Destructive"
style="@style/Button.Vector.Style.Destructive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:enabled="false"
android:text="Destructive disabled" />
<Button
style="@style/VectorButtonStyleUnelevated.Bot"
style="@style/Button.Vector.Style.Unelevated.Bot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Bot" />
<Button
style="@style/VectorButtonStyleUnelevated.Bot"
style="@style/Button.Vector.Style.Unelevated.Bot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:enabled="false"
android:text="Bot disabled" />
<Button
style="@style/VectorButtonStyleOutlined"
style="@style/Button.Vector.Style.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="Outline" />
<Button
style="@style/VectorButtonStyleOutlined"
style="@style/Button.Vector.Style.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:enabled="false"
android:text="Outline disabled" />
<Button
style="@style/VectorButtonStyleOutlined.Poll"
style="@style/Button.Vector.Style.Outlined.Poll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Poll " />
<Button
style="@style/VectorButtonStyleOutlined.Poll"
style="@style/Button.Vector.Style.Outlined.Poll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:enabled="false"
@ -119,14 +119,14 @@
android:padding="8dp">
<Button
style="@style/AlerterButton"
style="@style/Button.Vector.Style.Text.Alerter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="Alerter" />
<Button
style="@style/AlerterButton"
style="@style/Button.Vector.Style.Text.Alerter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:enabled="false"

38
library/ui-styles/src/debug/res/layout/activity_debug_text_view.xml
View file

@ -7,62 +7,62 @@
tools:ignore="HardcodedText">
<TextView
style="@style/VectorTextView.Title"
style="@style/TextView.Vector.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceTitle\nline 2" />
android:text="TextAppearance.Vector.Title\nline 2" />
<TextView
style="@style/VectorTextView.Title.M"
style="@style/TextView.Vector.Title.M"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceTitle.M\nline 2" />
android:text="TextAppearance.Vector.Title.M\nline 2" />
<TextView
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceHeadlineM\nline 2" />
android:text="TextAppearance.Vector.Headline.Medium\nline 2" />
<TextView
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceSubtitle\nline 2" />
android:text="TextAppearance.Vector.Subtitle\nline 2" />
<TextView
style="@style/VectorTextView.Subtitle.M"
style="@style/TextView.Vector.Subtitle.M"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceSubtitle.M\nline 2" />
android:text="TextAppearance.Vector.Subtitle.M\nline 2" />
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceBody\nline 2" />
android:text="TextAppearance.Vector.Body\nline 2" />
<TextView
style="@style/VectorTextView.Body.M"
style="@style/TextView.Vector.Body.M"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceBody.M\nline 2" />
android:text="TextAppearance.Vector.Body.M\nline 2" />
<TextView
style="@style/VectorTextView.Caption"
style="@style/TextView.Vector.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceCaption\nline 2" />
android:text="TextAppearance.Vector.Caption\nline 2" />
<TextView
style="@style/VectorTextView.Micro"
style="@style/TextView.Vector.Micro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceMicro\nline 2" />
android:text="TextAppearance.Vector.Micro\nline 2" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Default (VectorTextAppearanceBody)\nline 2" />
android:text="Default (TextAppearance.Vector.Body)\nline 2" />
</LinearLayout>

0
vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml → library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
View file

0
vector/src/main/res/color/button_background_tint_selector.xml → library/ui-styles/src/main/res/color/button_background_tint_selector.xml
View file

0
vector/src/main/res/color/button_social_google_background_selector_dark.xml → library/ui-styles/src/main/res/color/button_social_google_background_selector_dark.xml
View file

0
vector/src/main/res/color/button_social_google_background_selector_light.xml → library/ui-styles/src/main/res/color/button_social_google_background_selector_light.xml
View file

0
vector/src/main/res/color/color_primary_alpha25.xml → library/ui-styles/src/main/res/color/color_primary_alpha25.xml
View file

0
vector/src/main/res/drawable/bg_bottom_navigation.xml → library/ui-styles/src/main/res/drawable/bg_bottom_navigation.xml
View file

0
vector/src/main/res/drawable/bg_pin_key.xml → library/ui-styles/src/main/res/drawable/bg_pin_key.xml
View file

0
vector/src/main/res/drawable/element_logo_green.xml → library/ui-styles/src/main/res/drawable/element_logo_green.xml
View file

0
vector/src/main/res/drawable/file_progress_bar.xml → library/ui-styles/src/main/res/drawable/file_progress_bar.xml
View file

0
vector/src/main/res/drawable/ic_search.xml → library/ui-styles/src/main/res/drawable/ic_search.xml
View file

0
vector/src/main/res/drawable/ic_social_apple.xml → library/ui-styles/src/main/res/drawable/ic_social_apple.xml
View file

0
vector/src/main/res/drawable/ic_social_facebook.xml → library/ui-styles/src/main/res/drawable/ic_social_facebook.xml
View file

0
vector/src/main/res/drawable/ic_social_github.xml → library/ui-styles/src/main/res/drawable/ic_social_github.xml
View file

0
vector/src/main/res/drawable/ic_social_gitlab.xml → library/ui-styles/src/main/res/drawable/ic_social_gitlab.xml
View file

0
vector/src/main/res/drawable/ic_social_google.xml → library/ui-styles/src/main/res/drawable/ic_social_google.xml
View file

0
vector/src/main/res/drawable/ic_social_twitter.xml → library/ui-styles/src/main/res/drawable/ic_social_twitter.xml
View file

0
vector/src/main/res/drawable/ic_x_gray.xml → library/ui-styles/src/main/res/drawable/ic_x_gray.xml
View file

0
vector/src/main/res/drawable/pin_code_dot_empty.xml → library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml
View file

0
vector/src/main/res/drawable/pin_code_dot_fill.xml → library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml
View file

0
vector/src/main/res/drawable/pin_code_dots.xml → library/ui-styles/src/main/res/drawable/pin_code_dots.xml
View file

0
vector/src/main/res/drawable/vector_label_background.xml → library/ui-styles/src/main/res/drawable/vector_label_background.xml
View file

6
library/ui-styles/src/main/res/values/style_snackbar.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="VectorSnackBarStyle" parent="@style/Widget.MaterialComponents.Snackbar">
<style name="SnackBar.Vector.Style" parent="@style/Widget.MaterialComponents.Snackbar">
<!-- <item name="android:background">@color/notification_accent_color</item>-->
</style>
<style name="VectorSnackBarButton" parent="@style/VectorButtonStyleText.OnPrimary">
<style name="SnackBar.Vector.Button" parent="@style/Button.Vector.Style.Text.OnPrimary">
<!-- <item name="android:textColor">@color/white</item>-->
</style>
<style name="VectorSnackBarText" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
<style name="SnackBar.Vector.Text" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
<!-- <item name="android:textColor">@color/white</item>-->
</style>

2
library/ui-styles/src/main/res/values/styles.xml
View file

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Vector.PopupMenu" parent="Vector.PopupMenuBase" />
<style name="VectorEmptyImageView">
<item name="android:visibility">visible</item>
</style>

4
library/ui-styles/src/main/res/values/styles_alert_dialog.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="VectorAlertDialogStyleLight" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<style name="AlertDialog.Vector.Light" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<item name="colorPrimary">@color/palette_element_green</item>
<item name="colorSecondary">@color/palette_element_green</item>
<item name="colorSurface">@color/element_system_light</item>
@ -13,7 +13,7 @@
<item name="buttonBarNeutralButtonStyle">@style/Widget.App.Button</item-->
</style>
<style name="VectorAlertDialogStyleDark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<style name="AlertDialog.Vector.Dark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<item name="colorPrimary">@color/palette_element_green</item>
<item name="colorSecondary">@color/palette_element_green</item>
<item name="colorSurface">@color/element_system_dark</item>

2
library/ui-styles/src/main/res/values/styles_bottom_navigation.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="VectorBottomNavigation" parent="Widget.MaterialComponents.BottomNavigationView">
<style name="BottomNavigation.Vector" parent="Widget.MaterialComponents.BottomNavigationView">
<item name="android:background">@drawable/bg_bottom_navigation</item>
<item name="itemBackground">@drawable/bg_bottom_navigation</item>
<item name="itemIconSize">20dp</item>

6
library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
View file

@ -2,7 +2,7 @@
<resources>
<!-- BottomSheet theming -->
<style name="Vector.BottomSheet.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
<style name="BottomSheet.Vector.Light" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
<item name="colorPrimary">@color/element_accent_light</item>
<item name="colorSecondary">@color/palette_element_green</item>
<item name="colorSurface">@color/element_background_light</item>
@ -13,7 +13,7 @@
<item name="android:textColorLink">@color/element_link_light</item>
</style>
<style name="Vector.BottomSheet.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
<style name="BottomSheet.Vector.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
<item name="colorPrimary">@color/element_accent_dark</item>
<item name="colorSecondary">@color/palette_element_green</item>
<item name="colorSurface">@color/element_background_dark</item>
@ -24,7 +24,7 @@
<item name="android:textColorLink">@color/element_link_dark</item>
</style>
<style name="Vector.BottomSheet.Black" parent="Vector.BottomSheet.Dark">
<style name="BottomSheet.Vector.Black" parent="BottomSheet.Vector.Dark">
<item name="colorSurface">@color/element_background_black</item>
</style>

28
library/ui-styles/src/main/res/values/styles_buttons.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="VectorButtonStyle" parent="Widget.MaterialComponents.Button">
<style name="Button.Vector.Style" parent="Widget.MaterialComponents.Button">
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:minWidth">94dp</item>
<item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
<item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
<item name="lineHeight">24sp</item>
</style>
<style name="VectorButtonStyle.Destructive">
<style name="Button.Vector.Style.Destructive">
<item name="android:minWidth">94dp</item>
<item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayDestructive</item>
</style>
@ -18,7 +18,7 @@
<item name="colorPrimary">?colorError</item>
</style>
<style name="VectorButtonStyle.Positive">
<style name="Button.Vector.Style.Positive">
<item name="android:minWidth">94dp</item>
<item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
</style>
@ -27,15 +27,15 @@
<!-- Keep default colors from the theme -->
</style>
<style name="VectorButtonStyleUnelevated" parent="Widget.MaterialComponents.Button.UnelevatedButton">
<style name="Button.Vector.Style.Unelevated" parent="Widget.MaterialComponents.Button.UnelevatedButton">
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:minWidth">94dp</item>
<item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
<item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
<item name="lineHeight">24sp</item>
</style>
<style name="VectorButtonStyleUnelevated.Bot">
<style name="Button.Vector.Style.Unelevated.Bot">
<item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayBot</item>
</style>
@ -44,27 +44,27 @@
<item name="colorOnPrimary">@color/button_bot_enabled_text_color</item>
</style>
<style name="VectorButtonStyleText" parent="Widget.MaterialComponents.Button.TextButton">
<style name="Button.Vector.Style.Text" parent="Widget.MaterialComponents.Button.TextButton">
<item name="colorControlHighlight">?colorSecondary</item>
<item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
<item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
<item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
<item name="lineHeight">24sp</item>
</style>
<style name="VectorButtonStyleText.OnPrimary">
<style name="Button.Vector.Style.Text.OnPrimary">
<item name="colorControlHighlight">?colorOnPrimary</item>
<item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
</style>
<style name="VectorButtonStyleOutlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
<style name="Button.Vector.Style.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
<item name="android:textAllCaps">false</item>
<item name="strokeColor">@color/button_background_tint_selector</item>
<item name="strokeWidth">1dp</item>
<item name="android:textAppearance">@style/VectorTextAppearanceButton</item>
<item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
<item name="lineHeight">24sp</item>
</style>
<style name="AlerterButton" parent="VectorButtonStyleText">
<style name="Button.Vector.Style.Text.Alerter">
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">false</item>
<item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayOnPrimary</item>
@ -74,7 +74,7 @@
<item name="colorPrimary">?colorOnPrimary</item>
</style>
<style name="VectorButtonStyleOutlined.Poll">
<style name="Button.Vector.Style.Outlined.Poll">
<item name="android:minHeight">44dp</item>
<item name="cornerRadius">10dp</item>
</style>

10
library/ui-styles/src/main/res/values/styles_edit_text.xml
View file

@ -2,9 +2,9 @@
<resources>
<!-- Default style for TextInputLayout -->
<style name="VectorTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
<style name="TextInputLayout.Vector" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
<style name="ComposerEditTextStyle" parent="Widget.AppCompat.EditText">
<style name="EditText.Vector.Composer" parent="Widget.AppCompat.EditText">
<item name="android:background">@android:color/transparent</item>
<item name="android:inputType">textCapSentences|textMultiLine</item>
<item name="android:maxLines">12</item>
@ -14,10 +14,4 @@
<item name="android:textColor">?vctr_message_text_color</item>
</style>
<!-- Styles for login screen -->
<style name="LoginEditTextStyle" parent="Widget.AppCompat.EditText">
<item name="android:textSize">16sp</item>
</style>
</resources>

6
library/ui-styles/src/main/res/values/styles_login.xml
View file

@ -35,17 +35,17 @@
<item name="android:paddingBottom">32dp</item>
</style>
<style name="Style.Vector.Login.Button" parent="VectorButtonStyle">
<style name="Button.Vector.Style.Login">
<item name="android:minHeight">52dp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="Style.Vector.Login.Button.Outlined" parent="VectorButtonStyleOutlined">
<style name="Button.Vector.Style.Login.Outlined" parent="Button.Vector.Style.Outlined">
<item name="android:minHeight">52dp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="Style.Vector.Login.Button.Text" parent="VectorButtonStyleText">
<style name="Button.Vector.Style.Login.Text" parent="Button.Vector.Style.Text">
<item name="android:minHeight">52dp</item>
<item name="android:textAllCaps">false</item>
</style>

2
library/ui-styles/src/main/res/values/styles_pin_code.xml
View file

@ -15,7 +15,7 @@
<item name="android:button">@drawable/pin_code_dots</item>
</style>
<style name="PinCodeNextButtonStyle" parent="VectorButtonStyle">
<style name="PinCodeNextButtonStyle" parent="Button.Vector.Style">
<item name="android:textSize">18sp</item>
<item name="android:backgroundTint">@android:color/transparent</item>
<item name="android:layout_marginBottom">24dp</item>

5
library/ui-styles/src/main/res/values/styles_popup.xml
View file

@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Vector.PopupMenuBase" parent="Widget.AppCompat.PopupMenu">
<style name="PopupMenu.Vector.Base" parent="Widget.AppCompat.PopupMenu">
<item name="android:textColor">?vctr_content_primary</item>
<item name="android:textSize">16sp</item>
<item name="android:dropDownHorizontalOffset">0dp</item>
<item name="android:dropDownVerticalOffset">0dp</item>
</style>
<style name="PopupMenu.Vector" parent="PopupMenu.Vector.Base" />
</resources>

4
library/ui-styles/src/main/res/values/styles_progress.xml
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="FileProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal">
<style name="ProgressBar.Vector.File" parent="Widget.AppCompat.ProgressBar.Horizontal">
<item name="android:indeterminateOnly">false</item>
<item name="android:progressDrawable">@drawable/file_progress_bar</item>
<item name="android:minHeight">10dp</item>
<item name="android:maxHeight">40dp</item>
</style>
<style name="VectorHorizontalProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
<style name="ProgressBar.Vector.Horizontal" parent="Widget.AppCompat.ProgressBar.Horizontal" />
</resources>

2
library/ui-styles/src/main/res/values/styles_search_view.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="VectorSearchView" parent="Widget.AppCompat.SearchView">
<style name="SearchView.Vector" parent="Widget.AppCompat.SearchView">
<item name="searchIcon">@drawable/ic_search</item>
<item name="closeIcon">@drawable/ic_x_gray</item>
<item name="iconifiedByDefault">false</item>

38
library/ui-styles/src/main/res/values/styles_social_login.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="WidgetButtonSocialLogin" parent="Widget.MaterialComponents.Button.OutlinedButton">
<style name="Button.Vector.SocialLogin" parent="Widget.MaterialComponents.Button.OutlinedButton">
<item name="android:textAllCaps">false</item>
<item name="fontFamily">sans-serif-medium</item>
<item name="android:layout_width">wrap_content</item>
@ -17,44 +17,44 @@
<item name="strokeColor">@color/black_54</item>
</style>
<style name="WidgetButtonSocialLogin.Google">
<style name="Button.Vector.SocialLogin.Google">
<item name="icon">@drawable/ic_social_google</item>
<item name="iconTint">@android:color/transparent</item>
<item name="iconTintMode">add</item>
</style>
<style name="WidgetButtonSocialLogin.Google.Light">
<style name="Button.Vector.SocialLogin.Google.Light">
<item name="android:backgroundTint">@color/button_social_google_background_selector_light</item>
<item name="android:textColor">@color/black_54</item>
</style>
<style name="WidgetButtonSocialLogin.Google.Dark">
<style name="Button.Vector.SocialLogin.Google.Dark">
<item name="android:backgroundTint">@color/button_social_google_background_selector_dark</item>
<item name="android:textColor">@android:color/white</item>
</style>
<style name="WidgetButtonSocialLogin.Github" parent="WidgetButtonSocialLogin">
<style name="Button.Vector.SocialLogin.Github">
<item name="icon">@drawable/ic_social_github</item>
</style>
<style name="WidgetButtonSocialLogin.Github.Light">
<style name="Button.Vector.SocialLogin.Github.Light">
<item name="iconTint">@android:color/black</item>
<item name="android:textColor">@android:color/black</item>
<item name="android:backgroundTint">@android:color/white</item>
</style>
<style name="WidgetButtonSocialLogin.Github.Dark">
<style name="Button.Vector.SocialLogin.Github.Dark">
<item name="iconTint">@android:color/white</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:backgroundTint">@android:color/black</item>
</style>
<style name="WidgetButtonSocialLogin.Facebook" parent="WidgetButtonSocialLogin">
<style name="Button.Vector.SocialLogin.Facebook">
<item name="icon">@drawable/ic_social_facebook</item>
</style>
<style name="WidgetButtonSocialLogin.Facebook.Light">
<style name="Button.Vector.SocialLogin.Facebook.Light">
<item name="strokeColor">#3877EA</item>
<item name="strokeWidth">1dp</item>
<item name="iconTint">#3877EA</item>
@ -62,58 +62,58 @@
<item name="android:backgroundTint">@android:color/white</item>
</style>
<style name="WidgetButtonSocialLogin.Facebook.Dark">
<style name="Button.Vector.SocialLogin.Facebook.Dark">
<item name="iconTint">@android:color/white</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:backgroundTint">#3877EA</item>
</style>
<style name="WidgetButtonSocialLogin.Twitter" parent="WidgetButtonSocialLogin">
<style name="Button.Vector.SocialLogin.Twitter">
<item name="icon">@drawable/ic_social_twitter</item>
</style>
<style name="WidgetButtonSocialLogin.Twitter.Light">
<style name="Button.Vector.SocialLogin.Twitter.Light">
<item name="iconTint">#5D9EC9</item>
<item name="android:textColor">#5D9EC9</item>
<item name="android:backgroundTint">@android:color/white</item>
</style>
<style name="WidgetButtonSocialLogin.Twitter.Dark">
<style name="Button.Vector.SocialLogin.Twitter.Dark">
<item name="iconTint">@android:color/white</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:backgroundTint">#5D9EC9</item>
</style>
<style name="WidgetButtonSocialLogin.Apple" parent="WidgetButtonSocialLogin">
<style name="Button.Vector.SocialLogin.Apple">
<item name="icon">@drawable/ic_social_apple</item>
</style>
<style name="WidgetButtonSocialLogin.Apple.Light">
<style name="Button.Vector.SocialLogin.Apple.Light">
<item name="iconTint">@android:color/white</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:backgroundTint">@android:color/black</item>
</style>
<style name="WidgetButtonSocialLogin.Apple.Dark">
<style name="Button.Vector.SocialLogin.Apple.Dark">
<item name="iconTint">@android:color/black</item>
<item name="android:textColor">@android:color/black</item>
<item name="android:backgroundTint">@android:color/white</item>
</style>
<style name="WidgetButtonSocialLogin.Gitlab" parent="WidgetButtonSocialLogin">
<style name="Button.Vector.SocialLogin.Gitlab">
<item name="icon">@drawable/ic_social_gitlab</item>
<item name="iconTint">@android:color/transparent</item>
<item name="iconTintMode">add</item>
</style>
<style name="WidgetButtonSocialLogin.Gitlab.Light">
<style name="Button.Vector.SocialLogin.Gitlab.Light">
<item name="android:textColor">@android:color/black</item>
<item name="android:backgroundTint">@android:color/white</item>
</style>
<style name="WidgetButtonSocialLogin.Gitlab.Dark">
<style name="Button.Vector.SocialLogin.Gitlab.Dark">
<item name="android:textColor">@android:color/white</item>
<item name="android:backgroundTint">@android:color/black</item>
</style>

38
library/ui-styles/src/main/res/values/styles_text_view.xml
View file

@ -1,46 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="VectorTextView" parent="Widget.MaterialComponents.TextView" />
<style name="TextView.Vector" parent="Widget.MaterialComponents.TextView" />
<!-- Note: lineHeight attribute cannot be added in textAppearance style -->
<style name="VectorTextView.Title">
<item name="android:textAppearance">@style/VectorTextAppearanceTitle</item>
<style name="TextView.Vector.Title">
<item name="android:textAppearance">@style/TextAppearance.Vector.Title</item>
<item name="lineHeight">32sp</item>
</style>
<style name="VectorTextView.Title.M">
<item name="android:textAppearance">@style/VectorTextAppearanceTitle.M</item>
<style name="TextView.Vector.Title.M">
<item name="android:textAppearance">@style/TextAppearance.Vector.Title.M</item>
</style>
<style name="VectorTextView.HeadlineM">
<item name="android:textAppearance">@style/VectorTextAppearanceHeadlineM</item>
<style name="TextView.Vector.HeadlineM">
<item name="android:textAppearance">@style/TextAppearance.Vector.Headline.Medium</item>
</style>
<style name="VectorTextView.Subtitle">
<item name="android:textAppearance">@style/VectorTextAppearanceSubtitle</item>
<style name="TextView.Vector.Subtitle">
<item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle</item>
</style>
<style name="VectorTextView.Subtitle.M">
<item name="android:textAppearance">@style/VectorTextAppearanceSubtitle.M</item>
<style name="TextView.Vector.Subtitle.M">
<item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle.M</item>
</style>
<style name="VectorTextView.Body">
<item name="android:textAppearance">@style/VectorTextAppearanceBody</item>
<style name="TextView.Vector.Body">
<item name="android:textAppearance">@style/TextAppearance.Vector.Body</item>
<item name="lineHeight">20sp</item>
</style>
<style name="VectorTextView.Body.M">
<item name="android:textAppearance">@style/VectorTextAppearanceBody.M</item>
<style name="TextView.Vector.Body.M">
<item name="android:textAppearance">@style/TextAppearance.Vector.Body.M</item>
</style>
<style name="VectorTextView.Caption">
<item name="android:textAppearance">@style/VectorTextAppearanceCaption</item>
<style name="TextView.Vector.Caption">
<item name="android:textAppearance">@style/TextAppearance.Vector.Caption</item>
<item name="lineHeight">16sp</item>
</style>
<style name="VectorTextView.Micro">
<item name="android:textAppearance">@style/VectorTextAppearanceMicro</item>
<style name="TextView.Vector.Micro">
<item name="android:textAppearance">@style/TextAppearance.Vector.Micro</item>
<item name="lineHeight">16sp</item>
</style>

22
library/ui-styles/src/main/res/values/styles_toolbar.xml
View file

@ -1,50 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="VectorAppBarLayoutStyle" parent="Widget.MaterialComponents.AppBarLayout.Primary">
<style name="AppBarLayout.Vector.Style" parent="Widget.MaterialComponents.AppBarLayout.Primary">
<item name="android:background">?vctr_toolbar_background</item>
<item name="elevation">4dp</item>
</style>
<style name="VectorToolbarBase" parent="Widget.MaterialComponents.Toolbar">
<style name="Toolbar.Vector.Base" parent="Widget.MaterialComponents.Toolbar">
<item name="android:background">?vctr_toolbar_background</item>
<item name="elevation">0dp</item>
<!-- main text -->
<item name="titleTextStyle">@style/ActionBarTitleText</item>
<item name="titleTextStyle">@style/TextView.Vector.ActrionBarTitle</item>
<!-- sub text -->
<item name="subtitleTextStyle">@style/ActionBarSubTitleText</item>
<item name="subtitleTextStyle">@style/TextView.Vector.ActrionBarSubTitle</item>
</style>
<!-- Default toolbar style -->
<style name="VectorToolbar" parent="VectorToolbarBase">
<style name="Toolbar.Vector" parent="Toolbar.Vector.Base">
<item name="contentInsetStartWithNavigation">0dp</item>
</style>
<!-- Toolbar for settings Activity (so we keep the default contentInsetStartWithNavigation here) -->
<style name="VectorToolbarSettings" parent="VectorToolbarBase" />
<style name="Toolbar.Vector.Settings" parent="Toolbar.Vector.Base" />
<!-- Toolbar text style -->
<!-- main text -->
<style name="ActionBarTitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<style name="TextView.Vector.ActrionBarTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">?vctr_content_primary</item>
<item name="android:fontFamily">"sans-serif-medium"</item>
<item name="android:textSize">20sp</item>
</style>
<!-- sub text -->
<style name="ActionBarSubTitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
<style name="TextView.Vector.ActrionBarSubTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
<item name="android:textColor">?vctr_content_primary</item>
<item name="android:fontFamily">"sans-serif-medium"</item>
<item name="android:textSize">12sp</item>
</style>
<!-- Action mode style -->
<style name="VectorActionMode" parent="Widget.AppCompat.ActionMode">
<style name="ActionMode.Vector.Style" parent="Widget.AppCompat.ActionMode">
<item name="background">?android:colorBackground</item>
<item name="titleTextStyle">@style/VectorTextView.Title</item>
<item name="subtitleTextStyle">@style/VectorTextView.Subtitle</item>
<item name="titleTextStyle">@style/TextView.Vector.Title</item>
<item name="subtitleTextStyle">@style/TextView.Vector.Subtitle</item>
<item name="actionMenuTextColor">?colorOnPrimary</item>
</style>

20
library/ui-styles/src/main/res/values/text_appearances.xml
View file

@ -5,7 +5,7 @@
List of supported attributes for a TextAppearance:
https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/core/res/res/values/attrs.xml#4723-->
<style name="VectorTextAppearanceTitle" parent="TextAppearance.MaterialComponents.Headline3">
<style name="TextAppearance.Vector.Title" parent="TextAppearance.MaterialComponents.Headline3">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">24sp</item>
@ -13,12 +13,12 @@
<item name="android:textColor">?vctr_content_primary</item>
</style>
<style name="VectorTextAppearanceTitle.M">
<style name="TextAppearance.Vector.Title.M">
<item name="fontFamily">sans-serif-medium</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
<style name="VectorTextAppearanceHeadlineM" parent="TextAppearance.MaterialComponents.Headline1">
<style name="TextAppearance.Vector.Headline.Medium" parent="TextAppearance.MaterialComponents.Headline1">
<item name="fontFamily">sans-serif-medium</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">18sp</item>
@ -26,7 +26,7 @@
<item name="android:textColor">?vctr_content_primary</item>
</style>
<style name="VectorTextAppearanceSubtitle" parent="TextAppearance.MaterialComponents.Subtitle1">
<style name="TextAppearance.Vector.Subtitle" parent="TextAppearance.MaterialComponents.Subtitle1">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">16sp</item>
@ -34,13 +34,13 @@
<item name="android:textColor">?vctr_content_secondary</item>
</style>
<style name="VectorTextAppearanceSubtitle.M">
<style name="TextAppearance.Vector.Subtitle.M">
<item name="fontFamily">sans-serif-medium</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
<!-- Note: this is the default text appearance for all the TextViews -->
<style name="VectorTextAppearanceBody" parent="TextAppearance.MaterialComponents.Body1">
<style name="TextAppearance.Vector.Body" parent="TextAppearance.MaterialComponents.Body1">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">14sp</item>
@ -48,12 +48,12 @@
<item name="android:textColor">?vctr_content_primary</item>
</style>
<style name="VectorTextAppearanceBody.M">
<style name="TextAppearance.Vector.Body.M">
<item name="fontFamily">sans-serif-medium</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
<style name="VectorTextAppearanceCaption" parent="TextAppearance.MaterialComponents.Caption">
<style name="TextAppearance.Vector.Caption" parent="TextAppearance.MaterialComponents.Caption">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">12sp</item>
@ -61,14 +61,14 @@
<item name="android:textColor">?vctr_content_secondary</item>
</style>
<style name="VectorTextAppearanceMicro" parent="TextAppearance.MaterialComponents.Caption">
<style name="TextAppearance.Vector.Micro" parent="TextAppearance.MaterialComponents.Caption">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">10sp</item>
<item name="android:letterSpacing">0</item>
</style>
<style name="VectorTextAppearanceButton" parent="TextAppearance.MaterialComponents.Button">
<style name="TextAppearance.Vector.Button" parent="TextAppearance.MaterialComponents.Button">
<item name="fontFamily">sans-serif-medium</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">16sp</item>

2
library/ui-styles/src/main/res/values/theme_black.xml
View file

@ -25,7 +25,7 @@
<item name="colorSurface">@android:color/black</item>
<item name="android:colorBackground">@color/element_background_black</item>
<item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.Black</item>
<item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Black</item>
<item name="android:statusBarColor">@android:color/black</item>
<item name="android:navigationBarColor">@android:color/black</item>

52
library/ui-styles/src/main/res/values/theme_dark.xml
View file

@ -63,30 +63,30 @@
<item name="colorOnBackground">?vctr_content_primary</item>
<!--Material type attributes-->
<item name="textAppearanceButton">@style/VectorTextAppearanceButton</item>
<item name="textAppearanceCaption">@style/VectorTextAppearanceCaption</item>
<item name="textAppearanceButton">@style/TextAppearance.Vector.Button</item>
<item name="textAppearanceCaption">@style/TextAppearance.Vector.Caption</item>
<!-- Default Text appearance for TextViews -->
<item name="android:textAppearanceSmall">@style/VectorTextAppearanceBody</item>
<item name="android:textAppearanceSmall">@style/TextAppearance.Vector.Body</item>
<!-- Text appearance for List item (TODO Check that this is used in Preference Screen -->
<item name="textAppearanceListItem">@style/VectorTextAppearanceSubtitle</item>
<item name="textAppearanceListItemSecondary">@style/VectorTextAppearanceBody</item>
<item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
<item name="textAppearanceListItem">@style/TextAppearance.Vector.Subtitle</item>
<item name="textAppearanceListItemSecondary">@style/TextAppearance.Vector.Body</item>
<item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item>
<!-- Default styles -->
<item name="android:textViewStyle">@style/VectorTextView.Body</item>
<item name="materialButtonStyle">@style/VectorButtonStyle</item>
<item name="toolbarStyle">@style/VectorToolbar</item>
<item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark</item>
<item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
<item name="searchViewStyle">@style/VectorSearchView</item>
<item name="textInputStyle">@style/VectorTextInputLayout</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:textViewStyle">@style/TextView.Vector.Body</item>
<item name="materialButtonStyle">@style/Button.Vector.Style</item>
<item name="toolbarStyle">@style/Toolbar.Vector</item>
<item name="materialAlertDialogTheme">@style/AlertDialog.Vector.Dark</item>
<item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item>
<item name="searchViewStyle">@style/SearchView.Vector</item>
<item name="textInputStyle">@style/TextInputLayout.Vector</item>
<item name="appBarLayoutStyle">@style/AppBarLayout.Vector.Style</item>
<item name="popupMenuStyle">@style/PopupMenu.Vector</item>
<item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Dark</item>
<item name="snackbarStyle">@style/SnackBar.Vector.Style</item>
<item name="snackbarButtonStyle">@style/SnackBar.Vector.Button</item>
<item name="snackbarTextViewStyle">@style/SnackBar.Vector.Text</item>
<item name="actionModeStyle">@style/ActionMode.Vector.Style</item>
<item name="android:textColorLink">@color/element_link_dark</item>
@ -124,12 +124,12 @@
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
<item name="vctr_social_login_button_google_style">@style/WidgetButtonSocialLogin.Google.Dark</item>
<item name="vctr_social_login_button_github_style">@style/WidgetButtonSocialLogin.Github.Dark</item>
<item name="vctr_social_login_button_facebook_style">@style/WidgetButtonSocialLogin.Facebook.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_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Dark</item>
<item name="vctr_social_login_button_google_style">@style/Button.Vector.SocialLogin.Google.Dark</item>
<item name="vctr_social_login_button_github_style">@style/Button.Vector.SocialLogin.Github.Dark</item>
<item name="vctr_social_login_button_facebook_style">@style/Button.Vector.SocialLogin.Facebook.Dark</item>
<item name="vctr_social_login_button_twitter_style">@style/Button.Vector.SocialLogin.Twitter.Dark</item>
<item name="vctr_social_login_button_apple_style">@style/Button.Vector.SocialLogin.Apple.Dark</item>
<item name="vctr_social_login_button_gitlab_style">@style/Button.Vector.SocialLogin.Gitlab.Dark</item>
</style>
<style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />

52
library/ui-styles/src/main/res/values/theme_light.xml
View file

@ -63,30 +63,30 @@
<item name="colorOnBackground">?vctr_content_primary</item>
<!--Material type attributes-->
<item name="textAppearanceButton">@style/VectorTextAppearanceButton</item>
<item name="textAppearanceCaption">@style/VectorTextAppearanceCaption</item>
<item name="textAppearanceButton">@style/TextAppearance.Vector.Button</item>
<item name="textAppearanceCaption">@style/TextAppearance.Vector.Caption</item>
<!-- Default Text appearance for TextViews -->
<item name="android:textAppearanceSmall">@style/VectorTextAppearanceBody</item>
<item name="android:textAppearanceSmall">@style/TextAppearance.Vector.Body</item>
<!-- Text appearance for List item -->
<item name="textAppearanceListItem">@style/VectorTextAppearanceSubtitle</item>
<item name="textAppearanceListItemSecondary">@style/VectorTextAppearanceBody</item>
<item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
<item name="textAppearanceListItem">@style/TextAppearance.Vector.Subtitle</item>
<item name="textAppearanceListItemSecondary">@style/TextAppearance.Vector.Body</item>
<item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item>
<!-- Default styles -->
<item name="android:textViewStyle">@style/VectorTextView.Body</item>
<item name="materialButtonStyle">@style/VectorButtonStyle</item>
<item name="toolbarStyle">@style/VectorToolbar</item>
<item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight</item>
<item name="bottomNavigationStyle">@style/VectorBottomNavigation</item>
<item name="searchViewStyle">@style/VectorSearchView</item>
<item name="textInputStyle">@style/VectorTextInputLayout</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:textViewStyle">@style/TextView.Vector.Body</item>
<item name="materialButtonStyle">@style/Button.Vector.Style</item>
<item name="toolbarStyle">@style/Toolbar.Vector</item>
<item name="materialAlertDialogTheme">@style/AlertDialog.Vector.Light</item>
<item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item>
<item name="searchViewStyle">@style/SearchView.Vector</item>
<item name="textInputStyle">@style/TextInputLayout.Vector</item>
<item name="appBarLayoutStyle">@style/AppBarLayout.Vector.Style</item>
<item name="popupMenuStyle">@style/PopupMenu.Vector</item>
<item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Light</item>
<item name="snackbarStyle">@style/SnackBar.Vector.Style</item>
<item name="snackbarButtonStyle">@style/SnackBar.Vector.Button</item>
<item name="snackbarTextViewStyle">@style/SnackBar.Vector.Text</item>
<item name="actionModeStyle">@style/ActionMode.Vector.Style</item>
<item name="android:textColorLink">@color/element_link_light</item>
@ -126,12 +126,12 @@
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
<item name="vctr_social_login_button_google_style">@style/WidgetButtonSocialLogin.Google.Light</item>
<item name="vctr_social_login_button_github_style">@style/WidgetButtonSocialLogin.Github.Light</item>
<item name="vctr_social_login_button_facebook_style">@style/WidgetButtonSocialLogin.Facebook.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_gitlab_style">@style/WidgetButtonSocialLogin.Gitlab.Light</item>
<item name="vctr_social_login_button_google_style">@style/Button.Vector.SocialLogin.Google.Light</item>
<item name="vctr_social_login_button_github_style">@style/Button.Vector.SocialLogin.Github.Light</item>
<item name="vctr_social_login_button_facebook_style">@style/Button.Vector.SocialLogin.Facebook.Light</item>
<item name="vctr_social_login_button_twitter_style">@style/Button.Vector.SocialLogin.Twitter.Light</item>
<item name="vctr_social_login_button_apple_style">@style/Button.Vector.SocialLogin.Apple.Light</item>
<item name="vctr_social_login_button_gitlab_style">@style/Button.Vector.SocialLogin.Gitlab.Light</item>
</style>
<style name="AppTheme.Light" parent="AppTheme.Base.Light" />

2
tools/check/forbidden_strings_in_layout.txt
View file

@ -23,5 +23,5 @@
# Extension:xml
### Use style="@style/VectorTextView.*" instead of textSize attribute
### Use style="@style/TextView.Vector.*" instead of textSize attribute
android:textSize===9

2
tools/templates/ElementFeature/root/res/layout/fragment.xml.ftl
View file

@ -9,7 +9,7 @@
<TextView
android:id="@+id/message"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="${fragmentClass}"

8
vector/src/debug/res/layout/item_sas_emoji.xml
View file

@ -12,7 +12,7 @@
<TextView
android:id="@+id/sas_emoji_index"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -22,7 +22,7 @@
<TextView
android:id="@+id/sas_emoji"
style="@style/VectorTextView.Title"
style="@style/TextView.Vector.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -36,7 +36,7 @@
<TextView
android:id="@+id/sas_emoji_text"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -45,7 +45,7 @@
<TextView
android:id="@+id/sas_emoji_text_id"
style="@style/VectorTextView.Caption"
style="@style/TextView.Vector.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"

2
vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
View file

@ -231,7 +231,7 @@ class PopupAlertManager @Inject constructor() {
setIcon(it)
}
alert.actions.forEach { action ->
addButton(action.title, R.style.AlerterButton) {
addButton(action.title, R.style.Button_Vector_Style_Text_Alerter) {
if (action.autoClose) {
currentIsDismissed()
Alerter.hide()

8
vector/src/main/res/layout/activity_bug_report.xml
View file

@ -26,7 +26,7 @@
<TextView
android:id="@+id/bug_report_progress_text_view"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
@ -64,7 +64,7 @@
<TextView
android:id="@+id/bug_report_first_text"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
@ -93,7 +93,7 @@
</com.google.android.material.textfield.TextInputLayout>
<TextView
style="@style/VectorTextView.Caption"
style="@style/TextView.Vector.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
@ -103,7 +103,7 @@
<TextView
android:id="@+id/bug_report_logs_description"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"

6
vector/src/main/res/layout/activity_call.xml
View file

@ -98,7 +98,7 @@
<TextView
android:id="@+id/participantNameText"
style="@style/VectorTextView.Title"
style="@style/TextView.Vector.Title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -114,7 +114,7 @@
<TextView
android:id="@+id/callStatusText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -130,7 +130,7 @@
<Button
android:id="@+id/callActionText"
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_margin="8dp"

4
vector/src/main/res/layout/activity_call_transfer.xml
View file

@ -60,7 +60,7 @@
<TextView
android:id="@+id/callTransferConsultTitle"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
@ -72,7 +72,7 @@
<Button
android:id="@+id/callTransferConnectAction"
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"

6
vector/src/main/res/layout/activity_signed_out.xml
View file

@ -17,14 +17,14 @@
tools:ignore="ContentDescription" />
<TextView
style="@style/VectorTextView.Title"
style="@style/TextView.Vector.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/signed_out_title"
android:textColor="?vctr_content_primary" />
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
@ -34,7 +34,7 @@
<Button
android:id="@+id/signedOutSubmit"
style="@style/Style.Vector.Login.Button"
style="@style/Button.Vector.Style.Login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"

4
vector/src/main/res/layout/activity_vector_settings.xml
View file

@ -15,10 +15,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- Use VectorToolbarSettings on this screen for better alignment with setting items -->
<!-- Use Toolbar.Vector.Settings on this screen for better alignment with setting items -->
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/settingsToolbar"
style="@style/VectorToolbarSettings"
style="@style/Toolbar.Vector.Settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:navigationIcon="@drawable/ic_back_24dp"

4
vector/src/main/res/layout/alerter_incoming_call_layout.xml
View file

@ -22,7 +22,7 @@
<TextView
android:id="@+id/incomingCallNameView"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
@ -38,7 +38,7 @@
<TextView
android:id="@+id/incomingCallKindView"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"

4
vector/src/main/res/layout/alerter_verification_layout.xml
View file

@ -44,7 +44,7 @@
<TextView
android:id="@+id/tvTitle"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/alerter_padding_half"
@ -58,7 +58,7 @@
<TextView
android:id="@+id/tvText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/alerter_padding_half"

2
vector/src/main/res/layout/bottom_sheet_bootstrap.xml
View file

@ -31,7 +31,7 @@
<TextView
android:id="@+id/bootstrapTitleText"
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"

2
vector/src/main/res/layout/bottom_sheet_call_dial_pad.xml
View file

@ -16,7 +16,7 @@
<TextView
android:id="@+id/callDialPadTitle"
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"

2
vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
View file

@ -9,7 +9,7 @@
<TextView
android:id="@+id/bottomSheetTitle"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"

4
vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
View file

@ -36,7 +36,7 @@
<TextView
android:id="@+id/inviterText"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -49,7 +49,7 @@
<TextView
android:id="@+id/inviterMxid"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"

6
vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
View file

@ -11,7 +11,7 @@
android:paddingBottom="8dp">
<TextView
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -23,7 +23,7 @@
<TextView
android:id="@+id/bottom_sheet_signout_warning_text"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -63,7 +63,7 @@
<TextView
android:id="@+id/backupStatusText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"

14
vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
View file

@ -11,7 +11,7 @@
<TextView
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -23,7 +23,7 @@
<TextView
android:id="@+id/widgetPermissionHeader2"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -57,7 +57,7 @@
<TextView
android:id="@+id/widgetPermissionOwnerDisplayName"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAlignment="center"
@ -67,7 +67,7 @@
<TextView
android:id="@+id/widgetPermissionOwnerId"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAlignment="center"
@ -80,7 +80,7 @@
<TextView
android:id="@+id/widgetPermissionSharedInfo"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -99,7 +99,7 @@
<Button
android:id="@+id/widgetPermissionDecline"
style="@style/VectorButtonStyle.Destructive"
style="@style/Button.Vector.Style.Destructive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_vertical_margin"
@ -108,7 +108,7 @@
<Button
android:id="@+id/widgetPermissionContinue"
style="@style/VectorButtonStyle.Positive"
style="@style/Button.Vector.Style.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_vertical_margin"

8
vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
View file

@ -10,7 +10,7 @@
android:paddingBottom="8dp">
<TextView
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/keys_backup_setup_step3_copy_button_title"
@ -19,7 +19,7 @@
<TextView
android:id="@+id/keys_backup_recovery_key_text"
style="@style/VectorTextView.Title"
style="@style/TextView.Vector.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -52,7 +52,7 @@
tools:ignore="MissingPrefix" />
<TextView
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@ -85,7 +85,7 @@
tools:ignore="MissingPrefix" />
<TextView
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"

6
vector/src/main/res/layout/bottom_sheet_space_invite.xml
View file

@ -10,7 +10,7 @@
<TextView
android:id="@+id/headerText"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
@ -23,7 +23,7 @@
<TextView
android:id="@+id/descriptionText"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
@ -63,7 +63,7 @@
<!-- <Button-->
<!-- android:id="@+id/skipButton"-->
<!-- style="@style/VectorButtonStyleOutlined"-->
<!-- style="@style/Button.Vector.Style.Outlined"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="@dimen/layout_vertical_margin"-->

2
vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
View file

@ -9,7 +9,7 @@
<TextView
android:id="@+id/headerText"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"

4
vector/src/main/res/layout/bottom_sheet_space_settings.xml
View file

@ -27,7 +27,7 @@
<TextView
android:id="@+id/spaceNameView"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -56,7 +56,7 @@
<TextView
android:id="@+id/spaceDescription"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"

2
vector/src/main/res/layout/bottom_sheet_verification.xml
View file

@ -38,7 +38,7 @@
<TextView
android:id="@+id/otherUserNameText"
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"

2
vector/src/main/res/layout/composer_layout.xml
View file

@ -104,7 +104,7 @@
<im.vector.app.features.home.room.detail.composer.ComposerEditText
android:id="@+id/composerEditText"
style="@style/ComposerEditTextStyle"
style="@style/EditText.Vector.Composer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:nextFocusLeft="@id/composerEditText"

2
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
View file

@ -135,7 +135,7 @@
<im.vector.app.features.home.room.detail.composer.ComposerEditText
android:id="@+id/composerEditText"
style="@style/ComposerEditTextStyle"
style="@style/EditText.Vector.Composer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:hint="@string/room_message_placeholder_not_encrypted"

6
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
View file

@ -42,7 +42,7 @@
<TextView
android:id="@+id/composerRelatedMessageTitle"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="8dp"
@ -68,7 +68,7 @@
<TextView
android:id="@+id/composerRelatedMessageContent"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
@ -147,7 +147,7 @@
<im.vector.app.features.home.room.detail.composer.ComposerEditText
android:id="@+id/composerEditText"
style="@style/ComposerEditTextStyle"
style="@style/EditText.Vector.Composer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:nextFocusLeft="@id/composerEditText"

2
vector/src/main/res/layout/custom_action_item_layout_badge.xml
View file

@ -24,7 +24,7 @@
<TextView
android:id="@+id/cart_badge"
style="@style/VectorTextView.Micro"
style="@style/TextView.Vector.Micro"
android:layout_width="14dp"
android:layout_height="14dp"
android:background="@drawable/bg_unread_highlight"

12
vector/src/main/res/layout/dialog_background_sync_mode.xml
View file

@ -17,7 +17,7 @@
android:padding="16dp">
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_background_fdroid_sync_mode_battery"
@ -25,7 +25,7 @@
android:textStyle="bold" />
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
@ -43,7 +43,7 @@
android:padding="16dp">
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_background_fdroid_sync_mode_real_time"
@ -51,7 +51,7 @@
android:textStyle="bold" />
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
@ -69,7 +69,7 @@
android:padding="16dp">
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_background_fdroid_sync_mode_disabled"
@ -77,7 +77,7 @@
android:textStyle="bold" />
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"

2
vector/src/main/res/layout/dialog_confirmation_with_reason.xml
View file

@ -12,7 +12,7 @@
<TextView
android:id="@+id/dialogConfirmationText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"

16
vector/src/main/res/layout/dialog_device_verify.xml
View file

@ -13,14 +13,14 @@
android:paddingEnd="?dialogPreferredPadding">
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/encryption_information_verify_device_warning" />
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
@ -29,13 +29,13 @@
<TextView
android:id="@+id/encrypted_device_info_device_name"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="a device name" />
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
@ -44,13 +44,13 @@
<TextView
android:id="@+id/encrypted_device_info_device_id"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="a device id" />
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
@ -59,13 +59,13 @@
<TextView
android:id="@+id/encrypted_device_info_device_key"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="a device key" />
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"

4
vector/src/main/res/layout/dialog_disclaimer_content.xml
View file

@ -41,7 +41,7 @@
<TextView
android:id="@+id/disclaimerTextView"
style="@style/VectorTextView.Title"
style="@style/TextView.Vector.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/disclaimer_title"
@ -52,7 +52,7 @@
app:layout_constraintTop_toBottomOf="@id/disclaimerIconsLayout" />
<TextView
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"

2
vector/src/main/res/layout/dialog_event_content.xml
View file

@ -6,7 +6,7 @@
<TextView
android:id="@+id/event_content_text_view"
style="@style/VectorTextView.Caption"
style="@style/TextView.Vector.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"

2
vector/src/main/res/layout/dialog_export_e2e_keys.xml
View file

@ -12,7 +12,7 @@
<TextView
android:id="@+id/exportDialogText"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/encryption_export_notice"

2
vector/src/main/res/layout/dialog_import_e2e_keys.xml
View file

@ -12,7 +12,7 @@
<TextView
android:id="@+id/dialog_e2e_keys_passphrase_filename"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"

2
vector/src/main/res/layout/dialog_no_sticker_pack.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:drawablePadding="16dp"

2
vector/src/main/res/layout/dialog_prompt_password.xml
View file

@ -14,7 +14,7 @@
android:paddingEnd="?dialogPreferredPadding">
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"

4
vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
View file

@ -34,7 +34,7 @@
<TextView
android:id="@+id/bootstrapTitleText"
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -48,7 +48,7 @@
<TextView
android:id="@+id/keepItSafeText"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?vctr_content_secondary"

12
vector/src/main/res/layout/dialog_ssl_fingerprint.xml
View file

@ -13,7 +13,7 @@
android:paddingEnd="?dialogPreferredPadding">
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="6dp"
@ -21,7 +21,7 @@
<TextView
android:id="@+id/ssl_explanation"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="6dp"
@ -29,7 +29,7 @@
<TextView
android:id="@+id/ssl_user_id"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
@ -37,7 +37,7 @@
<TextView
android:id="@+id/ssl_fingerprint_title"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="6dp"
@ -45,14 +45,14 @@
<TextView
android:id="@+id/ssl_fingerprint"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="12dp"
tools:text="07 89 7A A0 30 82 99 95 E6 17 5D 1F 34 5D 8D 0C 67 82 63 1C 1F 57 20 75 42 91 F7 8B 28 03 54 A2" />
<TextView
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="6dp"

2
vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
View file

@ -11,7 +11,7 @@
<TextView
android:id="@+id/bootstrapConclusionText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"

4
vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
View file

@ -9,7 +9,7 @@
<TextView
android:id="@+id/bootstrapDescriptionText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@ -58,7 +58,7 @@
<Button
android:id="@+id/bootstrapPasswordButton"
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"

6
vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
View file

@ -8,7 +8,7 @@
<TextView
android:id="@+id/bootstrapDescriptionText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@ -48,7 +48,7 @@
<TextView
android:id="@+id/bootstrapWarningInfo"
style="@style/VectorTextView.Caption"
style="@style/TextView.Vector.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@ -76,7 +76,7 @@
<Button
android:id="@+id/bootstrapSubmit"
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/_continue"

8
vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
View file

@ -9,7 +9,7 @@
<TextView
android:id="@+id/bootstrapDescriptionText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@ -41,7 +41,7 @@
<Button
android:id="@+id/bootstrapMigrateUseFile"
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/use_file"
@ -51,7 +51,7 @@
<TextView
android:id="@+id/bootstrapMigrateForgotPassphrase"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
@ -74,7 +74,7 @@
<Button
android:id="@+id/bootstrapMigrateContinueButton"
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"

8
vector/src/main/res/layout/fragment_bootstrap_reauth.xml
View file

@ -9,7 +9,7 @@
<TextView
android:id="@+id/bootstrapDescriptionText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@ -28,7 +28,7 @@
<TextView
android:id="@+id/reAuthFailureText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@ -40,7 +40,7 @@
<Button
android:id="@+id/bootstrapCancelButton"
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
@ -49,7 +49,7 @@
<Button
android:id="@+id/bootstrapRetryButton"
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"

4
vector/src/main/res/layout/fragment_bootstrap_save_key.xml
View file

@ -10,7 +10,7 @@
<TextView
android:id="@+id/bootstrapSaveText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -21,7 +21,7 @@
<TextView
android:id="@+id/bootstrapRecoveryKeyText"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"

4
vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
View file

@ -10,7 +10,7 @@
<TextView
android:id="@+id/bootstrapSetupSecureText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -75,7 +75,7 @@
<TextView
android:id="@+id/bootstrapSetupWarningTextView"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"

4
vector/src/main/res/layout/fragment_bootstrap_waiting.xml
View file

@ -10,7 +10,7 @@
<TextView
android:id="@+id/bootstrapDescriptionText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@ -28,7 +28,7 @@
<TextView
android:id="@+id/bootstrapLoadingStatusText"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"

4
vector/src/main/res/layout/fragment_contacts_book.xml
View file

@ -43,7 +43,7 @@
<TextView
android:id="@+id/phoneBookTitle"
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -92,7 +92,7 @@
<Button
android:id="@+id/phoneBookSearchForMatrixContacts"
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"

2
vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
View file

@ -43,7 +43,7 @@
<TextView
android:id="@+id/createDirectRoomTitle"
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"

2
vector/src/main/res/layout/fragment_create_room.xml
View file

@ -40,7 +40,7 @@
<TextView
android:id="@+id/createRoomTitle"
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"

4
vector/src/main/res/layout/fragment_deactivate_account.xml
View file

@ -11,7 +11,7 @@
<TextView
android:id="@+id/deactivateAccountContent"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/deactivate_account_content"
@ -33,7 +33,7 @@
<Button
android:id="@+id/deactivateAccountSubmit"
style="@style/VectorButtonStyle.Destructive"
style="@style/Button.Vector.Style.Destructive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"

6
vector/src/main/res/layout/fragment_home_detail.xml
View file

@ -46,7 +46,7 @@
<im.vector.app.features.home.room.list.UnreadCounterBadgeView
android:id="@+id/drawerUnreadCounterBadgeView"
style="@style/VectorTextView.Micro"
style="@style/TextView.Vector.Micro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
@ -77,7 +77,7 @@
<TextView
android:id="@+id/groupToolbarTitleView"
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
@ -89,7 +89,7 @@
<TextView
android:id="@+id/groupToolbarSpaceTitleView"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"

10
vector/src/main/res/layout/fragment_home_drawer.xml
View file

@ -30,7 +30,7 @@
<TextView
android:id="@+id/homeDrawerUsernameView"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -47,7 +47,7 @@
<TextView
android:id="@+id/homeDrawerUserIdView"
style="@style/VectorTextView.Caption"
style="@style/TextView.Vector.Caption"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
@ -78,7 +78,7 @@
<Button
android:id="@+id/homeDrawerInviteFriendButton"
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginTop="8dp"
@ -130,7 +130,7 @@
<TextView
android:id="@+id/homeDrawerHeaderSettingsView"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
@ -149,7 +149,7 @@
<TextView
android:id="@+id/homeDrawerHeaderSignoutView"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"

4
vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
View file

@ -26,7 +26,7 @@
<TextView
android:id="@+id/keys_restore_with_key"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
@ -77,7 +77,7 @@
<TextView
android:id="@+id/keys_restore_key_help_with_link"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"

4
vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
View file

@ -26,7 +26,7 @@
<TextView
android:id="@+id/keys_backup_restore_with_passphrase"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
@ -74,7 +74,7 @@
<TextView
android:id="@+id/helperTextWithLink"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"

4
vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
View file

@ -21,7 +21,7 @@
<TextView
android:id="@+id/success_text"
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
@ -35,7 +35,7 @@
<TextView
android:id="@+id/success_details_text"
style="@style/VectorTextView.Subtitle"
style="@style/TextView.Vector.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"

8
vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
View file

@ -25,7 +25,7 @@
<TextView
android:id="@+id/keys_backup_setup_step1_title"
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
@ -39,7 +39,7 @@
<TextView
android:id="@+id/keys_backup_setup_step1_description"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
@ -66,7 +66,7 @@
<TextView
android:id="@+id/keys_backup_setup_step1_advanced_option_text"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -83,7 +83,7 @@
<Button
android:id="@+id/keys_backup_setup_step1_manual_export_button"
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_margin="16dp"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginEnd="@dimen/layout_horizontal_margin"

8
vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
View file

@ -15,7 +15,7 @@
<TextView
android:id="@+id/keys_backup_setup_step2_text_title"
style="@style/VectorTextView.HeadlineM"
style="@style/TextView.Vector.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
@ -32,7 +32,7 @@
<TextView
android:id="@+id/keys_backup_setup_step2_text_description"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
@ -120,7 +120,7 @@
<TextView
android:id="@+id/keys_backup_setup_step2_recovery_key_alternative"
style="@style/VectorTextView.Body"
style="@style/TextView.Vector.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -133,7 +133,7 @@
<Button
android:id="@+id/keys_backup_setup_step2_skip_button"
style="@style/VectorButtonStyleText"
style="@style/Button.Vector.Style.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"

Some files were not shown because too many files have changed in this diff Show more