Skip to content

A
AloqaIM-Android
Unverified Commit 5afedb48 authored by Rafael Kellermann Streit's avatar Rafael Kellermann Streit Committed by GitHub
Browse files
Options

Merge pull request #1877 from RocketChat/fix/onboarding-screen-being-cut-off 

[FIX] onbording being cut off on some resolutions.
parents e9fda389 84fe7c75
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 154 deletions
app/src/main/res/layout/fragment_authentication_on_boarding.xml
View file @ 5afedb48
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView 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"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -7,165 +7,170 @@ ...@@ -7,165 +7,170 @@
android:padding="@dimen/screen_edge_left_and_right_margins" android:padding="@dimen/screen_edge_left_and_right_margins"
tools:context="authentication.onboarding.ui.OnBoardingFragment"> tools:context="authentication.onboarding.ui.OnBoardingFragment">
<ImageView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/image_on_boarding" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:src="@drawable/ic_onboarding"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/text_on_boarding_title"
style="@style/Authentication.TextView.Headline"
android:layout_marginTop="32dp"
android:text="@string/msg_welcome_to_rocket_chat"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/image_on_boarding" />
<TextView
android:id="@+id/text_on_boarding_description"
style="@style/Authentication.TextView.Description"
android:text="@string/msg_team_communication"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_on_boarding_title" />
<RelativeLayout
android:id="@+id/connect_with_a_server_container"
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_marginTop="32dp"
android:background="@drawable/rounded_border"
android:foreground="?selectableItemBackground"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_on_boarding_description">
<ImageView <ImageView
android:id="@+id/image_connect_with_a_server" android:id="@+id/image_on_boarding"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_marginStart="16dp"
android:layout_marginEnd="20dp"
android:src="@drawable/ic_connect_with_a_server_black_30dp"
android:tint="@color/colorAccent"
tools:ignore="ContentDescription" />
<TextView
style="@style/Authentication.Button.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:src="@drawable/ic_onboarding"
android:layout_toStartOf="@+id/image_connect_with_a_server_chevron" app:layout_constraintEnd_toEndOf="parent"
android:layout_toEndOf="@+id/image_connect_with_a_server" app:layout_constraintStart_toStartOf="parent"
android:text="@string/action_connect_server" /> app:layout_constraintTop_toTopOf="parent"
<ImageView
android:id="@+id/image_connect_with_a_server_chevron"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_chevron_right_black_24dp"
android:tint="@color/colorAuthenticationChevronAndExpandIcon"
tools:ignore="ContentDescription" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/join_community_container"
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_marginTop="10dp"
android:background="@drawable/rounded_border"
android:foreground="?selectableItemBackground"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/connect_with_a_server_container">
<ImageView
android:id="@+id/image_join_community"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_marginStart="16dp"
android:layout_marginEnd="20dp"
android:src="@drawable/ic_rocket_chat_30dp"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<TextView <TextView
android:id="@+id/text_join_community" android:id="@+id/text_on_boarding_title"
style="@style/Authentication.Button.Title" style="@style/Authentication.TextView.Headline"
android:layout_width="wrap_content" android:layout_marginTop="32dp"
android:layout_height="wrap_content" android:text="@string/msg_welcome_to_rocket_chat"
android:layout_marginTop="10dp" app:layout_constraintEnd_toEndOf="parent"
android:layout_toStartOf="@+id/image_join_community_chevron" app:layout_constraintStart_toStartOf="parent"
android:layout_toEndOf="@+id/image_join_community" app:layout_constraintTop_toBottomOf="@+id/image_on_boarding" />
android:text="@string/action_join_community" />
<TextView <TextView
style="@style/Authentication.Button.Description" android:id="@+id/text_on_boarding_description"
android:layout_width="wrap_content" style="@style/Authentication.TextView.Description"
android:layout_height="wrap_content" android:text="@string/msg_team_communication"
android:layout_below="@+id/text_join_community" app:layout_constraintEnd_toEndOf="parent"
android:layout_toStartOf="@+id/image_join_community_chevron" app:layout_constraintStart_toStartOf="parent"
android:layout_toEndOf="@+id/image_join_community" app:layout_constraintTop_toBottomOf="@+id/text_on_boarding_title" />
android:text="@string/community_server_url" />
<RelativeLayout
<ImageView android:id="@+id/connect_with_a_server_container"
android:id="@+id/image_join_community_chevron" android:layout_width="0dp"
android:layout_width="20dp" android:layout_height="60dp"
android:layout_height="20dp" android:layout_marginTop="32dp"
android:layout_alignParentEnd="true" android:background="@drawable/rounded_border"
android:layout_centerVertical="true" android:foreground="?selectableItemBackground"
android:layout_marginEnd="8dp" app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/ic_chevron_right_black_24dp" app:layout_constraintStart_toStartOf="parent"
android:tint="@color/colorAuthenticationChevronAndExpandIcon" app:layout_constraintTop_toBottomOf="@+id/text_on_boarding_description">
tools:ignore="ContentDescription" />
</RelativeLayout> <ImageView
android:id="@+id/image_connect_with_a_server"
<RelativeLayout android:layout_width="30dp"
android:id="@+id/create_server_container" android:layout_height="30dp"
android:layout_width="0dp" android:layout_centerVertical="true"
android:layout_height="60dp" android:layout_marginStart="16dp"
android:layout_marginTop="10dp" android:layout_marginEnd="20dp"
android:background="@drawable/rounded_color_accent" android:src="@drawable/ic_connect_with_a_server_black_30dp"
android:foreground="?selectableItemBackground" android:tint="@color/colorAccent"
app:layout_constraintEnd_toEndOf="parent" tools:ignore="ContentDescription" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/join_community_container"> <TextView
style="@style/Authentication.Button.Title"
<ImageView android:layout_width="wrap_content"
android:id="@+id/image_add" android:layout_height="wrap_content"
android:layout_width="30dp" android:layout_centerVertical="true"
android:layout_height="30dp" android:layout_toStartOf="@+id/image_connect_with_a_server_chevron"
android:layout_centerVertical="true" android:layout_toEndOf="@+id/image_connect_with_a_server"
android:layout_marginStart="16dp" android:text="@string/action_connect_server" />
android:layout_marginEnd="20dp"
android:src="@drawable/ic_add_24dp" <ImageView
android:tint="@color/colorWhite" android:id="@+id/image_connect_with_a_server_chevron"
tools:ignore="ContentDescription" /> android:layout_width="20dp"
android:layout_height="20dp"
<TextView android:layout_alignParentEnd="true"
style="@style/Authentication.Button.Title.White" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:layout_marginEnd="8dp"
android:layout_height="wrap_content" android:src="@drawable/ic_chevron_right_black_24dp"
android:layout_centerVertical="true" android:tint="@color/colorAuthenticationChevronAndExpandIcon"
android:layout_toEndOf="@+id/image_add" tools:ignore="ContentDescription" />
android:text="@string/action_create_server" /> </RelativeLayout>
</RelativeLayout>
<RelativeLayout
<com.wang.avi.AVLoadingIndicatorView android:id="@+id/join_community_container"
android:id="@+id/view_loading" android:layout_width="0dp"
style="@style/Authentication.AVLoadingIndicatorView" android:layout_height="60dp"
android:visibility="gone" android:layout_marginTop="10dp"
app:layout_constraintBottom_toBottomOf="parent" android:background="@drawable/rounded_border"
app:layout_constraintEnd_toEndOf="parent" android:foreground="?selectableItemBackground"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintStart_toStartOf="parent"
</androidx.constraintlayout.widget.ConstraintLayout> app:layout_constraintTop_toBottomOf="@+id/connect_with_a_server_container">
<ImageView
android:id="@+id/image_join_community"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_marginStart="16dp"
android:layout_marginEnd="20dp"
android:src="@drawable/ic_rocket_chat_30dp"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/text_join_community"
style="@style/Authentication.Button.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_toStartOf="@+id/image_join_community_chevron"
android:layout_toEndOf="@+id/image_join_community"
android:text="@string/action_join_community" />
<TextView
style="@style/Authentication.Button.Description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/text_join_community"
android:layout_toStartOf="@+id/image_join_community_chevron"
android:layout_toEndOf="@+id/image_join_community"
android:text="@string/community_server_url" />
<ImageView
android:id="@+id/image_join_community_chevron"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_chevron_right_black_24dp"
android:tint="@color/colorAuthenticationChevronAndExpandIcon"
tools:ignore="ContentDescription" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/create_server_container"
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_marginTop="10dp"
android:background="@drawable/rounded_color_accent"
android:foreground="?selectableItemBackground"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/join_community_container">
<ImageView
android:id="@+id/image_add"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_marginStart="16dp"
android:layout_marginEnd="20dp"
android:src="@drawable/ic_add_24dp"
android:tint="@color/colorWhite"
tools:ignore="ContentDescription" />
<TextView
style="@style/Authentication.Button.Title.White"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/image_add"
android:text="@string/action_create_server" />
</RelativeLayout>
<com.wang.avi.AVLoadingIndicatorView
android:id="@+id/view_loading"
style="@style/Authentication.AVLoadingIndicatorView"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023