diff --git a/library/ui-styles/src/main/res/values-sw600dp/dimens.xml b/library/ui-styles/src/main/res/values-sw600dp/dimens.xml index 204d663d9c..f399a350b1 100644 --- a/library/ui-styles/src/main/res/values-sw600dp/dimens.xml +++ b/library/ui-styles/src/main/res/values-sw600dp/dimens.xml @@ -2,4 +2,8 @@ 400dp + + + 0.25 + 0.75 \ No newline at end of file diff --git a/library/ui-styles/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml index b63a54aeeb..a2a6b34b0f 100644 --- a/library/ui-styles/src/main/res/values/dimens.xml +++ b/library/ui-styles/src/main/res/values/dimens.xml @@ -49,5 +49,6 @@ 1dp - 16dp + 0.05 + 0.95 \ No newline at end of file diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt index f9c8e51f9c..fe20167b1e 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt @@ -16,6 +16,7 @@ package im.vector.app.features.onboarding.ftueauth +import android.annotation.SuppressLint import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -70,22 +71,26 @@ class FtueAuthSplashCarouselFragment : AbstractFtueAuthFragment( lateinit var item: SplashCarouselState.Item override fun bind(holder: Holder) { + holder.view.setBackgroundResource(item.pageBackground) holder.image.setImageResource(item.image) holder.title.text = item.title holder.body.text = item.body diff --git a/vector/src/main/res/drawable/bg_carousel_page_1.xml b/vector/src/main/res/drawable/bg_carousel_page_1.xml new file mode 100644 index 0000000000..bff828fb22 --- /dev/null +++ b/vector/src/main/res/drawable/bg_carousel_page_1.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/vector/src/main/res/drawable/bg_carousel_page_2.xml b/vector/src/main/res/drawable/bg_carousel_page_2.xml new file mode 100644 index 0000000000..54e5286ded --- /dev/null +++ b/vector/src/main/res/drawable/bg_carousel_page_2.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/vector/src/main/res/drawable/bg_carousel_page_3.xml b/vector/src/main/res/drawable/bg_carousel_page_3.xml new file mode 100644 index 0000000000..c31c70c078 --- /dev/null +++ b/vector/src/main/res/drawable/bg_carousel_page_3.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/vector/src/main/res/drawable/bg_carousel_page_4.xml b/vector/src/main/res/drawable/bg_carousel_page_4.xml new file mode 100644 index 0000000000..56989688af --- /dev/null +++ b/vector/src/main/res/drawable/bg_carousel_page_4.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/vector/src/main/res/layout/fragment_ftue_splash_carousel.xml b/vector/src/main/res/layout/fragment_ftue_splash_carousel.xml index 0b523f8e33..6791a09130 100644 --- a/vector/src/main/res/layout/fragment_ftue_splash_carousel.xml +++ b/vector/src/main/res/layout/fragment_ftue_splash_carousel.xml @@ -4,18 +4,19 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?android:colorBackground" - android:paddingTop="@dimen/layout_vertical_margin" - android:paddingBottom="@dimen/layout_vertical_margin"> + android:background="@null"> + android:layout_height="match_parent" /> + + + app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_start_percent" /> + app:layout_constraintGuide_percent="@dimen/ftue_auth_gutter_end_percent" /> - + android:layout_height="match_parent"> + + + + + app:layout_constraintBottom_toTopOf="@id/carousel_item_image_container" + app:layout_constraintHeight_percent="0.1" + app:layout_constraintTop_toTopOf="parent" /> + android:layout_gravity="center" + app:layout_constraintBottom_toTopOf="@id/carousel_item_image_bottom_space" + app:layout_constraintEnd_toEndOf="@id/splashCarouselGutterEnd" + app:layout_constraintStart_toStartOf="@id/splashCarouselGutterStart" + app:layout_constraintTop_toBottomOf="@id/carousel_item_top_space"> + android:layout_weight="0.05" + app:layout_constraintBottom_toTopOf="@id/carousel_item_title" + app:layout_constraintHeight_percent="0.05" + app:layout_constraintTop_toBottomOf="@id/carousel_item_image_container" /> - + + +