mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1288 from knight-shade/Fixes-#1287

Browse source 
Fixes #1287 Tutorial not available in landscape mode.
This commit is contained in:
neslihanturan 2018-03-16 13:15:22 +02:00 • committed by GitHub
commit 3548a0dcf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 301 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -99,6 +99,7 @@ dependencies {
kapt "com.google.dagger:dagger-android-processor:$DAGGER_VERSION" kapt "com.google.dagger:dagger-android-processor:$DAGGER_VERSION"
compile 'com.borjabravo:readmoretextview:2.1.0' compile 'com.borjabravo:readmoretextview:2.1.0'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
} }
android { android {

132
app/src/main/res/layout-land/welcome_do_upload.xml
View file

@ -1,163 +1,189 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="#0c609c" android:background="#0c609c"
android:gravity="center"> android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/welcomeYesButton"
android:layout_width="wrap_content"
android:layout_height="@dimen/overflow_button_dimen"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginTop="@dimen/standard_gap"
android:text="@string/welcome_skip_button"
android:textColor="#fff"
android:textSize="@dimen/normal_text"
android:textStyle="bold"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<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.55" />
<GridLayout <GridLayout
android:layout_width="300dp" android:layout_width="300dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/standard_gap" android:layout_marginBottom="8dp"
android:layout_marginRight="@dimen/standard_gap" android:layout_marginTop="8dp"
android:columnCount="2" android:columnCount="2"
> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/center_guideline">
<ImageView <ImageView
android:src="@drawable/mount_zao"
android:id="@+id/mount_zao" android:id="@+id/mount_zao"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="118dp" android:layout_height="118dp"
android:scaleType="fitXY"
android:contentDescription="@string/welcome_image_mount_zao" android:contentDescription="@string/welcome_image_mount_zao"
/> android:scaleType="fitXY"
android:src="@drawable/mount_zao" />
<ImageView <ImageView
android:src="@drawable/llamas"
android:id="@+id/llamas" android:id="@+id/llamas"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="118dp" android:layout_height="118dp"
android:scaleType="fitXY"
android:contentDescription="@string/welcome_image_llamas" android:contentDescription="@string/welcome_image_llamas"
/> android:scaleType="fitXY"
android:src="@drawable/llamas" />
<ImageView <ImageView
android:src="@drawable/rainbow_bridge"
android:id="@+id/rainbow_bridge" android:id="@+id/rainbow_bridge"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="118dp" android:layout_height="118dp"
android:scaleType="fitXY"
android:contentDescription="@string/welcome_image_rainbow_bridge" android:contentDescription="@string/welcome_image_rainbow_bridge"
/> android:scaleType="fitXY"
android:src="@drawable/rainbow_bridge" />
<ImageView <ImageView
android:src="@drawable/tulip"
android:id="@+id/tulip" android:id="@+id/tulip"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="118dp" android:layout_height="118dp"
android:scaleType="fitXY"
android:contentDescription="@string/welcome_image_tulip" android:contentDescription="@string/welcome_image_tulip"
/> android:scaleType="fitXY"
android:src="@drawable/tulip" />
</GridLayout> </GridLayout>
<LinearLayout android:orientation="vertical" <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
> android:orientation="vertical"
android:layout_marginStart="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
app:layout_constraintStart_toEndOf="@id/center_guideline"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_2_text" android:text="@string/tutorial_2_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textSize="@dimen/normal_text"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center_horizontal" android:textColor="@android:color/white"
android:textColor="@android:color/white"/> android:textSize="@dimen/normal_text"
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp"
android:layout_gravity="center" android:layout_gravity="center"
android:maxWidth="240dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp" android:paddingRight="4dp"
android:textSize="16sp"
android:paddingTop="@dimen/standard_gap" android:paddingTop="@dimen/standard_gap"
android:textColor="@android:color/white"/> android:text="@string/bullet"
android:textColor="@android:color/white"
android:textSize="16sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_2_subtext_1"
android:layout_gravity="center" android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="@dimen/standard_gap"
android:gravity="start" android:gravity="start"
android:textColor="@android:color/white" android:maxWidth="240dp"
/> android:paddingTop="@dimen/standard_gap"
android:text="@string/tutorial_2_subtext_1"
android:textAlignment="textStart"
android:textColor="@android:color/white" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp"
android:layout_gravity="center" android:layout_gravity="center"
android:maxWidth="240dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp" android:paddingRight="4dp"
android:textSize="16sp" android:text="@string/bullet"
android:textColor="@android:color/white"/> android:textColor="@android:color/white"
android:textSize="16sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_2_subtext_2" android:text="@string/tutorial_2_subtext_2"
android:layout_gravity="center"
android:textAlignment="textStart" android:textAlignment="textStart"
android:gravity="start" android:textColor="@android:color/white" />
android:textColor="@android:color/white"
/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp"
android:layout_gravity="center" android:layout_gravity="center"
android:maxWidth="240dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp" android:paddingRight="4dp"
android:textSize="16sp" android:text="@string/bullet"
android:textColor="@android:color/white"/> android:textColor="@android:color/white"
android:textSize="16sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_2_subtext_3" android:text="@string/tutorial_2_subtext_3"
android:layout_gravity="center"
android:textAlignment="textStart" android:textAlignment="textStart"
android:gravity="start" android:textColor="@android:color/white" />
android:textColor="@android:color/white"
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</android.support.constraint.ConstraintLayout>

122
app/src/main/res/layout-land/welcome_dont_upload.xml
View file

@ -1,59 +1,82 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#0c609c" xmlns:app="http://schemas.android.com/apk/res-auto"
android:gravity="center" android:background="#0c609c">
>
<RelativeLayout <TextView
android:layout_gravity="center" android:id="@+id/welcomeYesButton"
android:layout_width="240dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="@dimen/overflow_button_dimen"
android:layout_marginEnd="@dimen/standard_gap" android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap"
> android:layout_marginTop="@dimen/standard_gap"
android:text="@string/welcome_skip_button"
android:textColor="#fff"
android:textSize="@dimen/normal_text"
android:textStyle="bold"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<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 <ImageView
android:src="@drawable/selfie_x"
android:id="@+id/selfie_x" android:id="@+id/selfie_x"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:contentDescription="@string/welcome_image_no_selfies" android:contentDescription="@string/welcome_image_no_selfies"
/> android:src="@drawable/selfie_x" />
<ImageView <ImageView
android:src="@drawable/proprietary_x"
android:id="@+id/proprietary_x" android:id="@+id/proprietary_x"
android:layout_marginStart="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_toRightOf="@+id/selfie_x" android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:contentDescription="@string/welcome_image_proprietary" android:contentDescription="@string/welcome_image_proprietary"
/> android:src="@drawable/proprietary_x" />
</RelativeLayout> </LinearLayout>
<LinearLayout android:orientation="vertical" <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical" 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 <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_3_text" android:text="@string/tutorial_3_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/normal_text" android:textSize="@dimen/normal_text"
android:gravity="center_horizontal" android:textStyle="bold" />
android:textColor="@android:color/white"/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -64,51 +87,49 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp" android:paddingRight="4dp"
android:textSize="16sp"
android:paddingTop="@dimen/standard_gap" android:paddingTop="@dimen/standard_gap"
android:textColor="@android:color/white"/> android:text="@string/bullet"
android:textColor="@android:color/white"
android:textSize="16sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_3_subtext_1"
android:layout_gravity="center" android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="@dimen/standard_gap"
android:gravity="start" android:gravity="start"
android:textColor="@android:color/white" 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>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp"
android:layout_gravity="center" android:layout_gravity="center"
android:maxWidth="240dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp" android:paddingRight="4dp"
android:textSize="16sp" android:text="@string/bullet"
android:textColor="@android:color/white"/> android:textColor="@android:color/white"
android:textSize="16sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_3_subtext_2" android:text="@string/tutorial_3_subtext_2"
android:layout_gravity="center"
android:textAlignment="textStart" android:textAlignment="textStart"
android:gravity="start" android:textColor="@android:color/white" />
android:textColor="@android:color/white"
/>
</LinearLayout> </LinearLayout>
@ -121,24 +142,23 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp" android:paddingRight="4dp"
android:textSize="16sp" android:text="@string/bullet"
android:textColor="@android:color/white"/> android:textColor="@android:color/white"
android:textSize="16sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_3_subtext_3" android:text="@string/tutorial_3_subtext_3"
android:layout_gravity="center"
android:textAlignment="textStart" android:textAlignment="textStart"
android:gravity="start" android:textColor="@android:color/white" />
android:textColor="@android:color/white"
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </android.support.constraint.ConstraintLayout>

117
app/src/main/res/layout-land/welcome_image_details.xml
View file

@ -1,42 +1,72 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#0c609c" android:background="#0c609c"
android:gravity="center" android:gravity="center"
> android:orientation="horizontal">
<ImageView <TextView
android:id="@+id/welcomeYesButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="@dimen/overflow_button_dimen"
android:src="@drawable/sydney_opera_house" android:layout_marginEnd="@dimen/standard_gap"
android:paddingLeft="@dimen/large_gap" android:layout_marginRight="@dimen/standard_gap"
android:paddingRight="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
android:paddingTop="@dimen/large_gap" android:text="@string/welcome_skip_button"
android:paddingBottom="@dimen/large_gap" android:textColor="#fff"
android:adjustViewBounds="true" android:textSize="@dimen/normal_text"
android:layout_gravity="center" android:textStyle="bold"
android:contentDescription="@string/welcome_image_sydney_opera_house" android:visibility="gone"
/> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout android:orientation="vertical" <android.support.constraint.Guideline
android:id="@+id/center_guideline"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical" android:orientation="vertical"
> app:layout_constraintGuide_percent="0.60" />
<ImageView
android:layout_width="370dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:contentDescription="@string/welcome_image_sydney_opera_house"
android:paddingBottom="@dimen/large_gap"
android:paddingLeft="@dimen/tiny_gap"
android:paddingStart="@dimen/tiny_gap"
android:paddingRight="@dimen/standard_gap"
android:paddingEnd="@dimen/standard_gap"
android:paddingTop="@dimen/large_gap"
android:src="@drawable/sydney_opera_house"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/center_guideline"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
app:layout_constraintStart_toEndOf="@id/center_guideline"
app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_4_text" android:text="@string/tutorial_4_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/normal_text" android:textSize="@dimen/normal_text"
android:gravity="center_horizontal" android:textStyle="bold" />
android:textColor="@android:color/white"/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -47,23 +77,22 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp" android:paddingRight="4dp"
android:textSize="16sp"
android:paddingTop="@dimen/standard_gap" android:paddingTop="@dimen/standard_gap"
android:textColor="@android:color/white"/> android:text="@string/bullet"
android:textColor="@android:color/white"
android:textSize="16sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_4_subtext_1"
android:layout_gravity="center" android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="@dimen/standard_gap"
android:gravity="start" android:gravity="start"
android:textColor="@android:color/white" android:maxWidth="240dp"
/> android:paddingTop="@dimen/standard_gap"
android:text="@string/tutorial_4_subtext_1"
android:textAlignment="textStart"
android:textColor="@android:color/white" />
</LinearLayout> </LinearLayout>
@ -76,21 +105,20 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp" android:paddingRight="4dp"
android:textSize="16sp" android:text="@string/bullet"
android:textColor="@android:color/white"/> android:textColor="@android:color/white"
android:textSize="16sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_4_subtext_2" android:text="@string/tutorial_4_subtext_2"
android:layout_gravity="center"
android:textAlignment="textStart" android:textAlignment="textStart"
android:gravity="start" android:textColor="@android:color/white" />
android:textColor="@android:color/white"
/>
</LinearLayout> </LinearLayout>
@ -103,24 +131,23 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/bullet"
android:paddingRight="4dp" android:paddingRight="4dp"
android:textSize="16sp" android:text="@string/bullet"
android:textColor="@android:color/white"/> android:textColor="@android:color/white"
android:textSize="16sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_4_subtext_3" android:text="@string/tutorial_4_subtext_3"
android:layout_gravity="center"
android:textAlignment="textStart" android:textAlignment="textStart"
android:gravity="start" android:textColor="@android:color/white" />
android:textColor="@android:color/white"
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </android.support.constraint.ConstraintLayout>

73
app/src/main/res/layout-land/welcome_wikipedia.xml
View file

@ -1,51 +1,76 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#0c609c" android:background="#0c609c">
android:gravity="center"
> <TextView
android:id="@+id/welcomeYesButton"
android:layout_width="wrap_content"
android:layout_height="@dimen/overflow_button_dimen"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginTop="@dimen/standard_gap"
android:text="@string/welcome_skip_button"
android:textColor="#fff"
android:textSize="@dimen/normal_text"
android:textStyle="bold"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<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" />
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/welcome_wikipedia"
android:layout_marginEnd="@dimen/standard_gap" android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:contentDescription="@string/welcome_image_welcome_wikipedia" android:contentDescription="@string/welcome_image_welcome_wikipedia"
/> android:src="@drawable/welcome_wikipedia"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/center_guideline"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout android:orientation="vertical" <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:gravity="center_vertical" android:layout_marginLeft="@dimen/standard_gap"
> android:layout_marginStart="@dimen/standard_gap"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/center_guideline"
app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:maxWidth="240dp" android:maxWidth="240dp"
android:text="@string/tutorial_1_text" android:text="@string/tutorial_1_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textSize="@dimen/normal_text"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center_horizontal" android:textColor="@android:color/white"
android:textColor="@android:color/white"/> android:textSize="@dimen/normal_text"
android:textStyle="bold" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/tutorial_1_subtext"
android:layout_gravity="center" android:layout_gravity="center"
android:textAlignment="center" android:maxWidth="240dp"
android:paddingTop="@dimen/standard_gap" android:paddingTop="@dimen/standard_gap"
android:gravity="center_horizontal" android:text="@string/tutorial_1_subtext"
android:textColor="@android:color/white" android:textAlignment="center"
/> android:textColor="@android:color/white" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</android.support.constraint.ConstraintLayout>