Update/bindview (#1258)

* Update bindview for FrostVideoViewer

* Remove more bindview usages

* Fix compilation problems

* Remove custom drawer header

1 files changed, 18 insertions, 23 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
index 1938add0..6222d98f 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/TabCustomizerActivity.kt
@@ -3,23 +3,23 @@ package com.pitchedapps.frost.activities
 import android.app.Activity
 import android.content.res.ColorStateList
 import android.os.Bundle
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.ItemTouchHelper
 import android.view.View
 import android.view.animation.AnimationUtils
 import android.widget.TextView
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
 import ca.allanwang.kau.kotlin.lazyContext
 import ca.allanwang.kau.utils.bindView
 import ca.allanwang.kau.utils.scaleXY
 import ca.allanwang.kau.utils.setIcon
+import com.pitchedapps.frost.R
 import ca.allanwang.kau.utils.withAlpha
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter
 import com.mikepenz.fastadapter_extensions.drag.ItemTouchCallback
 import com.mikepenz.fastadapter_extensions.drag.SimpleDragCallback
 import com.mikepenz.google_material_typeface_library.GoogleMaterial
-import com.pitchedapps.frost.R
 import com.pitchedapps.frost.dbflow.TAB_COUNT
 import com.pitchedapps.frost.dbflow.loadFbTabs
 import com.pitchedapps.frost.dbflow.save
@@ -27,6 +27,7 @@ import com.pitchedapps.frost.facebook.FbItem
 import com.pitchedapps.frost.iitems.TabIItem
 import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.setFrostColors
+import kotlinx.android.synthetic.main.activity_tab_customizer.*
 import java.util.*
 
 /**
@@ -34,13 +35,7 @@ import java.util.*
  */
 class TabCustomizerActivity : BaseActivity() {
 
-    val toolbar: View by bindView(R.id.pseudo_toolbar)
-    val recycler: RecyclerView by bindView(R.id.tab_recycler)
-    val instructions: TextView by bindView(R.id.instructions)
-    val divider: View by bindView(R.id.divider)
-    val adapter = FastItemAdapter<TabIItem>()
-    val fabCancel: FloatingActionButton by bindView(R.id.fab_cancel)
-    val fabSave: FloatingActionButton by bindView(R.id.fab_save)
+    private val adapter = FastItemAdapter<TabIItem>()
 
     private val wobble = lazyContext { AnimationUtils.loadAnimation(it, R.anim.rotate_delta) }
 
@@ -48,11 +43,11 @@ class TabCustomizerActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_tab_customizer)
 
-        toolbar.setBackgroundColor(Prefs.headerColor)
+        pseudo_toolbar.setBackgroundColor(Prefs.headerColor)
 
-        recycler.layoutManager = GridLayoutManager(this, TAB_COUNT, RecyclerView.VERTICAL, false)
-        recycler.adapter = adapter
-        recycler.setHasFixedSize(true)
+        tab_recycler.layoutManager = GridLayoutManager(this, TAB_COUNT, RecyclerView.VERTICAL, false)
+        tab_recycler.adapter = adapter
+        tab_recycler.setHasFixedSize(true)
 
         divider.setBackgroundColor(Prefs.textColor.withAlpha(30))
         instructions.setTextColor(Prefs.textColor)
@@ -63,22 +58,22 @@ class TabCustomizerActivity : BaseActivity() {
         tabs.addAll(remaining)
 
         adapter.add(tabs.map(::TabIItem))
-        bindSwapper(adapter, recycler)
+        bindSwapper(adapter, tab_recycler)
 
         adapter.withOnClickListener { view, _, _, _ -> view!!.wobble(); true }
 
         setResult(Activity.RESULT_CANCELED)
 
-        fabSave.setIcon(GoogleMaterial.Icon.gmd_check, Prefs.iconColor)
-        fabSave.backgroundTintList = ColorStateList.valueOf(Prefs.accentColor)
-        fabSave.setOnClickListener {
+        fab_save.setIcon(GoogleMaterial.Icon.gmd_check, Prefs.iconColor)
+        fab_save.backgroundTintList = ColorStateList.valueOf(Prefs.accentColor)
+        fab_save.setOnClickListener {
             adapter.adapterItems.subList(0, TAB_COUNT).map(TabIItem::item).save()
             setResult(Activity.RESULT_OK)
             finish()
         }
-        fabCancel.setIcon(GoogleMaterial.Icon.gmd_close, Prefs.iconColor)
-        fabCancel.backgroundTintList = ColorStateList.valueOf(Prefs.accentColor)
-        fabCancel.setOnClickListener { finish() }
+        fab_cancel.setIcon(GoogleMaterial.Icon.gmd_close, Prefs.iconColor)
+        fab_cancel.backgroundTintList = ColorStateList.valueOf(Prefs.accentColor)
+        fab_cancel.setOnClickListener { finish() }
         setFrostColors {
             themeWindow = true
         }