From beebbe1c1b475fc962f97dad6de2a956c07b688a Mon Sep 17 00:00:00 2001 From: johan12345 Date: Sat, 14 Aug 2021 16:35:24 +0200 Subject: [PATCH] avoid animations overlapping text in intro --- app/src/main/res/layout/fragment_onboarding_icons.xml | 4 +++- app/src/main/res/layout/fragment_onboarding_welcome.xml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_onboarding_icons.xml b/app/src/main/res/layout/fragment_onboarding_icons.xml index f32d3801..badeab9b 100644 --- a/app/src/main/res/layout/fragment_onboarding_icons.xml +++ b/app/src/main/res/layout/fragment_onboarding_icons.xml @@ -8,11 +8,13 @@ android:id="@+id/icon1" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="28dp" app:layout_constraintBottom_toTopOf="@+id/iconLabel1" app:layout_constraintEnd_toEndOf="@+id/iconLabel1" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="@+id/iconLabel1" app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.7" app:layout_constraintVertical_chainStyle="packed" app:srcCompat="@drawable/ic_map_marker_charging" app:tint="@color/charger_low" @@ -26,7 +28,7 @@ android:layout_marginBottom="28dp" android:text="< 11 kW" android:textAppearance="@style/TextAppearance.MaterialComponents.Caption" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@+id/welcomeTitle" app:layout_constraintEnd_toStartOf="@+id/iconLabel2" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_onboarding_welcome.xml b/app/src/main/res/layout/fragment_onboarding_welcome.xml index 2c5ab95b..3184debd 100644 --- a/app/src/main/res/layout/fragment_onboarding_welcome.xml +++ b/app/src/main/res/layout/fragment_onboarding_welcome.xml @@ -8,12 +8,14 @@ android:id="@+id/animation_view" android:layout_width="256dp" android:layout_height="256dp" + android:layout_marginTop="28dp" android:layout_marginBottom="28dp" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@+id/welcomeTitle" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.85" app:lottie_autoPlay="true" app:lottie_rawRes="@raw/logo_anim" app:lottie_speed="0.75" />