Crop long param names. #10 #11 Update dialog when receive EVENT param…

…. Refactor Param dialog
PedalPi · Mar 1, 2018 · eceab7f · eceab7f
1 parent 9c12e5f
commit eceab7f
Show file tree

Hide file tree

Showing 18 changed files with 170 additions and 60 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,8 +14,8 @@
         android:name="io.github.pedalpi.displayview.communication.server.App">
         <!--<activity android:naio.github.pedalpi.displayview.activity.MainActivityvity">-->
         <activity android:name="io.github.pedalpi.displayview.activity.resume.ResumeActivity"
-                  android:screenOrientation="landscape"
-                  android:configChanges="orientation|keyboardHidden">
+                  ><!-- android:screenOrientation="landscape"
+                  android:configChanges="orientation|keyboardHidden" -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/io/github/pedalpi/displayview/activity/effects/EffectListItemViewHolder.kt b/app/src/main/java/io/github/pedalpi/displayview/activity/effects/EffectListItemViewHolder.kt
@@ -16,11 +16,11 @@ class EffectListItemViewHolder(private val adapter : EffectsListItemAdapter): Ge
 
     override lateinit var dto: EffectsListItemDTO
 
-    override var row: View? = null
+    override var view: View? = null
         set(value) {
-            field = row
-            name = row?.findViewById(R.id.effectsListItemName) as Button
-            status = row?.findViewById(R.id.effectsListItemStatus) as ToggleButton
+            field = view
+            name = view?.findViewById(R.id.effectsListItemName) as Button
+            status = view?.findViewById(R.id.effectsListItemStatus) as ToggleButton
 
             name.setOnClickListener { adapter.selectEffectListener(dto) }
             status.setOnClickListener { adapter.toggleStatusListener(dto) }

diff --git a/...ain/java/io/github/pedalpi/displayview/activity/params/ParamListItemViewHolderCombobox.kt b/...ain/java/io/github/pedalpi/displayview/activity/params/ParamListItemViewHolderCombobox.kt
@@ -10,7 +10,7 @@ import io.github.pedalpi.displayview.R
 import io.github.pedalpi.displayview.util.generateSpinnerDropdownAdapter
 
 
-class ParamListItemViewHolderCombobox(private val changeable: ParamValueChangeable): ParamListItemViewHolder {
+class ParamListItemViewHolderCombobox(private val notifier: ParamValueChangeNotifier): ParamListItemViewHolder {
 
     override val layout: Int = R.layout.param_list_item_combobox
 
@@ -21,7 +21,7 @@ class ParamListItemViewHolderCombobox(private val changeable: ParamValueChangeab
 
     override lateinit var dto: ParamListItemDTO
 
-    override var row: View? = null
+    override var view: View? = null
         set(row) {
             field = row
             name = row?.findViewById(R.id.paramsListItemName) as TextView
@@ -64,7 +64,7 @@ class ParamListItemViewHolderCombobox(private val changeable: ParamValueChangeab
 
     private fun selected(position: Int) {
         dto.param.value = position
-        changeable.onParamValueChange(dto.param)
+        notifier.onParamValueChange(dto.param)
     }
 
     private fun nextValue() {

diff --git a/...main/java/io/github/pedalpi/displayview/activity/params/ParamListItemViewHolderFactory.kt b/...main/java/io/github/pedalpi/displayview/activity/params/ParamListItemViewHolderFactory.kt
@@ -5,11 +5,11 @@ import io.github.pedalpi.displayview.model.ParamType
 
 class ParamListItemViewHolderFactory {
     companion object {
-        @JvmStatic fun build(changable: ParamValueChangeable, type: ParamType): ParamListItemViewHolder {
+        @JvmStatic fun build(notifier: ParamValueChangeNotifier, type: ParamType): ParamListItemViewHolder {
             return when (type) {
-                ParamType.COMBOBOX -> ParamListItemViewHolderCombobox(changable)
-                ParamType.TOGGLE -> ParamListItemViewHolderToggle(changable)
-                else -> ParamListItemViewHolderSlider(changable)
+                ParamType.COMBOBOX -> ParamListItemViewHolderCombobox(notifier)
+                ParamType.TOGGLE -> ParamListItemViewHolderToggle(notifier)
+                else -> ParamListItemViewHolderSlider(notifier)
             }
         }
     }

diff --git a/.../main/java/io/github/pedalpi/displayview/activity/params/ParamListItemViewHolderSlider.kt b/.../main/java/io/github/pedalpi/displayview/activity/params/ParamListItemViewHolderSlider.kt
@@ -9,7 +9,7 @@ import io.github.pedalpi.displayview.R
 /**
  * https://github.com/p4x3c0/PedalPi-Display-View/blob/master/app/src/main/java/com/pedalpi/pedalpi/component/ParamSeekbar.java
  */
-class ParamListItemViewHolderSlider(private val changeable: ParamValueChangeable) : ParamListItemViewHolder {
+class ParamListItemViewHolderSlider(private val notifier: ParamValueChangeNotifier) : ParamListItemViewHolder {
 
     override val layout: Int = R.layout.param_list_item_slider
 
@@ -20,7 +20,7 @@ class ParamListItemViewHolderSlider(private val changeable: ParamValueChangeable
 
     override lateinit var dto: ParamListItemDTO
 
-    override var row: View? = null
+    override var view: View? = null
         set(row) {
             field = row
             name   = row?.findViewById(R.id.paramsListItemName) as TextView
@@ -38,7 +38,7 @@ class ParamListItemViewHolderSlider(private val changeable: ParamValueChangeable
 
                     value.text = "$progress%"
                     dto.param.value = dto.param.calculateValueByPercent(progress)
-                    changeable.onParamValueChange(dto.param)
+                    notifier.onParamValueChange(dto.param)
                 }
             })
         }

diff --git a/.../main/java/io/github/pedalpi/displayview/activity/params/ParamListItemViewHolderToggle.kt b/.../main/java/io/github/pedalpi/displayview/activity/params/ParamListItemViewHolderToggle.kt
@@ -9,7 +9,7 @@ import io.github.pedalpi.displayview.R
 /**
  * https://github.com/p4x3c0/PedalPi-Display-View/blob/master/app/src/main/java/com/pedalpi/pedalpi/component/ParamSeekbar.java
  */
-class ParamListItemViewHolderToggle(private val changeable: ParamValueChangeable) : ParamListItemViewHolder {
+class ParamListItemViewHolderToggle(private val notifier: ParamValueChangeNotifier) : ParamListItemViewHolder {
 
     override val layout: Int = R.layout.param_list_item_toggle
 
@@ -18,15 +18,15 @@ class ParamListItemViewHolderToggle(private val changeable: ParamValueChangeable
 
     override lateinit var dto: ParamListItemDTO
 
-    override var row: View? = null
+    override var view: View? = null
         set(row) {
             field = row
             name   = row?.findViewById(R.id.paramsListItemName) as TextView
             toggle = row?.findViewById(R.id.paramsListItemToggle) as ToggleButton
 
             toggle.setOnClickListener {
                 dto.param.value = if (toggle.isChecked) 1 else 0
-                changeable.onParamValueChange(dto.param)
+                notifier.onParamValueChange(dto.param)
             }
         }
 

diff --git a/app/src/main/java/io/github/pedalpi/displayview/activity/params/ParamsListItemAdapter.kt b/app/src/main/java/io/github/pedalpi/displayview/activity/params/ParamsListItemAdapter.kt
@@ -7,7 +7,7 @@ import io.github.pedalpi.displayview.util.GenericViewHolder
 
 typealias ValueChangedListener = (param: Param) -> Unit
 
-interface ParamValueChangeable {
+interface ParamValueChangeNotifier {
     var onParamValueChange: ValueChangedListener
 }
 
@@ -19,7 +19,7 @@ interface ParamListItemViewHolder : GenericViewHolder<ParamListItemDTO> {
 
 class ParamsListItemAdapter(private val context: Context, items: List<ParamListItemDTO>)
     : GenericAdapter<ParamListItemDTO, ParamListItemViewHolder>(context, items),
-        ParamValueChangeable {
+        ParamValueChangeNotifier {
 
     override var onParamValueChange: ValueChangedListener = { }
 

diff --git a/...ava/io/github/pedalpi/displayview/activity/resume/effectsview/EffectGridItemViewHolder.kt b/...ava/io/github/pedalpi/displayview/activity/resume/effectsview/EffectGridItemViewHolder.kt
@@ -17,7 +17,7 @@ class EffectGridItemViewHolder(private val selectable: EffectSelectable, val res
 
     override lateinit var dto: EffectGridItemDTO
 
-    override var row: View? = null
+    override var view: View? = null
         set(row) {
             field = row
             name = row?.findViewById(R.id.effectsGridItemName) as Button

diff --git a/app/src/main/java/io/github/pedalpi/displayview/activity/resume/effectview/EffectView.kt b/app/src/main/java/io/github/pedalpi/displayview/activity/resume/effectview/EffectView.kt
@@ -1,25 +1,20 @@
 package io.github.pedalpi.displayview.activity.resume.effectview
 
 import android.content.Context
-import android.util.Log
 import android.view.View
 import android.widget.AdapterView.OnItemClickListener
 import android.widget.GridView
 import android.widget.TextView
 import android.widget.ToggleButton
-import io.github.pedalpi.displayview.activity.params.ParamListItemDTO
-import io.github.pedalpi.displayview.activity.params.ParamListItemViewHolderFactory
-import io.github.pedalpi.displayview.activity.params.ParamValueChangeable
+import io.github.pedalpi.displayview.activity.params.ParamValueChangeNotifier
 import io.github.pedalpi.displayview.activity.params.ValueChangedListener
 import io.github.pedalpi.displayview.model.Effect
 import io.github.pedalpi.displayview.model.Pedalboard
-import io.github.pedalpi.displayview.util.generateCustomDialog
-import io.github.pedalpi.displayview.util.inflate
 
 
 typealias EffectToggleStatusListener = (effect: Effect) -> Unit
 
-class OnDialogParamValueChange(private val paramsView: EffectView): ParamValueChangeable {
+class EffectViewParamValueChangeNotifier(private val paramsView: EffectView): ParamValueChangeNotifier {
     override var onParamValueChange: ValueChangedListener
         get() = {
             paramsView.updateParamView(it.index)
@@ -38,12 +33,18 @@ class EffectView(
     var effect: Effect? = null
     private lateinit var adapter: ParamsGridItemAdapter
 
+    private val valueChangeNotifier = EffectViewParamValueChangeNotifier(this)
+
+    var onParamValueChange: ValueChangedListener = {}
+    var onEffectToggleStatus: EffectToggleStatusListener = {}
+    val paramDialog = ParamDialog(context, valueChangeNotifier)
+
     init {
         clear()
 
         gridView.onItemClickListener = OnItemClickListener { parent, view, position, id ->
             val viewHolder = view.tag as ParamGridItemViewHolder
-            showDialog(ParamListItemDTO(viewHolder.dto.param))
+            this.paramDialog.show(viewHolder.dto.param)
         }
 
         effectStatus.setOnClickListener {
@@ -52,11 +53,6 @@ class EffectView(
         }
     }
 
-    private val onValueChangeDialog = OnDialogParamValueChange(this)
-
-    var onParamValueChange: ValueChangedListener = {}
-    var onEffectToggleStatus: EffectToggleStatusListener = {}
-
     /**
      * Change the view for the first effect of the pedalboard
      * or show none if pedalboard haven't effects
@@ -81,7 +77,7 @@ class EffectView(
     }
 
     private fun populateViews(effect: Effect) {
-        this.adapter = ParamsGridItemAdapter(context, generateData(effect))
+        this.adapter = ParamsGridItemAdapter(context, valueChangeNotifier, generateData(effect))
 
         this.gridView.adapter = adapter
         this.adapter.notifyDataSetChanged()
@@ -97,25 +93,12 @@ class EffectView(
         this.update(null)
     }
 
-    private fun showDialog(item: ParamListItemDTO) {
-        Log.i("PARAM", item.param.name)
-
-        val viewHolder = ParamListItemViewHolderFactory.build(onValueChangeDialog, item.param.type)
-
-        val view = context.inflate(viewHolder.layout)
-
-        viewHolder.row = view
-        item.viewHolder = viewHolder
-        viewHolder.update(context, item)
-
-        context.generateCustomDialog(view).show()
-    }
-
     /**
      * Update the param view
      */
     fun updateParamView(paramIndex: Int) {
         adapter.update(paramIndex)
+        paramDialog.update()
     }
 
     /**

diff --git a/app/src/main/java/io/github/pedalpi/displayview/activity/resume/effectview/ParamDialog.kt b/app/src/main/java/io/github/pedalpi/displayview/activity/resume/effectview/ParamDialog.kt
@@ -0,0 +1,38 @@
+package io.github.pedalpi.displayview.activity.resume.effectview
+
+import android.content.Context
+import android.view.ViewGroup
+import io.github.pedalpi.displayview.activity.params.ParamListItemDTO
+import io.github.pedalpi.displayview.activity.params.ParamListItemViewHolder
+import io.github.pedalpi.displayview.activity.params.ParamListItemViewHolderFactory
+import io.github.pedalpi.displayview.activity.params.ParamValueChangeNotifier
+import io.github.pedalpi.displayview.model.Param
+import io.github.pedalpi.displayview.util.generateCustomDialog
+import io.github.pedalpi.displayview.util.inflate
+
+
+class ParamDialog(private val context: Context, private val notifier: ParamValueChangeNotifier) {
+
+    private var viewHolder: ParamListItemViewHolder? = null
+
+    fun show(param: Param) {
+        val dto = ParamListItemDTO(param)
+
+        val viewHolder = ParamListItemViewHolderFactory.build(notifier, param.type)
+        this.viewHolder = viewHolder
+
+        val view = context.inflate(viewHolder.layout) as ViewGroup
+
+        viewHolder.view = view
+        dto.viewHolder = viewHolder
+        viewHolder.update(context, dto)
+
+        val dialog = context.generateCustomDialog(view)
+        dialog.setOnCancelListener { this.viewHolder = null }
+        dialog.show()
+    }
+
+    fun update() {
+        this.viewHolder?.update(context)
+    }
+}
diff --git a/.../github/pedalpi/displayview/activity/resume/effectview/ParamGridItemViewHolderProgress.kt b/.../github/pedalpi/displayview/activity/resume/effectview/ParamGridItemViewHolderProgress.kt
@@ -4,6 +4,7 @@ import android.view.View
 import android.widget.ProgressBar
 import android.widget.TextView
 import io.github.pedalpi.displayview.R
+import io.github.pedalpi.displayview.model.ParamType
 
 
 class ParamGridItemViewHolderProgress : ParamGridItemViewHolder {
@@ -16,7 +17,7 @@ class ParamGridItemViewHolderProgress : ParamGridItemViewHolder {
 
     override lateinit var dto: ParamGridItemDTO
 
-    override var row: View? = null
+    override var view: View? = null
         set(row) {
             field = row
             name   = row?.findViewById(R.id.paramsGridItemName) as TextView
@@ -29,7 +30,15 @@ class ParamGridItemViewHolderProgress : ParamGridItemViewHolder {
         this.dto = paramDTO
 
         name.text = paramDTO.param.name
-        value.text = "${paramDTO.param.valueAsPercent}%"
+        value.text = this.valueText
         progress.progress = paramDTO.param.valueAsPercent
     }
+
+    private val valueText: String
+        get() {
+            return when {
+                dto.param.type == ParamType.COMBOBOX -> dto.param.optionValue
+                else -> "${dto.param.valueAsPercent}%"
+            }
+        }
 }
diff --git a/...io/github/pedalpi/displayview/activity/resume/effectview/ParamGridItemViewHolderToggle.kt b/...io/github/pedalpi/displayview/activity/resume/effectview/ParamGridItemViewHolderToggle.kt
@@ -0,0 +1,37 @@
+package io.github.pedalpi.displayview.activity.resume.effectview
+
+import android.view.View
+import android.widget.TextView
+import android.widget.ToggleButton
+import io.github.pedalpi.displayview.R
+import io.github.pedalpi.displayview.activity.params.ParamValueChangeNotifier
+
+
+class ParamGridItemViewHolderToggle(private val notifier: ParamValueChangeNotifier) : ParamGridItemViewHolder {
+
+    override val layout: Int = R.layout.resume_param_grid_item_toggle
+
+    private lateinit var name: TextView
+    private lateinit var toggle: ToggleButton
+
+    override lateinit var dto: ParamGridItemDTO
+
+    override var view: View? = null
+        set(row) {
+            field = row
+            name   = row?.findViewById(R.id.paramsGridItemName) as TextView
+            toggle = row?.findViewById(R.id.paramGridItemToggle) as ToggleButton
+
+            toggle.setOnClickListener {
+                this.dto.param.value = if (this.dto.param.value == 1) 0 else 1
+                notifier.onParamValueChange(this.dto.param)
+            }
+        }
+
+    override fun update(paramDTO: ParamGridItemDTO) {
+        this.dto = paramDTO
+
+        name.text = paramDTO.param.name
+        toggle.isChecked = paramDTO.param.value.toInt() == 1
+    }
+}
diff --git a/...in/java/io/github/pedalpi/displayview/activity/resume/effectview/ParamsGridItemAdapter.kt b/...in/java/io/github/pedalpi/displayview/activity/resume/effectview/ParamsGridItemAdapter.kt
@@ -2,23 +2,28 @@ package io.github.pedalpi.displayview.activity.resume.effectview
 
 import android.content.Context
 import android.view.View
+import io.github.pedalpi.displayview.activity.params.ParamValueChangeNotifier
+import io.github.pedalpi.displayview.model.ParamType
 import io.github.pedalpi.displayview.util.GenericAdapter
 import io.github.pedalpi.displayview.util.GenericViewHolder
 
 
 interface ParamGridItemViewHolder: GenericViewHolder<ParamGridItemDTO> {
     override var dto: ParamGridItemDTO
     override val layout: Int
-    override var row: View?
+    override var view: View?
 
     fun update(paramDTO: ParamGridItemDTO)
 }
 
-class ParamsGridItemAdapter(context: Context, items: List<ParamGridItemDTO>)
+class ParamsGridItemAdapter(context: Context, private val notifier: ParamValueChangeNotifier, items: List<ParamGridItemDTO>)
     : GenericAdapter<ParamGridItemDTO, ParamGridItemViewHolder>(context, items) {
 
     override fun generateViewHolder(dto: ParamGridItemDTO): ParamGridItemViewHolder {
-        return ParamGridItemViewHolderProgress()
+        return when {
+            dto.param.type == ParamType.TOGGLE -> ParamGridItemViewHolderToggle(notifier)
+            else -> ParamGridItemViewHolderProgress()
+        }
     }
 
     override fun update(item: ParamGridItemDTO, viewHolder: ParamGridItemViewHolder) {