1 files changed, 28 insertions, 14 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroFragmentTheme.kt b/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroFragmentTheme.kt
index 42630d79..afa8df35 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroFragmentTheme.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroFragmentTheme.kt
@@ -1,35 +1,50 @@
+/*
+ * Copyright 2018 Allan Wang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.pitchedapps.frost.intro
 
 import android.os.Bundle
 import android.view.View
-import ca.allanwang.kau.utils.bindViewResettable
 import ca.allanwang.kau.utils.scaleXY
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.activities.IntroActivity
 import com.pitchedapps.frost.enums.Theme
 import com.pitchedapps.frost.utils.Prefs
+import kotlinx.android.synthetic.main.intro_theme.*
 
 /**
  * Created by Allan Wang on 2017-07-28.
  */
 class IntroFragmentTheme : BaseIntroFragment(R.layout.intro_theme) {
 
-    val light: View by bindViewResettable(R.id.intro_theme_light)
-    val dark: View by bindViewResettable(R.id.intro_theme_dark)
-    val amoled: View by bindViewResettable(R.id.intro_theme_amoled)
-    val glass: View by bindViewResettable(R.id.intro_theme_glass)
-
     val themeList
-        get() = listOf(light, dark, amoled, glass)
+        get() = listOf(intro_theme_light, intro_theme_dark, intro_theme_amoled, intro_theme_glass)
 
-    override fun viewArray(): Array<Array<out View>> = arrayOf(arrayOf(title), arrayOf(light, dark), arrayOf(amoled, glass))
+    override fun viewArray(): Array<Array<out View>> = arrayOf(
+        arrayOf(title),
+        arrayOf(intro_theme_light, intro_theme_dark),
+        arrayOf(intro_theme_amoled, intro_theme_glass)
+    )
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        light.setThemeClick(Theme.LIGHT)
-        dark.setThemeClick(Theme.DARK)
-        amoled.setThemeClick(Theme.AMOLED)
-        glass.setThemeClick(Theme.GLASS)
+        intro_theme_light.setThemeClick(Theme.LIGHT)
+        intro_theme_dark.setThemeClick(Theme.DARK)
+        intro_theme_amoled.setThemeClick(Theme.AMOLED)
+        intro_theme_glass.setThemeClick(Theme.GLASS)
         val currentTheme = Prefs.theme - 1
         if (currentTheme in 0..3)
             themeList.forEachIndexed { index, v -> v.scaleXY = if (index == currentTheme) 1.6f else 0.8f }
@@ -45,5 +60,4 @@ class IntroFragmentTheme : BaseIntroFragment(R.layout.intro_theme) {
             themeList.forEach { it.animate().scaleXY(if (it == this) 1.6f else 0.8f).start() }
         }
     }
-
-}
\ No newline at end of file
+}