mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 20:33:53 +01:00
f79456ec8e
* Update WelcomeActivity.java Now it starts welcome screen after not finishing the pager. Moved "Skip Tutorial" button here so it does not animate by swipe. * Update activity_welcome.xml Putting "Skip Tutorial" button here so that it does not animate by swipes. * Update LoginActivity.java Removing the set of "first run " flag from here. we set it after the buttons press or on WelcomeActivity's finish() * Update welcome_do_upload.xml removing "skip tut" button from here. * Update welcome_dont_upload.xml Removing "Skip Tutorial" button from here so that it does not animate by swipes. * Update welcome_image_details.xml Removing "Skip Tutorial" button from here so that it does not animate by swipes. * Update welcome_wikipedia.xml Removing "Skip Tutorial" button from here so that it does not animate by swipes. * Update WelcomePagerAdapter.java the "welcomyesButton" is removed from the child views in pager, so it is optional now. * Add JavaDoc to WelcomeActivity.onBackPressed() * Fix #2103: Remove welcomeYesButton from landscape layout * Refactor WelcomePagerAdapter
149 lines
5.6 KiB
XML
149 lines
5.6 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
android:background="#0c609c">
|
|
|
|
<android.support.constraint.Guideline
|
|
android:id="@+id/center_guideline"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical"
|
|
app:layout_constraintGuide_percent="0.50" />
|
|
|
|
<LinearLayout
|
|
android:layout_width="240dp"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="center_vertical"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintEnd_toStartOf="@id/center_guideline"
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
android:layout_marginEnd="@dimen/standard_gap"
|
|
android:layout_marginRight="@dimen/standard_gap">
|
|
|
|
<ImageView
|
|
android:id="@+id/selfie_x"
|
|
android:layout_width="110dp"
|
|
android:layout_height="wrap_content"
|
|
android:contentDescription="@string/welcome_image_no_selfies"
|
|
android:src="@drawable/selfie_x" />
|
|
|
|
<ImageView
|
|
android:id="@+id/proprietary_x"
|
|
android:layout_width="110dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginLeft="@dimen/standard_gap"
|
|
android:layout_marginStart="@dimen/standard_gap"
|
|
android:contentDescription="@string/welcome_image_proprietary"
|
|
android:src="@drawable/proprietary_x" />
|
|
|
|
</LinearLayout>
|
|
|
|
|
|
<LinearLayout
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:gravity="center_vertical"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintStart_toEndOf="@id/center_guideline"
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
android:orientation="vertical">
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"
|
|
android:gravity="center_horizontal"
|
|
android:maxWidth="240dp"
|
|
android:text="@string/tutorial_3_text"
|
|
android:textAlignment="center"
|
|
android:textColor="@android:color/white"
|
|
android:textSize="@dimen/normal_text"
|
|
android:textStyle="bold" />
|
|
|
|
<LinearLayout
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:maxWidth="240dp"
|
|
android:orientation="horizontal">
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:paddingRight="4dp"
|
|
android:paddingTop="@dimen/standard_gap"
|
|
android:text="@string/bullet"
|
|
android:textColor="@android:color/white"
|
|
android:textSize="16sp" />
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"
|
|
android:gravity="start"
|
|
android:maxWidth="240dp"
|
|
android:paddingTop="@dimen/standard_gap"
|
|
android:text="@string/tutorial_3_subtext_1"
|
|
android:textAlignment="textStart"
|
|
android:textColor="@android:color/white" />
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"
|
|
android:maxWidth="240dp"
|
|
android:orientation="horizontal">
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:paddingRight="4dp"
|
|
android:text="@string/bullet"
|
|
android:textColor="@android:color/white"
|
|
android:textSize="16sp" />
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"
|
|
android:gravity="start"
|
|
android:maxWidth="240dp"
|
|
android:text="@string/tutorial_3_subtext_2"
|
|
android:textAlignment="textStart"
|
|
android:textColor="@android:color/white" />
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:maxWidth="240dp"
|
|
android:orientation="horizontal">
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:paddingRight="4dp"
|
|
android:text="@string/bullet"
|
|
android:textColor="@android:color/white"
|
|
android:textSize="16sp" />
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"
|
|
android:gravity="start"
|
|
android:maxWidth="240dp"
|
|
android:text="@string/tutorial_3_subtext_3"
|
|
android:textAlignment="textStart"
|
|
android:textColor="@android:color/white" />
|
|
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
</android.support.constraint.ConstraintLayout>
|