From fe8e44b162dda0fc713fbb5b8a77e66a32b30ba8 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 5 Jan 2022 09:48:41 +0100
Subject: [PATCH] adding FAQ and Settings activities

---
 app/src/main/AndroidManifest.xml              | 16 ++++++----
 .../keyboard/activities/MainActivity.kt       | 29 +++++++++++++++++++
 app/src/main/res/menu/menu_main.xml           | 15 +++++++++-
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fc703103..7de39c70 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,6 +17,10 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
+        <activity
+            android:name=".activities.SplashActivity"
+            android:theme="@style/SplashTheme" />
+
         <activity
             android:name=".activities.MainActivity"
             android:exported="true"
@@ -28,10 +32,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".activities.SplashActivity"
-            android:theme="@style/SplashTheme" />
-
         <service
             android:name=".helpers.SimpleKeyboardIME"
             android:label="@string/app_name"
@@ -46,12 +46,18 @@
 
         <activity
             android:name=".activities.SettingsActivity"
-            android:label="@string/app_name">
+            android:label="@string/settings"
+            android:parentActivityName=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="com.simplemobiletools.commons.activities.AboutActivity"
+            android:label="@string/about"
+            android:parentActivityName=".activities.MainActivity" />
+
         <activity-alias
             android:name=".activities.SplashActivity.Red"
             android:enabled="false"
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/MainActivity.kt
index b9f9e873..8924674d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/MainActivity.kt
@@ -1,7 +1,11 @@
 package com.simplemobiletools.keyboard.activities
 
+import android.content.Intent
 import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
 import com.simplemobiletools.commons.extensions.appLaunched
+import com.simplemobiletools.commons.models.FAQItem
 import com.simplemobiletools.keyboard.BuildConfig
 import com.simplemobiletools.keyboard.R
 
@@ -12,4 +16,29 @@ class MainActivity : SimpleActivity() {
         setContentView(R.layout.activity_main)
         appLaunched(BuildConfig.APPLICATION_ID)
     }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_main, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java))
+            R.id.about -> launchAbout()
+            else -> return super.onOptionsItemSelected(item)
+        }
+        return true
+    }
+
+    private fun launchAbout() {
+        val licenses = 0
+
+        val faqItems = arrayListOf(
+            FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons),
+            FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons),
+        )
+
+        startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
+    }
 }
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 6940e3ae..1b13619a 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1 +1,14 @@
-<menu></menu>
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/settings"
+        android:icon="@drawable/ic_settings_cog_vector"
+        android:title="@string/settings"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/about"
+        android:icon="@drawable/ic_info_vector"
+        android:title="@string/about"
+        app:showAsAction="ifRoom" />
+</menu>