@@ -31,10 +31,7 @@ import com.rafsan.dynamicui_fromjson.data.CollectData.Companion.getDataFromRadio
31
31
import com.rafsan.dynamicui_fromjson.data.CollectData.Companion.getDataFromSpinner
32
32
import com.rafsan.dynamicui_fromjson.databinding.ActivityGenerateFormBinding
33
33
import com.rafsan.dynamicui_fromjson.databinding.FormButtonsLayoutBinding
34
- import com.rafsan.dynamicui_fromjson.model.FormComponent
35
- import com.rafsan.dynamicui_fromjson.model.FormComponentItem
36
- import com.rafsan.dynamicui_fromjson.model.FormViewComponent
37
- import com.rafsan.dynamicui_fromjson.model.Value
34
+ import com.rafsan.dynamicui_fromjson.model.*
38
35
import com.rafsan.dynamicui_fromjson.utils.Utils
39
36
import com.rafsan.dynamicui_fromjson.utils.Utils.Companion.getCurrentDate
40
37
import com.rafsan.dynamicui_fromjson.utils.Utils.Companion.getCustomColorStateList
@@ -82,19 +79,19 @@ class GenerateFormActivity : AppCompatActivity() {
82
79
formComponent?.let {
83
80
it.forEach { component ->
84
81
when (component.type) {
85
- " header " -> binding.miniAppFormContainer.addView(
82
+ WidgetItems . HEADER .label -> binding.miniAppFormContainer.addView(
86
83
createHeaderView(
87
84
component
88
85
)
89
86
)
90
- " text " -> createEditableTextWithLabel(component, viewId++ )
91
- " textarea " -> createEditableTextWithLabel(component, viewId++ )
92
- " select " -> createSpinner(component, viewId++ )
93
- " radio-group " -> createRadioGroup(component, viewId++ )
94
- " paragraph " -> createParagraph(component)
95
- " date " -> createDatePicker(component)
96
- " checkbox-group " -> createCheckBoxGroup(component, viewId++ )
97
- " number " -> createNumberEditText(component)
87
+ WidgetItems . TEXT .label -> createEditableTextWithLabel(component, viewId++ )
88
+ WidgetItems . TEXTAREA .label -> createEditableTextWithLabel(component, viewId++ )
89
+ WidgetItems . SELECT .label -> createSpinner(component, viewId++ )
90
+ WidgetItems . RADIO_GROUP .label -> createRadioGroup(component, viewId++ )
91
+ WidgetItems . PARAGRAPH .label -> createParagraph(component)
92
+ WidgetItems . DATE .label -> createDatePicker(component)
93
+ WidgetItems . CHECKBOX_GROUP .label -> createCheckBoxGroup(component, viewId++ )
94
+ WidgetItems . NUMBER .label -> createNumberEditText(component)
98
95
}
99
96
}
100
97
}
@@ -132,7 +129,7 @@ class GenerateFormActivity : AppCompatActivity() {
132
129
LinearLayoutCompat .LayoutParams .MATCH_PARENT ,
133
130
LinearLayout .LayoutParams .WRAP_CONTENT
134
131
)
135
- if (component.type.equals(" textarea " )) editText.gravity = Gravity .NO_GRAVITY
132
+ if (component.type.equals(WidgetItems . TEXTAREA .label )) editText.gravity = Gravity .NO_GRAVITY
136
133
137
134
editText.setPadding(20 , 30 , 20 , 30 )
138
135
editText.setBackgroundResource(R .drawable.edit_text_background)
@@ -854,48 +851,48 @@ class GenerateFormActivity : AppCompatActivity() {
854
851
val viewComponentModel: FormComponentItem =
855
852
formViewComponent.getViewComponentModel()
856
853
when (viewComponentModel.type) {
857
- " text " ->
854
+ WidgetItems . TEXT .label ->
858
855
if (! getDataFromEditText(view, viewComponentModel)) {
859
856
submitPropertyArrayJson = JsonArray ()
860
857
} else {
861
858
viewComponentModel.label?.let { labelStr ->
862
859
showRequiredDialog(labelStr)
863
860
}
864
861
}
865
- " textarea " ->
862
+ WidgetItems . TEXTAREA .label ->
866
863
if (! getDataFromEditText(view, viewComponentModel)) {
867
864
submitPropertyArrayJson = JsonArray ()
868
865
} else {
869
866
viewComponentModel.label?.let { labelStr ->
870
867
showRequiredDialog(labelStr)
871
868
}
872
869
}
873
- " select " ->
870
+ WidgetItems . SELECT .label ->
874
871
if (! getDataFromSpinner(view, viewComponentModel)) {
875
872
submitPropertyArrayJson = JsonArray ()
876
873
} else {
877
874
viewComponentModel.label?.let { labelStr ->
878
875
showRequiredDialog(labelStr)
879
876
}
880
877
}
881
- " radio-group " ->
878
+ WidgetItems . RADIO_GROUP .label ->
882
879
if (! getDataFromRadioGroup(view, viewComponentModel)) {
883
880
submitPropertyArrayJson = JsonArray ()
884
881
} else {
885
882
viewComponentModel.label?.let { labelStr ->
886
883
showRequiredDialog(labelStr)
887
884
}
888
885
}
889
- " date " -> getDataFromDateTextView(view, viewComponentModel)
890
- " checkbox-group " ->
886
+ WidgetItems . DATE .label -> getDataFromDateTextView(view, viewComponentModel)
887
+ WidgetItems . CHECKBOX_GROUP .label ->
891
888
if (! getDataFromCheckBoxGroup(view, viewComponentModel)) {
892
889
submitPropertyArrayJson = JsonArray ()
893
890
} else {
894
891
viewComponentModel.label?.let { labelStr ->
895
892
showRequiredDialog(labelStr)
896
893
}
897
894
}
898
- " number " -> {
895
+ WidgetItems . NUMBER .label -> {
899
896
if (! getDataFromEditText(view, viewComponentModel)) {
900
897
submitPropertyArrayJson = JsonArray ()
901
898
} else {
0 commit comments