From 1c8753c34152865b8e08fa3ab4909934e1bafc58 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 7 Aug 2016 23:14:37 +0200
Subject: [PATCH] implement the actual Dark theme

---
 .../applauncher/activities/AboutActivity.kt   |  3 +--
 .../applauncher/activities/LicenseActivity.kt |  3 +--
 .../applauncher/activities/MainActivity.kt    |  3 +--
 .../activities/SettingsActivity.kt            |  3 +--
 .../applauncher/activities/SimpleActivity.kt  | 25 +++++++++++++++++++
 app/src/main/res/values/styles.xml            |  6 +++++
 6 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SimpleActivity.kt

diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/AboutActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/AboutActivity.kt
index 8447b81..5e417de 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/AboutActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/AboutActivity.kt
@@ -3,7 +3,6 @@ package com.simplemobiletools.applauncher.activities
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.text.Html
 import android.text.method.LinkMovementMethod
 import android.view.View
@@ -15,7 +14,7 @@ import com.simplemobiletools.applauncher.extensions.viewIntent
 import kotlinx.android.synthetic.main.activity_about.*
 import java.util.*
 
-class AboutActivity : AppCompatActivity() {
+class AboutActivity : SimpleActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/LicenseActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/LicenseActivity.kt
index c3f439e..ef9171e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/LicenseActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/LicenseActivity.kt
@@ -1,12 +1,11 @@
 package com.simplemobiletools.applauncher.activities
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import com.simplemobiletools.applauncher.R
 import com.simplemobiletools.applauncher.extensions.viewIntent
 import kotlinx.android.synthetic.main.activity_license.*
 
-class LicenseActivity : AppCompatActivity() {
+class LicenseActivity : SimpleActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
index 45324fd..40935fb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
@@ -2,14 +2,13 @@ package com.simplemobiletools.applauncher.activities
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
 import com.simplemobiletools.applauncher.R
 import com.simplemobiletools.applauncher.extensions.isFirstRun
 import com.simplemobiletools.applauncher.extensions.preferences
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : SimpleActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt
index ac56183..1db1530 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt
@@ -2,13 +2,12 @@ package com.simplemobiletools.applauncher.activities
 
 import android.os.Bundle
 import android.support.v4.app.TaskStackBuilder
-import android.support.v7.app.AppCompatActivity
 import com.simplemobiletools.applauncher.R
 import com.simplemobiletools.applauncher.extensions.isDarkTheme
 import com.simplemobiletools.applauncher.extensions.preferences
 import kotlinx.android.synthetic.main.activity_settings.*
 
-class SettingsActivity : AppCompatActivity() {
+class SettingsActivity : SimpleActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SimpleActivity.kt
new file mode 100644
index 0000000..59831a7
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SimpleActivity.kt
@@ -0,0 +1,25 @@
+package com.simplemobiletools.applauncher.activities
+
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.view.MenuItem
+import com.simplemobiletools.applauncher.R
+import com.simplemobiletools.applauncher.extensions.isDarkTheme
+import com.simplemobiletools.applauncher.extensions.preferences
+
+open class SimpleActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(if (preferences.isDarkTheme) R.style.AppTheme_Dark else R.style.AppTheme)
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        when (item?.itemId) {
+            android.R.id.home -> {
+                finish()
+                return true
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+}
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b4390a2..447043c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,4 +6,10 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="AppTheme.Dark" parent="Theme.AppCompat">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
 </resources>