Simplify welcome layouts (#2741)

* Simplify welcome layouts

* Add landscape layouts

* Reformat welcome layouts

* Rename string resources

app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java

@@ -3,19 +3,14 @@ package fr.free.nrw.commons;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 
 import com.viewpagerindicator.CirclePageIndicator;
 
-import javax.inject.Inject;
+import androidx.viewpager.widget.ViewPager;
-import javax.inject.Named;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.quiz.QuizActivity;
 import fr.free.nrw.commons.theme.BaseActivity;
 import fr.free.nrw.commons.utils.ConfigUtils;
@@ -29,7 +24,6 @@ public class WelcomeActivity extends BaseActivity {
 
     private WelcomePagerAdapter adapter = new WelcomePagerAdapter();
     private boolean isQuiz;
-    static String moreInformation;
 
     /**
      * Initialises exiting fields and dependencies
@@ -41,8 +35,6 @@ public class WelcomeActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_welcome);
 
-        moreInformation = this.getString(R.string.welcome_help_button_text);
-
         if (getIntent() != null) {
             Bundle bundle = getIntent().getExtras();
             if (bundle != null) {
@@ -61,7 +53,6 @@ public class WelcomeActivity extends BaseActivity {
 
         pager.setAdapter(adapter);
         indicator.setViewPager(pager);
-        adapter.setCallback(this::finishTutorial);
     }
 
     /**
@@ -73,7 +64,6 @@ public class WelcomeActivity extends BaseActivity {
             Intent i = new Intent(WelcomeActivity.this, QuizActivity.class);
             startActivity(i);
         }
-        adapter.setCallback(null);
         super.onDestroy();
     }
 

app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java

@@ -1,13 +1,14 @@
 package fr.free.nrw.commons;
 
 import android.net.Uri;
+import android.text.Html;
 import androidx.annotation.Nullable;
 import androidx.viewpager.widget.PagerAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-
+import androidx.viewpager.widget.PagerAdapter;
 import org.wikipedia.util.StringUtil;
 
 public class WelcomePagerAdapter extends PagerAdapter {
@@ -15,22 +16,9 @@ public class WelcomePagerAdapter extends PagerAdapter {
             R.layout.welcome_wikipedia,
             R.layout.welcome_do_upload,
             R.layout.welcome_dont_upload,
-            R.layout.welcome_image_details,
+            R.layout.welcome_image_example,
             R.layout.welcome_final
     };
-    private static final int PAGE_FINAL = 4;
-    private Callback callback;
-    private ViewGroup container;
-
-    /**
-     * Changes callback to provided one
-     *
-     * @param callback New callback
-     *                 it can be null.
-     */
-    public void setCallback(@Nullable Callback callback) {
-        this.callback = callback;
-    }
 
     /**
      * Gets total number of layouts
@@ -54,29 +42,22 @@ public class WelcomePagerAdapter extends PagerAdapter {
 
     @Override
     public Object instantiateItem(ViewGroup container, int position) {
-        this.container = container;
         LayoutInflater inflater = LayoutInflater.from(container.getContext());
         ViewGroup layout = (ViewGroup) inflater.inflate(PAGE_LAYOUTS[position], container, false);
 
         // If final page
-        if (position == PAGE_FINAL) {
+        if (position == PAGE_LAYOUTS.length - 1) {
             // Add link to more information
             TextView moreInfo = layout.findViewById(R.id.welcomeInfo);
-            moreInfo.setText(StringUtil.fromHtml(WelcomeActivity.moreInformation));
+            moreInfo.setText(Html.fromHtml(container.getContext().getString(R.string.welcome_help_button_text)));
-            moreInfo.setOnClickListener(view -> {
+            moreInfo.setOnClickListener(view -> Utils.handleWebUrl(
-                try {
+                    container.getContext(),
-                    Utils.handleWebUrl(
+                    Uri.parse("https://commons.wikimedia.org/wiki/Help:Contents")
-                            container.getContext(),
+            ));
-                            Uri.parse("https://commons.wikimedia.org/wiki/Help:Contents")
-                    );
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            });
 
             // Handle click of finishTutorialButton ("YES!" button) inside layout
             layout.findViewById(R.id.finishTutorialButton)
-                    .setOnClickListener(view -> callback.finishTutorial());
+                    .setOnClickListener(view -> ((WelcomeActivity) container.getContext()).finishTutorial());
         }
 
         container.addView(layout);
@@ -93,8 +74,4 @@ public class WelcomePagerAdapter extends PagerAdapter {
     public void destroyItem(ViewGroup container, int position, Object obj) {
         container.removeView((View) obj);
     }
-
-    public interface Callback {
-        void finishTutorial();
-    }
 }

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

@@ -1,85 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/tutorialBackground"
     android:gravity="center"
-    android:orientation="horizontal">
+    android:paddingLeft="@dimen/huge_gap"
+    android:paddingRight="@dimen/huge_gap">
 
-    <androidx.constraintlayout.widget.Guideline
+    <ImageView
-        android:id="@+id/center_guideline"
+        android:layout_width="0dp"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.55" />
-
-    <GridLayout
-        android:layout_width="300dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
+        android:layout_marginRight="@dimen/large_gap"
-        android:layout_marginBottom="8dp"
+        android:layout_weight="0.5"
-        android:layout_marginTop="8dp"
+        android:adjustViewBounds="true"
-        android:columnCount="2"
+        android:contentDescription="@string/welcome_do_upload_content_description"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:src="@drawable/welcome_do_upload" />
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/center_guideline">
-
-        <ImageView
-            android:id="@+id/mount_zao"
-            android:layout_width="150dp"
-            android:layout_height="118dp"
-            android:contentDescription="@string/welcome_image_mount_zao"
-            android:scaleType="fitXY"
-            android:src="@drawable/mount_zao" />
-
-        <ImageView
-            android:id="@+id/llamas"
-            android:layout_width="150dp"
-            android:layout_height="118dp"
-            android:contentDescription="@string/welcome_image_llamas"
-            android:scaleType="fitXY"
-            android:src="@drawable/llamas" />
-
-        <ImageView
-            android:id="@+id/rainbow_bridge"
-            android:layout_width="150dp"
-            android:layout_height="118dp"
-            android:contentDescription="@string/welcome_image_rainbow_bridge"
-            android:scaleType="fitXY"
-            android:src="@drawable/rainbow_bridge" />
-
-        <ImageView
-            android:id="@+id/tulip"
-            android:layout_width="150dp"
-            android:layout_height="118dp"
-            android:contentDescription="@string/welcome_image_tulip"
-            android:scaleType="fitXY"
-            android:src="@drawable/tulip" />
-
-    </GridLayout>
-
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
+        android:layout_weight="0.5"
-        android:orientation="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
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/standard_gap"
-            android:gravity="center_horizontal"
+            android:layout_marginBottom="@dimen/standard_gap"
-            android:maxWidth="240dp"
             android:text="@string/tutorial_2_text"
             android:textAlignment="center"
             android:textColor="@android:color/white"
@@ -87,88 +34,47 @@
             android:textStyle="bold" />
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:maxWidth="240dp"
             android:orientation="horizontal">
 
-            <TextView
+            <include layout="@layout/welcome_bullet" />
-                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_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="start"
-                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
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:maxWidth="240dp"
             android:orientation="horizontal">
 
-            <TextView
+            <include layout="@layout/welcome_bullet" />
-                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_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="start"
-                android:maxWidth="240dp"
                 android:text="@string/tutorial_2_subtext_2"
-                android:textAlignment="textStart"
                 android:textColor="@android:color/white" />
-
         </LinearLayout>
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:maxWidth="240dp"
             android:orientation="horizontal">
 
-            <TextView
+            <include layout="@layout/welcome_bullet" />
-                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_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="start"
-                android:maxWidth="240dp"
                 android:text="@string/tutorial_2_subtext_3"
-                android:textAlignment="textStart"
                 android:textColor="@android:color/white" />
-
         </LinearLayout>
-
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

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

@@ -1,62 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-<androidx.constraintlayout.widget.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="?attr/tutorialBackground"
-    android:background="?attr/tutorialBackground">
+    android:gravity="center"
+    android:paddingLeft="@dimen/huge_gap"
+    android:paddingRight="@dimen/huge_gap">
 
-    <androidx.constraintlayout.widget.Guideline
+    <ImageView
-        android:id="@+id/center_guideline"
+        android:layout_width="0dp"
-        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"
+        android:layout_marginRight="@dimen/large_gap"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_weight="0.5"
-        app:layout_constraintEnd_toStartOf="@id/center_guideline"
+        android:adjustViewBounds="true"
-        app:layout_constraintTop_toTopOf="parent"
+        android:contentDescription="@string/welcome_dont_upload_content_description"
-        android:layout_marginEnd="@dimen/standard_gap"
+        android:src="@drawable/welcome_dont_upload" />
-        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_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
+        android:layout_weight="0.5"
-        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_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/standard_gap"
-            android:gravity="center_horizontal"
+            android:layout_marginBottom="@dimen/standard_gap"
-            android:maxWidth="240dp"
             android:text="@string/tutorial_3_text"
             android:textAlignment="center"
             android:textColor="@android:color/white"
@@ -64,86 +34,48 @@
             android:textStyle="bold" />
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:orientation="horizontal">
 
-            <TextView
+            <include layout="@layout/welcome_bullet" />
-                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_width="match_parent"
                 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_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:maxWidth="240dp"
             android:orientation="horizontal">
 
-            <TextView
+            <include layout="@layout/welcome_bullet" />
-                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_width="match_parent"
                 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_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:orientation="horizontal">
 
-            <TextView
+            <include layout="@layout/welcome_bullet" />
-                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_width="match_parent"
                 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>
-
+</LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="?attr/tutorialBackground"
-
-        >
-    <TextView
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="@dimen/large_gap"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/welcomeInfo"
-        android:layout_gravity="end|top"
-        android:layout_marginTop="@dimen/standard_gap"
-        android:layout_marginRight="@dimen/standard_gap"
-        android:layout_marginEnd="@dimen/standard_gap"
-        android:textSize="@dimen/normal_text"
-        android:textColor="@android:color/white"
-        />
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:gravity="center">
-    <!-- Sorry about the hardcoded sizes here. They're image-related. -->
-    <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="180dp"
-            android:gravity="center_horizontal">
-
-        <ImageView
-                android:layout_width="150dp"
-                android:layout_height="180dp"
-                android:src="@drawable/welcome_wikipedia"
-                android:contentDescription="@string/welcome_image_welcome_wikipedia"
-            />
-
-        <ImageView
-                android:layout_width="160dp"
-                android:layout_height="120dp"
-                android:layout_gravity="center"
-                android:src="@drawable/welcome_copyright"
-                android:contentDescription="@string/welcome_image_proprietary"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="wrap_content"
-                  android:layout_height="match_parent"
-                  android:gravity="center_vertical"
-            >
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxWidth="240dp"
-                android:text="@string/welcome_final_text"
-                android:layout_gravity="center"
-                android:textStyle="bold"
-                android:textSize="@dimen/normal_text"
-                android:textAlignment="center"
-                android:gravity="center_horizontal"
-                android:textColor="@android:color/white"/>
-
-        <Button
-                android:layout_width="120dp"
-                android:layout_height="@dimen/overflow_button_dimen"
-                android:layout_marginTop="@dimen/standard_gap"
-                android:text="@string/welcome_final_button_text"
-                android:id="@+id/finishTutorialButton"
-                android:layout_gravity="center"
-                android:background="@android:color/white"
-                android:textColor="#0c609c"
-                android:textStyle="bold"
-                />
-
-    </LinearLayout>
-    </LinearLayout>
-
-</RelativeLayout>

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

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/tutorialBackground"
-    android:gravity="center"
-    android:orientation="horizontal">
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/center_guideline"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        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
-            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_4_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_4_subtext_1"
-                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_4_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_4_subtext_3"
-                android:textAlignment="textStart"
-                android:textColor="@android:color/white" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/tutorialBackground"
+    android:gravity="center"
+    android:paddingLeft="@dimen/huge_gap"
+    android:paddingRight="@dimen/huge_gap">
+
+    <ImageView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/large_gap"
+        android:layout_weight="0.5"
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/welcome_image_sydney_opera_house"
+        android:src="@drawable/welcome_image_example" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.5"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/standard_gap"
+            android:layout_marginBottom="@dimen/standard_gap"
+            android:text="@string/tutorial_4_text"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/normal_text"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <include layout="@layout/welcome_bullet" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/tutorial_4_subtext_1"
+                android:textColor="@android:color/white" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <include layout="@layout/welcome_bullet" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/tutorial_4_subtext_2"
+                android:textColor="@android:color/white" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <include layout="@layout/welcome_bullet" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/tutorial_4_subtext_3"
+                android:textColor="@android:color/white" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -1,47 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/tutorialBackground">
+    android:background="?attr/tutorialBackground"
-
+    android:gravity="center"
-    <androidx.constraintlayout.widget.Guideline
+    android:paddingLeft="@dimen/huge_gap"
-        android:id="@+id/center_guideline"
+    android:paddingRight="@dimen/huge_gap">
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.50" />
-
 
     <ImageView
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/large_gap"
-        android:layout_marginRight="@dimen/standard_gap"
+        android:layout_weight="0.5"
         android:adjustViewBounds="true"
         android:contentDescription="@string/welcome_image_welcome_wikipedia"
-        android:src="@drawable/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:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/standard_gap"
+        android:layout_weight="0.5"
-        android:layout_marginStart="@dimen/standard_gap"
+        android:orientation="vertical">
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/center_guideline"
-        app:layout_constraintTop_toTopOf="parent">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
+            android:layout_marginTop="@dimen/standard_gap"
-            android:maxWidth="240dp"
+            android:layout_marginBottom="@dimen/standard_gap"
             android:text="@string/tutorial_1_text"
             android:textAlignment="center"
             android:textColor="@android:color/white"
@@ -51,11 +36,10 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:maxWidth="240dp"
-            android:paddingTop="@dimen/standard_gap"
             android:text="@string/tutorial_1_subtext"
             android:textAlignment="center"
             android:textColor="@android:color/white" />
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</LinearLayout>

app/src/main/res/layout/activity_welcome.xml

@@ -11,24 +11,21 @@
         android:fadingEdge="none" />
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/overflow_button_dimen"
-        android:layout_marginTop="@dimen/standard_gap"
-        android:layout_marginRight="@dimen/standard_gap"
-        android:text="@string/welcome_skip_button"
         android:id="@+id/finishTutorialButton"
-        android:textSize="@dimen/normal_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="right"
-        android:layout_alignParentRight="true"
+        android:padding="@dimen/standard_gap"
-        android:textColor="#fff"
+        android:text="@string/welcome_skip_button"
+        android:textColor="@color/white"
+        android:textSize="@dimen/normal_text"
         android:textStyle="bold"
-        android:visibility="gone"
+        android:visibility="gone" />
-        />
 
     <com.viewpagerindicator.CirclePageIndicator
         android:id="@+id/welcomePagerIndicator"
-        android:layout_height="@dimen/half_standard_height"
         android:layout_width="match_parent"
+        android:layout_height="@dimen/half_standard_height"
         android:layout_gravity="bottom"
         android:padding="5dp" />
 

app/src/main/res/layout/welcome_bullet.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="top">
+    <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="@dimen/normal_text" />
+</LinearLayout>

app/src/main/res/layout/welcome_do_upload.xml

@@ -1,168 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/tutorialBackground"
     android:gravity="center"
-    android:weightSum="1"
+    android:orientation="vertical"
-    android:layout_centerHorizontal="true">
+    android:paddingLeft="@dimen/huge_gap"
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingRight="@dimen/huge_gap">
-        android:orientation="vertical"
+
+    <ImageView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        android:background="?attr/tutorialBackground"
+        android:adjustViewBounds="true"
-        android:gravity="center_vertical"
+        android:contentDescription="@string/welcome_do_upload_content_description"
-        >
+        android:src="@drawable/welcome_do_upload" />
-
-    <GridLayout
-        android:layout_width="wrap_content"
-        android:layout_height="240dp"
-        android:layout_gravity="center_horizontal"
-        android:columnCount="2"
-        >
-
-        <ImageView
-            android:src="@drawable/mount_zao"
-            android:id="@+id/mount_zao"
-            android:layout_width="150dp"
-            android:layout_height="118dp"
-            android:scaleType="fitXY"
-            android:contentDescription="@string/welcome_image_mount_zao"
-            />
-
-        <ImageView
-            android:src="@drawable/llamas"
-            android:id="@+id/llamas"
-            android:layout_width="150dp"
-            android:layout_height="118dp"
-            android:scaleType="fitXY"
-            android:contentDescription="@string/welcome_image_llamas"
-            />
-
-        <ImageView
-            android:src="@drawable/rainbow_bridge"
-            android:id="@+id/rainbow_bridge"
-            android:layout_width="150dp"
-            android:layout_height="118dp"
-            android:scaleType="fitXY"
-            android:contentDescription="@string/welcome_image_rainbow_bridge"
-            />
-
-        <ImageView
-            android:src="@drawable/tulip"
-            android:id="@+id/tulip"
-            android:layout_width="150dp"
-            android:layout_height="118dp"
-            android:scaleType="fitXY"
-            android:contentDescription="@string/welcome_image_tulip"
-            />
-
-    </GridLayout>
 
     <TextView
-        android:layout_width="295dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxWidth="240dp"
+        android:layout_marginTop="@dimen/standard_gap"
+        android:layout_marginBottom="@dimen/standard_gap"
         android:text="@string/tutorial_2_text"
-        android:layout_gravity="center"
-        android:textStyle="bold"
-        android:textSize="@dimen/normal_text"
         android:textAlignment="center"
-        android:paddingTop="@dimen/standard_gap"
-        android:gravity="center_horizontal"
         android:textColor="@android:color/white"
-        />
+        android:textSize="@dimen/normal_text"
+        android:textStyle="bold" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:orientation="horizontal">
 
-        <TextView
+        <include layout="@layout/welcome_bullet" />
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/bullet"
-            android:paddingRight="4dp"
-            android:textSize="16sp"
-            android:paddingTop="@dimen/standard_gap"
-            android:textColor="@android:color/white"/>
 
         <TextView
-            android:layout_width="295dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:text="@string/tutorial_2_subtext_1"
-            android:layout_gravity="center"
+            android:textColor="@android:color/white" />
-            android:textAlignment="textStart"
-            android:paddingTop="@dimen/standard_gap"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
 
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:orientation="horizontal">
 
-        <TextView
+        <include layout="@layout/welcome_bullet" />
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/bullet"
-            android:paddingRight="4dp"
-            android:textSize="16sp"
-            android:textColor="@android:color/white"/>
 
         <TextView
-            android:layout_width="295dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:text="@string/tutorial_2_subtext_2"
-            android:layout_gravity="center"
+            android:textColor="@android:color/white" />
-            android:textAlignment="textStart"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
-
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:orientation="horizontal">
 
-        <LinearLayout
+        <include layout="@layout/welcome_bullet" />
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/bullet"
-                android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
-
-        </LinearLayout>
 
         <TextView
-            android:layout_width="295dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:text="@string/tutorial_2_subtext_3"
-            android:layout_gravity="center"
+            android:textColor="@android:color/white" />
-            android:textAlignment="textStart"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
-
-    </LinearLayout>
     </LinearLayout>
 
-</RelativeLayout>
+</LinearLayout>

app/src/main/res/layout/welcome_dont_upload.xml

@@ -1,141 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/tutorialBackground"
-    android:gravity="center_vertical"
+    android:gravity="center"
-    >
+    android:orientation="vertical"
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingLeft="@dimen/huge_gap"
-        android:orientation="vertical"
+    android:paddingRight="@dimen/huge_gap">
+
+    <ImageView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        android:background="?attr/tutorialBackground"
+        android:adjustViewBounds="true"
-        android:gravity="center_vertical"
+        android:contentDescription="@string/welcome_dont_upload_content_description"
-        >
+        android:src="@drawable/welcome_dont_upload" />
-
-    <LinearLayout
-        android:gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="240dp"
-        android:layout_gravity="center_horizontal"
-        >
-
-        <ImageView
-            android:src="@drawable/selfie_x"
-            android:id="@+id/selfie_x"
-            android:layout_width="140dp"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/welcome_image_no_selfies"
-            />
-
-        <ImageView
-            android:src="@drawable/proprietary_x"
-            android:id="@+id/proprietary_x"
-            android:layout_marginLeft="@dimen/standard_gap"
-            android:layout_marginStart="@dimen/standard_gap"
-            android:layout_width="140dp"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/welcome_image_proprietary"
-            />
-
-    </LinearLayout>
 
     <TextView
-        android:layout_width="295dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxWidth="240dp"
+        android:layout_marginTop="@dimen/standard_gap"
+        android:layout_marginBottom="@dimen/standard_gap"
         android:text="@string/tutorial_3_text"
-        android:layout_gravity="center"
-        android:textStyle="bold"
-        android:textSize="@dimen/normal_text"
         android:textAlignment="center"
-        android:paddingTop="@dimen/standard_gap"
-        android:gravity="center_horizontal"
         android:textColor="@android:color/white"
-        />
+        android:textSize="@dimen/normal_text"
+        android:textStyle="bold" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:orientation="horizontal">
 
-        <TextView
+        <include layout="@layout/welcome_bullet" />
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/bullet"
-            android:paddingRight="4dp"
-            android:textSize="16sp"
-            android:paddingTop="@dimen/standard_gap"
-            android:textColor="@android:color/white"/>
 
         <TextView
-            android:layout_width="295dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:text="@string/tutorial_3_subtext_1"
-            android:layout_gravity="center"
+            android:textColor="@android:color/white" />
-            android:textAlignment="textStart"
-            android:paddingTop="@dimen/standard_gap"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
 
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:orientation="horizontal">
 
-        <TextView
+        <include layout="@layout/welcome_bullet" />
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/bullet"
-            android:paddingRight="4dp"
-            android:textSize="16sp"
-            android:textColor="@android:color/white"/>
 
         <TextView
-            android:layout_width="295dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:text="@string/tutorial_3_subtext_2"
-            android:layout_gravity="center"
+            android:textColor="@android:color/white" />
-            android:textAlignment="textStart"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
 
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:orientation="horizontal">
 
-        <TextView
+        <include layout="@layout/welcome_bullet" />
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/bullet"
-            android:paddingRight="4dp"
-            android:textSize="16sp"
-            android:textColor="@android:color/white"/>
 
         <TextView
-            android:layout_width="295dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxWidth="240dp"
             android:text="@string/tutorial_3_subtext_3"
-            android:layout_gravity="center"
+            android:textColor="@android:color/white" />
-            android:textAlignment="textStart"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
 
     </LinearLayout>
 </LinearLayout>
-</RelativeLayout>

app/src/main/res/layout/welcome_final.xml

@@ -66,19 +66,14 @@
 
     </LinearLayout>
     <TextView
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top|end"
-        android:layout_marginTop="@dimen/standard_gap"
-        android:layout_marginRight="@dimen/standard_gap"
-        android:layout_marginEnd="@dimen/standard_gap"
         android:id="@+id/welcomeInfo"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
         android:textSize="@dimen/normal_text"
         android:textColor="@android:color/white"
-        android:layout_marginBottom="@dimen/large_gap"
+        android:padding="@dimen/standard_gap"
-        android:paddingBottom="@dimen/large_gap"
+        android:layout_marginBottom="@dimen/standard_gap"
-        />
+        android:text="@string/welcome_help_button_text" />
 </RelativeLayout>

app/src/main/res/layout/welcome_image_details.xml

@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#0c609c"
-    android:gravity="center_vertical"
-    >
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/tutorialBackground"
-        android:gravity="center_vertical"
-        >
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/large_gap"
-        android:paddingRight="@dimen/large_gap"
-        android:src="@drawable/sydney_opera_house"
-        android:adjustViewBounds="true"
-        android:layout_gravity="center"
-        android:id="@+id/imageView"
-        android:contentDescription="@string/welcome_image_sydney_opera_house"/>
-
-    <TextView
-        android:layout_width="295dp"
-        android:layout_height="wrap_content"
-        android:maxWidth="240dp"
-        android:text="@string/tutorial_4_text"
-        android:layout_gravity="center"
-        android:textStyle="bold"
-        android:textSize="@dimen/normal_text"
-        android:textAlignment="center"
-        android:paddingTop="@dimen/standard_gap"
-        android:gravity="center_horizontal"
-        android:textColor="@android:color/white"
-        />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/bullet"
-            android:paddingRight="4dp"
-            android:textSize="16sp"
-            android:paddingTop="@dimen/standard_gap"
-            android:textColor="@android:color/white"/>
-
-        <TextView
-            android:layout_width="295dp"
-            android:layout_height="wrap_content"
-            android:maxWidth="240dp"
-            android:text="@string/tutorial_4_subtext_1"
-            android:layout_gravity="center"
-            android:textAlignment="textStart"
-            android:paddingTop="@dimen/standard_gap"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/bullet"
-                android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
-
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="295dp"
-            android:layout_height="wrap_content"
-            android:maxWidth="240dp"
-            android:text="@string/tutorial_4_subtext_2"
-            android:layout_gravity="center"
-            android:textAlignment="textStart"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/bullet"
-                android:paddingRight="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/white"/>
-
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="295dp"
-            android:layout_height="wrap_content"
-            android:maxWidth="240dp"
-            android:text="@string/tutorial_4_subtext_3"
-            android:layout_gravity="center"
-            android:textAlignment="textStart"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
-
-        </LinearLayout>
-    </LinearLayout>
-    
-</RelativeLayout>

app/src/main/res/layout/welcome_image_example.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/tutorialBackground"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/huge_gap"
+    android:paddingRight="@dimen/huge_gap">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/welcome_image_sydney_opera_house"
+        android:src="@drawable/welcome_image_example" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/standard_gap"
+        android:layout_marginBottom="@dimen/standard_gap"
+        android:text="@string/tutorial_4_text"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/normal_text"
+        android:textStyle="bold" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <include layout="@layout/welcome_bullet" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/tutorial_4_subtext_1"
+            android:textColor="@android:color/white" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <include layout="@layout/welcome_bullet" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/tutorial_4_subtext_2"
+            android:textColor="@android:color/white" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <include layout="@layout/welcome_bullet" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/tutorial_4_subtext_3"
+            android:textColor="@android:color/white" />
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/layout/welcome_wikipedia.xml

@@ -1,53 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/tutorialBackground"
-    android:gravity="center_vertical"
+    android:gravity="center"
-    >
+    android:orientation="vertical"
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingLeft="@dimen/huge_gap"
-        android:orientation="vertical"
+    android:paddingRight="@dimen/huge_gap">
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/tutorialBackground"
-        android:gravity="center_vertical"
-        >
 
     <ImageView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:src="@drawable/welcome_wikipedia"
         android:adjustViewBounds="true"
         android:contentDescription="@string/welcome_image_welcome_wikipedia"
-        />
+        android:src="@drawable/welcome_wikipedia" />
 
     <TextView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxWidth="240dp"
+        android:layout_marginTop="@dimen/standard_gap"
+        android:layout_marginBottom="@dimen/standard_gap"
         android:text="@string/tutorial_1_text"
-        android:layout_gravity="center"
-        android:textStyle="bold"
         android:textAlignment="center"
-        android:textSize="@dimen/normal_text"
-        android:paddingTop="@dimen/standard_gap"
-        android:gravity="center_horizontal"
         android:textColor="@android:color/white"
-        />
+        android:textSize="@dimen/normal_text"
+        android:textStyle="bold" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:maxWidth="240dp"
         android:text="@string/tutorial_1_subtext"
-        android:layout_gravity="center"
         android:textAlignment="center"
-        android:paddingTop="@dimen/standard_gap"
+        android:textColor="@android:color/white" />
-        android:gravity="center_horizontal"
-        android:textColor="@android:color/white"
-        />
-    </LinearLayout>
 
-</RelativeLayout>
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -533,6 +533,8 @@ Upload your first media by tapping on the add button.</string>
   <string name="images_featured_explanation">Featured pictures are images from highly skilled photographers and illustrators that the Wikimedia Commons community has chosen as some of the highest quality on the site.</string>
   <string name="images_via_nearby_explanation">Images Uploaded via Nearby places are the images which are uploaded by discovering places on the map.</string>
   <string name="thanks_received_explanation" >This feature allows editors to send a Thank you notification to users who make useful edits – by using a small thank link on the history page or diff page.</string>
+  <string name="welcome_do_upload_content_description">Examples of good images to upload to Commons</string>
+  <string name="welcome_dont_upload_content_description">Examples of images not to upload</string>
   <string name="skip_image">SKIP THIS IMAGE</string>
   <string name="download_failed_we_cannot_download_the_file_without_storage_permission">Download Failed!!. We cannot download the file without external storage permission.</string>
 </resources>