jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4611 from vector-im/feature/bma/devx_view_ids 

Devx view ids
This commit is contained in:
Benoit Marty 2021-12-02 19:48:35 +01:00 committed by GitHub
parent f9a88db2f7 6cb8a2458f
commit 3644e5d755
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
201 changed files with 566 additions and 735 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4604.misc Normal file
View File

@ -0,0 +1 @@
Cleanup the layout files

3
library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml
View File

@ -34,7 +34,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout"> app:layout_constraintTop_toBottomOf="@id/appBarLayout">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -334,7 +334,6 @@
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox" style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"

1
library/ui-styles/src/debug/res/values/debug_styles.xml
View File

@ -5,7 +5,6 @@
<item name="android:visibility">visible</item> <item name="android:visibility">visible</item>
</style> </style>
<style name="Theme.Debug.Light" parent="Theme.MaterialComponents.Light.NoActionBar"> <style name="Theme.Debug.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
<!-- Keep all default value --> <!-- Keep all default value -->
</style> </style>

2
library/ui-styles/src/main/res/transition/image_preview_transition.xml
View File

@ -11,5 +11,3 @@
<changeImageTransform /> <changeImageTransform />
</transitionSet> </transitionSet>

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

@ -32,7 +32,6 @@
<dimen name="call_pip_width">88dp</dimen> <dimen name="call_pip_width">88dp</dimen>
<dimen name="call_pip_radius">8dp</dimen> <dimen name="call_pip_radius">8dp</dimen>
<dimen name="item_form_min_height">76dp</dimen> <dimen name="item_form_min_height">76dp</dimen>
<!-- Max width for some buttons --> <!-- Max width for some buttons -->
@ -40,5 +39,4 @@
<!-- Navigation Drawer --> <!-- Navigation Drawer -->
<dimen name="navigation_drawer_max_width">320dp</dimen> <dimen name="navigation_drawer_max_width">320dp</dimen>
</resources> </resources>

1
library/ui-styles/src/main/res/values/palette.xml
View File

@ -20,7 +20,6 @@
<color name="palette_prune">#5C56F5</color> <color name="palette_prune">#5C56F5</color>
<color name="palette_links">#0086E6</color> <color name="palette_links">#0086E6</color>
<!-- For light themes --> <!-- For light themes -->
<color name="palette_gray_25">#F4F6FA</color> <color name="palette_gray_25">#F4F6FA</color>
<color name="palette_gray_50">#E3E8F0</color> <color name="palette_gray_50">#E3E8F0</color>

1
library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<declare-styleable name="BadgeFloatingActionButton"> <declare-styleable name="BadgeFloatingActionButton">

4
library/ui-styles/src/main/res/values/styles_social_login.xml
View File

@ -49,7 +49,6 @@
<item name="android:backgroundTint">@android:color/black</item> <item name="android:backgroundTint">@android:color/black</item>
</style> </style>
<style name="Widget.Vector.Button.Outlined.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>
@ -68,7 +67,6 @@
<item name="android:backgroundTint">#3877EA</item> <item name="android:backgroundTint">#3877EA</item>
</style> </style>
<style name="Widget.Vector.Button.Outlined.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>
@ -85,7 +83,6 @@
<item name="android:backgroundTint">#5D9EC9</item> <item name="android:backgroundTint">#5D9EC9</item>
</style> </style>
<style name="Widget.Vector.Button.Outlined.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>
@ -118,5 +115,4 @@
<item name="android:backgroundTint">@android:color/black</item> <item name="android:backgroundTint">@android:color/black</item>
</style> </style>
</resources> </resources>

5
tools/check/forbidden_strings_in_layout.txt
View File

@ -25,3 +25,8 @@
### Use style="@style/Widget.Vector.TextView.*" instead of textSize attribute ### Use style="@style/Widget.Vector.TextView.*" instead of textSize attribute
android:textSize===9 android:textSize===9
### Use `@id` and not `@+id` when referencing ids in layouts
layout_(.*)="@\+id
accessibilityTraversal(.*)="@\+id
toolbarId="@\+id

2
tools/templates/ElementFeature/template.xml
View File

@ -105,8 +105,6 @@
suggest="${underscoreToCamelCase(classToResource(fragmentClass))}ViewEvents" suggest="${underscoreToCamelCase(classToResource(fragmentClass))}ViewEvents"
default="MainViewEvents" default="MainViewEvents"
help="The name of the view events to create" /> help="The name of the view events to create" />
<parameter <parameter
id="packageName" id="packageName"

4
vector/src/debug/res/layout/demo_theme_sample.xml
View File

@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
The aim of this file is to test the different themes of Riot The aim of this file is to test the different themes of Element
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"

4
vector/src/debug/res/layout/demo_themes.xml
View File

@ -1,10 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
The aim of this file is to test the different themes of Riot The aim of this file is to test the different themes of Element
Unfortunately, this does not work in the preview. Unfortunately, this does not work in the preview.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

1
vector/src/main/res/drawable/bg_attachment_type_selector.xml
View File

@ -20,5 +20,4 @@
</item> </item>
</layer-list> </layer-list>

1
vector/src/main/res/drawable/bg_rounded_button.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:attr/colorControlHighlight"> android:color="?android:attr/colorControlHighlight">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">

1
vector/src/main/res/drawable/bg_tombstone_predecessor.xml
View File

@ -18,5 +18,4 @@
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

1
vector/src/main/res/drawable/bg_unread_notification.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">

1
vector/src/main/res/drawable/highlighted_message_background.xml
View File

@ -31,5 +31,4 @@
</shape> </shape>
</item> </item>
</selector> </selector>

2
vector/src/main/res/layout/activity_big_image_viewer.xml
View File

@ -25,7 +25,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" app:layout_constraintTop_toBottomOf="@id/appBarLayout"
app:optimizeDisplay="true" /> app:optimizeDisplay="true" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

7
vector/src/main/res/layout/activity_call.xml
View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- tools:ignore is needed because lint thinks this can be replaced with a merge. Replacing this <!-- tools:ignore is needed because lint thinks this can be replaced with a merge. Replacing this
with a merge causes the fullscreen SurfaceView not to be centered. --> with a merge causes the fullscreen SurfaceView not to be centered. -->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout 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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@ -33,10 +31,10 @@
android:id="@+id/pipContainer" android:id="@+id/pipContainer"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/callControlsView" app:layout_constraintBottom_toTopOf="@id/callControlsView"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/callToolbar"> app:layout_constraintTop_toBottomOf="@id/callToolbar">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/pipRendererWrapper" android:id="@+id/pipRendererWrapper"
@ -94,7 +92,6 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/callToolbar" android:id="@+id/callToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"

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

@ -35,7 +35,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_constraintBottom_toTopOf="@+id/callTransferActionsLayout" app:layout_constraintBottom_toTopOf="@id/callTransferActionsLayout"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/appBarLayout" /> app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
@ -65,7 +65,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_toStartOf="@+id/callTransferConnectAction" android:layout_toStartOf="@id/callTransferConnectAction"
android:layout_toEndOf="@id/callTransferConsultCheckBox" android:layout_toEndOf="@id/callTransferConsultCheckBox"
android:ellipsize="end" android:ellipsize="end"
android:text="@string/call_transfer_consult_first" /> android:text="@string/call_transfer_consult_first" />

2
vector/src/main/res/layout/activity_filtered_rooms.xml
View File

@ -39,7 +39,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" /> app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
vector/src/main/res/layout/activity_home.xml
View File

@ -22,12 +22,10 @@
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>
<androidx.fragment.app.FragmentContainerView <androidx.fragment.app.FragmentContainerView
android:id="@+id/homeDrawerFragmentContainer" android:id="@+id/homeDrawerFragmentContainer"
android:layout_width="@dimen/navigation_drawer_max_width" android:layout_width="@dimen/navigation_drawer_max_width"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="start" /> android:layout_gravity="start" />
</androidx.drawerlayout.widget.DrawerLayout> </androidx.drawerlayout.widget.DrawerLayout>

2
vector/src/main/res/layout/activity_incoming_share.xml
View File

@ -39,7 +39,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" /> app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

1
vector/src/main/res/layout/activity_main.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- The background of this Activity is in the theme (so just added as tools here, for preview), <!-- The background of this Activity is in the theme (so just added as tools here, for preview),
so we just add a ProgressBar here --> so we just add a ProgressBar here -->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"

1
vector/src/main/res/layout/activity_room_detail.xml
View File

@ -28,7 +28,6 @@
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>
<androidx.fragment.app.FragmentContainerView <androidx.fragment.app.FragmentContainerView
android:id="@+id/roomDetailDrawerContainer" android:id="@+id/roomDetailDrawerContainer"
android:layout_width="wrap_content" android:layout_width="wrap_content"

2
vector/src/main/res/layout/activity_search.xml
View File

@ -39,7 +39,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" /> app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
vector/src/main/res/layout/activity_vector_web_view.xml
View File

@ -25,7 +25,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" /> app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
<ProgressBar <ProgressBar
android:id="@+id/simple_webview_loader" android:id="@+id/simple_webview_loader"

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

@ -31,7 +31,7 @@
android:maxLines="1" android:maxLines="1"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView" app:layout_constraintEnd_toStartOf="@id/incomingCallRejectView"
app:layout_constraintStart_toEndOf="@id/incomingCallAvatar" app:layout_constraintStart_toEndOf="@id/incomingCallAvatar"
app:layout_constraintTop_toTopOf="@id/incomingCallAvatar" app:layout_constraintTop_toTopOf="@id/incomingCallAvatar"
tools:text="@sample/users.json/data/displayName" /> tools:text="@sample/users.json/data/displayName" />
@ -48,7 +48,7 @@
android:maxLines="1" android:maxLines="1"
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:drawableTint="?vctr_content_secondary" app:drawableTint="?vctr_content_secondary"
app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView" app:layout_constraintEnd_toStartOf="@id/incomingCallRejectView"
app:layout_constraintStart_toStartOf="@id/incomingCallNameView" app:layout_constraintStart_toStartOf="@id/incomingCallNameView"
app:layout_constraintTop_toBottomOf="@id/incomingCallNameView" app:layout_constraintTop_toBottomOf="@id/incomingCallNameView"
tools:drawableStart="@drawable/ic_call_audio_small" tools:drawableStart="@drawable/ic_call_audio_small"

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

@ -14,7 +14,7 @@
android:layout_height="40dp" android:layout_height="40dp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/alerter_texts" app:layout_constraintEnd_toStartOf="@id/alerter_texts"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:src="@sample/user_round_avatars" /> tools:src="@sample/user_round_avatars" />
@ -26,7 +26,7 @@
android:layout_height="24dp" android:layout_height="24dp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_shield_warning" android:src="@drawable/ic_shield_warning"
app:layout_constraintCircle="@+id/ivUserAvatar" app:layout_constraintCircle="@id/ivUserAvatar"
app:layout_constraintCircleAngle="135" app:layout_constraintCircleAngle="135"
app:layout_constraintCircleRadius="20dp" app:layout_constraintCircleRadius="20dp"
tools:ignore="MissingConstraints" tools:ignore="MissingConstraints"

1
vector/src/main/res/layout/bottom_sheet_add_rooms_or_spaces_to_space.xml
View File

@ -41,5 +41,4 @@
app:titleTextColor="?vctr_content_primary" app:titleTextColor="?vctr_content_primary"
tools:actionDescription="" /> tools:actionDescription="" />
</LinearLayout> </LinearLayout>

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

@ -41,7 +41,7 @@
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/bootstrapIcon" app:layout_constraintBottom_toBottomOf="@id/bootstrapIcon"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/bootstrapIcon" app:layout_constraintStart_toEndOf="@id/bootstrapIcon"
app:layout_constraintTop_toTopOf="@id/bootstrapIcon" app:layout_constraintTop_toTopOf="@id/bootstrapIcon"
tools:text="@string/bottom_sheet_setup_secure_backup_title" /> tools:text="@string/bottom_sheet_setup_secure_backup_title" />

1
vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
View File

@ -24,5 +24,4 @@
app:tint="?vctr_content_primary" app:tint="?vctr_content_primary"
app:titleTextColor="?vctr_content_primary" /> app:titleTextColor="?vctr_content_primary" />
</LinearLayout> </LinearLayout>

2
vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
View File

@ -33,7 +33,6 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:src="@sample/user_round_avatars" /> tools:src="@sample/user_round_avatars" />
<TextView <TextView
android:id="@+id/inviterText" android:id="@+id/inviterText"
style="@style/Widget.Vector.TextView.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
@ -61,7 +60,6 @@
app:layout_constraintTop_toBottomOf="@id/inviterText" app:layout_constraintTop_toBottomOf="@id/inviterText"
tools:text="@sample/users.json/data/id" /> tools:text="@sample/users.json/data/id" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<View <View

2
vector/src/main/res/layout/bottom_sheet_leave_space.xml
View File

@ -88,7 +88,6 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/leave_space" /> android:text="@string/leave_space" />
</FrameLayout> </FrameLayout>
<Button <Button
@ -103,5 +102,4 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="@string/cancel" /> android:text="@string/cancel" />
</LinearLayout> </LinearLayout>

1
vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
View File

@ -9,7 +9,6 @@
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp"> android:paddingBottom="8dp">
<TextView <TextView
style="@style/Widget.Vector.TextView.HeadlineMedium" style="@style/Widget.Vector.TextView.HeadlineMedium"
android:layout_width="match_parent" android:layout_width="match_parent"

3
vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
View File

@ -39,7 +39,6 @@
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
tools:text="@string/help_people_in_spaces_find_and_join" /> tools:text="@string/help_people_in_spaces_find_and_join" />
<ImageView <ImageView
android:id="@+id/imageHint" android:id="@+id/imageHint"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -62,7 +61,6 @@
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -88,5 +86,4 @@
android:textAllCaps="true" /> android:textAllCaps="true" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

6
vector/src/main/res/layout/bottom_sheet_space_settings.xml
View File

@ -37,14 +37,13 @@
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
android:textStyle="bold" android:textStyle="bold"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@+id/spaceDescription" app:layout_constraintBottom_toTopOf="@id/spaceDescription"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView" app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"
tools:text="@sample/spaces.json/data/name" /> tools:text="@sample/spaces.json/data/name" />
<TextView <TextView
android:id="@+id/spaceDescription" android:id="@+id/spaceDescription"
style="@style/Widget.Vector.TextView.Body" style="@style/Widget.Vector.TextView.Body"
@ -60,7 +59,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView" app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView"
app:layout_constraintTop_toBottomOf="@+id/spaceNameView" app:layout_constraintTop_toBottomOf="@id/spaceNameView"
tools:text="@sample/spaces.json/data/topic" tools:text="@sample/spaces.json/data/topic"
tools:visibility="visible" /> tools:visibility="visible" />
@ -109,7 +108,6 @@
app:titleTextColor="?vctr_content_primary" app:titleTextColor="?vctr_content_primary"
tools:actionDescription="" /> tools:actionDescription="" />
<im.vector.app.core.ui.views.BottomSheetActionButton <im.vector.app.core.ui.views.BottomSheetActionButton
android:id="@+id/addRooms" android:id="@+id/addRooms"
android:layout_width="match_parent" android:layout_width="match_parent"

10
vector/src/main/res/layout/bottom_sheet_verification.xml
View File

@ -31,7 +31,7 @@
android:id="@+id/otherUserShield" android:id="@+id/otherUserShield"
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
app:layout_constraintCircle="@+id/otherUserAvatarImageView" app:layout_constraintCircle="@id/otherUserAvatarImageView"
app:layout_constraintCircleAngle="135" app:layout_constraintCircleAngle="135"
app:layout_constraintCircleRadius="16dp" app:layout_constraintCircleRadius="16dp"
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />
@ -47,10 +47,10 @@
android:maxLines="2" android:maxLines="2"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/otherUserAvatarImageView" app:layout_constraintBottom_toBottomOf="@id/otherUserAvatarImageView"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/otherUserAvatarImageView" app:layout_constraintStart_toEndOf="@id/otherUserAvatarImageView"
app:layout_constraintTop_toTopOf="@+id/otherUserAvatarImageView" app:layout_constraintTop_toTopOf="@id/otherUserAvatarImageView"
tools:text="@string/verification_verify_user" /> tools:text="@string/verification_verify_user" />
<FrameLayout <FrameLayout
@ -59,7 +59,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/otherUserAvatarImageView" /> app:layout_constraintTop_toBottomOf="@id/otherUserAvatarImageView" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
vector/src/main/res/layout/bottom_sheet_with_fragments.xml
View File

@ -3,6 +3,4 @@
android:id="@+id/bottomSheetFragmentContainer" android:id="@+id/bottomSheetFragmentContainer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?colorSurface" /> android:background="?colorSurface" />

8
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
View File

@ -115,7 +115,7 @@
android:contentDescription="@string/option_send_files" android:contentDescription="@string/option_send_files"
android:src="@drawable/ic_attachment" android:src="@drawable/ic_attachment"
app:layout_constraintBottom_toBottomOf="@id/sendButton" app:layout_constraintBottom_toBottomOf="@id/sendButton"
app:layout_constraintEnd_toStartOf="@+id/composerEditTextOuterBorder" app:layout_constraintEnd_toStartOf="@id/composerEditTextOuterBorder"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/sendButton" app:layout_constraintTop_toTopOf="@id/sendButton"
app:layout_goneMarginBottom="57dp" app:layout_goneMarginBottom="57dp"
@ -142,8 +142,8 @@
android:nextFocusLeft="@id/composerEditText" android:nextFocusLeft="@id/composerEditText"
android:nextFocusUp="@id/composerEditText" android:nextFocusUp="@id/composerEditText"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/composerEmojiButton" app:layout_constraintEnd_toStartOf="@id/composerEmojiButton"
app:layout_constraintStart_toStartOf="@+id/composerEditTextOuterBorder" app:layout_constraintStart_toStartOf="@id/composerEditTextOuterBorder"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="@tools:sample/lorem/random" /> tools:text="@tools:sample/lorem/random" />
@ -156,7 +156,7 @@
android:contentDescription="@string/a11y_open_emoji_picker" android:contentDescription="@string/a11y_open_emoji_picker"
android:src="@drawable/ic_insert_emoji" android:src="@drawable/ic_insert_emoji"
app:layout_constraintBottom_toBottomOf="@id/attachmentButton" app:layout_constraintBottom_toBottomOf="@id/attachmentButton"
app:layout_constraintEnd_toEndOf="@+id/composerEditTextOuterBorder" app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder"
app:layout_constraintStart_toEndOf="@id/composerEditText" app:layout_constraintStart_toEndOf="@id/composerEditText"
app:layout_constraintTop_toTopOf="@id/attachmentButton" app:layout_constraintTop_toTopOf="@id/attachmentButton"
app:layout_goneMarginEnd="8dp" app:layout_goneMarginEnd="8dp"

18
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
View File

@ -23,7 +23,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:background="?vctr_list_separator" android:background="?vctr_list_separator"
app:layout_constraintEnd_toEndOf="@id/related_message_background" app:layout_constraintEnd_toEndOf="@id/related_message_background"
app:layout_constraintStart_toStartOf="@+id/related_message_background" app:layout_constraintStart_toStartOf="@id/related_message_background"
app:layout_constraintTop_toTopOf="@id/related_message_background" /> app:layout_constraintTop_toTopOf="@id/related_message_background" />
<ImageView <ImageView
@ -35,7 +35,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
app:layout_constraintBottom_toTopOf="@id/composerRelatedMessageActionIcon" app:layout_constraintBottom_toTopOf="@id/composerRelatedMessageActionIcon"
app:layout_constraintEnd_toStartOf="@+id/composerRelatedMessageTitle" app:layout_constraintEnd_toStartOf="@id/composerRelatedMessageTitle"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/composerRelatedMessageTitle" app:layout_constraintTop_toTopOf="@id/composerRelatedMessageTitle"
tools:src="@sample/user_round_avatars" /> tools:src="@sample/user_round_avatars" />
@ -60,8 +60,8 @@
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:visibility="gone" android:visibility="gone"
app:layout_constraintStart_toStartOf="@+id/composerRelatedMessageTitle" app:layout_constraintStart_toStartOf="@id/composerRelatedMessageTitle"
app:layout_constraintTop_toBottomOf="@+id/composerRelatedMessageTitle" app:layout_constraintTop_toBottomOf="@id/composerRelatedMessageTitle"
tools:ignore="MissingPrefix" tools:ignore="MissingPrefix"
tools:src="@tools:sample/backgrounds/scenic" tools:src="@tools:sample/backgrounds/scenic"
tools:visibility="visible" /> tools:visibility="visible" />
@ -127,9 +127,9 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/option_send_files" android:contentDescription="@string/option_send_files"
android:src="@drawable/ic_attachment" android:src="@drawable/ic_attachment"
app:layout_constraintBottom_toBottomOf="@+id/sendButton" app:layout_constraintBottom_toBottomOf="@id/sendButton"
app:layout_constraintEnd_toStartOf="parent" app:layout_constraintEnd_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/sendButton" app:layout_constraintTop_toTopOf="@id/sendButton"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
<FrameLayout <FrameLayout
@ -153,8 +153,8 @@
android:nextFocusLeft="@id/composerEditText" android:nextFocusLeft="@id/composerEditText"
android:nextFocusUp="@id/composerEditText" android:nextFocusUp="@id/composerEditText"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/composerEmojiButton" app:layout_constraintEnd_toStartOf="@id/composerEmojiButton"
app:layout_constraintStart_toStartOf="@+id/composerEditTextOuterBorder" app:layout_constraintStart_toStartOf="@id/composerEditTextOuterBorder"
app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier" app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
tools:text="@tools:sample/lorem/random" /> tools:text="@tools:sample/lorem/random" />
@ -167,7 +167,7 @@
android:contentDescription="@string/a11y_open_emoji_picker" android:contentDescription="@string/a11y_open_emoji_picker"
android:src="@drawable/ic_insert_emoji" android:src="@drawable/ic_insert_emoji"
app:layout_constraintBottom_toBottomOf="@id/sendButton" app:layout_constraintBottom_toBottomOf="@id/sendButton"
app:layout_constraintEnd_toEndOf="@+id/composerEditTextOuterBorder" app:layout_constraintEnd_toEndOf="@id/composerEditTextOuterBorder"
app:layout_constraintStart_toEndOf="@id/composerEditText" app:layout_constraintStart_toEndOf="@id/composerEditText"
app:layout_constraintTop_toTopOf="@id/sendButton" app:layout_constraintTop_toTopOf="@id/sendButton"
app:layout_goneMarginBottom="52dp" app:layout_goneMarginBottom="52dp"

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

@ -30,7 +30,7 @@
android:background="@drawable/bg_unread_highlight" android:background="@drawable/bg_unread_highlight"
android:gravity="center" android:gravity="center"
android:textColor="?colorOnError" android:textColor="?colorOnError"
app:layout_constraintCircle="@+id/action_view_icon_image" app:layout_constraintCircle="@id/action_view_icon_image"
app:layout_constraintCircleAngle="45" app:layout_constraintCircleAngle="45"
app:layout_constraintCircleRadius="12dp" app:layout_constraintCircleRadius="12dp"
tools:ignore="MissingConstraints" tools:ignore="MissingConstraints"

4
vector/src/main/res/layout/dialog_confirmation_with_reason.xml
View File

@ -26,7 +26,7 @@
android:checked="true" android:checked="true"
android:text="@string/delete_event_dialog_reason_checkbox" android:text="@string/delete_event_dialog_reason_checkbox"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dialogConfirmationText" /> app:layout_constraintTop_toBottomOf="@id/dialogConfirmationText" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/dialogReasonTextInputLayout" android:id="@+id/dialogReasonTextInputLayout"
@ -36,7 +36,7 @@
app:counterMaxLength="240" app:counterMaxLength="240"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dialogReasonCheck" app:layout_constraintTop_toBottomOf="@id/dialogReasonCheck"
tools:hint="@string/delete_event_dialog_reason_hint"> tools:hint="@string/delete_event_dialog_reason_hint">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText

1
vector/src/main/res/layout/dialog_edit_power_level.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

1
vector/src/main/res/layout/dialog_export_e2e_keys.xml
View File

@ -35,7 +35,6 @@
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/exportDialogTilConfirm" android:id="@+id/exportDialogTilConfirm"
style="@style/Widget.Vector.TextInputLayout.Password" style="@style/Widget.Vector.TextInputLayout.Password"

6
vector/src/main/res/layout/dialog_import_e2e_keys.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/layout_root" android:id="@+id/layout_root"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,10 +26,7 @@
android:id="@+id/importDialogTil" android:id="@+id/importDialogTil"
style="@style/Widget.Vector.TextInputLayout.Password" style="@style/Widget.Vector.TextInputLayout.Password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
app:layout_constraintEnd_toStartOf="@+id/importDialogShowPassword"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dialog_e2e_keys_passphrase_filename">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/dialog_e2e_keys_passphrase_edit_text" android:id="@+id/dialog_e2e_keys_passphrase_edit_text"

1
vector/src/main/res/layout/dialog_preference_edit_text.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- This file is here to fix Google issue https://code.google.com/p/android/issues/detail?id=231576 --> <!-- This file is here to fix Google issue https://code.google.com/p/android/issues/detail?id=231576 -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"

4
vector/src/main/res/layout/fragment_attachments_preview.xml
View File

@ -48,7 +48,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp" android:padding="8dp"
app:layout_constraintBottom_toTopOf="@+id/attachmentPreviewerSendImageOriginalSize" app:layout_constraintBottom_toTopOf="@id/attachmentPreviewerSendImageOriginalSize"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
@ -64,7 +64,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/attachmentPreviewerMiniatureList" app:layout_constraintTop_toBottomOf="@id/attachmentPreviewerMiniatureList"
tools:text="@plurals/send_images_with_original_size" /> tools:text="@plurals/send_images_with_original_size" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

5
vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout 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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@ -25,7 +24,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
app:errorEnabled="true" app:errorEnabled="true"
app:layout_constraintBottom_toTopOf="@+id/bootstrapPasswordButton" app:layout_constraintBottom_toTopOf="@id/bootstrapPasswordButton"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/bootstrapDescriptionText"> app:layout_constraintTop_toBottomOf="@id/bootstrapDescriptionText">
@ -51,6 +50,6 @@
android:text="@string/_continue" android:text="@string/_continue"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bootstrapAccountPasswordTil" /> app:layout_constraintTop_toBottomOf="@id/bootstrapAccountPasswordTil" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
View File

@ -71,7 +71,7 @@
android:text="@string/_continue" android:text="@string/_continue"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_enter_til" /> app:layout_constraintTop_toBottomOf="@id/ssss_passphrase_enter_til" />
<!-- <TextView--> <!-- <TextView-->
<!-- android:id="@+id/bootstrapWarningInfo"--> <!-- android:id="@+id/bootstrapWarningInfo"-->

3
vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout 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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@ -70,6 +69,6 @@
android:text="@string/_continue" android:text="@string/_continue"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bootstrapRecoveryKeyEnterTil" /> app:layout_constraintTop_toBottomOf="@id/bootstrapRecoveryKeyEnterTil" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

3
vector/src/main/res/layout/fragment_bootstrap_reauth.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout 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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@ -24,7 +23,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
app:layout_constraintBottom_toTopOf="@id/reAuthFailureText" app:layout_constraintBottom_toTopOf="@id/reAuthFailureText"
app:layout_constraintTop_toBottomOf="@+id/bootstrapDescriptionText" /> app:layout_constraintTop_toBottomOf="@id/bootstrapDescriptionText" />
<TextView <TextView
android:id="@+id/reAuthFailureText" android:id="@+id/reAuthFailureText"

3
vector/src/main/res/layout/fragment_bootstrap_save_key.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout 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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@ -32,7 +31,6 @@
android:textColor="?vctr_notice_secondary" android:textColor="?vctr_notice_secondary"
tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8" /> tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
@ -83,5 +81,4 @@
android:layout_height="1dp" android:layout_height="1dp"
android:background="?vctr_list_separator_on_surface" /> android:background="?vctr_list_separator_on_surface" />
</LinearLayout> </LinearLayout>

1
vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout 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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"

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

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout 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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@ -24,7 +23,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bootstrapDescriptionText" /> app:layout_constraintTop_toBottomOf="@id/bootstrapDescriptionText" />
<TextView <TextView
android:id="@+id/bootstrapLoadingStatusText" android:id="@+id/bootstrapLoadingStatusText"
@ -37,5 +36,4 @@
app:layout_constraintTop_toBottomOf="@id/bootstrapWaitingProgress" app:layout_constraintTop_toBottomOf="@id/bootstrapWaitingProgress"
tools:text="Bending the spoon..." /> tools:text="Bending the spoon..." />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

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

@ -56,7 +56,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/phoneBookClose" app:layout_constraintStart_toEndOf="@id/phoneBookClose"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -114,7 +114,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" app:layout_constraintTop_toBottomOf="@id/appBarLayout"
tools:listitem="@layout/item_contact_main" /> tools:listitem="@layout/item_contact_main" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
View File

@ -56,7 +56,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/createDirectRoomClose" app:layout_constraintStart_toEndOf="@id/createDirectRoomClose"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -92,7 +92,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" app:layout_constraintTop_toBottomOf="@id/appBarLayout"
tools:listitem="@layout/item_create_direct_room_user" /> tools:listitem="@layout/item_create_direct_room_user" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
vector/src/main/res/layout/fragment_create_poll.xml
View File

@ -52,7 +52,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/createPollClose" app:layout_constraintStart_toEndOf="@id/createPollClose"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -68,7 +68,7 @@
android:overScrollMode="always" android:overScrollMode="always"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_constraintBottom_toTopOf="@id/createPollButton" app:layout_constraintBottom_toTopOf="@id/createPollButton"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" app:layout_constraintTop_toBottomOf="@id/appBarLayout"
tools:listitem="@layout/item_form_text_input_with_delete" /> tools:listitem="@layout/item_form_text_input_with_delete" />
<Button <Button

4
vector/src/main/res/layout/fragment_create_room.xml
View File

@ -53,7 +53,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/createRoomClose" app:layout_constraintStart_toEndOf="@id/createRoomClose"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -69,7 +69,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" app:layout_constraintTop_toBottomOf="@id/appBarLayout"
tools:listitem="@layout/item_form_switch" /> tools:listitem="@layout/item_form_switch" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

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

@ -29,7 +29,7 @@
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/deactivateAccountContent" /> app:layout_constraintTop_toBottomOf="@id/deactivateAccountContent" />
<Button <Button
android:id="@+id/deactivateAccountSubmit" android:id="@+id/deactivateAccountSubmit"
@ -40,7 +40,7 @@
android:text="@string/deactivate_account_submit" android:text="@string/deactivate_account_submit"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/deactivateAccountEraseCheckbox" /> app:layout_constraintTop_toBottomOf="@id/deactivateAccountEraseCheckbox" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

1
vector/src/main/res/layout/fragment_devtool_keyrequests.xml
View File

@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
tools:background="#FFFFFF"> tools:background="#FFFFFF">
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout

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

@ -123,7 +123,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" /> app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
<im.vector.app.core.ui.views.KeysBackupBanner <im.vector.app.core.ui.views.KeysBackupBanner
android:id="@+id/homeKeysBackupBanner" android:id="@+id/homeKeysBackupBanner"
@ -141,8 +141,8 @@
android:id="@+id/roomListContainer" android:id="@+id/roomListContainer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView" app:layout_constraintBottom_toTopOf="@id/bottomNavigationView"
app:layout_constraintTop_toBottomOf="@+id/homeKeysBackupBanner" /> app:layout_constraintTop_toBottomOf="@id/homeKeysBackupBanner" />
<com.google.android.material.bottomnavigation.BottomNavigationView <com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottomNavigationView" android:id="@+id/bottomNavigationView"

28
vector/src/main/res/layout/fragment_home_drawer.xml
View File

@ -38,10 +38,10 @@
android:maxLines="1" android:maxLines="1"
android:singleLine="true" android:singleLine="true"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@+id/homeDrawerUserIdView" app:layout_constraintBottom_toTopOf="@id/homeDrawerUserIdView"
app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton" app:layout_constraintEnd_toStartOf="@id/homeDrawerQRCodeButton"
app:layout_constraintStart_toEndOf="@+id/homeDrawerHeaderAvatarView" app:layout_constraintStart_toEndOf="@id/homeDrawerHeaderAvatarView"
app:layout_constraintTop_toTopOf="@+id/homeDrawerHeaderAvatarView" app:layout_constraintTop_toTopOf="@id/homeDrawerHeaderAvatarView"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"
tools:text="@sample/users.json/data/displayName" /> tools:text="@sample/users.json/data/displayName" />
@ -55,10 +55,10 @@
android:maxLines="1" android:maxLines="1"
android:singleLine="true" android:singleLine="true"
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="@+id/homeDrawerHeaderAvatarView" app:layout_constraintBottom_toBottomOf="@id/homeDrawerHeaderAvatarView"
app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton" app:layout_constraintEnd_toStartOf="@id/homeDrawerQRCodeButton"
app:layout_constraintStart_toStartOf="@+id/homeDrawerUsernameView" app:layout_constraintStart_toStartOf="@id/homeDrawerUsernameView"
app:layout_constraintTop_toBottomOf="@+id/homeDrawerUsernameView" app:layout_constraintTop_toBottomOf="@id/homeDrawerUsernameView"
tools:text="@sample/users.json/data/id" /> tools:text="@sample/users.json/data/id" />
<ImageView <ImageView
@ -93,8 +93,8 @@
app:iconGravity="textStart" app:iconGravity="textStart"
app:iconSize="20dp" app:iconSize="20dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView" app:layout_constraintStart_toStartOf="@id/homeDrawerHeaderAvatarView"
app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeaderAvatarView" app:layout_constraintTop_toBottomOf="@id/homeDrawerHeaderAvatarView"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
<ImageView <ImageView
@ -117,24 +117,24 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?vctr_list_separator" android:background="?vctr_list_separator"
app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeader" /> app:layout_constraintTop_toBottomOf="@id/homeDrawerHeader" />
<androidx.fragment.app.FragmentContainerView <androidx.fragment.app.FragmentContainerView
android:id="@+id/homeDrawerGroupListContainer" android:id="@+id/homeDrawerGroupListContainer"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/homeDrawerBottomSeparator" app:layout_constraintBottom_toTopOf="@id/homeDrawerBottomSeparator"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeaderSeparator" /> app:layout_constraintTop_toBottomOf="@id/homeDrawerHeaderSeparator" />
<View <View
android:id="@+id/homeDrawerBottomSeparator" android:id="@+id/homeDrawerBottomSeparator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?vctr_list_separator" android:background="?vctr_list_separator"
app:layout_constraintBottom_toTopOf="@+id/homeDrawerHeaderSettingsView" /> app:layout_constraintBottom_toTopOf="@id/homeDrawerHeaderSettingsView" />
<TextView <TextView
android:id="@+id/homeDrawerHeaderSettingsView" android:id="@+id/homeDrawerHeaderSettingsView"

2
vector/src/main/res/layout/fragment_incoming_share.xml
View File

@ -40,7 +40,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" app:layout_constraintTop_toBottomOf="@id/appBarLayout"
tools:listitem="@layout/item_room" /> tools:listitem="@layout/item_room" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton

4
vector/src/main/res/layout/fragment_join_rules_recycler.xml
View File

@ -11,12 +11,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:itemSpacing="1dp" app:itemSpacing="1dp"
app:layout_constraintBottom_toTopOf="@+id/buttonBar" app:layout_constraintBottom_toTopOf="@id/buttonBar"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:itemCount="1" tools:itemCount="1"
tools:listitem="@layout/item_bottom_sheet_joinrule_restricted" /> tools:listitem="@layout/item_bottom_sheet_joinrule_restricted" />
<LinearLayout <LinearLayout
android:id="@+id/buttonBar" android:id="@+id/buttonBar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -46,7 +45,6 @@
android:text="@string/save" /> android:text="@string/save" />
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:elevation="2dp" android:elevation="2dp"

10
vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
View File

@ -36,7 +36,7 @@
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keys_backup_shield" /> app:layout_constraintTop_toBottomOf="@id/keys_backup_shield" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/key_input_layout" android:id="@+id/key_input_layout"
@ -45,9 +45,9 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
app:errorEnabled="true" app:errorEnabled="true"
app:layout_constraintEnd_toStartOf="@+id/keys_backup_import" app:layout_constraintEnd_toStartOf="@id/keys_backup_import"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keys_restore_with_key"> app:layout_constraintTop_toBottomOf="@id/keys_restore_with_key">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/key_text_edit" android:id="@+id/key_text_edit"
@ -86,7 +86,7 @@
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/key_input_layout" /> app:layout_constraintTop_toBottomOf="@id/key_input_layout" />
<Button <Button
android:id="@+id/keys_restore_button" android:id="@+id/keys_restore_button"
@ -97,7 +97,7 @@
android:minWidth="200dp" android:minWidth="200dp"
android:text="@string/keys_backup_unlock_button" android:text="@string/keys_backup_unlock_button"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keys_restore_key_help_with_link" app:layout_constraintTop_toBottomOf="@id/keys_restore_key_help_with_link"
app:layout_constraintVertical_bias="0" /> app:layout_constraintVertical_bias="0" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

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

@ -72,7 +72,7 @@
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keys_backup_passphrase_enter_til" app:layout_constraintTop_toBottomOf="@id/keys_backup_passphrase_enter_til"
tools:text="@string/keys_backup_restore_with_passphrase_helper_with_link" /> tools:text="@string/keys_backup_restore_with_passphrase_helper_with_link" />
<Button <Button
@ -85,7 +85,7 @@
android:text="@string/keys_backup_unlock_button" android:text="@string/keys_backup_unlock_button"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/helperTextWithLink" /> app:layout_constraintTop_toBottomOf="@id/helperTextWithLink" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>

6
vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
View File

@ -30,7 +30,7 @@
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keys_backup_shield" app:layout_constraintTop_toBottomOf="@id/keys_backup_shield"
tools:text="@string/keys_backup_restore_success_title" /> tools:text="@string/keys_backup_restore_success_title" />
<TextView <TextView
@ -43,7 +43,7 @@
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/success_text" app:layout_constraintTop_toBottomOf="@id/success_text"
tools:text="Restored a backup with 34 keys.\n22 new keys have been added to this session." /> tools:text="Restored a backup with 34 keys.\n22 new keys have been added to this session." />
<Button <Button
@ -55,6 +55,6 @@
android:text="@string/done" android:text="@string/done"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/success_details_text" /> app:layout_constraintTop_toBottomOf="@id/success_details_text" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

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

@ -14,7 +14,7 @@
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/backup_keys" android:src="@drawable/backup_keys"
app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_title" app:layout_constraintBottom_toTopOf="@id/keys_backup_setup_step1_title"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
@ -33,8 +33,8 @@
android:textAlignment="center" android:textAlignment="center"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_description" app:layout_constraintBottom_toTopOf="@id/keys_backup_setup_step1_description"
app:layout_constraintTop_toBottomOf="@+id/keys_backup_setup_step1_image" app:layout_constraintTop_toBottomOf="@id/keys_backup_setup_step1_image"
app:layout_constraintVertical_chainStyle="packed" /> app:layout_constraintVertical_chainStyle="packed" />
<TextView <TextView
@ -46,7 +46,7 @@
android:text="@string/keys_backup_setup_step1_description" android:text="@string/keys_backup_setup_step1_description"
android:textAlignment="center" android:textAlignment="center"
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_button" app:layout_constraintBottom_toTopOf="@id/keys_backup_setup_step1_button"
app:layout_constraintTop_toBottomOf="@id/keys_backup_setup_step1_title" /> app:layout_constraintTop_toBottomOf="@id/keys_backup_setup_step1_title" />
<!-- Centered button --> <!-- Centered button -->

4
vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
View File

@ -40,7 +40,7 @@
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keys_backup_setup_step2_text_title" /> app:layout_constraintTop_toBottomOf="@id/keys_backup_setup_step2_text_title" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/keys_backup_setup_step2_passphrase_enter_til" android:id="@+id/keys_backup_setup_step2_passphrase_enter_til"
@ -110,7 +110,7 @@
android:text="@string/keys_backup_setup_step1_recovery_key_alternative" android:text="@string/keys_backup_setup_step1_recovery_key_alternative"
android:textAlignment="center" android:textAlignment="center"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintTop_toBottomOf="@+id/keys_backup_setup_step2_button" /> app:layout_constraintTop_toBottomOf="@id/keys_backup_setup_step2_button" />
<Button <Button
android:id="@+id/keys_backup_setup_step2_skip_button" android:id="@+id/keys_backup_setup_step2_skip_button"

3
vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
View File

@ -40,7 +40,6 @@
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
<TextView <TextView
android:id="@+id/keys_backup_setup_step3_line1_text" android:id="@+id/keys_backup_setup_step3_line1_text"
style="@style/Widget.Vector.TextView.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
@ -65,7 +64,6 @@
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
tools:text="@string/keys_backup_setup_step3_text_line2" /> tools:text="@string/keys_backup_setup_step3_text_line2" />
<TextView <TextView
android:id="@+id/keys_backup_setup_step3_recovery_key_text" android:id="@+id/keys_backup_setup_step3_recovery_key_text"
style="@style/Widget.Vector.TextView.Title" style="@style/Widget.Vector.TextView.Title"
@ -79,7 +77,6 @@
tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8" tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8"
tools:visibility="visible" /> tools:visibility="visible" />
<Button <Button
android:id="@+id/keys_backup_setup_step3_copy_button" android:id="@+id/keys_backup_setup_step3_copy_button"
style="@style/Widget.Vector.Button.Text" style="@style/Widget.Vector.Button.Text"

10
vector/src/main/res/layout/fragment_login_account_created.xml
View File

@ -77,8 +77,8 @@
android:maxLines="1" android:maxLines="1"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/loginAccountCreatedTime" app:layout_constraintEnd_toStartOf="@id/loginAccountCreatedTime"
app:layout_constraintStart_toEndOf="@+id/loginAccountCreatedAvatar" app:layout_constraintStart_toEndOf="@id/loginAccountCreatedAvatar"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="\@user:domain.org" /> tools:text="\@user:domain.org" />
@ -91,7 +91,7 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintBaseline_toBaselineOf="@+id/loginAccountCreatedMemberName" app:layout_constraintBaseline_toBaselineOf="@id/loginAccountCreatedMemberName"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
tools:text="@tools:sample/date/hhmm" /> tools:text="@tools:sample/date/hhmm" />
@ -102,8 +102,8 @@
android:text="@string/login_account_created_message" android:text="@string/login_account_created_message"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/loginAccountCreatedMemberName" app:layout_constraintStart_toStartOf="@id/loginAccountCreatedMemberName"
app:layout_constraintTop_toBottomOf="@+id/loginAccountCreatedMemberName" /> app:layout_constraintTop_toBottomOf="@id/loginAccountCreatedMemberName" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

3
vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
View File

@ -65,8 +65,7 @@
<RelativeLayout <RelativeLayout
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">
android:orientation="horizontal">
<Button <Button
android:id="@+id/loginGenericTextInputFormOtherButton" android:id="@+id/loginGenericTextInputFormOtherButton"

28
vector/src/main/res/layout/fragment_login_server_selection.xml
View File

@ -41,7 +41,7 @@
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerTitle" /> app:layout_constraintTop_toBottomOf="@id/loginServerTitle" />
<!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow --> <!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow -->
<im.vector.app.core.platform.CheckableConstraintLayout <im.vector.app.core.platform.CheckableConstraintLayout
@ -56,7 +56,7 @@
android:paddingEnd="@dimen/layout_horizontal_margin" android:paddingEnd="@dimen/layout_horizontal_margin"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerText"> app:layout_constraintTop_toBottomOf="@id/loginServerText">
<ImageView <ImageView
android:id="@+id/loginServerChoiceMatrixOrgIcon" android:id="@+id/loginServerChoiceMatrixOrgIcon"
@ -64,7 +64,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_logo_matrix_org" android:src="@drawable/ic_logo_matrix_org"
app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceMatrixOrgText" app:layout_constraintBottom_toTopOf="@id/loginServerChoiceMatrixOrgText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"
@ -83,7 +83,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrgIcon" /> app:layout_constraintTop_toBottomOf="@id/loginServerChoiceMatrixOrgIcon" />
</im.vector.app.core.platform.CheckableConstraintLayout> </im.vector.app.core.platform.CheckableConstraintLayout>
@ -99,7 +99,7 @@
android:paddingEnd="0dp" android:paddingEnd="0dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrg"> app:layout_constraintTop_toBottomOf="@id/loginServerChoiceMatrixOrg">
<ImageView <ImageView
android:id="@+id/loginServerChoiceEmsIcon" android:id="@+id/loginServerChoiceEmsIcon"
@ -107,7 +107,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_logo_element_matrix_services" android:src="@drawable/ic_logo_element_matrix_services"
app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceEmsText" app:layout_constraintBottom_toTopOf="@id/loginServerChoiceEmsText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"
@ -124,9 +124,9 @@
android:text="@string/login_server_modular_text" android:text="@string/login_server_modular_text"
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/loginServerChoiceEmsLearnMore" app:layout_constraintEnd_toStartOf="@id/loginServerChoiceEmsLearnMore"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceEmsIcon" /> app:layout_constraintTop_toBottomOf="@id/loginServerChoiceEmsIcon" />
<TextView <TextView
android:id="@+id/loginServerChoiceEmsLearnMore" android:id="@+id/loginServerChoiceEmsLearnMore"
@ -136,9 +136,9 @@
android:padding="16dp" android:padding="16dp"
android:text="@string/login_server_modular_learn_more" android:text="@string/login_server_modular_learn_more"
android:textColor="?colorPrimary" android:textColor="?colorPrimary"
app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText" app:layout_constraintBottom_toBottomOf="@id/loginServerChoiceEmsText"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/loginServerChoiceEmsText" /> app:layout_constraintTop_toTopOf="@id/loginServerChoiceEmsText" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -154,7 +154,7 @@
android:paddingEnd="@dimen/layout_horizontal_margin" android:paddingEnd="@dimen/layout_horizontal_margin"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceEms"> app:layout_constraintTop_toBottomOf="@id/loginServerChoiceEms">
<TextView <TextView
android:id="@+id/loginServerChoiceOtherTitle" android:id="@+id/loginServerChoiceOtherTitle"
@ -164,7 +164,7 @@
android:gravity="start" android:gravity="start"
android:text="@string/login_server_other_title" android:text="@string/login_server_other_title"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText" app:layout_constraintBottom_toTopOf="@id/loginServerChoiceOtherText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" /> app:layout_constraintVertical_chainStyle="packed" />
@ -181,7 +181,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOtherTitle" /> app:layout_constraintTop_toBottomOf="@id/loginServerChoiceOtherTitle" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -196,7 +196,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOther" /> app:layout_constraintTop_toBottomOf="@id/loginServerChoiceOther" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

12
vector/src/main/res/layout/fragment_login_server_selection_2.xml
View File

@ -52,7 +52,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_logo_matrix_org" android:src="@drawable/ic_logo_matrix_org"
app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceMatrixOrgText" app:layout_constraintBottom_toTopOf="@id/loginServerChoiceMatrixOrgText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"
@ -71,7 +71,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrgIcon" /> app:layout_constraintTop_toBottomOf="@id/loginServerChoiceMatrixOrgIcon" />
</im.vector.app.core.platform.CheckableConstraintLayout> </im.vector.app.core.platform.CheckableConstraintLayout>
@ -104,7 +104,7 @@
android:gravity="start" android:gravity="start"
android:text="@string/login_element_matrix_server_and_others" android:text="@string/login_element_matrix_server_and_others"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText" app:layout_constraintBottom_toTopOf="@id/loginServerChoiceOtherText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" /> app:layout_constraintVertical_chainStyle="packed" />
@ -121,7 +121,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOtherTitle" /> app:layout_constraintTop_toBottomOf="@id/loginServerChoiceOtherTitle" />
</im.vector.app.core.platform.CheckableConstraintLayout> </im.vector.app.core.platform.CheckableConstraintLayout>
@ -135,9 +135,9 @@
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:text="@string/login_server_modular_learn_more_about_ems" android:text="@string/login_server_modular_learn_more_about_ems"
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText" app:layout_constraintBottom_toBottomOf="@id/loginServerChoiceEmsText"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/loginServerChoiceEmsText" /> app:layout_constraintTop_toTopOf="@id/loginServerChoiceEmsText" />
</LinearLayout> </LinearLayout>

8
vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
View File

@ -39,7 +39,7 @@
android:layout_marginTop="27dp" android:layout_marginTop="27dp"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninServerIcon" app:layout_constraintTop_toBottomOf="@id/loginSignupSigninServerIcon"
app:layout_goneMarginTop="0dp" app:layout_goneMarginTop="0dp"
tools:text="@string/login_connect_to" /> tools:text="@string/login_connect_to" />
@ -53,7 +53,7 @@
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninTitle" app:layout_constraintTop_toBottomOf="@id/loginSignupSigninTitle"
tools:text="@string/login_server_matrix_org_text" /> tools:text="@string/login_server_matrix_org_text" />
<!-- Sign up or sign in SSO --> <!-- Sign up or sign in SSO -->
@ -65,7 +65,7 @@
android:layout_marginTop="38dp" android:layout_marginTop="38dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninText" app:layout_constraintTop_toBottomOf="@id/loginSignupSigninText"
tools:text="@string/login_signup" /> tools:text="@string/login_signup" />
<!-- Sign in or gone --> <!-- Sign in or gone -->
@ -80,7 +80,7 @@
app:layout_constraintBottom_toTopOf="@id/loginSignupSigninSignInSocialLoginContainer" app:layout_constraintBottom_toTopOf="@id/loginSignupSigninSignInSocialLoginContainer"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninSubmit" app:layout_constraintTop_toBottomOf="@id/loginSignupSigninSubmit"
tools:visibility="visible" /> tools:visibility="visible" />
<!-- Social Login buttons --> <!-- Social Login buttons -->

48
vector/src/main/res/layout/fragment_login_splash.xml
View File

@ -16,7 +16,7 @@
android:id="@+id/loginSplashSpace1" android:id="@+id/loginSplashSpace1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/loginSplashLogoContainer" app:layout_constraintBottom_toTopOf="@id/loginSplashLogoContainer"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="spread_inside" app:layout_constraintVertical_chainStyle="spread_inside"
app:layout_constraintVertical_weight="4" /> app:layout_constraintVertical_weight="4" />
@ -27,10 +27,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace2" app:layout_constraintBottom_toTopOf="@id/loginSplashSpace2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace1"> app:layout_constraintTop_toBottomOf="@id/loginSplashSpace1">
<ImageView <ImageView
android:id="@+id/loginSplashLogo" android:id="@+id/loginSplashLogo"
@ -56,8 +56,8 @@
android:id="@+id/loginSplashSpace2" android:id="@+id/loginSplashSpace2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/loginSplashTitle" app:layout_constraintBottom_toTopOf="@id/loginSplashTitle"
app:layout_constraintTop_toBottomOf="@+id/loginSplashLogoContainer" app:layout_constraintTop_toBottomOf="@id/loginSplashLogoContainer"
app:layout_constraintVertical_weight="1" /> app:layout_constraintVertical_weight="1" />
<TextView <TextView
@ -69,27 +69,27 @@
android:text="@string/login_splash_title" android:text="@string/login_splash_title"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
android:transitionName="loginTitleTransition" android:transitionName="loginTitleTransition"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace3" app:layout_constraintBottom_toTopOf="@id/loginSplashSpace3"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace2" /> app:layout_constraintTop_toBottomOf="@id/loginSplashSpace2" />
<Space <Space
android:id="@+id/loginSplashSpace3" android:id="@+id/loginSplashSpace3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/loginSplashContent" app:layout_constraintBottom_toTopOf="@id/loginSplashContent"
app:layout_constraintTop_toBottomOf="@+id/loginSplashTitle" app:layout_constraintTop_toBottomOf="@id/loginSplashTitle"
app:layout_constraintVertical_weight="2" /> app:layout_constraintVertical_weight="2" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/loginSplashContent" android:id="@+id/loginSplashContent"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace4" app:layout_constraintBottom_toTopOf="@id/loginSplashSpace4"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace3"> app:layout_constraintTop_toBottomOf="@id/loginSplashSpace3">
<ImageView <ImageView
android:id="@+id/loginSplashPicto1" android:id="@+id/loginSplashPicto1"
@ -99,7 +99,7 @@
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_login_splash_message_circle" android:src="@drawable/ic_login_splash_message_circle"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/loginSplashText1" app:layout_constraintTop_toTopOf="@id/loginSplashText1"
app:tint="?vctr_content_secondary" app:tint="?vctr_content_secondary"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
@ -112,7 +112,7 @@
android:gravity="start" android:gravity="start"
android:text="@string/login_splash_text1" android:text="@string/login_splash_text1"
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@+id/loginSplashText2" app:layout_constraintBottom_toTopOf="@id/loginSplashText2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/loginSplashPicto1" app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -124,7 +124,7 @@
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_login_splash_lock" android:src="@drawable/ic_login_splash_lock"
app:layout_constraintStart_toStartOf="@id/loginSplashPicto1" app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
app:layout_constraintTop_toTopOf="@+id/loginSplashText2" app:layout_constraintTop_toTopOf="@id/loginSplashText2"
app:tint="?vctr_content_secondary" app:tint="?vctr_content_secondary"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
@ -140,7 +140,7 @@
app:layout_constraintBottom_toTopOf="@id/loginSplashText3" app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/loginSplashText1" app:layout_constraintStart_toStartOf="@id/loginSplashText1"
app:layout_constraintTop_toBottomOf="@+id/loginSplashText1" /> app:layout_constraintTop_toBottomOf="@id/loginSplashText1" />
<ImageView <ImageView
android:id="@+id/loginSplashPicto3" android:id="@+id/loginSplashPicto3"
@ -148,8 +148,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_login_splash_sliders" android:src="@drawable/ic_login_splash_sliders"
app:layout_constraintStart_toStartOf="@+id/loginSplashPicto1" app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
app:layout_constraintTop_toTopOf="@+id/loginSplashText3" app:layout_constraintTop_toTopOf="@id/loginSplashText3"
app:tint="?vctr_content_secondary" app:tint="?vctr_content_secondary"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
@ -164,8 +164,8 @@
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/loginSplashText1" app:layout_constraintStart_toStartOf="@id/loginSplashText1"
app:layout_constraintTop_toBottomOf="@+id/loginSplashText2" /> app:layout_constraintTop_toBottomOf="@id/loginSplashText2" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -173,8 +173,8 @@
android:id="@+id/loginSplashSpace4" android:id="@+id/loginSplashSpace4"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSubmit" app:layout_constraintBottom_toTopOf="@id/loginSplashSubmit"
app:layout_constraintTop_toBottomOf="@+id/loginSplashContent" app:layout_constraintTop_toBottomOf="@id/loginSplashContent"
app:layout_constraintVertical_weight="2" /> app:layout_constraintVertical_weight="2" />
<Button <Button
@ -184,17 +184,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login_splash_submit" android:text="@string/login_splash_submit"
android:transitionName="loginSubmitTransition" android:transitionName="loginSubmitTransition"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace5" app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace4" /> app:layout_constraintTop_toBottomOf="@id/loginSplashSpace4" />
<Space <Space
android:id="@+id/loginSplashSpace5" android:id="@+id/loginSplashSpace5"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSplashSubmit" app:layout_constraintTop_toBottomOf="@id/loginSplashSubmit"
app:layout_constraintVertical_weight="4" /> app:layout_constraintVertical_weight="4" />
<TextView <TextView

48
vector/src/main/res/layout/fragment_login_splash_2.xml
View File

@ -16,7 +16,7 @@
android:id="@+id/loginSplashSpace1" android:id="@+id/loginSplashSpace1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/loginSplashLogoContainer" app:layout_constraintBottom_toTopOf="@id/loginSplashLogoContainer"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="spread_inside" app:layout_constraintVertical_chainStyle="spread_inside"
app:layout_constraintVertical_weight="4" /> app:layout_constraintVertical_weight="4" />
@ -27,10 +27,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace2" app:layout_constraintBottom_toTopOf="@id/loginSplashSpace2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace1"> app:layout_constraintTop_toBottomOf="@id/loginSplashSpace1">
<ImageView <ImageView
android:id="@+id/loginSplashLogo" android:id="@+id/loginSplashLogo"
@ -56,8 +56,8 @@
android:id="@+id/loginSplashSpace2" android:id="@+id/loginSplashSpace2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/loginSplashTitle" app:layout_constraintBottom_toTopOf="@id/loginSplashTitle"
app:layout_constraintTop_toBottomOf="@+id/loginSplashLogoContainer" app:layout_constraintTop_toBottomOf="@id/loginSplashLogoContainer"
app:layout_constraintVertical_weight="1" /> app:layout_constraintVertical_weight="1" />
<TextView <TextView
@ -69,27 +69,27 @@
android:text="@string/login_splash_title" android:text="@string/login_splash_title"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
android:transitionName="loginTitleTransition" android:transitionName="loginTitleTransition"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace25" app:layout_constraintBottom_toTopOf="@id/loginSplashSpace25"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace2" /> app:layout_constraintTop_toBottomOf="@id/loginSplashSpace2" />
<Space <Space
android:id="@+id/loginSplashSpace25" android:id="@+id/loginSplashSpace25"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/loginSplashContent" app:layout_constraintBottom_toTopOf="@id/loginSplashContent"
app:layout_constraintTop_toBottomOf="@+id/loginSplashTitle" app:layout_constraintTop_toBottomOf="@id/loginSplashTitle"
app:layout_constraintVertical_weight="3" /> app:layout_constraintVertical_weight="3" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/loginSplashContent" android:id="@+id/loginSplashContent"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace3" app:layout_constraintBottom_toTopOf="@id/loginSplashSpace3"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace25"> app:layout_constraintTop_toBottomOf="@id/loginSplashSpace25">
<ImageView <ImageView
android:id="@+id/loginSplashPicto1" android:id="@+id/loginSplashPicto1"
@ -99,7 +99,7 @@
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_login_splash_message_circle" android:src="@drawable/ic_login_splash_message_circle"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/loginSplashText1" app:layout_constraintTop_toTopOf="@id/loginSplashText1"
app:tint="?vctr_content_secondary" app:tint="?vctr_content_secondary"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
@ -112,7 +112,7 @@
android:gravity="start" android:gravity="start"
android:text="@string/login_splash_text1" android:text="@string/login_splash_text1"
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@+id/loginSplashText2" app:layout_constraintBottom_toTopOf="@id/loginSplashText2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/loginSplashPicto1" app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -124,7 +124,7 @@
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_login_splash_lock" android:src="@drawable/ic_login_splash_lock"
app:layout_constraintStart_toStartOf="@id/loginSplashPicto1" app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
app:layout_constraintTop_toTopOf="@+id/loginSplashText2" app:layout_constraintTop_toTopOf="@id/loginSplashText2"
app:tint="?vctr_content_secondary" app:tint="?vctr_content_secondary"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
@ -140,7 +140,7 @@
app:layout_constraintBottom_toTopOf="@id/loginSplashText3" app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/loginSplashText1" app:layout_constraintStart_toStartOf="@id/loginSplashText1"
app:layout_constraintTop_toBottomOf="@+id/loginSplashText1" /> app:layout_constraintTop_toBottomOf="@id/loginSplashText1" />
<ImageView <ImageView
android:id="@+id/loginSplashPicto3" android:id="@+id/loginSplashPicto3"
@ -148,8 +148,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_login_splash_sliders" android:src="@drawable/ic_login_splash_sliders"
app:layout_constraintStart_toStartOf="@+id/loginSplashPicto1" app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
app:layout_constraintTop_toTopOf="@+id/loginSplashText3" app:layout_constraintTop_toTopOf="@id/loginSplashText3"
app:tint="?vctr_content_secondary" app:tint="?vctr_content_secondary"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
@ -164,8 +164,8 @@
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/loginSplashText1" app:layout_constraintStart_toStartOf="@id/loginSplashText1"
app:layout_constraintTop_toBottomOf="@+id/loginSplashText2" /> app:layout_constraintTop_toBottomOf="@id/loginSplashText2" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -173,8 +173,8 @@
android:id="@+id/loginSplashSpace3" android:id="@+id/loginSplashSpace3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/loginFormContent" app:layout_constraintBottom_toTopOf="@id/loginFormContent"
app:layout_constraintTop_toBottomOf="@+id/loginSplashContent" app:layout_constraintTop_toBottomOf="@id/loginSplashContent"
app:layout_constraintVertical_weight="3" /> app:layout_constraintVertical_weight="3" />
<LinearLayout <LinearLayout
@ -182,10 +182,10 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace5" app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace3"> app:layout_constraintTop_toBottomOf="@id/loginSplashSpace3">
<Button <Button
android:id="@+id/loginSignupSigninSignUp" android:id="@+id/loginSignupSigninSignUp"
@ -211,7 +211,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginFormContent" app:layout_constraintTop_toBottomOf="@id/loginFormContent"
app:layout_constraintVertical_weight="6" /> app:layout_constraintVertical_weight="6" />
<TextView <TextView

6
vector/src/main/res/layout/fragment_login_terms.xml
View File

@ -40,7 +40,7 @@
android:paddingEnd="36dp" android:paddingEnd="36dp"
android:text="@string/auth_accept_policies" android:text="@string/auth_accept_policies"
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintTop_toBottomOf="@+id/loginTermsTitle" /> app:layout_constraintTop_toBottomOf="@id/loginTermsTitle" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/loginTermsPolicyList" android:id="@+id/loginTermsPolicyList"
@ -48,8 +48,8 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
app:layout_constraintBottom_toTopOf="@+id/loginTermsSubmit" app:layout_constraintBottom_toTopOf="@id/loginTermsSubmit"
app:layout_constraintTop_toBottomOf="@+id/loginTermsNotice" app:layout_constraintTop_toBottomOf="@id/loginTermsNotice"
tools:listitem="@layout/item_policy" /> tools:listitem="@layout/item_policy" />
<Button <Button

6
vector/src/main/res/layout/fragment_login_terms_2.xml
View File

@ -44,7 +44,7 @@
android:paddingEnd="36dp" android:paddingEnd="36dp"
android:text="@string/auth_accept_policies" android:text="@string/auth_accept_policies"
android:textColor="?vctr_content_secondary" android:textColor="?vctr_content_secondary"
app:layout_constraintTop_toBottomOf="@+id/loginTermsTitle" /> app:layout_constraintTop_toBottomOf="@id/loginTermsTitle" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/loginTermsPolicyList" android:id="@+id/loginTermsPolicyList"
@ -52,8 +52,8 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
app:layout_constraintBottom_toTopOf="@+id/loginTermsSubmit" app:layout_constraintBottom_toTopOf="@id/loginTermsSubmit"
app:layout_constraintTop_toBottomOf="@+id/loginTermsNotice" app:layout_constraintTop_toBottomOf="@id/loginTermsNotice"
tools:listitem="@layout/item_policy" /> tools:listitem="@layout/item_policy" />
<Button <Button

6
vector/src/main/res/layout/fragment_matrix_profile.xml
View File

@ -21,7 +21,7 @@
app:scrimAnimationDuration="250" app:scrimAnimationDuration="250"
app:scrimVisibleHeightTrigger="80dp" app:scrimVisibleHeightTrigger="80dp"
app:titleEnabled="false" app:titleEnabled="false"
app:toolbarId="@+id/matrixProfileToolbar"> app:toolbarId="@id/matrixProfileToolbar">
<ViewStub <ViewStub
android:id="@+id/matrixProfileHeaderView" android:id="@+id/matrixProfileHeaderView"
@ -63,7 +63,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:alpha="0" android:alpha="0"
app:layout_constraintCircle="@+id/matrixProfileToolbarAvatarImageView" app:layout_constraintCircle="@id/matrixProfileToolbarAvatarImageView"
app:layout_constraintCircleAngle="135" app:layout_constraintCircleAngle="135"
app:layout_constraintCircleRadius="20dp" app:layout_constraintCircleRadius="20dp"
tools:alpha="1" tools:alpha="1"
@ -82,7 +82,7 @@
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/matrixProfileToolbarAvatarImageView" app:layout_constraintStart_toEndOf="@id/matrixProfileToolbarAvatarImageView"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:alpha="1" tools:alpha="1"
tools:text="@sample/rooms.json/data/name" /> tools:text="@sample/rooms.json/data/name" />

3
vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
View File

@ -39,7 +39,7 @@
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar" app:layout_constraintTop_toBottomOf="@id/matrixToCardAvatar"
tools:text="@sample/rooms.json/data/name" /> tools:text="@sample/rooms.json/data/name" />
<TextView <TextView
@ -58,7 +58,6 @@
tools:text="@sample/rooms.json/data/alias" tools:text="@sample/rooms.json/data/alias"
tools:visibility="visible" /> tools:visibility="visible" />
<ImageView <ImageView
android:id="@+id/matrixToAccessImage" android:id="@+id/matrixToAccessImage"
android:layout_width="16dp" android:layout_width="16dp"

2
vector/src/main/res/layout/fragment_matrix_to_user_card.xml
View File

@ -31,7 +31,7 @@
android:singleLine="true" android:singleLine="true"
android:textAlignment="center" android:textAlignment="center"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar" app:layout_constraintTop_toBottomOf="@id/matrixToCardAvatar"
tools:text="@sample/users.json/data/displayName" /> tools:text="@sample/users.json/data/displayName" />
<TextView <TextView

2
vector/src/main/res/layout/fragment_public_rooms.xml
View File

@ -48,7 +48,7 @@
app:iconPadding="13dp" app:iconPadding="13dp"
app:iconTint="?colorPrimary" app:iconTint="?colorPrimary"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/publicRoomsToolbar" /> app:layout_constraintTop_toBottomOf="@id/publicRoomsToolbar" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

3
vector/src/main/res/layout/fragment_recyclerview_with_search.xml
View File

@ -64,7 +64,6 @@
</com.google.android.material.appbar.MaterialToolbar> </com.google.android.material.appbar.MaterialToolbar>
<androidx.appcompat.widget.SearchView <androidx.appcompat.widget.SearchView
android:id="@+id/memberNameFilter" android:id="@+id/memberNameFilter"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -73,7 +72,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar" app:layout_constraintTop_toBottomOf="@id/addRoomToSpaceToolbar"
app:queryHint="@string/search_hint_room_name" /> app:queryHint="@string/search_hint_room_name" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

2
vector/src/main/res/layout/fragment_review_terms.xml
View File

@ -9,7 +9,7 @@
android:id="@+id/reviewTermsRecyclerView" android:id="@+id/reviewTermsRecyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/reviewTermsBottomBar" app:layout_constraintBottom_toTopOf="@id/reviewTermsBottomBar"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"

24
vector/src/main/res/layout/fragment_room_detail.xml
View File

@ -49,9 +49,9 @@
android:layout_height="17dp" android:layout_height="17dp"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
app:layout_constraintBottom_toBottomOf="@+id/roomToolbarTitleView" app:layout_constraintBottom_toBottomOf="@id/roomToolbarTitleView"
app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView" app:layout_constraintStart_toEndOf="@id/roomToolbarAvatarImageView"
app:layout_constraintTop_toTopOf="@+id/roomToolbarTitleView" /> app:layout_constraintTop_toTopOf="@id/roomToolbarTitleView" />
<im.vector.app.core.ui.views.PresenceStateImageView <im.vector.app.core.ui.views.PresenceStateImageView
android:id="@+id/roomToolbarPresenceImageView" android:id="@+id/roomToolbarPresenceImageView"
@ -60,7 +60,7 @@
android:background="@drawable/background_circle" android:background="@drawable/background_circle"
android:padding="2dp" android:padding="2dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintCircle="@+id/roomToolbarAvatarImageView" app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
app:layout_constraintCircleAngle="135" app:layout_constraintCircleAngle="135"
app:layout_constraintCircleRadius="20dp" app:layout_constraintCircleRadius="20dp"
tools:ignore="MissingConstraints" tools:ignore="MissingConstraints"
@ -77,7 +77,7 @@
android:padding="1dp" android:padding="1dp"
android:src="@drawable/ic_public_room" android:src="@drawable/ic_public_room"
android:visibility="gone" android:visibility="gone"
app:layout_constraintCircle="@+id/roomToolbarAvatarImageView" app:layout_constraintCircle="@id/roomToolbarAvatarImageView"
app:layout_constraintCircleAngle="135" app:layout_constraintCircleAngle="135"
app:layout_constraintCircleRadius="20dp" app:layout_constraintCircleRadius="20dp"
tools:ignore="MissingConstraints" tools:ignore="MissingConstraints"
@ -93,10 +93,10 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@+id/roomToolbarSubtitleView" app:layout_constraintBottom_toTopOf="@id/roomToolbarSubtitleView"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/roomToolbarDecorationImageView" app:layout_constraintStart_toEndOf="@id/roomToolbarDecorationImageView"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"
app:layout_goneMarginStart="7dp" app:layout_goneMarginStart="7dp"
@ -115,8 +115,8 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView" app:layout_constraintStart_toEndOf="@id/roomToolbarAvatarImageView"
app:layout_constraintTop_toBottomOf="@+id/roomToolbarTitleView" app:layout_constraintTop_toBottomOf="@id/roomToolbarTitleView"
tools:text="@sample/rooms.json/data/topic" tools:text="@sample/rooms.json/data/topic"
tools:visibility="visible" /> tools:visibility="visible" />
@ -150,13 +150,12 @@
android:visibility="visible" android:visibility="visible"
app:layout_constraintTop_toBottomOf="@id/syncStateView" /> app:layout_constraintTop_toBottomOf="@id/syncStateView" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/timelineRecyclerView" android:id="@+id/timelineRecyclerView"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:overScrollMode="always" android:overScrollMode="always"
app:layout_constraintBottom_toTopOf="@+id/timelineRecyclerViewBarrier" app:layout_constraintBottom_toTopOf="@id/timelineRecyclerViewBarrier"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView" app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView"
@ -179,7 +178,6 @@
app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView" app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView"
tools:visibility="visible" /> tools:visibility="visible" />
<im.vector.app.core.ui.views.NotificationAreaView <im.vector.app.core.ui.views.NotificationAreaView
android:id="@+id/notificationAreaView" android:id="@+id/notificationAreaView"
android:layout_width="0dp" android:layout_width="0dp"
@ -231,7 +229,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" /> app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
<androidx.constraintlayout.widget.Barrier <androidx.constraintlayout.widget.Barrier
android:id="@+id/badgeBarrier" android:id="@+id/badgeBarrier"

2
vector/src/main/res/layout/fragment_room_directory_picker.xml
View File

@ -32,7 +32,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout" app:layout_constraintTop_toBottomOf="@id/appBarLayout"
tools:listitem="@layout/item_room_directory" /> tools:listitem="@layout/item_room_directory" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

4
vector/src/main/res/layout/fragment_room_list.xml
View File

@ -31,7 +31,7 @@
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:accessibilityTraversalBefore="@+id/roomListView" android:accessibilityTraversalBefore="@id/roomListView"
android:contentDescription="@string/a11y_create_direct_message" android:contentDescription="@string/a11y_create_direct_message"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_fab_add_chat" android:src="@drawable/ic_fab_add_chat"
@ -47,7 +47,7 @@
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:accessibilityTraversalBefore="@+id/roomListView" android:accessibilityTraversalBefore="@id/roomListView"
android:contentDescription="@string/a11y_create_room" android:contentDescription="@string/a11y_create_room"
android:src="@drawable/ic_fab_add_room" android:src="@drawable/ic_fab_add_room"
android:visibility="gone" android:visibility="gone"

2
vector/src/main/res/layout/fragment_room_preview_no_preview.xml
View File

@ -50,7 +50,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/roomPreviewNoPreviewToolbarAvatar" app:layout_constraintStart_toEndOf="@id/roomPreviewNoPreviewToolbarAvatar"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="@sample/users.json/data/displayName" /> tools:text="@sample/users.json/data/displayName" />

6
vector/src/main/res/layout/fragment_room_setting_generic.xml
View File

@ -41,7 +41,7 @@
android:id="@+id/roomSettingsDecorationToolbarAvatarImageView" android:id="@+id/roomSettingsDecorationToolbarAvatarImageView"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
app:layout_constraintCircle="@+id/roomSettingsToolbarAvatarImageView" app:layout_constraintCircle="@id/roomSettingsToolbarAvatarImageView"
app:layout_constraintCircleAngle="135" app:layout_constraintCircleAngle="135"
app:layout_constraintCircleRadius="20dp" app:layout_constraintCircleRadius="20dp"
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />
@ -58,7 +58,7 @@
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/roomSettingsToolbarAvatarImageView" app:layout_constraintStart_toEndOf="@id/roomSettingsToolbarAvatarImageView"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="@sample/rooms.json/data/name" /> tools:text="@sample/rooms.json/data/name" />
@ -75,7 +75,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout"> app:layout_constraintTop_toBottomOf="@id/appBarLayout">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/roomSettingsRecyclerView" android:id="@+id/roomSettingsRecyclerView"

6
vector/src/main/res/layout/fragment_room_uploads.xml
View File

@ -39,7 +39,7 @@
android:id="@+id/roomUploadsDecorationToolbarAvatarImageView" android:id="@+id/roomUploadsDecorationToolbarAvatarImageView"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
app:layout_constraintCircle="@+id/roomUploadsToolbarAvatarImageView" app:layout_constraintCircle="@id/roomUploadsToolbarAvatarImageView"
app:layout_constraintCircleAngle="135" app:layout_constraintCircleAngle="135"
app:layout_constraintCircleRadius="20dp" app:layout_constraintCircleRadius="20dp"
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />
@ -56,7 +56,7 @@
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/roomUploadsToolbarAvatarImageView" app:layout_constraintStart_toEndOf="@id/roomUploadsToolbarAvatarImageView"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="@sample/rooms.json/data/name" /> tools:text="@sample/rooms.json/data/name" />
@ -68,7 +68,7 @@
android:id="@+id/roomUploadsTabs" android:id="@+id/roomUploadsTabs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/roomUploadsToolbarAvatarImageView" app:layout_constraintTop_toBottomOf="@id/roomUploadsToolbarAvatarImageView"
app:tabGravity="fill" app:tabGravity="fill"
app:tabMaxWidth="0dp" app:tabMaxWidth="0dp"
app:tabMode="fixed" /> app:tabMode="fixed" />

3
vector/src/main/res/layout/fragment_room_widget.xml
View File

@ -2,8 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:orientation="vertical">
<WebView <WebView
android:id="@+id/widgetWebView" android:id="@+id/widgetWebView"

5
vector/src/main/res/layout/fragment_space_add_rooms.xml
View File

@ -61,7 +61,6 @@
</com.google.android.material.appbar.MaterialToolbar> </com.google.android.material.appbar.MaterialToolbar>
<androidx.appcompat.widget.SearchView <androidx.appcompat.widget.SearchView
android:id="@+id/publicRoomsFilter" android:id="@+id/publicRoomsFilter"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -70,7 +69,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar" app:layout_constraintTop_toBottomOf="@id/addRoomToSpaceToolbar"
app:queryHint="@string/search_hint_room_name" /> app:queryHint="@string/search_hint_room_name" />
<Button <Button
@ -87,7 +86,7 @@
app:iconPadding="13dp" app:iconPadding="13dp"
app:iconTint="?colorPrimary" app:iconTint="?colorPrimary"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar" app:layout_constraintTop_toBottomOf="@id/addRoomToSpaceToolbar"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

3
vector/src/main/res/layout/fragment_space_directory.xml
View File

@ -20,7 +20,7 @@
app:scrimAnimationDuration="250" app:scrimAnimationDuration="250"
app:scrimVisibleHeightTrigger="120dp" app:scrimVisibleHeightTrigger="120dp"
app:titleEnabled="false" app:titleEnabled="false"
app:toolbarId="@+id/toolbar"> app:toolbarId="@id/toolbar">
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -43,7 +43,6 @@
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/spaceDirectoryList" android:id="@+id/spaceDirectoryList"
android:layout_width="match_parent" android:layout_width="match_parent"

3
vector/src/main/res/layout/fragment_space_leave_advanced.xml
View File

@ -50,7 +50,6 @@
</com.google.android.material.appbar.MaterialToolbar> </com.google.android.material.appbar.MaterialToolbar>
<androidx.appcompat.widget.SearchView <androidx.appcompat.widget.SearchView
android:id="@+id/publicRoomsFilter" android:id="@+id/publicRoomsFilter"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -59,7 +58,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar" app:layout_constraintTop_toBottomOf="@id/addRoomToSpaceToolbar"
app:queryHint="@string/search_hint_room_name" /> app:queryHint="@string/search_hint_room_name" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

4
vector/src/main/res/layout/fragment_space_preview.xml
View File

@ -52,7 +52,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/spacePreviewToolbarAvatar" app:layout_constraintStart_toEndOf="@id/spacePreviewToolbarAvatar"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="@sample/users.json/data/displayName" /> tools:text="@sample/users.json/data/displayName" />
@ -82,7 +82,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/spacePreviewPeekingProgress" app:layout_constraintTop_toBottomOf="@id/spacePreviewPeekingProgress"
tools:listitem="@layout/item_space_subspace" /> tools:listitem="@layout/item_space_subspace" />
<View <View

6
vector/src/main/res/layout/fragment_space_restricted_select.xml
View File

@ -20,7 +20,7 @@
app:scrimAnimationDuration="250" app:scrimAnimationDuration="250"
app:scrimVisibleHeightTrigger="120dp" app:scrimVisibleHeightTrigger="120dp"
app:titleEnabled="false" app:titleEnabled="false"
app:toolbarId="@+id/toolbar"> app:toolbarId="@id/toolbar">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:layout_width="match_parent" android:layout_width="match_parent"
@ -49,7 +49,6 @@
</com.google.android.material.appbar.MaterialToolbar> </com.google.android.material.appbar.MaterialToolbar>
<!-- <com.google.android.material.appbar.MaterialToolbar--> <!-- <com.google.android.material.appbar.MaterialToolbar-->
<!-- android:id="@+id/toolbar"--> <!-- android:id="@+id/toolbar"-->
<!-- android:layout_width="match_parent"--> <!-- android:layout_width="match_parent"-->
@ -63,7 +62,6 @@
<!-- android:layout_height="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/decide_which_spaces_can_access" />--> <!-- android:text="@string/decide_which_spaces_can_access" />-->
</com.google.android.material.appbar.CollapsingToolbarLayout> </com.google.android.material.appbar.CollapsingToolbarLayout>
<androidx.appcompat.widget.SearchView <androidx.appcompat.widget.SearchView
@ -75,7 +73,6 @@
app:queryHint="@string/search_hint_room_name" /> app:queryHint="@string/search_hint_room_name" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -102,5 +99,4 @@
android:text="@string/ok" /> android:text="@string/ok" />
</LinearLayout> </LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

13
vector/src/main/res/layout/fragment_ssss_access_from_key.xml
View File

@ -17,9 +17,9 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_security_key_24dp" android:src="@drawable/ic_security_key_24dp"
app:layout_constraintBottom_toBottomOf="@+id/ssss_restore_with_key" app:layout_constraintBottom_toBottomOf="@id/ssss_restore_with_key"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_key" app:layout_constraintTop_toTopOf="@id/ssss_restore_with_key"
app:tint="?vctr_content_primary" app:tint="?vctr_content_primary"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
@ -38,7 +38,6 @@
app:layout_constraintStart_toEndOf="@id/ssss_shield" app:layout_constraintStart_toEndOf="@id/ssss_shield"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/ssss_restore_with_key_text" android:id="@+id/ssss_restore_with_key_text"
style="@style/Widget.Vector.TextView.Subtitle" style="@style/Widget.Vector.TextView.Subtitle"
@ -51,7 +50,6 @@
app:layout_constraintTop_toBottomOf="@id/ssss_restore_with_key" app:layout_constraintTop_toBottomOf="@id/ssss_restore_with_key"
tools:text="@string/enter_secret_storage_input_key" /> tools:text="@string/enter_secret_storage_input_key" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/ssss_key_enter_til" android:id="@+id/ssss_key_enter_til"
android:layout_width="0dp" android:layout_width="0dp"
@ -78,7 +76,6 @@
<!-- --> <!-- -->
<Button <Button
android:id="@+id/ssss_key_use_file" android:id="@+id/ssss_key_use_file"
style="@style/Widget.Vector.Button.Text" style="@style/Widget.Vector.Button.Text"
@ -105,11 +102,10 @@
app:constraint_referenced_ids="ssss_key_use_file,ssss_key_submit" app:constraint_referenced_ids="ssss_key_use_file,ssss_key_submit"
app:flow_horizontalStyle="spread_inside" app:flow_horizontalStyle="spread_inside"
app:flow_wrapMode="chain" app:flow_wrapMode="chain"
app:layout_constraintBottom_toTopOf="@+id/ssss_key_reset" app:layout_constraintBottom_toTopOf="@id/ssss_key_reset"
app:layout_constraintTop_toBottomOf="@+id/ssss_key_enter_til" app:layout_constraintTop_toBottomOf="@id/ssss_key_enter_til"
app:layout_goneMarginBottom="@dimen/layout_vertical_margin_big" /> app:layout_goneMarginBottom="@dimen/layout_vertical_margin_big" />
<im.vector.app.core.ui.views.BottomSheetActionButton <im.vector.app.core.ui.views.BottomSheetActionButton
android:id="@+id/ssss_key_reset" android:id="@+id/ssss_key_reset"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -123,6 +119,5 @@
app:tint="?colorError" app:tint="?colorError"
app:titleTextColor="?vctr_content_secondary" /> app:titleTextColor="?vctr_content_secondary" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>

12
vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
View File

@ -19,9 +19,9 @@
android:layout_marginStart="@dimen/layout_horizontal_margin" android:layout_marginStart="@dimen/layout_horizontal_margin"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:src="@drawable/ic_security_phrase_24dp" android:src="@drawable/ic_security_phrase_24dp"
app:layout_constraintBottom_toBottomOf="@+id/ssss_restore_with_passphrase" app:layout_constraintBottom_toBottomOf="@id/ssss_restore_with_passphrase"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_passphrase" app:layout_constraintTop_toTopOf="@id/ssss_restore_with_passphrase"
app:tint="?vctr_content_primary" app:tint="?vctr_content_primary"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
@ -84,7 +84,7 @@
android:layout_marginEnd="@dimen/layout_horizontal_margin" android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:text="@string/_continue" android:text="@string/_continue"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_enter_til" /> app:layout_constraintTop_toBottomOf="@id/ssss_passphrase_enter_til" />
<TextView <TextView
android:id="@+id/ssss_passphrase_or" android:id="@+id/ssss_passphrase_or"
@ -96,7 +96,7 @@
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_submit" /> app:layout_constraintTop_toBottomOf="@id/ssss_passphrase_submit" />
<Button <Button
android:id="@+id/ssss_passphrase_use_key" android:id="@+id/ssss_passphrase_use_key"
@ -106,10 +106,10 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/use_recovery_key" android:text="@string/use_recovery_key"
app:icon="@drawable/ic_security_key_24dp" app:icon="@drawable/ic_security_key_24dp"
app:layout_constraintBottom_toTopOf="@+id/ssss_passphrase_reset" app:layout_constraintBottom_toTopOf="@id/ssss_passphrase_reset"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_or" app:layout_constraintTop_toBottomOf="@id/ssss_passphrase_or"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
<im.vector.app.core.ui.views.BottomSheetActionButton <im.vector.app.core.ui.views.BottomSheetActionButton

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