- Removing support for DuasLinhas

- Using Spinnable as 'Alternativa'
pedrofsn · Nov 5, 2018 · 2433b12 · 2433b12
1 parent 8bf1597
commit 2433b12
Show file tree

Hide file tree

Showing 28 changed files with 95 additions and 263 deletions.
diff --git a/dataform/build.gradle b/dataform/build.gradle
@@ -27,6 +27,7 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.github.pedrofsn:spinnable:1.0.4.1'
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
 }

diff --git a/dataform/src/main/java/br/redcode/dataform/lib/adapter/AdapterCheckBox.kt b/dataform/src/main/java/br/redcode/dataform/lib/adapter/AdapterCheckBox.kt
@@ -1,17 +1,17 @@
 package br.redcode.dataform.lib.adapter
 
 import android.view.View
+import br.com.redcode.spinnable.library.model.Spinnable
 import br.redcode.dataform.lib.R
 import br.redcode.dataform.lib.adapter.viewholder.ViewHolderCheckBox
 import br.redcode.dataform.lib.domain.AdapterGeneric
 import br.redcode.dataform.lib.interfaces.OnItemClickListener
-import br.redcode.dataform.lib.model.Alternativa
 import br.redcode.dataform.lib.model.ConfiguracaoFormulario
 
 /**
  * Created by pedrofsn on 31/10/2017.
  */
-class AdapterCheckBox(override var myOnItemClickListener: OnItemClickListener?, val configuracaoFormulario: ConfiguracaoFormulario) : AdapterGeneric<Alternativa, ViewHolderCheckBox>() {
+class AdapterCheckBox(override var myOnItemClickListener: OnItemClickListener?, val configuracaoFormulario: ConfiguracaoFormulario) : AdapterGeneric<Spinnable, ViewHolderCheckBox>() {
 
     override val layout: Int = R.layout.adapter_checkbox
 

diff --git a/dataform/src/main/java/br/redcode/dataform/lib/adapter/AdapterItemRemovivel.kt b/dataform/src/main/java/br/redcode/dataform/lib/adapter/AdapterItemRemovivel.kt
@@ -1,17 +1,17 @@
 package br.redcode.dataform.lib.adapter
 
 import android.view.View
+import br.com.redcode.spinnable.library.model.Spinnable
 import br.redcode.dataform.lib.R
 import br.redcode.dataform.lib.adapter.viewholder.ViewHolderItemRemovivel
 import br.redcode.dataform.lib.domain.AdapterGeneric
-import br.redcode.dataform.lib.interfaces.DuasLinhas
 import br.redcode.dataform.lib.interfaces.OnItemClickListener
 import br.redcode.dataform.lib.model.ConfiguracaoFormulario
 
 /**
  * Created by pedrofsn on 31/10/2017.
  */
-class AdapterItemRemovivel(override var myOnItemClickListener: OnItemClickListener?, val configuracao: ConfiguracaoFormulario) : AdapterGeneric<DuasLinhas, ViewHolderItemRemovivel>() {
+class AdapterItemRemovivel(override var myOnItemClickListener: OnItemClickListener?, val configuracao: ConfiguracaoFormulario) : AdapterGeneric<Spinnable, ViewHolderItemRemovivel>() {
 
     override val layout: Int = R.layout.adapter_item_removivel
 

diff --git a/dataform/src/main/java/br/redcode/dataform/lib/adapter/AdapterRadioButton.kt b/dataform/src/main/java/br/redcode/dataform/lib/adapter/AdapterRadioButton.kt
@@ -1,17 +1,17 @@
 package br.redcode.dataform.lib.adapter
 
 import android.view.View
+import br.com.redcode.spinnable.library.model.Spinnable
 import br.redcode.dataform.lib.R
 import br.redcode.dataform.lib.adapter.viewholder.ViewHolderRadioButton
 import br.redcode.dataform.lib.domain.AdapterGeneric
 import br.redcode.dataform.lib.interfaces.OnItemClickListener
-import br.redcode.dataform.lib.model.Alternativa
 import br.redcode.dataform.lib.model.ConfiguracaoFormulario
 
 /**
  * Created by pedrofsn on 31/10/2017.
  */
-class AdapterRadioButton(override var myOnItemClickListener: OnItemClickListener?, val configuracao: ConfiguracaoFormulario) : AdapterGeneric<Alternativa, ViewHolderRadioButton>() {
+class AdapterRadioButton(override var myOnItemClickListener: OnItemClickListener?, val configuracao: ConfiguracaoFormulario) : AdapterGeneric<Spinnable, ViewHolderRadioButton>() {
 
     override val layout: Int = R.layout.adapter_radiobutton
 

diff --git a/dataform/src/main/java/br/redcode/dataform/lib/adapter/AdapterSpinnerSpinneable.kt b/dataform/src/main/java/br/redcode/dataform/lib/adapter/AdapterSpinnerSpinneable.kt
diff --git a/dataform/src/main/java/br/redcode/dataform/lib/adapter/viewholder/ViewHolderCheckBox.kt b/dataform/src/main/java/br/redcode/dataform/lib/adapter/viewholder/ViewHolderCheckBox.kt
@@ -2,29 +2,29 @@ package br.redcode.dataform.lib.adapter.viewholder
 
 import android.view.View
 import android.widget.CheckBox
+import br.com.redcode.spinnable.library.model.Spinnable
 import br.redcode.dataform.lib.R
 import br.redcode.dataform.lib.domain.ViewHolderGeneric
 import br.redcode.dataform.lib.interfaces.OnItemClickListener
-import br.redcode.dataform.lib.model.Alternativa
 import br.redcode.dataform.lib.model.ConfiguracaoFormulario
 
 /**
  * Created by pedrofsn on 31/10/2017.
  */
-class ViewHolderCheckBox(itemView: View) : ViewHolderGeneric<Alternativa>(itemView) {
+class ViewHolderCheckBox(itemView: View) : ViewHolderGeneric<Spinnable>(itemView) {
 
     private lateinit var checkBox: CheckBox
 
-    fun popular(obj: Alternativa, click: OnItemClickListener?, configuracaoFormulario: ConfiguracaoFormulario) {
+    fun popular(obj: Spinnable, click: OnItemClickListener?, configuracaoFormulario: ConfiguracaoFormulario) {
         super.popular(obj, click)
         checkBox.isEnabled = configuracaoFormulario.editavel
     }
 
-    override fun popular(obj: Alternativa) {
-        checkBox = itemView.findViewById<CheckBox>(R.id.checkBox)
+    override fun popular(obj: Spinnable) {
+        checkBox = itemView.findViewById(R.id.checkBox)
 
-        checkBox.text = obj.descricao
-        checkBox.isChecked = obj.selecionado
+        checkBox.text = obj.description
+        checkBox.isChecked = obj.selected
     }
 
 }
diff --git a/dataform/src/main/java/br/redcode/dataform/lib/adapter/viewholder/ViewHolderItemRemovivel.kt b/dataform/src/main/java/br/redcode/dataform/lib/adapter/viewholder/ViewHolderItemRemovivel.kt
@@ -3,37 +3,34 @@ package br.redcode.dataform.lib.adapter.viewholder
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import br.com.redcode.spinnable.library.model.Spinnable
 import br.redcode.dataform.lib.R
 import br.redcode.dataform.lib.domain.ViewHolderGeneric
 import br.redcode.dataform.lib.extension.setTextOrHide
-import br.redcode.dataform.lib.interfaces.DuasLinhas
 import br.redcode.dataform.lib.interfaces.OnItemClickListener
 import br.redcode.dataform.lib.model.ConfiguracaoFormulario
 
 /**
  * Created by pedrofsn on 31/10/2017.
  */
-class ViewHolderItemRemovivel(itemView: View) : ViewHolderGeneric<DuasLinhas>(itemView) {
+class ViewHolderItemRemovivel(itemView: View) : ViewHolderGeneric<Spinnable>(itemView) {
 
     private lateinit var textViewLinha1: TextView
-    private lateinit var textViewLinha2: TextView
     private lateinit var imageViewRemoverItem: ImageView
 
-    override fun popular(obj: DuasLinhas) {
-        textViewLinha1 = itemView.findViewById<TextView>(R.id.textViewLinha1)
-        textViewLinha2 = itemView.findViewById<TextView>(R.id.textViewLinha2)
-        imageViewRemoverItem = itemView.findViewById<ImageView>(R.id.imageViewRemoverItem)
+    override fun popular(obj: Spinnable) {
+        textViewLinha1 = itemView.findViewById(R.id.textViewLinha1)
+        imageViewRemoverItem = itemView.findViewById(R.id.imageViewRemoverItem)
 
-        textViewLinha1.setTextOrHide(obj.getId())
-        textViewLinha2.setTextOrHide(obj.getTexto())
+        textViewLinha1.setTextOrHide(obj.description)
     }
 
-    override fun popular(obj: DuasLinhas, click: OnItemClickListener?) {
+    override fun popular(obj: Spinnable, click: OnItemClickListener?) {
         super.popular(obj, click)
         click?.let { imageViewRemoverItem.setOnClickListener { click.onItemClickListener(adapterPosition) } }
     }
 
-    fun popular(duasLinhas: DuasLinhas, myOnItemClickListener: OnItemClickListener?, configuracao: ConfiguracaoFormulario) {
+    fun popular(duasLinhas: Spinnable, myOnItemClickListener: OnItemClickListener?, configuracao: ConfiguracaoFormulario) {
         popular(duasLinhas, myOnItemClickListener)
         imageViewRemoverItem.visibility = if (configuracao.editavel) View.VISIBLE else View.GONE
     }

diff --git a/dataform/src/main/java/br/redcode/dataform/lib/adapter/viewholder/ViewHolderRadioButton.kt b/dataform/src/main/java/br/redcode/dataform/lib/adapter/viewholder/ViewHolderRadioButton.kt
@@ -2,27 +2,27 @@ package br.redcode.dataform.lib.adapter.viewholder
 
 import android.view.View
 import android.widget.RadioButton
+import br.com.redcode.spinnable.library.model.Spinnable
 import br.redcode.dataform.lib.R
 import br.redcode.dataform.lib.domain.ViewHolderGeneric
 import br.redcode.dataform.lib.interfaces.OnItemClickListener
-import br.redcode.dataform.lib.model.Alternativa
 import br.redcode.dataform.lib.model.ConfiguracaoFormulario
 
 /**
  * Created by pedrofsn on 31/10/2017.
  */
-class ViewHolderRadioButton(itemView: View) : ViewHolderGeneric<Alternativa>(itemView) {
+class ViewHolderRadioButton(itemView: View) : ViewHolderGeneric<Spinnable>(itemView) {
 
     private lateinit var radioButton: RadioButton
 
-    override fun popular(obj: Alternativa) {
+    override fun popular(obj: Spinnable) {
         radioButton = itemView.findViewById<RadioButton>(R.id.radioButton)
 
-        radioButton.text = obj.descricao
-        radioButton.isChecked = obj.selecionado
+        radioButton.text = obj.description
+        radioButton.isChecked = obj.selected
     }
 
-    fun popular(obj: Alternativa, click: OnItemClickListener?, configuracaoFormulario: ConfiguracaoFormulario) {
+    fun popular(obj: Spinnable, click: OnItemClickListener?, configuracaoFormulario: ConfiguracaoFormulario) {
         super.popular(obj, click)
         radioButton.isEnabled = configuracaoFormulario.editavel
     }

diff --git a/dataform/src/main/java/br/redcode/dataform/lib/domain/handlers/HandlerInputPopup.kt b/dataform/src/main/java/br/redcode/dataform/lib/domain/handlers/HandlerInputPopup.kt
@@ -1,6 +1,6 @@
 package br.redcode.dataform.lib.domain.handlers
 
-import br.redcode.dataform.lib.interfaces.DuasLinhas
+import br.com.redcode.spinnable.library.model.Spinnable
 
 /**
  * Created by pedrofsn on 13/11/2017.
@@ -9,7 +9,7 @@ abstract class HandlerInputPopup {
 
     var idPergunta = -1
 
-    open fun chamarPopup(idPergunta: Int, functionAdicionarItem: (idPergunta: Int, duasLinhas: DuasLinhas) -> Unit) {
+    open fun chamarPopup(idPergunta: Int, functionAdicionarItem: (idPergunta: Int, spinnable: Spinnable) -> Unit) {
         this.idPergunta = idPergunta
     }
 

diff --git a/dataform/src/main/java/br/redcode/dataform/lib/extension/ExtensionSpinnable.kt b/dataform/src/main/java/br/redcode/dataform/lib/extension/ExtensionSpinnable.kt
@@ -0,0 +1,11 @@
+package br.redcode.dataform.lib.extension
+
+import br.com.redcode.spinnable.library.model.Spinnable
+import br.redcode.dataform.lib.model.payloads.AlternativaPayload
+
+/**
+ * Created by pedrofsn on 31/10/2017.
+ */
+fun Spinnable.toDTO(): AlternativaPayload {
+    return AlternativaPayload(id.toLong(), selected)
+}
diff --git a/dataform/src/main/java/br/redcode/dataform/lib/extension/ExtensionSpinner.kt b/dataform/src/main/java/br/redcode/dataform/lib/extension/ExtensionSpinner.kt
diff --git a/dataform/src/main/java/br/redcode/dataform/lib/interfaces/DuasLinhas.kt b/dataform/src/main/java/br/redcode/dataform/lib/interfaces/DuasLinhas.kt
diff --git a/dataform/src/main/java/br/redcode/dataform/lib/interfaces/Spinnable.kt b/dataform/src/main/java/br/redcode/dataform/lib/interfaces/Spinnable.kt
diff --git a/dataform/src/main/java/br/redcode/dataform/lib/model/Alternativa.kt b/dataform/src/main/java/br/redcode/dataform/lib/model/Alternativa.kt
diff --git a/dataform/src/main/java/br/redcode/dataform/lib/model/Campo.kt b/dataform/src/main/java/br/redcode/dataform/lib/model/Campo.kt
@@ -1,5 +1,6 @@
 package br.redcode.dataform.lib.model
 
+import br.com.redcode.spinnable.library.model.Spinnable
 import br.redcode.dataform.lib.utils.Constantes
 import java.io.Serializable
 
@@ -11,7 +12,7 @@ data class Campo(
         val descricao: String,
         val tipo: String,
 
-        val alternativas: List<Alternativa>? = null
+        val alternativas: List<Spinnable>? = null
 ) : Serializable {
 
     fun isTextoData(): Boolean {