From 3f37c9b2b3add20e39a60f57d13d7efe77b98f3a Mon Sep 17 00:00:00 2001
From: akaessens <>
Date: Thu, 4 Jun 2020 14:04:15 +0200
Subject: [PATCH] add new help section

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../akdev/nofbeventscraper/HelpActivity.java  | 14 ++++
 .../akdev/nofbeventscraper/MainActivity.java  |  4 +
 app/src/main/res/layout/activity_about.xml    | 26 +++----
 app/src/main/res/layout/activity_help.xml     | 76 +++++++++++++++++++
 app/src/main/res/menu/menu_main.xml           |  5 ++
 app/src/main/res/values/strings.xml           | 20 ++++-
 .../metadata/android/en-US/changelogs/2.txt   |  1 +
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 9 files changed, 130 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/com/akdev/nofbeventscraper/HelpActivity.java
 create mode 100644 app/src/main/res/layout/activity_help.xml
 create mode 100644 fastlane/metadata/android/en-US/changelogs/2.txt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 94e7f3f..f3db0e7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".AboutActivity"></activity>
+        <activity android:name=".HelpActivity"></activity>
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
diff --git a/app/src/main/java/com/akdev/nofbeventscraper/HelpActivity.java b/app/src/main/java/com/akdev/nofbeventscraper/HelpActivity.java
new file mode 100644
index 0000000..736c500
--- /dev/null
+++ b/app/src/main/java/com/akdev/nofbeventscraper/HelpActivity.java
@@ -0,0 +1,14 @@
+package com.akdev.nofbeventscraper;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class HelpActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_help);
+    }
+}
diff --git a/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java b/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java
index 1beb053..ef7fc48 100644
--- a/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java
+++ b/app/src/main/java/com/akdev/nofbeventscraper/MainActivity.java
@@ -262,6 +262,10 @@ public class MainActivity extends AppCompatActivity {
             startActivity(new Intent(this, AboutActivity.class));
             return true;
         }
+        if (id == R.id.action_help) {
+            startActivity(new Intent(this, HelpActivity.class));
+            return true;
+        }
 
         return super.onOptionsItemSelected(item);
     }
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index da90eb3..202ef13 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -13,31 +13,30 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:layout_margin="16dp">
 
             <TextView
-                android:id="@+id/about_heading"
+                android:id="@+id/description_heading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="16dp"
-                android:text="@string/action_about"
+                android:layout_marginBottom="8dp"
+                android:text="@string/description_heading"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
             <TextView
-                android:id="@+id/about_text"
+                android:id="@+id/description_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="16dp"
-                android:text="@string/about_text"
+                android:text="@string/description_text"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
             <TextView
                 android:id="@+id/open_source_heading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="32dp"
-                android:layout_marginEnd="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp"
                 android:text="@string/open_source_heading"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
@@ -45,7 +44,6 @@
                 android:id="@+id/open_source_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="16dp"
                 android:autoLink="web"
                 android:text="@string/open_source_text"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
@@ -54,9 +52,8 @@
                 android:id="@+id/changelog_heading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="32dp"
-                android:layout_marginEnd="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp"
                 android:text="@string/changelog_heading"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
@@ -64,7 +61,6 @@
                 android:id="@+id/changelog_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="16dp"
                 android:autoLink="web"
                 android:text="@string/changelog_text"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
new file mode 100644
index 0000000..ea958d5
--- /dev/null
+++ b/app/src/main/res/layout/activity_help.xml
@@ -0,0 +1,76 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".HelpActivity">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_margin="16dp">
+
+            <TextView
+                android:id="@+id/faq_heading"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:text="@string/faq_heading"
+                android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+
+            <TextView
+                android:id="@+id/faq_0q"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="0dp"
+                android:layout_marginBottom="4dp"
+                android:text="@string/faq_0q"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+            <TextView
+                android:id="@+id/faq_0a"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/faq_0a"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+            <TextView
+                android:id="@+id/faq_1q"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="4dp"
+                android:text="@string/faq_1q"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+            <TextView
+                android:id="@+id/faq_1a"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/faq_1a"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+            <TextView
+                android:id="@+id/faq_2q"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="4dp"
+                android:text="@string/faq_2q"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+            <TextView
+                android:id="@+id/faq_2a"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/faq_2a"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+
+        </LinearLayout>
+    </ScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 88ce364..68241f8 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -7,4 +7,9 @@
         android:icon="@android:drawable/ic_menu_info_details"
         android:orderInCategory="100"
         android:title="@string/action_about" />
+    <item
+        android:id="@+id/action_help"
+        android:icon="@android:drawable/ic_menu_info_details"
+        android:orderInCategory="100"
+        android:title="@string/action_help" />
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b37a458..0ba5c4b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,15 +1,29 @@
 <resources>
     <string name="app_name">NoFb Event Scraper</string>
     <string name="action_about">About</string>
+    <string name="action_help">Help</string>
     <string name="add_link_hint">Paste facebook link to the event.</string>
-    <string name="about_text">This application was developed to be used without a facebook account.
+
+    <string name="description_heading">Description</string>
+    <string name="description_text">This application was developed to be used without a facebook account.
         \nTherefore it does not use the facebook API.
         Instead it opens the facebook event URI and downloads the website source code.
         This source contains the information which is used to create a calendar entry.
     </string>
     <string name="open_source_heading"> Open Source </string>
-    <string name="open_source_text"> The source code for this application can be found at https://github.com/akaessens/NoFbEventScraper .</string>
+    <string name="open_source_text"> The source code and issue tracker for this application can be found at https://github.com/akaessens/NoFbEventScraper .</string>
+
+    <string name="faq_heading"> FAQ </string>
+    <string name="faq_0q"> What links can be used with this app? </string>
+    <string name="faq_0a"> All facebook subdomains are supported, whether mobile (m.facebook.com) or language-specific (de-de.facebook.com). The link must contain an event ID.</string>
+    <string name="faq_1q"> How to use this application? </string>
+    <string name="faq_1a"> You can use the paste button to paste a previously copied link into the URL bar.
+        Alternatively you can use the "share" function e.g. from the Android browser.
+        A third option is to click on a facebook link and use the "open with"-dialog. </string>
+    <string name="faq_2q"> Why does event X not work? </string>
+    <string name="faq_2a"> Current limitations are events in the past or events with multiple instances. If you find some other event that does not work, please let me know.</string>
 
     <string name="changelog_heading"> Changelog </string>
-    <string name="changelog_text"> v0.1.0\t\tInitial release.</string>
+    <string name="changelog_text">v0.1.0\t\tInitial release.\nv0.2.0\t\tAdded help section.\n
+    </string>
 </resources>
diff --git a/fastlane/metadata/android/en-US/changelogs/2.txt b/fastlane/metadata/android/en-US/changelogs/2.txt
new file mode 100644
index 0000000..ad2456a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/2.txt
@@ -0,0 +1 @@
+Added help section.
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 05a0f4e..b115012 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Wed Jun 03 22:20:07 CEST 2020
+#Thu Jun 04 13:39:14 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME