mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-18 07:11:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rename again the style to follow Android convention (G's review)

Browse source
This commit is contained in:
Benoit Marty 2021-06-16 11:59:08 +02:00
parent 1d356cd49d
commit ece9d19d8c
270 changed files with 776 additions and 771 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 <TextView
android:id="@+id/videoMediaViewerErrorView" android:id="@+id/videoMediaViewerErrorView"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"

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

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

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

@ -7,55 +7,55 @@
tools:ignore="HardcodedText"> tools:ignore="HardcodedText">
<TextView <TextView
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TextAppearance.Vector.Title\nline 2" /> android:text="TextAppearance.Vector.Title\nline 2" />
<TextView <TextView
style="@style/TextView.Vector.Title.Medium" style="@style/Widget.Vector.TextView.Title.Medium"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TextAppearance.Vector.Title.Medium\nline 2" /> android:text="TextAppearance.Vector.Title.Medium\nline 2" />
<TextView <TextView
style="@style/TextView.Vector.HeadlineMedium" style="@style/Widget.Vector.TextView.HeadlineMedium"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TextAppearance.Vector.Headline.Medium\nline 2" /> android:text="TextAppearance.Vector.Headline.Medium\nline 2" />
<TextView <TextView
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TextAppearance.Vector.Subtitle\nline 2" /> android:text="TextAppearance.Vector.Subtitle\nline 2" />
<TextView <TextView
style="@style/TextView.Vector.Subtitle.Medium" style="@style/Widget.Vector.TextView.Subtitle.Medium"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TextAppearance.Vector.Subtitle.Medium\nline 2" /> android:text="TextAppearance.Vector.Subtitle.Medium\nline 2" />
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TextAppearance.Vector.Body\nline 2" /> android:text="TextAppearance.Vector.Body\nline 2" />
<TextView <TextView
style="@style/TextView.Vector.Body.Medium" style="@style/Widget.Vector.TextView.Body.Medium"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TextAppearance.Vector.Body.Medium\nline 2" /> android:text="TextAppearance.Vector.Body.Medium\nline 2" />
<TextView <TextView
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TextAppearance.Vector.Caption\nline 2" /> android:text="TextAppearance.Vector.Caption\nline 2" />
<TextView <TextView
style="@style/TextView.Vector.Micro" style="@style/Widget.Vector.TextView.Micro"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TextAppearance.Vector.Micro\nline 2" /> android:text="TextAppearance.Vector.Micro\nline 2" />

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

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

12
library/ui-styles/src/main/res/values/styles_action_mode.xml Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Action mode style -->
<style name="Widget.Vector.ActionMode" parent="Widget.AppCompat.ActionMode">
<item name="background">?android:colorBackground</item>
<item name="titleTextStyle">@style/Widget.Vector.TextView.Title</item>
<item name="subtitleTextStyle">@style/Widget.Vector.TextView.Subtitle</item>
<item name="actionMenuTextColor">?colorOnPrimary</item>
</style>
</resources>

9
library/ui-styles/src/main/res/values/styles_app_bar_layout.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Widget.Vector.AppBarLayout" parent="Widget.MaterialComponents.AppBarLayout.Primary">
<item name="android:background">?vctr_toolbar_background</item>
<item name="elevation">4dp</item>
</style>
</resources>

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

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

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

@ -2,9 +2,9 @@
<resources> <resources>
<!-- Default style for TextInputLayout --> <!-- Default style for TextInputLayout -->
<style name="TextInputLayout.Vector" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" /> <style name="Widget.Vector.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
<style name="EditText.Vector.Composer" parent="Widget.AppCompat.EditText"> <style name="Widget.Vector.EditText.Composer" parent="Widget.AppCompat.EditText">
<item name="android:background">@android:color/transparent</item> <item name="android:background">@android:color/transparent</item>
<item name="android:inputType">textCapSentences|textMultiLine</item> <item name="android:inputType">textCapSentences|textMultiLine</item>
<item name="android:maxLines">12</item> <item name="android:maxLines">12</item>

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

@ -35,17 +35,17 @@
<item name="android:paddingBottom">32dp</item> <item name="android:paddingBottom">32dp</item>
</style> </style>
<style name="Button.Vector.Style.Login"> <style name="Widget.Vector.Button.Login">
<item name="android:minHeight">52dp</item> <item name="android:minHeight">52dp</item>
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
</style> </style>
<style name="Button.Vector.Style.Login.Outlined" parent="Button.Vector.Style.Outlined"> <style name="Widget.Vector.Button.Outlined.Login">
<item name="android:minHeight">52dp</item> <item name="android:minHeight">52dp</item>
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
</style> </style>
<style name="Button.Vector.Style.Login.Text" parent="Button.Vector.Style.Text"> <style name="Widget.Vector.Button.Text.Login">
<item name="android:minHeight">52dp</item> <item name="android:minHeight">52dp</item>
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
</style> </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> <item name="android:button">@drawable/pin_code_dots</item>
</style> </style>
<style name="PinCodeNextButtonStyle" parent="Button.Vector.Style"> <style name="PinCodeNextButtonStyle" parent="Widget.Vector.Button">
<item name="android:textSize">18sp</item> <item name="android:textSize">18sp</item>
<item name="android:backgroundTint">@android:color/transparent</item> <item name="android:backgroundTint">@android:color/transparent</item>
<item name="android:layout_marginBottom">24dp</item> <item name="android:layout_marginBottom">24dp</item>

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

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

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

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="ProgressBar.Vector.File" parent="Widget.AppCompat.ProgressBar.Horizontal"> <style name="Widget.Vector.ProgressBar.Horizontal" parent="Widget.AppCompat.ProgressBar.Horizontal" />
<style name="Widget.Vector.ProgressBar.Horizontal.File">
<item name="android:indeterminateOnly">false</item> <item name="android:indeterminateOnly">false</item>
<item name="android:progressDrawable">@drawable/file_progress_bar</item> <item name="android:progressDrawable">@drawable/file_progress_bar</item>
<item name="android:minHeight">10dp</item> <item name="android:minHeight">10dp</item>
<item name="android:maxHeight">40dp</item> <item name="android:maxHeight">40dp</item>
</style> </style>
<style name="ProgressBar.Vector.Horizontal" parent="Widget.AppCompat.ProgressBar.Horizontal" />
</resources> </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"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="SearchView.Vector" parent="Widget.AppCompat.SearchView"> <style name="Widget.Vector.SearchView" parent="Widget.AppCompat.SearchView">
<item name="searchIcon">@drawable/ic_search</item> <item name="searchIcon">@drawable/ic_search</item>
<item name="closeIcon">@drawable/ic_x_gray</item> <item name="closeIcon">@drawable/ic_x_gray</item>
<item name="iconifiedByDefault">false</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"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Button.Vector.SocialLogin" parent="Widget.MaterialComponents.Button.OutlinedButton"> <style name="Widget.Vector.Button.Outlined.SocialLogin">
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
<item name="fontFamily">sans-serif-medium</item> <item name="fontFamily">sans-serif-medium</item>
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
@ -17,44 +17,44 @@
<item name="strokeColor">@color/black_54</item> <item name="strokeColor">@color/black_54</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Google"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Google">
<item name="icon">@drawable/ic_social_google</item> <item name="icon">@drawable/ic_social_google</item>
<item name="iconTint">@android:color/transparent</item> <item name="iconTint">@android:color/transparent</item>
<item name="iconTintMode">add</item> <item name="iconTintMode">add</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Google.Light"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Google.Light">
<item name="android:backgroundTint">@color/button_social_google_background_selector_light</item> <item name="android:backgroundTint">@color/button_social_google_background_selector_light</item>
<item name="android:textColor">@color/black_54</item> <item name="android:textColor">@color/black_54</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Google.Dark"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Google.Dark">
<item name="android:backgroundTint">@color/button_social_google_background_selector_dark</item> <item name="android:backgroundTint">@color/button_social_google_background_selector_dark</item>
<item name="android:textColor">@android:color/white</item> <item name="android:textColor">@android:color/white</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Github"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Github">
<item name="icon">@drawable/ic_social_github</item> <item name="icon">@drawable/ic_social_github</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Github.Light"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Github.Light">
<item name="iconTint">@android:color/black</item> <item name="iconTint">@android:color/black</item>
<item name="android:textColor">@android:color/black</item> <item name="android:textColor">@android:color/black</item>
<item name="android:backgroundTint">@android:color/white</item> <item name="android:backgroundTint">@android:color/white</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Github.Dark"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Github.Dark">
<item name="iconTint">@android:color/white</item> <item name="iconTint">@android:color/white</item>
<item name="android:textColor">@android:color/white</item> <item name="android:textColor">@android:color/white</item>
<item name="android:backgroundTint">@android:color/black</item> <item name="android:backgroundTint">@android:color/black</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Facebook"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Facebook">
<item name="icon">@drawable/ic_social_facebook</item> <item name="icon">@drawable/ic_social_facebook</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Facebook.Light"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Facebook.Light">
<item name="strokeColor">#3877EA</item> <item name="strokeColor">#3877EA</item>
<item name="strokeWidth">1dp</item> <item name="strokeWidth">1dp</item>
<item name="iconTint">#3877EA</item> <item name="iconTint">#3877EA</item>
@ -62,58 +62,58 @@
<item name="android:backgroundTint">@android:color/white</item> <item name="android:backgroundTint">@android:color/white</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Facebook.Dark"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Facebook.Dark">
<item name="iconTint">@android:color/white</item> <item name="iconTint">@android:color/white</item>
<item name="android:textColor">@android:color/white</item> <item name="android:textColor">@android:color/white</item>
<item name="android:backgroundTint">#3877EA</item> <item name="android:backgroundTint">#3877EA</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Twitter"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Twitter">
<item name="icon">@drawable/ic_social_twitter</item> <item name="icon">@drawable/ic_social_twitter</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Twitter.Light"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Twitter.Light">
<item name="iconTint">#5D9EC9</item> <item name="iconTint">#5D9EC9</item>
<item name="android:textColor">#5D9EC9</item> <item name="android:textColor">#5D9EC9</item>
<item name="android:backgroundTint">@android:color/white</item> <item name="android:backgroundTint">@android:color/white</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Twitter.Dark"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark">
<item name="iconTint">@android:color/white</item> <item name="iconTint">@android:color/white</item>
<item name="android:textColor">@android:color/white</item> <item name="android:textColor">@android:color/white</item>
<item name="android:backgroundTint">#5D9EC9</item> <item name="android:backgroundTint">#5D9EC9</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Apple"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Apple">
<item name="icon">@drawable/ic_social_apple</item> <item name="icon">@drawable/ic_social_apple</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Apple.Light"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Apple.Light">
<item name="iconTint">@android:color/white</item> <item name="iconTint">@android:color/white</item>
<item name="android:textColor">@android:color/white</item> <item name="android:textColor">@android:color/white</item>
<item name="android:backgroundTint">@android:color/black</item> <item name="android:backgroundTint">@android:color/black</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Apple.Dark"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Apple.Dark">
<item name="iconTint">@android:color/black</item> <item name="iconTint">@android:color/black</item>
<item name="android:textColor">@android:color/black</item> <item name="android:textColor">@android:color/black</item>
<item name="android:backgroundTint">@android:color/white</item> <item name="android:backgroundTint">@android:color/white</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Gitlab"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Gitlab">
<item name="icon">@drawable/ic_social_gitlab</item> <item name="icon">@drawable/ic_social_gitlab</item>
<item name="iconTint">@android:color/transparent</item> <item name="iconTint">@android:color/transparent</item>
<item name="iconTintMode">add</item> <item name="iconTintMode">add</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Gitlab.Light"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light">
<item name="android:textColor">@android:color/black</item> <item name="android:textColor">@android:color/black</item>
<item name="android:backgroundTint">@android:color/white</item> <item name="android:backgroundTint">@android:color/white</item>
</style> </style>
<style name="Button.Vector.SocialLogin.Gitlab.Dark"> <style name="Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark">
<item name="android:textColor">@android:color/white</item> <item name="android:textColor">@android:color/white</item>
<item name="android:backgroundTint">@android:color/black</item> <item name="android:backgroundTint">@android:color/black</item>
</style> </style>

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

@ -5,45 +5,45 @@
Source: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1336%3A17796 Source: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1336%3A17796
--> -->
<style name="TextView.Vector" parent="Widget.MaterialComponents.TextView" /> <style name="Widget.Vector.TextView" parent="Widget.MaterialComponents.TextView" />
<!-- Note: lineHeight attribute cannot be added in textAppearance style --> <!-- Note: lineHeight attribute cannot be added in textAppearance style -->
<style name="TextView.Vector.Title"> <style name="Widget.Vector.TextView.Title">
<item name="android:textAppearance">@style/TextAppearance.Vector.Title</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Title</item>
<item name="lineHeight">32sp</item> <item name="lineHeight">32sp</item>
</style> </style>
<style name="TextView.Vector.Title.Medium"> <style name="Widget.Vector.TextView.Title.Medium">
<item name="android:textAppearance">@style/TextAppearance.Vector.Title.Medium</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Title.Medium</item>
</style> </style>
<style name="TextView.Vector.HeadlineMedium"> <style name="Widget.Vector.TextView.HeadlineMedium">
<item name="android:textAppearance">@style/TextAppearance.Vector.Headline.Medium</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Headline.Medium</item>
</style> </style>
<style name="TextView.Vector.Subtitle"> <style name="Widget.Vector.TextView.Subtitle">
<item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle</item>
</style> </style>
<style name="TextView.Vector.Subtitle.Medium"> <style name="Widget.Vector.TextView.Subtitle.Medium">
<item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle.Medium</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Subtitle.Medium</item>
</style> </style>
<style name="TextView.Vector.Body"> <style name="Widget.Vector.TextView.Body">
<item name="android:textAppearance">@style/TextAppearance.Vector.Body</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Body</item>
<item name="lineHeight">20sp</item> <item name="lineHeight">20sp</item>
</style> </style>
<style name="TextView.Vector.Body.Medium"> <style name="Widget.Vector.TextView.Body.Medium">
<item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
</style> </style>
<style name="TextView.Vector.Caption"> <style name="Widget.Vector.TextView.Caption">
<item name="android:textAppearance">@style/TextAppearance.Vector.Caption</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Caption</item>
<item name="lineHeight">16sp</item> <item name="lineHeight">16sp</item>
</style> </style>
<style name="TextView.Vector.Micro"> <style name="Widget.Vector.TextView.Micro">
<item name="android:textAppearance">@style/TextAppearance.Vector.Micro</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Micro</item>
<item name="lineHeight">16sp</item> <item name="lineHeight">16sp</item>
</style> </style>

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

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

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

@ -8,7 +8,7 @@
List of supported attributes for a TextAppearance: List of supported attributes for a TextAppearance:
https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/core/res/res/values/attrs.xml#4723 https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/core/res/res/values/attrs.xml#4723
Do not use TextAppearance style directly, use TextView.Vector style instead Do not use TextAppearance directly, use Widget.Vector.TextView style instead
--> -->
<style name="TextAppearance.Vector.Title" parent="TextAppearance.MaterialComponents.Headline3"> <style name="TextAppearance.Vector.Title" parent="TextAppearance.MaterialComponents.Headline3">

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

@ -67,26 +67,26 @@
<item name="textAppearanceCaption">@style/TextAppearance.Vector.Caption</item> <item name="textAppearanceCaption">@style/TextAppearance.Vector.Caption</item>
<!-- Default Text appearance for TextViews --> <!-- Default Text appearance for TextViews -->
<item name="android:textAppearanceSmall">@style/TextAppearance.Vector.Body</item> <item name="android:textAppearanceSmall">@style/TextAppearance.Vector.Body</item>
<!-- Text appearance for List item (TODO Check that this is used in Preference Screen --> <!-- Text appearance for List item -->
<item name="textAppearanceListItem">@style/TextAppearance.Vector.Subtitle</item> <item name="textAppearanceListItem">@style/TextAppearance.Vector.Subtitle</item>
<item name="textAppearanceListItemSecondary">@style/TextAppearance.Vector.Body</item> <item name="textAppearanceListItemSecondary">@style/TextAppearance.Vector.Body</item>
<item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item> <item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item>
<!-- Default styles --> <!-- Default styles -->
<item name="android:textViewStyle">@style/TextView.Vector.Body</item> <item name="android:textViewStyle">@style/Widget.Vector.TextView.Body</item>
<item name="materialButtonStyle">@style/Button.Vector.Style</item> <item name="materialButtonStyle">@style/Widget.Vector.Button</item>
<item name="toolbarStyle">@style/Toolbar.Vector</item> <item name="toolbarStyle">@style/Widget.Vector.Toolbar</item>
<item name="materialAlertDialogTheme">@style/AlertDialog.Vector.Dark</item> <item name="materialAlertDialogTheme">@style/AlertDialog.Vector.Dark</item>
<item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item> <item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item>
<item name="searchViewStyle">@style/SearchView.Vector</item> <item name="searchViewStyle">@style/Widget.Vector.SearchView</item>
<item name="textInputStyle">@style/TextInputLayout.Vector</item> <item name="textInputStyle">@style/Widget.Vector.TextInputLayout</item>
<item name="appBarLayoutStyle">@style/AppBarLayout.Vector.Style</item> <item name="appBarLayoutStyle">@style/Widget.Vector.AppBarLayout</item>
<item name="popupMenuStyle">@style/PopupMenu.Vector</item> <item name="popupMenuStyle">@style/Widget.Vector.PopupMenu</item>
<item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Dark</item> <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Dark</item>
<item name="snackbarStyle">@style/SnackBar.Vector.Style</item> <item name="snackbarStyle">@style/Widget.Vector.SnackBar</item>
<item name="snackbarButtonStyle">@style/SnackBar.Vector.Button</item> <item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
<item name="snackbarTextViewStyle">@style/SnackBar.Vector.Text</item> <item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
<item name="actionModeStyle">@style/ActionMode.Vector.Style</item> <item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
<item name="android:textColorLink">@color/element_link_dark</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:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item> <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
<item name="vctr_social_login_button_google_style">@style/Button.Vector.SocialLogin.Google.Dark</item> <item name="vctr_social_login_button_google_style">@style/Widget.Vector.Button.Outlined.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_github_style">@style/Widget.Vector.Button.Outlined.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_facebook_style">@style/Widget.Vector.Button.Outlined.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_twitter_style">@style/Widget.Vector.Button.Outlined.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_apple_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Dark</item>
<item name="vctr_social_login_button_gitlab_style">@style/Button.Vector.SocialLogin.Gitlab.Dark</item> <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark</item>
</style> </style>
<style name="AppTheme.Dark" parent="AppTheme.Base.Dark" /> <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />

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

@ -73,20 +73,20 @@
<item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item> <item name="textAppearanceListItemSmall">@style/TextAppearance.Vector.Body</item>
<!-- Default styles --> <!-- Default styles -->
<item name="android:textViewStyle">@style/TextView.Vector.Body</item> <item name="android:textViewStyle">@style/Widget.Vector.TextView.Body</item>
<item name="materialButtonStyle">@style/Button.Vector.Style</item> <item name="materialButtonStyle">@style/Widget.Vector.Button</item>
<item name="toolbarStyle">@style/Toolbar.Vector</item> <item name="toolbarStyle">@style/Widget.Vector.Toolbar</item>
<item name="materialAlertDialogTheme">@style/AlertDialog.Vector.Light</item> <item name="materialAlertDialogTheme">@style/AlertDialog.Vector.Light</item>
<item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item> <item name="bottomNavigationStyle">@style/BottomNavigation.Vector</item>
<item name="searchViewStyle">@style/SearchView.Vector</item> <item name="searchViewStyle">@style/Widget.Vector.SearchView</item>
<item name="textInputStyle">@style/TextInputLayout.Vector</item> <item name="textInputStyle">@style/Widget.Vector.TextInputLayout</item>
<item name="appBarLayoutStyle">@style/AppBarLayout.Vector.Style</item> <item name="appBarLayoutStyle">@style/Widget.Vector.AppBarLayout</item>
<item name="popupMenuStyle">@style/PopupMenu.Vector</item> <item name="popupMenuStyle">@style/Widget.Vector.PopupMenu</item>
<item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Light</item> <item name="bottomSheetDialogTheme">@style/BottomSheet.Vector.Light</item>
<item name="snackbarStyle">@style/SnackBar.Vector.Style</item> <item name="snackbarStyle">@style/Widget.Vector.SnackBar</item>
<item name="snackbarButtonStyle">@style/SnackBar.Vector.Button</item> <item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
<item name="snackbarTextViewStyle">@style/SnackBar.Vector.Text</item> <item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
<item name="actionModeStyle">@style/ActionMode.Vector.Style</item> <item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
<item name="android:textColorLink">@color/element_link_light</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:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item> <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
<item name="vctr_social_login_button_google_style">@style/Button.Vector.SocialLogin.Google.Light</item> <item name="vctr_social_login_button_google_style">@style/Widget.Vector.Button.Outlined.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_github_style">@style/Widget.Vector.Button.Outlined.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_facebook_style">@style/Widget.Vector.Button.Outlined.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_twitter_style">@style/Widget.Vector.Button.Outlined.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_apple_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Light</item>
<item name="vctr_social_login_button_gitlab_style">@style/Button.Vector.SocialLogin.Gitlab.Light</item> <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light</item>
</style> </style>
<style name="AppTheme.Light" parent="AppTheme.Base.Light" /> <style name="AppTheme.Light" parent="AppTheme.Base.Light" />

2
tools/check/forbidden_strings_in_layout.txt
View file

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

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

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

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

@ -12,7 +12,7 @@
<TextView <TextView
android:id="@+id/sas_emoji_index" android:id="@+id/sas_emoji_index"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="32dp" android:layout_width="32dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
@ -22,7 +22,7 @@
<TextView <TextView
android:id="@+id/sas_emoji" android:id="@+id/sas_emoji"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
@ -36,7 +36,7 @@
<TextView <TextView
android:id="@+id/sas_emoji_text" android:id="@+id/sas_emoji_text"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
@ -45,7 +45,7 @@
<TextView <TextView
android:id="@+id/sas_emoji_text_id" android:id="@+id/sas_emoji_text_id"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" 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) setIcon(it)
} }
alert.actions.forEach { action -> alert.actions.forEach { action ->
addButton(action.title, R.style.Button_Vector_Style_Text_Alerter) { addButton(action.title, R.style.Widget_Vector_Button_Text_Alerter) {
if (action.autoClose) { if (action.autoClose) {
currentIsDismissed() currentIsDismissed()
Alerter.hide() Alerter.hide()

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

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

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

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

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

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

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

@ -17,14 +17,14 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/signed_out_title" android:text="@string/signed_out_title"
android:textColor="?vctr_content_primary" /> android:textColor="?vctr_content_primary" />
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -34,7 +34,7 @@
<Button <Button
android:id="@+id/signedOutSubmit" android:id="@+id/signedOutSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" 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_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<!-- Use Toolbar.Vector.Settings on this screen for better alignment with setting items --> <!-- Use Widget.Vector.Toolbar.Settings on this screen for better alignment with setting items -->
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/settingsToolbar" android:id="@+id/settingsToolbar"
style="@style/Toolbar.Vector.Settings" style="@style/Widget.Vector.Toolbar.Settings"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:navigationIcon="@drawable/ic_back_24dp" tools:navigationIcon="@drawable/ic_back_24dp"

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

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

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

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

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

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

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

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

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

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

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

@ -36,7 +36,7 @@
<TextView <TextView
android:id="@+id/inviterText" android:id="@+id/inviterText"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
@ -49,7 +49,7 @@
<TextView <TextView
android:id="@+id/inviterMxid" android:id="@+id/inviterMxid"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" 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"> android:paddingBottom="8dp">
<TextView <TextView
style="@style/TextView.Vector.HeadlineMedium" style="@style/Widget.Vector.TextView.HeadlineMedium"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin" android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -23,7 +23,7 @@
<TextView <TextView
android:id="@+id/bottom_sheet_signout_warning_text" android:id="@+id/bottom_sheet_signout_warning_text"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin" android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -63,7 +63,7 @@
<TextView <TextView
android:id="@+id/backupStatusText" android:id="@+id/backupStatusText"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"

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

@ -11,7 +11,7 @@
<TextView <TextView
style="@style/TextView.Vector.HeadlineMedium" style="@style/Widget.Vector.TextView.HeadlineMedium"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin" android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -23,7 +23,7 @@
<TextView <TextView
android:id="@+id/widgetPermissionHeader2" android:id="@+id/widgetPermissionHeader2"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin" android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -57,7 +57,7 @@
<TextView <TextView
android:id="@+id/widgetPermissionOwnerDisplayName" android:id="@+id/widgetPermissionOwnerDisplayName"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center" android:textAlignment="center"
@ -67,7 +67,7 @@
<TextView <TextView
android:id="@+id/widgetPermissionOwnerId" android:id="@+id/widgetPermissionOwnerId"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center" android:textAlignment="center"
@ -80,7 +80,7 @@
<TextView <TextView
android:id="@+id/widgetPermissionSharedInfo" android:id="@+id/widgetPermissionSharedInfo"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin" android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -99,7 +99,7 @@
<Button <Button
android:id="@+id/widgetPermissionDecline" android:id="@+id/widgetPermissionDecline"
style="@style/Button.Vector.Style.Destructive" style="@style/Widget.Vector.Button.Destructive"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_vertical_margin" android:layout_marginEnd="@dimen/layout_vertical_margin"
@ -108,7 +108,7 @@
<Button <Button
android:id="@+id/widgetPermissionContinue" android:id="@+id/widgetPermissionContinue"
style="@style/Button.Vector.Style.Positive" style="@style/Widget.Vector.Button.Positive"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_vertical_margin" 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"> android:paddingBottom="8dp">
<TextView <TextView
style="@style/TextView.Vector.HeadlineMedium" style="@style/Widget.Vector.TextView.HeadlineMedium"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/keys_backup_setup_step3_copy_button_title" android:text="@string/keys_backup_setup_step3_copy_button_title"
@ -19,7 +19,7 @@
<TextView <TextView
android:id="@+id/keys_backup_recovery_key_text" android:id="@+id/keys_backup_recovery_key_text"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
@ -52,7 +52,7 @@
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
<TextView <TextView
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
@ -85,7 +85,7 @@
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
<TextView <TextView
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"

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

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

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

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

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

@ -38,7 +38,7 @@
<TextView <TextView
android:id="@+id/otherUserNameText" android:id="@+id/otherUserNameText"
style="@style/TextView.Vector.HeadlineMedium" style="@style/Widget.Vector.TextView.HeadlineMedium"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" 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 <im.vector.app.features.home.room.detail.composer.ComposerEditText
android:id="@+id/composerEditText" android:id="@+id/composerEditText"
style="@style/EditText.Vector.Composer" style="@style/Widget.Vector.EditText.Composer"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:nextFocusLeft="@id/composerEditText" 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 <im.vector.app.features.home.room.detail.composer.ComposerEditText
android:id="@+id/composerEditText" android:id="@+id/composerEditText"
style="@style/EditText.Vector.Composer" style="@style/Widget.Vector.EditText.Composer"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/room_message_placeholder_not_encrypted" 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 <TextView
android:id="@+id/composerRelatedMessageTitle" android:id="@+id/composerRelatedMessageTitle"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
@ -68,7 +68,7 @@
<TextView <TextView
android:id="@+id/composerRelatedMessageContent" android:id="@+id/composerRelatedMessageContent"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
@ -147,7 +147,7 @@
<im.vector.app.features.home.room.detail.composer.ComposerEditText <im.vector.app.features.home.room.detail.composer.ComposerEditText
android:id="@+id/composerEditText" android:id="@+id/composerEditText"
style="@style/EditText.Vector.Composer" style="@style/Widget.Vector.EditText.Composer"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:nextFocusLeft="@id/composerEditText" android:nextFocusLeft="@id/composerEditText"

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

@ -24,7 +24,7 @@
<TextView <TextView
android:id="@+id/cart_badge" android:id="@+id/cart_badge"
style="@style/TextView.Vector.Micro" style="@style/Widget.Vector.TextView.Micro"
android:layout_width="14dp" android:layout_width="14dp"
android:layout_height="14dp" android:layout_height="14dp"
android:background="@drawable/bg_unread_highlight" 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"> android:padding="16dp">
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_background_fdroid_sync_mode_battery" android:text="@string/settings_background_fdroid_sync_mode_battery"
@ -25,7 +25,7 @@
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
@ -43,7 +43,7 @@
android:padding="16dp"> android:padding="16dp">
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_background_fdroid_sync_mode_real_time" android:text="@string/settings_background_fdroid_sync_mode_real_time"
@ -51,7 +51,7 @@
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
@ -69,7 +69,7 @@
android:padding="16dp"> android:padding="16dp">
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_background_fdroid_sync_mode_disabled" android:text="@string/settings_background_fdroid_sync_mode_disabled"
@ -77,7 +77,7 @@
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"

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

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

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

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

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

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

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

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

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

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

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

@ -12,7 +12,7 @@
<TextView <TextView
android:id="@+id/dialog_e2e_keys_passphrase_filename" android:id="@+id/dialog_e2e_keys_passphrase_filename"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" 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"?> <?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:drawablePadding="16dp" android:drawablePadding="16dp"

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

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

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

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

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

@ -13,7 +13,7 @@
android:paddingEnd="?dialogPreferredPadding"> android:paddingEnd="?dialogPreferredPadding">
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="6dp" android:padding="6dp"
@ -21,7 +21,7 @@
<TextView <TextView
android:id="@+id/ssl_explanation" android:id="@+id/ssl_explanation"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="6dp" android:padding="6dp"
@ -29,7 +29,7 @@
<TextView <TextView
android:id="@+id/ssl_user_id" android:id="@+id/ssl_user_id"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="6dp" android:padding="6dp"
@ -37,7 +37,7 @@
<TextView <TextView
android:id="@+id/ssl_fingerprint_title" android:id="@+id/ssl_fingerprint_title"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="6dp" android:padding="6dp"
@ -45,14 +45,14 @@
<TextView <TextView
android:id="@+id/ssl_fingerprint" android:id="@+id/ssl_fingerprint"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="12dp" 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" /> 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 <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="6dp" android:padding="6dp"

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

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

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

@ -9,7 +9,7 @@
<TextView <TextView
android:id="@+id/bootstrapDescriptionText" android:id="@+id/bootstrapDescriptionText"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@ -58,7 +58,7 @@
<Button <Button
android:id="@+id/bootstrapPasswordButton" android:id="@+id/bootstrapPasswordButton"
style="@style/Button.Vector.Style.Text" style="@style/Widget.Vector.Button.Text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" 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 <TextView
android:id="@+id/bootstrapDescriptionText" android:id="@+id/bootstrapDescriptionText"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@ -48,7 +48,7 @@
<TextView <TextView
android:id="@+id/bootstrapWarningInfo" android:id="@+id/bootstrapWarningInfo"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@ -76,7 +76,7 @@
<Button <Button
android:id="@+id/bootstrapSubmit" android:id="@+id/bootstrapSubmit"
style="@style/Button.Vector.Style.Text" style="@style/Widget.Vector.Button.Text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/_continue" android:text="@string/_continue"

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

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

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

@ -9,7 +9,7 @@
<TextView <TextView
android:id="@+id/bootstrapDescriptionText" android:id="@+id/bootstrapDescriptionText"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@ -28,7 +28,7 @@
<TextView <TextView
android:id="@+id/reAuthFailureText" android:id="@+id/reAuthFailureText"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@ -40,7 +40,7 @@
<Button <Button
android:id="@+id/bootstrapCancelButton" android:id="@+id/bootstrapCancelButton"
style="@style/Button.Vector.Style.Text" style="@style/Widget.Vector.Button.Text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -49,7 +49,7 @@
<Button <Button
android:id="@+id/bootstrapRetryButton" android:id="@+id/bootstrapRetryButton"
style="@style/Button.Vector.Style.Text" style="@style/Widget.Vector.Button.Text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" 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 <TextView
android:id="@+id/bootstrapSaveText" android:id="@+id/bootstrapSaveText"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
@ -21,7 +21,7 @@
<TextView <TextView
android:id="@+id/bootstrapRecoveryKeyText" android:id="@+id/bootstrapRecoveryKeyText"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"

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

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

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

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

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

@ -43,7 +43,7 @@
<TextView <TextView
android:id="@+id/phoneBookTitle" android:id="@+id/phoneBookTitle"
style="@style/TextView.Vector.HeadlineMedium" style="@style/Widget.Vector.TextView.HeadlineMedium"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
@ -92,7 +92,7 @@
<Button <Button
android:id="@+id/phoneBookSearchForMatrixContacts" android:id="@+id/phoneBookSearchForMatrixContacts"
style="@style/Button.Vector.Style.Text" style="@style/Widget.Vector.Button.Text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin" 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 <TextView
android:id="@+id/createDirectRoomTitle" android:id="@+id/createDirectRoomTitle"
style="@style/TextView.Vector.HeadlineMedium" style="@style/Widget.Vector.TextView.HeadlineMedium"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"

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

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

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

@ -11,7 +11,7 @@
<TextView <TextView
android:id="@+id/deactivateAccountContent" android:id="@+id/deactivateAccountContent"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/deactivate_account_content" android:text="@string/deactivate_account_content"
@ -33,7 +33,7 @@
<Button <Button
android:id="@+id/deactivateAccountSubmit" android:id="@+id/deactivateAccountSubmit"
style="@style/Button.Vector.Style.Destructive" style="@style/Widget.Vector.Button.Destructive"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" 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 <im.vector.app.features.home.room.list.UnreadCounterBadgeView
android:id="@+id/drawerUnreadCounterBadgeView" android:id="@+id/drawerUnreadCounterBadgeView"
style="@style/TextView.Vector.Micro" style="@style/Widget.Vector.TextView.Micro"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
@ -77,7 +77,7 @@
<TextView <TextView
android:id="@+id/groupToolbarTitleView" android:id="@+id/groupToolbarTitleView"
style="@style/TextView.Vector.HeadlineMedium" style="@style/Widget.Vector.TextView.HeadlineMedium"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
@ -89,7 +89,7 @@
<TextView <TextView
android:id="@+id/groupToolbarSpaceTitleView" android:id="@+id/groupToolbarSpaceTitleView"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"

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

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

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

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

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

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

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

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

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

@ -25,7 +25,7 @@
<TextView <TextView
android:id="@+id/keys_backup_setup_step1_title" android:id="@+id/keys_backup_setup_step1_title"
style="@style/TextView.Vector.HeadlineMedium" style="@style/Widget.Vector.TextView.HeadlineMedium"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="16dp" android:layout_margin="16dp"
@ -39,7 +39,7 @@
<TextView <TextView
android:id="@+id/keys_backup_setup_step1_description" android:id="@+id/keys_backup_setup_step1_description"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="16dp" android:layout_margin="16dp"
@ -66,7 +66,7 @@
<TextView <TextView
android:id="@+id/keys_backup_setup_step1_advanced_option_text" android:id="@+id/keys_backup_setup_step1_advanced_option_text"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin" android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -83,7 +83,7 @@
<Button <Button
android:id="@+id/keys_backup_setup_step1_manual_export_button" android:id="@+id/keys_backup_setup_step1_manual_export_button"
style="@style/Button.Vector.Style.Text" style="@style/Widget.Vector.Button.Text"
android:layout_margin="16dp" android:layout_margin="16dp"
android:layout_marginStart="@dimen/layout_horizontal_margin" android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginEnd="@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 <TextView
android:id="@+id/keys_backup_setup_step2_text_title" android:id="@+id/keys_backup_setup_step2_text_title"
style="@style/TextView.Vector.HeadlineMedium" style="@style/Widget.Vector.TextView.HeadlineMedium"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
@ -32,7 +32,7 @@
<TextView <TextView
android:id="@+id/keys_backup_setup_step2_text_description" android:id="@+id/keys_backup_setup_step2_text_description"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
@ -120,7 +120,7 @@
<TextView <TextView
android:id="@+id/keys_backup_setup_step2_recovery_key_alternative" android:id="@+id/keys_backup_setup_step2_recovery_key_alternative"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
@ -133,7 +133,7 @@
<Button <Button
android:id="@+id/keys_backup_setup_step2_skip_button" android:id="@+id/keys_backup_setup_step2_skip_button"
style="@style/Button.Vector.Style.Text" style="@style/Widget.Vector.Button.Text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"

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

@ -27,7 +27,7 @@
<TextView <TextView
android:id="@+id/keys_backup_setup_step3_success_title" android:id="@+id/keys_backup_setup_step3_success_title"
style="@style/TextView.Vector.HeadlineMedium" style="@style/Widget.Vector.TextView.HeadlineMedium"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin" android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -43,7 +43,7 @@
<TextView <TextView
android:id="@+id/keys_backup_setup_step3_line1_text" android:id="@+id/keys_backup_setup_step3_line1_text"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin" android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -55,7 +55,7 @@
<TextView <TextView
android:id="@+id/keys_backup_setup_step3_label2" android:id="@+id/keys_backup_setup_step3_label2"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin" android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -68,7 +68,7 @@
<TextView <TextView
android:id="@+id/keys_backup_setup_step3_recovery_key_text" android:id="@+id/keys_backup_setup_step3_recovery_key_text"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/layout_horizontal_margin" android:layout_margin="@dimen/layout_horizontal_margin"
@ -82,7 +82,7 @@
<Button <Button
android:id="@+id/keys_backup_setup_step3_copy_button" android:id="@+id/keys_backup_setup_step3_copy_button"
style="@style/Button.Vector.Style.Text" style="@style/Widget.Vector.Button.Text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"

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

@ -26,7 +26,7 @@
<TextView <TextView
android:id="@+id/loginTitle" android:id="@+id/loginTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -35,7 +35,7 @@
<TextView <TextView
android:id="@+id/loginNotice" android:id="@+id/loginNotice"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -101,7 +101,7 @@
<TextView <TextView
android:id="@+id/loginPasswordNotice" android:id="@+id/loginPasswordNotice"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
@ -117,7 +117,7 @@
<Button <Button
android:id="@+id/forgetPasswordButton" android:id="@+id/forgetPasswordButton"
style="@style/Button.Vector.Style.Login.Text" style="@style/Widget.Vector.Button.Text.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start" android:layout_gravity="start"
@ -125,7 +125,7 @@
<Button <Button
android:id="@+id/loginSubmit" android:id="@+id/loginSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
@ -147,7 +147,7 @@
<TextView <TextView
android:id="@+id/loginSocialLoginHeader" android:id="@+id/loginSocialLoginHeader"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"

20
vector/src/main/res/layout/fragment_login_account_created.xml
View file

@ -16,7 +16,7 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -25,7 +25,7 @@
<TextView <TextView
android:id="@+id/loginAccountCreatedSubtitle" android:id="@+id/loginAccountCreatedSubtitle"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -33,7 +33,7 @@
tools:text="@string/login_account_created_subtitle" /> tools:text="@string/login_account_created_subtitle" />
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
@ -41,7 +41,7 @@
android:textColor="?vctr_content_secondary" /> android:textColor="?vctr_content_secondary" />
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -67,7 +67,7 @@
<TextView <TextView
android:id="@+id/loginAccountCreatedMemberName" android:id="@+id/loginAccountCreatedMemberName"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
@ -84,7 +84,7 @@
<TextView <TextView
android:id="@+id/loginAccountCreatedTime" android:id="@+id/loginAccountCreatedTime"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
@ -96,7 +96,7 @@
tools:text="@tools:sample/date/hhmm" /> tools:text="@tools:sample/date/hhmm" />
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login_account_created_message" android:text="@string/login_account_created_message"
@ -108,7 +108,7 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -122,7 +122,7 @@
<Button <Button
android:id="@+id/loginAccountCreatedLater" android:id="@+id/loginAccountCreatedLater"
style="@style/Button.Vector.Style.Login.Text" style="@style/Widget.Vector.Button.Text.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
@ -130,7 +130,7 @@
<Button <Button
android:id="@+id/loginAccountCreatedDone" android:id="@+id/loginAccountCreatedDone"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"

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

@ -22,7 +22,7 @@
<TextView <TextView
android:id="@+id/loginCaptchaNotice" android:id="@+id/loginCaptchaNotice"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"

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

@ -17,7 +17,7 @@
<TextView <TextView
android:id="@+id/loginGenericTextInputFormTitle" android:id="@+id/loginGenericTextInputFormTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
@ -25,7 +25,7 @@
<TextView <TextView
android:id="@+id/loginGenericTextInputFormNotice" android:id="@+id/loginGenericTextInputFormNotice"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -36,7 +36,7 @@
<TextView <TextView
android:id="@+id/loginGenericTextInputFormNotice2" android:id="@+id/loginGenericTextInputFormNotice2"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
@ -70,7 +70,7 @@
<Button <Button
android:id="@+id/loginGenericTextInputFormOtherButton" android:id="@+id/loginGenericTextInputFormOtherButton"
style="@style/Button.Vector.Style.Login.Text" style="@style/Widget.Vector.Button.Text.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start" android:layout_gravity="start"
@ -80,7 +80,7 @@
<Button <Button
android:id="@+id/loginGenericTextInputFormSubmit" android:id="@+id/loginGenericTextInputFormSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"

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

@ -17,7 +17,7 @@
<TextView <TextView
android:id="@+id/loginGenericTextInputFormTitle" android:id="@+id/loginGenericTextInputFormTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -26,7 +26,7 @@
<TextView <TextView
android:id="@+id/loginGenericTextInputFormNotice" android:id="@+id/loginGenericTextInputFormNotice"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -37,7 +37,7 @@
<TextView <TextView
android:id="@+id/loginGenericTextInputFormMandatoryNotice" android:id="@+id/loginGenericTextInputFormMandatoryNotice"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="26dp" android:layout_marginBottom="26dp"
@ -49,7 +49,7 @@
<TextView <TextView
android:id="@+id/loginGenericTextInputFormNotice2" android:id="@+id/loginGenericTextInputFormNotice2"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
@ -82,7 +82,7 @@
<Button <Button
android:id="@+id/loginGenericTextInputFormOtherButton" android:id="@+id/loginGenericTextInputFormOtherButton"
style="@style/Button.Vector.Style.Login.Text" style="@style/Widget.Vector.Button.Text.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start" android:layout_gravity="start"
@ -92,7 +92,7 @@
<Button <Button
android:id="@+id/loginGenericTextInputFormLater" android:id="@+id/loginGenericTextInputFormLater"
style="@style/Button.Vector.Style.Login.Text" style="@style/Widget.Vector.Button.Text.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
@ -103,7 +103,7 @@
<Button <Button
android:id="@+id/loginGenericTextInputFormSubmit" android:id="@+id/loginGenericTextInputFormSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"

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

@ -16,7 +16,7 @@
<TextView <TextView
android:id="@+id/resetPasswordTitle" android:id="@+id/resetPasswordTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
@ -24,7 +24,7 @@
<TextView <TextView
android:id="@+id/loginNotice" android:id="@+id/loginNotice"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -89,7 +89,7 @@
<Button <Button
android:id="@+id/resetPasswordSubmit" android:id="@+id/resetPasswordSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"

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

@ -16,7 +16,7 @@
<TextView <TextView
android:id="@+id/resetPasswordTitle" android:id="@+id/resetPasswordTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -24,7 +24,7 @@
tools:text="@string/login_reset_password_on" /> tools:text="@string/login_reset_password_on" />
<TextView <TextView
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
@ -51,7 +51,7 @@
<TextView <TextView
android:id="@+id/loginNotice" android:id="@+id/loginNotice"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@ -60,7 +60,7 @@
android:textColor="?vctr_content_secondary" /> android:textColor="?vctr_content_secondary" />
<TextView <TextView
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
@ -109,7 +109,7 @@
<Button <Button
android:id="@+id/resetPasswordSubmit" android:id="@+id/resetPasswordSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"

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

@ -14,7 +14,7 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login_reset_password_mail_confirmation_title" android:text="@string/login_reset_password_mail_confirmation_title"
@ -22,7 +22,7 @@
<TextView <TextView
android:id="@+id/resetPasswordMailConfirmationNotice" android:id="@+id/resetPasswordMailConfirmationNotice"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -30,7 +30,7 @@
tools:text="@string/login_reset_password_mail_confirmation_notice" /> tools:text="@string/login_reset_password_mail_confirmation_notice" />
<TextView <TextView
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -39,7 +39,7 @@
<Button <Button
android:id="@+id/resetPasswordMailConfirmationSubmit" android:id="@+id/resetPasswordMailConfirmationSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"

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

@ -14,7 +14,7 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -23,7 +23,7 @@
<TextView <TextView
android:id="@+id/resetPasswordMailConfirmationNotice" android:id="@+id/resetPasswordMailConfirmationNotice"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -31,7 +31,7 @@
tools:text="@string/login_reset_password_mail_confirmation_notice" /> tools:text="@string/login_reset_password_mail_confirmation_notice" />
<TextView <TextView
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -40,7 +40,7 @@
<Button <Button
android:id="@+id/resetPasswordMailConfirmationSubmit" android:id="@+id/resetPasswordMailConfirmationSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"

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

@ -14,7 +14,7 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login_reset_password_success_title" android:text="@string/login_reset_password_success_title"
@ -22,7 +22,7 @@
<TextView <TextView
android:id="@+id/resetPasswordSuccessNotice" android:id="@+id/resetPasswordSuccessNotice"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -30,7 +30,7 @@
android:textColor="?vctr_content_secondary" /> android:textColor="?vctr_content_secondary" />
<TextView <TextView
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -39,7 +39,7 @@
<Button <Button
android:id="@+id/resetPasswordSuccessSubmit" android:id="@+id/resetPasswordSuccessSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"

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

@ -14,7 +14,7 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -23,7 +23,7 @@
<TextView <TextView
android:id="@+id/resetPasswordSuccessNotice" android:id="@+id/resetPasswordSuccessNotice"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -31,7 +31,7 @@
android:textColor="?vctr_content_primary" /> android:textColor="?vctr_content_primary" />
<TextView <TextView
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -40,7 +40,7 @@
<Button <Button
android:id="@+id/resetPasswordSuccessSubmit" android:id="@+id/resetPasswordSuccessSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"

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

@ -19,7 +19,7 @@
<TextView <TextView
android:id="@+id/loginServerTitle" android:id="@+id/loginServerTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="36dp" android:layout_marginTop="36dp"
@ -32,7 +32,7 @@
<TextView <TextView
android:id="@+id/loginServerText" android:id="@+id/loginServerText"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -73,7 +73,7 @@
<TextView <TextView
android:id="@+id/loginServerChoiceMatrixOrgText" android:id="@+id/loginServerChoiceMatrixOrgText"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
@ -116,7 +116,7 @@
<TextView <TextView
android:id="@+id/loginServerChoiceEmsText" android:id="@+id/loginServerChoiceEmsText"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="7dp" android:layout_marginTop="7dp"
@ -130,7 +130,7 @@
<TextView <TextView
android:id="@+id/loginServerChoiceEmsLearnMore" android:id="@+id/loginServerChoiceEmsLearnMore"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp" android:padding="16dp"
@ -158,7 +158,7 @@
<TextView <TextView
android:id="@+id/loginServerChoiceOtherTitle" android:id="@+id/loginServerChoiceOtherTitle"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
@ -171,7 +171,7 @@
<TextView <TextView
android:id="@+id/loginServerChoiceOtherText" android:id="@+id/loginServerChoiceOtherText"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
@ -187,7 +187,7 @@
<Button <Button
android:id="@+id/loginServerIKnowMyIdSubmit" android:id="@+id/loginServerIKnowMyIdSubmit"
style="@style/Button.Vector.Style.Login.Text" style="@style/Widget.Vector.Button.Text.Login"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"

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

@ -16,7 +16,7 @@
<TextView <TextView
android:id="@+id/loginServerTitle" android:id="@+id/loginServerTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -26,7 +26,7 @@
<TextView <TextView
android:id="@+id/loginServerText" android:id="@+id/loginServerText"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -61,7 +61,7 @@
<TextView <TextView
android:id="@+id/loginServerChoiceMatrixOrgText" android:id="@+id/loginServerChoiceMatrixOrgText"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
@ -77,7 +77,7 @@
<TextView <TextView
android:id="@+id/loginServerText2" android:id="@+id/loginServerText2"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
@ -98,7 +98,7 @@
<TextView <TextView
android:id="@+id/loginServerChoiceOtherTitle" android:id="@+id/loginServerChoiceOtherTitle"
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="start" android:gravity="start"
@ -111,7 +111,7 @@
<TextView <TextView
android:id="@+id/loginServerChoiceOtherText" android:id="@+id/loginServerChoiceOtherText"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
@ -127,7 +127,7 @@
<TextView <TextView
android:id="@+id/loginServerChoiceEmsLearnMore" android:id="@+id/loginServerChoiceEmsLearnMore"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="32dp" android:layout_marginBottom="32dp"

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

@ -27,7 +27,7 @@
<TextView <TextView
android:id="@+id/loginServerUrlFormTitle" android:id="@+id/loginServerUrlFormTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="27dp" android:layout_marginTop="27dp"
@ -36,7 +36,7 @@
<TextView <TextView
android:id="@+id/loginServerUrlFormText" android:id="@+id/loginServerUrlFormText"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -46,7 +46,7 @@
<TextView <TextView
android:id="@+id/loginServerUrlFormLearnMore" android:id="@+id/loginServerUrlFormLearnMore"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
@ -75,7 +75,7 @@
<TextView <TextView
android:id="@+id/loginServerUrlFormClearHistory" android:id="@+id/loginServerUrlFormClearHistory"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
@ -86,7 +86,7 @@
<TextView <TextView
android:id="@+id/loginServerUrlFormNotice" android:id="@+id/loginServerUrlFormNotice"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
@ -96,7 +96,7 @@
<Button <Button
android:id="@+id/loginServerUrlFormSubmit" android:id="@+id/loginServerUrlFormSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"

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

@ -17,7 +17,7 @@
<TextView <TextView
android:id="@+id/loginServerUrlFormTitle" android:id="@+id/loginServerUrlFormTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -46,7 +46,7 @@
<TextView <TextView
android:id="@+id/loginServerUrlFormClearHistory" android:id="@+id/loginServerUrlFormClearHistory"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
@ -60,7 +60,7 @@
<Button <Button
android:id="@+id/loginServerUrlFormSubmit" android:id="@+id/loginServerUrlFormSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"

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

@ -16,7 +16,7 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -34,7 +34,7 @@
<TextView <TextView
android:id="@+id/loginWelcomeBack" android:id="@+id/loginWelcomeBack"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -43,7 +43,7 @@
<TextView <TextView
android:id="@+id/loginWelcomeBackWarning" android:id="@+id/loginWelcomeBackWarning"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -98,7 +98,7 @@
<Button <Button
android:id="@+id/forgetPasswordButton" android:id="@+id/forgetPasswordButton"
style="@style/Button.Vector.Style.Login.Text" style="@style/Widget.Vector.Button.Text.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start" android:layout_gravity="start"
@ -108,7 +108,7 @@
<Button <Button
android:id="@+id/loginSubmit" android:id="@+id/loginSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"

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

@ -17,7 +17,7 @@
<TextView <TextView
android:id="@+id/loginTitle" android:id="@+id/loginTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -87,7 +87,7 @@
<Button <Button
android:id="@+id/forgetPasswordButton" android:id="@+id/forgetPasswordButton"
style="@style/Button.Vector.Style.Login.Text" style="@style/Widget.Vector.Button.Text.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start" android:layout_gravity="start"
@ -97,7 +97,7 @@
<Button <Button
android:id="@+id/loginSubmit" android:id="@+id/loginSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
@ -119,7 +119,7 @@
<TextView <TextView
android:id="@+id/loginSocialLoginHeader" android:id="@+id/loginSocialLoginHeader"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"

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

@ -17,7 +17,7 @@
<TextView <TextView
android:id="@+id/loginTitle" android:id="@+id/loginTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -26,7 +26,7 @@
<TextView <TextView
android:id="@+id/loginSubtitle" android:id="@+id/loginSubtitle"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -52,7 +52,7 @@
<Button <Button
android:id="@+id/loginSubmit" android:id="@+id/loginSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
@ -61,7 +61,7 @@
<TextView <TextView
android:id="@+id/loginServerText3" android:id="@+id/loginServerText3"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
@ -71,7 +71,7 @@
<Button <Button
android:id="@+id/loginChooseAServer" android:id="@+id/loginChooseAServer"
style="@style/Button.Vector.Style.Login.Text" style="@style/Widget.Vector.Button.Text.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"

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

@ -16,7 +16,7 @@
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -24,7 +24,7 @@
android:textColor="?vctr_content_primary" /> android:textColor="?vctr_content_primary" />
<TextView <TextView
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
@ -33,7 +33,7 @@
<TextView <TextView
android:id="@+id/loginMatrixIdentifier" android:id="@+id/loginMatrixIdentifier"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@ -41,7 +41,7 @@
tools:text="\@user:domain.org" /> tools:text="\@user:domain.org" />
<TextView <TextView
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@ -50,7 +50,7 @@
android:textStyle="italic" /> android:textStyle="italic" />
<TextView <TextView
style="@style/TextView.Vector.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
@ -99,7 +99,7 @@
<Button <Button
android:id="@+id/loginSubmit" android:id="@+id/loginSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"

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

@ -33,7 +33,7 @@
<TextView <TextView
android:id="@+id/loginSignupSigninTitle" android:id="@+id/loginSignupSigninTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="27dp" android:layout_marginTop="27dp"
@ -45,7 +45,7 @@
<TextView <TextView
android:id="@+id/loginSignupSigninText" android:id="@+id/loginSignupSigninText"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="27dp" android:layout_marginTop="27dp"
@ -59,7 +59,7 @@
<!-- Sign up or sign in SSO --> <!-- Sign up or sign in SSO -->
<Button <Button
android:id="@+id/loginSignupSigninSubmit" android:id="@+id/loginSignupSigninSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="38dp" android:layout_marginTop="38dp"
@ -71,7 +71,7 @@
<!-- Sign in or gone --> <!-- Sign in or gone -->
<Button <Button
android:id="@+id/loginSignupSigninSignIn" android:id="@+id/loginSignupSigninSignIn"
style="@style/Button.Vector.Style.Login.Outlined" style="@style/Widget.Vector.Button.Outlined.Login"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
@ -99,7 +99,7 @@
<TextView <TextView
android:id="@+id/loginSignupSigninSocialLoginHeader" android:id="@+id/loginSignupSigninSocialLoginHeader"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="27dp" android:layout_marginTop="27dp"

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

@ -17,7 +17,7 @@
<TextView <TextView
android:id="@+id/loginTitle" android:id="@+id/loginTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -26,7 +26,7 @@
<TextView <TextView
android:id="@+id/loginSubtitle" android:id="@+id/loginSubtitle"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
@ -52,7 +52,7 @@
<TextView <TextView
android:id="@+id/loginChooseHelp" android:id="@+id/loginChooseHelp"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login_please_choose_a_user_name_help_2" android:text="@string/login_please_choose_a_user_name_help_2"
@ -61,7 +61,7 @@
<Button <Button
android:id="@+id/loginSubmit" android:id="@+id/loginSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
@ -82,7 +82,7 @@
<TextView <TextView
android:id="@+id/loginSocialLoginHeader" android:id="@+id/loginSocialLoginHeader"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"

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

@ -62,7 +62,7 @@
<TextView <TextView
android:id="@+id/loginSplashTitle" android:id="@+id/loginSplashTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
@ -105,7 +105,7 @@
<TextView <TextView
android:id="@+id/loginSplashText1" android:id="@+id/loginSplashText1"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
@ -130,7 +130,7 @@
<TextView <TextView
android:id="@+id/loginSplashText2" android:id="@+id/loginSplashText2"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
@ -155,7 +155,7 @@
<TextView <TextView
android:id="@+id/loginSplashText3" android:id="@+id/loginSplashText3"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
@ -179,7 +179,7 @@
<Button <Button
android:id="@+id/loginSplashSubmit" android:id="@+id/loginSplashSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login_splash_submit" android:text="@string/login_splash_submit"
@ -199,7 +199,7 @@
<TextView <TextView
android:id="@+id/loginSplashVersion" android:id="@+id/loginSplashVersion"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"

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

@ -62,7 +62,7 @@
<TextView <TextView
android:id="@+id/loginSplashTitle" android:id="@+id/loginSplashTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
@ -105,7 +105,7 @@
<TextView <TextView
android:id="@+id/loginSplashText1" android:id="@+id/loginSplashText1"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
@ -130,7 +130,7 @@
<TextView <TextView
android:id="@+id/loginSplashText2" android:id="@+id/loginSplashText2"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
@ -155,7 +155,7 @@
<TextView <TextView
android:id="@+id/loginSplashText3" android:id="@+id/loginSplashText3"
style="@style/TextView.Vector.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
@ -189,7 +189,7 @@
<Button <Button
android:id="@+id/loginSignupSigninSignUp" android:id="@+id/loginSignupSigninSignUp"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
@ -197,7 +197,7 @@
<Button <Button
android:id="@+id/loginSignupSigninSignIn" android:id="@+id/loginSignupSigninSignIn"
style="@style/Button.Vector.Style.Login.Text" style="@style/Widget.Vector.Button.Text.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
@ -216,7 +216,7 @@
<TextView <TextView
android:id="@+id/loginSplashVersion" android:id="@+id/loginSplashVersion"
style="@style/TextView.Vector.Caption" style="@style/Widget.Vector.TextView.Caption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"

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

@ -15,7 +15,7 @@
<TextView <TextView
android:id="@+id/loginSignupSigninTitle" android:id="@+id/loginSignupSigninTitle"
style="@style/TextView.Vector.Title" style="@style/Widget.Vector.TextView.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
@ -25,7 +25,7 @@
<Button <Button
android:id="@+id/loginSignupSigninSubmit" android:id="@+id/loginSignupSigninSubmit"
style="@style/Button.Vector.Style.Login" style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"

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