From 6d2c41b91efc163756a5a407cf442d5275dea51d Mon Sep 17 00:00:00 2001
From: Balakrishnan S <97balakrishnan@gmail.com>
Date: Mon, 30 Apr 2018 17:01:27 +0530
Subject: [PATCH] Help button (#1415)

* Help button added to tutorial

* debug typo removed

* Help changed to more info

* More option moved to bottom

* Alignment changes made
---
 .../free/nrw/commons/WelcomePagerAdapter.java | 14 ++++++++
 .../main/res/layout-land/welcome_final.xml    | 32 ++++++++++++++++---
 app/src/main/res/layout/welcome_final.xml     | 30 ++++++++++++++---
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java b/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java
index 705de23da..bca548632 100644
--- a/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java
@@ -1,5 +1,6 @@
 package fr.free.nrw.commons;
 
+import android.net.Uri;
 import android.support.annotation.Nullable;
 import android.support.v4.view.PagerAdapter;
 import android.view.LayoutInflater;
@@ -9,6 +10,7 @@ import android.widget.TextView;
 
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import butterknife.Optional;
 
 public class WelcomePagerAdapter extends PagerAdapter {
     static final int[] PAGE_LAYOUTS = new int[]{
@@ -20,6 +22,7 @@ public class WelcomePagerAdapter extends PagerAdapter {
     };
     private static final int PAGE_FINAL = 4;
     private Callback callback;
+    private ViewGroup container;
 
     /**
      * Changes callback to provided one
@@ -53,6 +56,7 @@ 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( BuildConfig.FLAVOR == "beta"){
@@ -102,5 +106,15 @@ public class WelcomePagerAdapter extends PagerAdapter {
             }
         }
 
+        @Optional
+        @OnClick(R.id.welcomeInfo)
+        void onHelpClicked () {
+            try {
+                Utils.handleWebUrl(container.getContext(),Uri.parse("https://commons.wikimedia.org/wiki/Help:Contents" ));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
     }
 }
diff --git a/app/src/main/res/layout-land/welcome_final.xml b/app/src/main/res/layout-land/welcome_final.xml
index 0b99b481f..d44339647 100644
--- a/app/src/main/res/layout-land/welcome_final.xml
+++ b/app/src/main/res/layout-land/welcome_final.xml
@@ -1,13 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
+<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="#0c609c"
-              android:gravity="center"
-        >
 
+        >
+    <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:text="@string/welcome_help_button_text"
+        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"
@@ -59,6 +79,8 @@
                 android:textColor="#0c609c"
                 android:textStyle="bold"
                 />
+
+    </LinearLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/welcome_final.xml b/app/src/main/res/layout/welcome_final.xml
index 7f323253b..561e660aa 100644
--- a/app/src/main/res/layout/welcome_final.xml
+++ b/app/src/main/res/layout/welcome_final.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="#0c609c"
-    android:gravity="center_vertical"
     >
 
     <LinearLayout
-        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center_vertical">
+    <LinearLayout
+        android:gravity="center_vertical"
         android:layout_width="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_height="180dp"
@@ -60,4 +64,22 @@
         android:textStyle="bold"
         />
 
-</LinearLayout>
\ No newline at end of file
+    </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:textSize="@dimen/normal_text"
+        android:textColor="@android:color/white"
+        android:text="@string/welcome_help_button_text"
+        android:layout_marginBottom="@dimen/large_gap"
+        android:paddingBottom="@dimen/large_gap"
+        />
+</RelativeLayout>
\ 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 28ecaeb8f..efdeeec7e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -149,6 +149,7 @@
   <string name="welcome_copyright_subtext">Avoid copyrighted materials you found from the Internet as well as images of posters, book covers, etc.</string>
   <string name="welcome_final_text">You think you got it?</string>
   <string name="welcome_final_button_text">Yes!</string>
+  <string name="welcome_help_button_text"><u>More Information</u></string>
   <string name="detail_panel_cats_label">Categories</string>
   <string name="detail_panel_cats_loading">Loading…</string>
   <string name="detail_panel_cats_none">None selected</string>