From 68ac0db2e1339cba184e215a1469b6763403c093 Mon Sep 17 00:00:00 2001
From: Meghna Gupta <meghnagupta64@gmail.com>
Date: Mon, 26 Feb 2018 09:25:05 +0530
Subject: [PATCH] Formatted text in Tutorial pageviews

---
 .../res/layout-land/welcome_do_upload.xml     |  81 ++++++++++++-
 .../res/layout-land/welcome_dont_upload.xml   |  88 +++++++++++++--
 .../res/layout-land/welcome_image_details.xml |  89 +++++++++++++--
 app/src/main/res/layout/welcome_do_upload.xml | 100 +++++++++++++++--
 .../main/res/layout/welcome_dont_upload.xml   |  92 +++++++++++++--
 .../main/res/layout/welcome_image_details.xml | 106 ++++++++++++++++--
 app/src/main/res/values/strings.xml           |  12 +-
 7 files changed, 519 insertions(+), 49 deletions(-)

diff --git a/app/src/main/res/layout-land/welcome_do_upload.xml b/app/src/main/res/layout-land/welcome_do_upload.xml
index 1f02c3183..d96b00675 100644
--- a/app/src/main/res/layout-land/welcome_do_upload.xml
+++ b/app/src/main/res/layout-land/welcome_do_upload.xml
@@ -73,16 +73,91 @@
                 android:gravity="center_horizontal"
                 android:textColor="@android:color/white"/>
 
-        <TextView
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:layout_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="wrap_content"
                 android:layout_height="wrap_content"
                 android:maxWidth="240dp"
-                android:text="@string/tutorial_2_subtext"
+                android:text="@string/tutorial_2_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="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:layout_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:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_2_subtext_2"
+                android:layout_gravity="center"
+                android:textAlignment="textStart"
+                android:gravity="start"
+                android:textColor="@android:color/white"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:layout_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:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_2_subtext_3"
+                android:layout_gravity="center"
+                android:textAlignment="textStart"
+                android:gravity="start"
+                android:textColor="@android:color/white"
+                />
+
+        </LinearLayout>
+
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout-land/welcome_dont_upload.xml b/app/src/main/res/layout-land/welcome_dont_upload.xml
index 1d4d0db80..d950ffc1d 100644
--- a/app/src/main/res/layout-land/welcome_dont_upload.xml
+++ b/app/src/main/res/layout-land/welcome_dont_upload.xml
@@ -55,16 +55,90 @@
             android:gravity="center_horizontal"
             android:textColor="@android:color/white"/>
 
-        <TextView
+        <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:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:paddingTop="@dimen/standard_gap"
+                android:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_3_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="wrap_content"
             android:layout_height="wrap_content"
             android:maxWidth="240dp"
-            android:text="@string/tutorial_3_subtext"
             android:layout_gravity="center"
-            android:textAlignment="textStart"
-            android:paddingTop="@dimen/standard_gap"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
+            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:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_3_subtext_2"
+                android:layout_gravity="center"
+                android:textAlignment="textStart"
+                android:gravity="start"
+                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:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="240dp"
+                android:text="@string/tutorial_3_subtext_3"
+                android:layout_gravity="center"
+                android:textAlignment="textStart"
+                android:gravity="start"
+                android:textColor="@android:color/white"
+                />
+
+        </LinearLayout>
+
     </LinearLayout>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout-land/welcome_image_details.xml b/app/src/main/res/layout-land/welcome_image_details.xml
index d112292a1..79f48829b 100644
--- a/app/src/main/res/layout-land/welcome_image_details.xml
+++ b/app/src/main/res/layout-land/welcome_image_details.xml
@@ -38,16 +38,89 @@
             android:gravity="center_horizontal"
             android:textColor="@android:color/white"/>
 
-        <TextView
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:maxWidth="240dp"
-            android:text="@string/tutorial_4_subtext"
-            android:layout_gravity="center"
-            android:textAlignment="textStart"
-            android:paddingTop="@dimen/standard_gap"
-            android:gravity="start"
-            android:textColor="@android:color/white"
-            />
+            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="wrap_content"
+                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="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:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                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="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:text="@string/bullet"
+                android:paddingRight="4dp"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                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>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/welcome_do_upload.xml b/app/src/main/res/layout/welcome_do_upload.xml
index b2befbf12..fab6452df 100644
--- a/app/src/main/res/layout/welcome_do_upload.xml
+++ b/app/src/main/res/layout/welcome_do_upload.xml
@@ -67,15 +67,95 @@
         android:textColor="@android:color/white"
         />
 
-    <TextView
-        android:layout_width="295dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxWidth="240dp"
-        android:text="@string/tutorial_2_subtext"
-        android:layout_gravity="center"
-        android:textAlignment="textStart"
-        android:paddingTop="@dimen/standard_gap"
-        android:gravity="start"
-        android:textColor="@android:color/white"
-        />
+        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_2_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">
+
+        <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"/>
+
+        <TextView
+            android:layout_width="295dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_2_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_2_subtext_3"
+            android:layout_gravity="center"
+            android:textAlignment="textStart"
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
+
+    </LinearLayout>
+
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/welcome_dont_upload.xml b/app/src/main/res/layout/welcome_dont_upload.xml
index 8d352547e..d819bc035 100644
--- a/app/src/main/res/layout/welcome_dont_upload.xml
+++ b/app/src/main/res/layout/welcome_dont_upload.xml
@@ -48,15 +48,87 @@
         android:textColor="@android:color/white"
         />
 
-    <TextView
-        android:layout_width="295dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxWidth="240dp"
-        android:text="@string/tutorial_3_subtext"
-        android:layout_gravity="center"
-        android:textAlignment="textStart"
-        android:paddingTop="@dimen/standard_gap"
-        android:gravity="start"
-        android:textColor="@android:color/white"
-        />
+        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_3_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">
+
+        <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"/>
+
+        <TextView
+            android:layout_width="295dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_3_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">
+
+        <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"/>
+
+        <TextView
+            android:layout_width="295dp"
+            android:layout_height="wrap_content"
+            android:maxWidth="240dp"
+            android:text="@string/tutorial_3_subtext_3"
+            android:layout_gravity="center"
+            android:textAlignment="textStart"
+            android:gravity="start"
+            android:textColor="@android:color/white"
+            />
+
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/welcome_image_details.xml b/app/src/main/res/layout/welcome_image_details.xml
index 0b4618b37..e38eb5979 100644
--- a/app/src/main/res/layout/welcome_image_details.xml
+++ b/app/src/main/res/layout/welcome_image_details.xml
@@ -32,15 +32,101 @@
         android:textColor="@android:color/white"
         />
 
-    <TextView
-        android:layout_width="278dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:maxWidth="240dp"
-        android:text="@string/tutorial_4_subtext"
-        android:layout_gravity="center"
-        android:textAlignment="textStart"
-        android:paddingTop="@dimen/standard_gap"
-        android:gravity="start"
-        android:textColor="@android:color/white"
-        />
+        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>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3ddc44287..4099b1781 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Commons</string>
+  <string name="bullet">&#8226;  </string>
   <string name="menu_settings">Settings</string>
   <string name="username">Username</string>
   <string name="password">Password</string>
@@ -120,11 +121,20 @@
   <string name="tutorial_1_text">Wikimedia Commons hosts most of the images that are used in Wikipedia.</string>
   <string name="tutorial_1_subtext">Your images help educate people around the world!</string>
   <string name="tutorial_2_text">Please upload pictures that are taken or created entirely by yourself:</string>
-  <string name="tutorial_2_subtext">- Natural objects (flowers, animals, mountains)\n- Useful objects (bicycles, train stations)\n- Famous people (your mayor, Olympic athletes you met)</string>
+  <string name="tutorial_2_subtext">Natural objects (flowers, animals, mountains)\n&#8226; Useful objects (bicycles, train stations)\n&#8226; Famous people (your mayor, Olympic athletes you met)</string>
+  <string name="tutorial_2_subtext_1">Natural objects (flowers, animals, mountains)</string>
+  <string name="tutorial_2_subtext_2">Useful objects (bicycles, train stations)</string>
+  <string name="tutorial_2_subtext_3">Famous people (your mayor, Olympic athletes you met)</string>
   <string name="tutorial_3_text">Please do NOT upload:</string>
   <string name="tutorial_3_subtext">- Selfies or pictures of your friends\n- Pictures you downloaded from the Internet\n- Screenshots of proprietary apps</string>
+  <string name="tutorial_3_subtext_1">Selfies or pictures of your friends</string>
+  <string name="tutorial_3_subtext_2">Pictures you downloaded from the Internet</string>
+  <string name="tutorial_3_subtext_3">Screenshots of proprietary apps</string>
   <string name="tutorial_4_text">Example upload:</string>
   <string name="tutorial_4_subtext">- Title: Sydney Opera House\n- Description: Sydney Opera House as viewed from across the bay\n- Categories: Sydney Opera House from the west, Sydney Opera House remote views</string>
+  <string name="tutorial_4_subtext_1">Title: Sydney Opera House</string>
+  <string name="tutorial_4_subtext_2">Description: Sydney Opera House as viewed from across the bay</string>
+  <string name="tutorial_4_subtext_3">Categories: Sydney Opera House from the west, Sydney Opera House remote views</string>
   <string name="welcome_wikipedia_text">Contribute your images. Help Wikipedia articles come to life!</string>
   <string name="welcome_wikipedia_subtext">Images on Wikipedia come from Wikimedia Commons.</string>
   <string name="welcome_copyright_text">Your images help educate people around the world.</string>