Skip to content

Commit 89231c9

Browse files
committed
Improve DataSourceSelectFragment UI
Tablet layout: scroll down automatically to reveal "Let's go" button
1 parent 6aeede2 commit 89231c9

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

app/src/main/java/net/vonforst/evmap/fragment/OnboardingFragment.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@ import android.annotation.SuppressLint
66
import android.content.Context
77
import android.graphics.drawable.AnimatedVectorDrawable
88
import android.os.Bundle
9-
import android.text.SpannableString
10-
import android.text.SpannableStringBuilder
11-
import android.text.style.URLSpan
129
import android.view.LayoutInflater
1310
import android.view.View
1411
import android.view.ViewGroup
1512
import android.view.animation.DecelerateInterpolator
1613
import android.widget.ImageView
14+
import android.widget.ScrollView
1715
import androidx.core.content.ContextCompat
1816
import androidx.core.text.HtmlCompat
19-
import androidx.core.text.getSpans
2017
import androidx.core.text.method.LinkMovementMethodCompat
2118
import androidx.fragment.app.Fragment
2219
import androidx.navigation.fragment.findNavController
@@ -31,7 +28,6 @@ import net.vonforst.evmap.databinding.FragmentOnboardingWelcomeBinding
3128
import net.vonforst.evmap.model.FILTERS_DISABLED
3229
import net.vonforst.evmap.navigation.safeNavigate
3330
import net.vonforst.evmap.storage.PreferenceDataSource
34-
import net.vonforst.evmap.ui.CustomUrlSpan
3531
import net.vonforst.evmap.ui.replaceUrlSpansWithCustom
3632
import net.vonforst.evmap.waitForLayout
3733

@@ -267,6 +263,9 @@ class DataSourceSelectFragment : OnboardingPageFragment() {
267263
ObjectAnimator.ofFloat(binding.btnGetStarted, "alpha", 0f, 1f).apply {
268264
interpolator = DecelerateInterpolator()
269265
}.start()
266+
(binding.root as? ScrollView)?.let {
267+
it.smoothScrollBy(0, it.height)
268+
}
270269
}
271270
}
272271
}

app/src/main/res/layout-land/fragment_onboarding_data_source.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
android:layout_marginStart="24dp"
1313
android:layout_marginTop="16dp"
1414
android:layout_marginBottom="16dp"
15+
android:requiresFadingEdge="vertical"
1516
app:layout_constraintBottom_toBottomOf="parent"
1617
app:layout_constraintEnd_toStartOf="@+id/welcomeTitle"
1718
app:layout_constraintHorizontal_bias="0.5"

app/src/main/res/layout-sw720dp/fragment_onboarding_data_source.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
66
xmlns:tools="http://schemas.android.com/tools"
7-
android:fillViewport="true">
7+
android:fillViewport="true"
8+
android:requiresFadingEdge="vertical">
89

910
<androidx.constraintlayout.widget.ConstraintLayout
1011
android:layout_width="match_parent"
@@ -30,13 +31,16 @@
3031
android:layout_marginStart="32dp"
3132
android:layout_marginEnd="32dp"
3233
android:layout_marginBottom="16dp"
34+
android:layout_marginTop="32dp"
3335
android:gravity="center"
3436
android:text="@string/pref_data_source"
3537
android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
3638
app:layout_constraintBottom_toTopOf="@+id/welcomeText2"
3739
app:layout_constraintEnd_toEndOf="parent"
3840
app:layout_constraintHorizontal_bias="0.5"
39-
app:layout_constraintStart_toStartOf="parent" />
41+
app:layout_constraintVertical_bias="1.0"
42+
app:layout_constraintStart_toStartOf="parent"
43+
app:layout_constraintTop_toTopOf="parent" />
4044

4145
<TextView
4246
android:id="@+id/welcomeText2"
@@ -61,7 +65,7 @@
6165
android:layout_height="wrap_content"
6266
android:layout_marginStart="32dp"
6367
android:layout_marginEnd="32dp"
64-
android:layout_marginBottom="32dp"
68+
android:layout_marginBottom="16dp"
6569
android:gravity="center"
6670
android:text="@string/data_sources_hint"
6771
android:textAppearance="@style/TextAppearance.Material3.BodySmall"

0 commit comments

Comments
 (0)