Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make description scrollable #993

Merged
merged 1 commit into from
Jan 8, 2022
Merged

Make description scrollable #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions appintro/src/main/java/com/github/appintro/AppIntroBaseFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.github.appintro

import android.graphics.drawable.Animatable
import android.os.Bundle
import android.text.method.ScrollingMovementMethod
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
Expand Down Expand Up @@ -164,6 +165,9 @@ abstract class AppIntroBaseFragment : Fragment(), SlideSelectionListener, SlideB
}
}

titleText.movementMethod = ScrollingMovementMethod()
descriptionText.movementMethod = ScrollingMovementMethod()

return view
}

Expand Down
9 changes: 7 additions & 2 deletions appintro/src/main/res/layout-land/appintro_fragment_intro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@
android:id="@+id/title"
style="@style/AppIntroDefaultHeading"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="0dp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@+id/description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/midline"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="spread"
app:layout_constraintVertical_weight="2"
tools:text="Welcome" />

<ImageView
Expand All @@ -36,12 +38,15 @@
android:id="@+id/description"
style="@style/AppIntroDefaultText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:autoLink="web"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/midline"
app:layout_constraintTop_toBottomOf="@+id/title"
app:layout_constraintVertical_chainStyle="spread"
app:layout_constraintVertical_weight="3"
tools:text="This is a demo of the AppIntro Library" />

<androidx.constraintlayout.widget.Guideline
Expand Down
8 changes: 4 additions & 4 deletions appintro/src/main/res/layout/appintro_fragment_intro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,37 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center"
app:layout_constraintVertical_weight="2"
app:layout_constraintBottom_toTopOf="@+id/image"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="spread"
app:layout_constraintVertical_weight="2"
tools:text="Welcome" />

<ImageView
android:id="@+id/image"
style="@style/AppIntroDefaultImage"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintVertical_weight="5"
android:contentDescription="@string/app_intro_image_content_description"
app:layout_constraintBottom_toTopOf="@+id/description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title" />
app:layout_constraintTop_toBottomOf="@+id/title"
app:layout_constraintVertical_weight="5" />

<TextView
android:id="@+id/description"
style="@style/AppIntroDefaultText"
android:layout_width="0dp"
android:layout_height="0dp"
android:autoLink="web"
app:layout_constraintVertical_weight="3"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/image"
app:layout_constraintVertical_weight="3"
tools:text="This is a demo of the AppIntro Library" />

</androidx.constraintlayout.widget.ConstraintLayout>
3 changes: 2 additions & 1 deletion appintro/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<item name="android:textSize">@dimen/appintro_headtext_size</item>
<item name="android:textStyle">bold</item>
<item name="android:padding">@dimen/appintro_head_padding</item>
<item name="android:gravity">bottom|center_horizontal</item>
<item name="android:gravity">center</item>
<item name="autoSizeTextType">uniform</item>
<item name="autoSizeMaxTextSize">@dimen/appintro_headtext_size</item>
<item name="autoSizeMinTextSize">@dimen/appintro_min_text_size</item>
Expand All @@ -44,6 +44,7 @@
<item name="android:textSize">@dimen/appintro_desctext_size</item>
<item name="android:padding">@dimen/appintro_desc_padding</item>
<item name="android:gravity">center</item>
<item name="autoSizeTextType">uniform</item>
<item name="autoSizeMaxTextSize">@dimen/appintro_desctext_size</item>
<item name="autoSizeMinTextSize">@dimen/appintro_min_text_size</item>
<item name="autoSizeStepGranularity">@dimen/appintro_text_granularity_size</item>
Expand Down