mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved UI of assitant & welcome pages, moving mountains at the bottom like on desktop

Browse source
This commit is contained in:
Sylvain Berfini 2025-02-19 15:23:57 +01:00
parent b8a6177f97
commit 7e2a4c124d
16 changed files with 158 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/AndroidManifest.xml
View file

@ -122,18 +122,6 @@
</activity>
<activity
android:name=".ui.fileviewer.MediaViewerActivity"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleTask"
android:resizeableActivity="true" />
<activity
android:name=".ui.fileviewer.FileViewerActivity"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleTask"
android:resizeableActivity="true" />
<activity
android:name=".ui.welcome.WelcomeActivity"
android:windowSoftInputMode="adjustResize"
@ -146,6 +134,18 @@
android:launchMode="singleTask"
android:resizeableActivity="true" />
<activity
android:name=".ui.fileviewer.MediaViewerActivity"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleTask"
android:resizeableActivity="true" />
<activity
android:name=".ui.fileviewer.FileViewerActivity"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleTask"
android:resizeableActivity="true" />
<activity
android:name=".ui.call.CallActivity"
android:windowSoftInputMode="adjustResize"

25
app/src/main/res/layout-land/welcome_activity.xml
View file

@ -22,19 +22,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/mountains"
android:contentDescription="@null"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{skipClickListener}"
style="@style/default_text_style_600"
@ -48,9 +35,8 @@
android:paddingEnd="20dp"
android:text="@string/welcome_carousel_skip"
android:textSize="13sp"
android:textColor="?attr/color_on_main"
android:textColor="?attr/color_text"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/header"
app:layout_constraintEnd_toEndOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
@ -60,10 +46,9 @@
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:text="@string/welcome_page_title"
android:textColor="?attr/color_on_main"
android:textColor="?attr/color_text"
android:textSize="36sp"
app:layout_constraintTop_toTopOf="@id/header"
app:layout_constraintBottom_toBottomOf="@id/header"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
@ -73,7 +58,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@string/welcome_page_subtitle"
android:textColor="?attr/color_on_main"
android:textColor="?attr/color_text"
android:textSize="26sp"
app:layout_constraintBottom_toBottomOf="@id/title_first_line"
app:layout_constraintStart_toEndOf="@id/title_first_line"/>
@ -83,7 +68,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="20dp"
app:layout_constraintTop_toBottomOf="@id/header"
app:layout_constraintTop_toBottomOf="@id/title_second_line"
app:layout_constraintBottom_toTopOf="@id/dots_indicator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

4
app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
View file

@ -266,10 +266,10 @@
app:layout_constraintStart_toStartOf="@id/title"
app:layout_constraintEnd_toEndOf="@id/title"
app:layout_constraintTop_toBottomOf="@id/scan_qr_code"
app:layout_constraintBottom_toTopOf="@id/header"/>
app:layout_constraintBottom_toTopOf="@id/mountains"/>
<ImageView
android:id="@+id/header"
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"

4
app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml
View file

@ -237,12 +237,12 @@
android:text="@string/assistant_permissions_grant_all_of_them"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintTop_toBottomOf="@id/skip"
app:layout_constraintBottom_toTopOf="@id/header"
app:layout_constraintBottom_toTopOf="@id/mountains"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<ImageView
android:id="@+id/header"
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"

4
app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml
View file

@ -191,10 +191,10 @@
app:layout_constraintStart_toStartOf="@id/title"
app:layout_constraintEnd_toEndOf="@id/title"
app:layout_constraintTop_toBottomOf="@id/code_first_digit"
app:layout_constraintBottom_toTopOf="@id/header"/>
app:layout_constraintBottom_toTopOf="@id/mountains"/>
<ImageView
android:id="@+id/header"
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"

6
app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
View file

@ -47,7 +47,7 @@
android:src="@drawable/assistant_logo"
app:layout_constraintStart_toEndOf="@id/title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/header"
app:layout_constraintBottom_toTopOf="@id/mountains"
app:layout_constraintTop_toBottomOf="@id/login" />
<ImageView
@ -332,7 +332,7 @@
android:background="@drawable/secondary_button_background"
app:layout_constraintStart_toEndOf="@id/create_email_account_label"
app:layout_constraintTop_toBottomOf="@id/create"
app:layout_constraintBottom_toTopOf="@id/header" />
app:layout_constraintBottom_toTopOf="@id/mountains" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
@ -365,7 +365,7 @@
app:layout_constraintBottom_toBottomOf="@id/title"/>
<ImageView
android:id="@+id/header"
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"

6
app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
View file

@ -33,7 +33,7 @@
android:src="@drawable/assistant_logo"
app:layout_constraintStart_toEndOf="@id/advanced_settings"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/header"
app:layout_constraintBottom_toTopOf="@id/mountains"
app:layout_constraintTop_toBottomOf="@id/title" />
<ImageView
@ -276,7 +276,7 @@
android:text="@string/assistant_account_login"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintTop_toBottomOf="@id/transport"
app:layout_constraintBottom_toTopOf="@id/header"
app:layout_constraintBottom_toTopOf="@id/mountains"
app:layout_constraintStart_toStartOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
@ -369,7 +369,7 @@
app:layout_constraintEnd_toEndOf="@id/advanced_settings"/>
<ImageView
android:id="@+id/header"
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"

6
app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
View file

@ -39,7 +39,7 @@
android:src="@drawable/assistant_logo"
app:layout_constraintStart_toEndOf="@id/message"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/header"
app:layout_constraintBottom_toTopOf="@id/mountains"
app:layout_constraintTop_toBottomOf="@id/title" />
<ImageView
@ -171,12 +171,12 @@
android:text="@string/assistant_third_party_sip_account_warning_ok"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintTop_toBottomOf="@id/create_linphone_account"
app:layout_constraintBottom_toTopOf="@id/header"
app:layout_constraintBottom_toTopOf="@id/mountains"
app:layout_constraintStart_toStartOf="@id/title"
app:layout_constraintEnd_toEndOf="@id/message" />
<ImageView
android:id="@+id/header"
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"

4
app/src/main/res/layout-sw600dp/welcome_activity.xml
View file

@ -106,12 +106,12 @@
android:text="@string/next"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintTop_toBottomOf="@id/dots_indicator"
app:layout_constraintBottom_toTopOf="@id/header"
app:layout_constraintBottom_toTopOf="@id/mountains"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<ImageView
android:id="@+id/header"
android:id="@+id/mountains"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/mountains"

36
app/src/main/res/layout/assistant_landing_fragment.xml
View file

@ -48,30 +48,15 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<ImageView
android:id="@+id/header"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="19dp"
android:src="@drawable/mountains"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/title"
app:tint="?attr/color_main1_500" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/assistant_page_title_style"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:paddingBottom="27dp"
android:text="@string/assistant_account_login"
app:layout_constraintTop_toTopOf="parent"
android:textColor="?attr/color_text"
app:layout_constraintTop_toTopOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -296,7 +281,20 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/no_account_yet"
app:layout_constraintTop_toBottomOf="@id/third_party_sip_account"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintBottom_toTopOf="@id/mountains"/>
<ImageView
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_main1_500" />
</androidx.constraintlayout.widget.ConstraintLayout>

41
app/src/main/res/layout/assistant_permissions_fragment.xml
View file

@ -50,30 +50,15 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<ImageView
android:id="@+id/header"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="19dp"
android:src="@drawable/mountains"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/title"
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/assistant_page_title_style"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:paddingBottom="27dp"
android:text="@string/assistant_permissions_title"
app:layout_constraintTop_toTopOf="parent"
android:textColor="?attr/color_text"
app:layout_constraintTop_toTopOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -89,7 +74,7 @@
android:gravity="center"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/title" />
app:layout_constraintTop_toBottomOf="@id/back" />
<ImageView
android:id="@+id/post_notifications_icon"
@ -222,6 +207,7 @@
android:text="@string/assistant_permissions_skip_permissions"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintVertical_bias="1"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintTop_toBottomOf="@id/access_camera_title"
app:layout_constraintBottom_toTopOf="@id/grant_all_permissions"
app:layout_constraintStart_toStartOf="parent"
@ -233,7 +219,6 @@
android:id="@+id/grant_all_permissions"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="@dimen/screen_bottom_margin"
@ -241,10 +226,24 @@
android:paddingEnd="20dp"
android:text="@string/assistant_permissions_grant_all_of_them"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/skip"
app:layout_constraintBottom_toTopOf="@id/mountains"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<ImageView
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_main1_500" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

33
app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
View file

@ -34,29 +34,15 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<ImageView
android:id="@+id/image"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/mountains"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/title"
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/assistant_page_title_style"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:paddingBottom="30dp"
android:text="@string/assistant_account_creation_sms_confirmation_title"
app:layout_constraintTop_toTopOf="parent"
android:textColor="?attr/color_text"
app:layout_constraintTop_toTopOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -195,6 +181,19 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/code_first_digit" />
<ImageView
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_main1_500" />
</androidx.constraintlayout.widget.ConstraintLayout>
<include

36
app/src/main/res/layout/assistant_register_fragment.xml
View file

@ -49,30 +49,15 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<ImageView
android:id="@+id/header"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="19dp"
android:src="@drawable/mountains"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/title"
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/assistant_page_title_style"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:paddingBottom="27dp"
android:text="@string/assistant_account_register"
app:layout_constraintTop_toTopOf="parent"
android:textColor="?attr/color_text"
app:layout_constraintTop_toTopOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -350,7 +335,20 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/already_an_account"
app:layout_constraintTop_toBottomOf="@id/create_email_account"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintBottom_toTopOf="@id/mountains"/>
<ImageView
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_main1_500" />
</androidx.constraintlayout.widget.ConstraintLayout>

36
app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
View file

@ -35,30 +35,15 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<ImageView
android:id="@+id/header"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="19dp"
android:src="@drawable/mountains"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/title"
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/assistant_page_title_style"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:paddingBottom="27dp"
android:text="@string/assistant_login_third_party_sip_account_title"
app:layout_constraintTop_toTopOf="parent"
android:textColor="?attr/color_text"
app:layout_constraintTop_toTopOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -350,10 +335,23 @@
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintVertical_bias="1"
app:layout_constraintTop_toBottomOf="@id/outbound_proxy"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@id/mountains"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<ImageView
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_main1_500" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

24
app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
View file

@ -46,10 +46,10 @@
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:text="@string/assistant_login_third_party_sip_account_title"
android:textColor="?attr/color_main2_600"
app:layout_constraintTop_toTopOf="parent"
android:textColor="?attr/color_text"
app:layout_constraintTop_toTopOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -134,6 +134,7 @@
android:text="@string/assistant_third_party_sip_account_create_linphone_account"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintVertical_bias="1"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/contact"
@ -145,7 +146,6 @@
android:id="@+id/continue_third_party_account_login"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="@dimen/screen_bottom_margin"
@ -153,10 +153,24 @@
android:paddingEnd="20dp"
android:text="@string/assistant_third_party_sip_account_warning_ok"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/create_linphone_account"
app:layout_constraintBottom_toTopOf="@id/mountains"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<ImageView
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_main1_500" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

37
app/src/main/res/layout/welcome_activity.xml
View file

@ -40,20 +40,6 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<ImageView
android:id="@+id/header"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:src="@drawable/mountains"
android:contentDescription="@null"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/skip"
app:layout_constraintBottom_toBottomOf="@id/title_second_line"
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/title_first_line"
@ -62,9 +48,9 @@
android:layout_marginStart="65dp"
android:layout_marginTop="16dp"
android:text="@string/welcome_page_title"
android:textColor="?attr/color_on_main"
android:textColor="?attr/color_text"
android:textSize="36sp"
app:layout_constraintTop_toTopOf="@id/header"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
@ -75,7 +61,7 @@
android:layout_marginEnd="65dp"
android:paddingBottom="16dp"
android:text="@string/welcome_page_subtitle"
android:textColor="?attr/color_on_main"
android:textColor="?attr/color_text"
android:textSize="26sp"
app:layout_constraintTop_toBottomOf="@id/title_first_line"
app:layout_constraintEnd_toEndOf="parent"/>
@ -85,7 +71,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="20dp"
app:layout_constraintTop_toBottomOf="@id/header"
app:layout_constraintTop_toBottomOf="@id/title_second_line"
app:layout_constraintBottom_toTopOf="@id/dots_indicator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -121,10 +107,23 @@
android:text="@string/next"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintTop_toBottomOf="@id/dots_indicator"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@id/mountains"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<ImageView
android:id="@+id/mountains"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/mountains"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:tint="?attr/color_main1_500" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>