[REF] Generic ThemeModel class

jsonthemer/src/main/java/jsonthemer/model/ThemeModel.kt

@@ -1,16 +1,81 @@
 package jsonthemer.model
 
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import jsonthemer.annotation.*
+
 /**
- * Created by Manne Öhlund on 2018-02-27.
+ * Created by Manne Öhlund on 2018-02-23.
  * Copyright © 2018. All rights reserved.
  */
-interface ThemeModel {
-    var theme: Int
-    var statusBarColor: String
-    var navigationBarColor: String
-
-    fun getModelTheme(): Int
-    fun getStatusBarColor(): Int
-    fun getToolbarColor(): Int
-    fun getNavigationBarColor(): Int
+
+class ThemeModel {
+    val LIGHT = 0
+    val DARK = 1
+
+    var theme = LIGHT
+    @StatusBar
+    var statusBarColor = "#FFFF5722"
+    @NavigationBar
+    var navigationBarColor = "#FFFF5722"
+
+    // Theme overlays
+
+    private var toolbarThemeOverlay: Int = LIGHT
+    private var popupThemeOverlay: Int = LIGHT
+
+    // Other
+
+    @ToolbarBar
+    private var toolbarColor: String = "#FFFF5722"
+    @AccentColor
+    private var accentColor: String = "#FFFF5722"
+    private var windowBackgroundColor: String = "#FF000000"
+
+    @Theme
+    fun getModelTheme(): Int {
+        return when (theme) {
+            DARK -> return android.support.v7.appcompat.R.style.Theme_AppCompat_NoActionBar
+            else -> android.support.v7.appcompat.R.style.Theme_AppCompat_Light_NoActionBar
+        }
+    }
+
+    @ToolbarThemeOverlay
+    fun getToolbarThemeOverlay(): Int {
+        return when (toolbarThemeOverlay) {
+            DARK -> return android.support.v7.appcompat.R.style.ThemeOverlay_AppCompat_Dark_ActionBar
+            else -> android.support.v7.appcompat.R.style.ThemeOverlay_AppCompat_ActionBar
+        }
+    }
+
+    fun getPopupThemeOverlay(): Int {
+        return when (popupThemeOverlay) {
+            DARK -> return android.support.v7.appcompat.R.style.Theme_AppCompat
+            else -> android.support.v7.appcompat.R.style.Theme_AppCompat_Light
+        }
+    }
+
+    fun getStatusBarColor(): Int {
+        return Color.parseColor(statusBarColor)
+    }
+
+    fun getStatusBarColorDrawable(): ColorDrawable {
+        return ColorDrawable(getStatusBarColor())
+    }
+
+    fun getToolbarColor(): Int {
+        return Color.parseColor(toolbarColor)
+    }
+
+    fun getAccentColor(): Int {
+        return Color.parseColor(accentColor)
+    }
+
+    fun getNavigationBarColor(): Int {
+        return Color.parseColor(navigationBarColor)
+    }
+
+    fun getWindowBackgroundColor(): Int {
+        return Color.parseColor(windowBackgroundColor)
+    }
 }

sample/src/main/java/com/sample/jsonthemer/MainActivity.kt

@@ -9,7 +9,7 @@ import android.view.MenuItem
 import android.view.View
 import com.sample.jsonthemer.databinding.ActivityMainBinding
 import jsonthemer.JsonThemer
-import jsonthemer.model.BaseThemeModel
+import jsonthemer.model.ThemeModel
 
 class MainActivity : AppCompatActivity() {
 
@@ -26,14 +26,14 @@ class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        val theme: BaseThemeModel = let {
+        val theme: ThemeModel = let {
             try {
                 JsonThemer.setup(this, currentTheme)
             } catch (e: Exception) {
                 Log.e(MainActivity::class.simpleName, "Error: AssetFileNotFound, " + e.message)
 
                 // Fallback on base model
-                BaseThemeModel()
+                ThemeModel()
             }
         }
         super.onCreate(savedInstanceState)

sample/src/main/res/layout/activity_main.xml

@@ -5,7 +5,7 @@
 
         <variable
             name="themeModel"
-            type="jsonthemer.model.BaseThemeModel" />
+            type="jsonthemer.model.ThemeModel" />
     </data>
 
     <android.support.design.widget.CoordinatorLayout xmlns:app="http://schemas.android.com/apk/res-auto"