diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt index a9ee287..b882bac 100644 --- a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt +++ b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt @@ -2,101 +2,75 @@ import android.app.Dialog import android.content.Context -import android.graphics.Typeface import android.os.Bundle -import android.widget.LinearLayout -import android.widget.TextView -import com.casic.br.ar.app.R +import android.view.View +import android.widget.AdapterView +import android.widget.ArrayAdapter import com.casic.br.ar.app.databinding.DialogAddHiddenTroubleBinding import com.casic.br.ar.app.model.DictionaryModel import com.casic.br.ar.app.utils.RuntimeCache -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.initDialogLayoutParams class AddHiddenTroubleDialog(context: Context) : Dialog(context) { private val binding: DialogAddHiddenTroubleBinding by binding() - private val marginOffset by lazy { 3.dp2px(context) } private lateinit var listener: OnDialogButtonClickListener - private lateinit var mainDictionary: DictionaryModel.DataModel - private lateinit var subDictionary: DictionaryModel.DataModel + private var selectedMainTypePosition = 0 + private var selectedSubTypePosition = 0 override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) initDialogLayoutParams(1f) - val mainTypeAdapter = object : NormalRecyclerAdapter( - R.layout.item_add_trouble_dialog_rv_l, RuntimeCache.mainDicModels - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: DictionaryModel.DataModel - ) { - viewHolder.setText(R.id.itemTextView, item.name) - viewHolder.getView(R.id.itemRootView) - .setOnFocusChangeListener { v, hasFocus -> - val textView = v.findViewById(R.id.itemTextView) - if (hasFocus) { - textView.typeface = Typeface.DEFAULT_BOLD - v.setBackgroundResource(R.drawable.dialog_view_item_border_selected) - } else { - textView.typeface = Typeface.DEFAULT - v.setBackgroundResource(R.drawable.dialog_view_item_border) - } - } - } + val mainTypeArray = ArrayList() + RuntimeCache.mainDicModels.forEach { + mainTypeArray.add(it.name) } - binding.mainRecyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, 0, marginOffset, 0) + val mainTypeAdapter = ArrayAdapter( + context, android.R.layout.simple_list_item_1, mainTypeArray ) - binding.mainRecyclerView.adapter = mainTypeAdapter - mainTypeAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - mainDictionary = t - } - }) + binding.mainTypeSpinner.adapter = mainTypeAdapter + binding.mainTypeSpinner.setSelection(0) + binding.mainTypeSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + selectedMainTypePosition = position + } - val subTypeAdapter = object : NormalRecyclerAdapter( - R.layout.item_add_trouble_dialog_rv_l, RuntimeCache.subDicModels - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: DictionaryModel.DataModel - ) { - viewHolder.setText(R.id.itemTextView, item.name) - viewHolder.getView(R.id.itemRootView) - .setOnFocusChangeListener { v, hasFocus -> - val textView = v.findViewById(R.id.itemTextView) - if (hasFocus) { - textView.typeface = Typeface.DEFAULT_BOLD - v.setBackgroundResource(R.drawable.dialog_view_item_border_selected) - } else { - textView.typeface = Typeface.DEFAULT - v.setBackgroundResource(R.drawable.dialog_view_item_border) - } - } + override fun onNothingSelected(parent: AdapterView<*>?) { + + } } + + val subTypeArray = ArrayList() + RuntimeCache.subDicModels.forEach { dic -> + subTypeArray.add(dic.name) } - binding.subRecyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, 0, marginOffset, 0) + val subTypeAdapter = ArrayAdapter( + context, android.R.layout.simple_list_item_1, subTypeArray ) - binding.subRecyclerView.adapter = subTypeAdapter - subTypeAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - subDictionary = t + binding.subTypeSpinner.adapter = subTypeAdapter + binding.subTypeSpinner.setSelection(0) + binding.subTypeSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + selectedSubTypePosition = position + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } } - }) binding.checkPassButton.setOnClickListener { listener.onConfirmClick( - mainDictionary, - subDictionary, + RuntimeCache.mainDicModels[selectedMainTypePosition], + RuntimeCache.subDicModels[selectedSubTypePosition], binding.hiddenTroubleNameView.text.toString(), binding.hiddenTroubleContentView.text.toString() ) diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt index a9ee287..b882bac 100644 --- a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt +++ b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt @@ -2,101 +2,75 @@ import android.app.Dialog import android.content.Context -import android.graphics.Typeface import android.os.Bundle -import android.widget.LinearLayout -import android.widget.TextView -import com.casic.br.ar.app.R +import android.view.View +import android.widget.AdapterView +import android.widget.ArrayAdapter import com.casic.br.ar.app.databinding.DialogAddHiddenTroubleBinding import com.casic.br.ar.app.model.DictionaryModel import com.casic.br.ar.app.utils.RuntimeCache -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.initDialogLayoutParams class AddHiddenTroubleDialog(context: Context) : Dialog(context) { private val binding: DialogAddHiddenTroubleBinding by binding() - private val marginOffset by lazy { 3.dp2px(context) } private lateinit var listener: OnDialogButtonClickListener - private lateinit var mainDictionary: DictionaryModel.DataModel - private lateinit var subDictionary: DictionaryModel.DataModel + private var selectedMainTypePosition = 0 + private var selectedSubTypePosition = 0 override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) initDialogLayoutParams(1f) - val mainTypeAdapter = object : NormalRecyclerAdapter( - R.layout.item_add_trouble_dialog_rv_l, RuntimeCache.mainDicModels - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: DictionaryModel.DataModel - ) { - viewHolder.setText(R.id.itemTextView, item.name) - viewHolder.getView(R.id.itemRootView) - .setOnFocusChangeListener { v, hasFocus -> - val textView = v.findViewById(R.id.itemTextView) - if (hasFocus) { - textView.typeface = Typeface.DEFAULT_BOLD - v.setBackgroundResource(R.drawable.dialog_view_item_border_selected) - } else { - textView.typeface = Typeface.DEFAULT - v.setBackgroundResource(R.drawable.dialog_view_item_border) - } - } - } + val mainTypeArray = ArrayList() + RuntimeCache.mainDicModels.forEach { + mainTypeArray.add(it.name) } - binding.mainRecyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, 0, marginOffset, 0) + val mainTypeAdapter = ArrayAdapter( + context, android.R.layout.simple_list_item_1, mainTypeArray ) - binding.mainRecyclerView.adapter = mainTypeAdapter - mainTypeAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - mainDictionary = t - } - }) + binding.mainTypeSpinner.adapter = mainTypeAdapter + binding.mainTypeSpinner.setSelection(0) + binding.mainTypeSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + selectedMainTypePosition = position + } - val subTypeAdapter = object : NormalRecyclerAdapter( - R.layout.item_add_trouble_dialog_rv_l, RuntimeCache.subDicModels - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: DictionaryModel.DataModel - ) { - viewHolder.setText(R.id.itemTextView, item.name) - viewHolder.getView(R.id.itemRootView) - .setOnFocusChangeListener { v, hasFocus -> - val textView = v.findViewById(R.id.itemTextView) - if (hasFocus) { - textView.typeface = Typeface.DEFAULT_BOLD - v.setBackgroundResource(R.drawable.dialog_view_item_border_selected) - } else { - textView.typeface = Typeface.DEFAULT - v.setBackgroundResource(R.drawable.dialog_view_item_border) - } - } + override fun onNothingSelected(parent: AdapterView<*>?) { + + } } + + val subTypeArray = ArrayList() + RuntimeCache.subDicModels.forEach { dic -> + subTypeArray.add(dic.name) } - binding.subRecyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, 0, marginOffset, 0) + val subTypeAdapter = ArrayAdapter( + context, android.R.layout.simple_list_item_1, subTypeArray ) - binding.subRecyclerView.adapter = subTypeAdapter - subTypeAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - subDictionary = t + binding.subTypeSpinner.adapter = subTypeAdapter + binding.subTypeSpinner.setSelection(0) + binding.subTypeSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + selectedSubTypePosition = position + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } } - }) binding.checkPassButton.setOnClickListener { listener.onConfirmClick( - mainDictionary, - subDictionary, + RuntimeCache.mainDicModels[selectedMainTypePosition], + RuntimeCache.subDicModels[selectedSubTypePosition], binding.hiddenTroubleNameView.text.toString(), binding.hiddenTroubleContentView.text.toString() ) diff --git a/app/src/main/res/drawable/dialog_view_item_border.xml b/app/src/main/res/drawable/dialog_view_item_border.xml deleted file mode 100644 index ee5fc50..0000000 --- a/app/src/main/res/drawable/dialog_view_item_border.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt index a9ee287..b882bac 100644 --- a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt +++ b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt @@ -2,101 +2,75 @@ import android.app.Dialog import android.content.Context -import android.graphics.Typeface import android.os.Bundle -import android.widget.LinearLayout -import android.widget.TextView -import com.casic.br.ar.app.R +import android.view.View +import android.widget.AdapterView +import android.widget.ArrayAdapter import com.casic.br.ar.app.databinding.DialogAddHiddenTroubleBinding import com.casic.br.ar.app.model.DictionaryModel import com.casic.br.ar.app.utils.RuntimeCache -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.initDialogLayoutParams class AddHiddenTroubleDialog(context: Context) : Dialog(context) { private val binding: DialogAddHiddenTroubleBinding by binding() - private val marginOffset by lazy { 3.dp2px(context) } private lateinit var listener: OnDialogButtonClickListener - private lateinit var mainDictionary: DictionaryModel.DataModel - private lateinit var subDictionary: DictionaryModel.DataModel + private var selectedMainTypePosition = 0 + private var selectedSubTypePosition = 0 override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) initDialogLayoutParams(1f) - val mainTypeAdapter = object : NormalRecyclerAdapter( - R.layout.item_add_trouble_dialog_rv_l, RuntimeCache.mainDicModels - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: DictionaryModel.DataModel - ) { - viewHolder.setText(R.id.itemTextView, item.name) - viewHolder.getView(R.id.itemRootView) - .setOnFocusChangeListener { v, hasFocus -> - val textView = v.findViewById(R.id.itemTextView) - if (hasFocus) { - textView.typeface = Typeface.DEFAULT_BOLD - v.setBackgroundResource(R.drawable.dialog_view_item_border_selected) - } else { - textView.typeface = Typeface.DEFAULT - v.setBackgroundResource(R.drawable.dialog_view_item_border) - } - } - } + val mainTypeArray = ArrayList() + RuntimeCache.mainDicModels.forEach { + mainTypeArray.add(it.name) } - binding.mainRecyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, 0, marginOffset, 0) + val mainTypeAdapter = ArrayAdapter( + context, android.R.layout.simple_list_item_1, mainTypeArray ) - binding.mainRecyclerView.adapter = mainTypeAdapter - mainTypeAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - mainDictionary = t - } - }) + binding.mainTypeSpinner.adapter = mainTypeAdapter + binding.mainTypeSpinner.setSelection(0) + binding.mainTypeSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + selectedMainTypePosition = position + } - val subTypeAdapter = object : NormalRecyclerAdapter( - R.layout.item_add_trouble_dialog_rv_l, RuntimeCache.subDicModels - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: DictionaryModel.DataModel - ) { - viewHolder.setText(R.id.itemTextView, item.name) - viewHolder.getView(R.id.itemRootView) - .setOnFocusChangeListener { v, hasFocus -> - val textView = v.findViewById(R.id.itemTextView) - if (hasFocus) { - textView.typeface = Typeface.DEFAULT_BOLD - v.setBackgroundResource(R.drawable.dialog_view_item_border_selected) - } else { - textView.typeface = Typeface.DEFAULT - v.setBackgroundResource(R.drawable.dialog_view_item_border) - } - } + override fun onNothingSelected(parent: AdapterView<*>?) { + + } } + + val subTypeArray = ArrayList() + RuntimeCache.subDicModels.forEach { dic -> + subTypeArray.add(dic.name) } - binding.subRecyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, 0, marginOffset, 0) + val subTypeAdapter = ArrayAdapter( + context, android.R.layout.simple_list_item_1, subTypeArray ) - binding.subRecyclerView.adapter = subTypeAdapter - subTypeAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - subDictionary = t + binding.subTypeSpinner.adapter = subTypeAdapter + binding.subTypeSpinner.setSelection(0) + binding.subTypeSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + selectedSubTypePosition = position + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } } - }) binding.checkPassButton.setOnClickListener { listener.onConfirmClick( - mainDictionary, - subDictionary, + RuntimeCache.mainDicModels[selectedMainTypePosition], + RuntimeCache.subDicModels[selectedSubTypePosition], binding.hiddenTroubleNameView.text.toString(), binding.hiddenTroubleContentView.text.toString() ) diff --git a/app/src/main/res/drawable/dialog_view_item_border.xml b/app/src/main/res/drawable/dialog_view_item_border.xml deleted file mode 100644 index ee5fc50..0000000 --- a/app/src/main/res/drawable/dialog_view_item_border.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/dialog_view_item_border_selected.xml b/app/src/main/res/drawable/dialog_view_item_border_selected.xml deleted file mode 100644 index 3e415f7..0000000 --- a/app/src/main/res/drawable/dialog_view_item_border_selected.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt index a9ee287..b882bac 100644 --- a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt +++ b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt @@ -2,101 +2,75 @@ import android.app.Dialog import android.content.Context -import android.graphics.Typeface import android.os.Bundle -import android.widget.LinearLayout -import android.widget.TextView -import com.casic.br.ar.app.R +import android.view.View +import android.widget.AdapterView +import android.widget.ArrayAdapter import com.casic.br.ar.app.databinding.DialogAddHiddenTroubleBinding import com.casic.br.ar.app.model.DictionaryModel import com.casic.br.ar.app.utils.RuntimeCache -import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ViewHolder -import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.dp2px import com.pengxh.kt.lite.extensions.initDialogLayoutParams class AddHiddenTroubleDialog(context: Context) : Dialog(context) { private val binding: DialogAddHiddenTroubleBinding by binding() - private val marginOffset by lazy { 3.dp2px(context) } private lateinit var listener: OnDialogButtonClickListener - private lateinit var mainDictionary: DictionaryModel.DataModel - private lateinit var subDictionary: DictionaryModel.DataModel + private var selectedMainTypePosition = 0 + private var selectedSubTypePosition = 0 override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) initDialogLayoutParams(1f) - val mainTypeAdapter = object : NormalRecyclerAdapter( - R.layout.item_add_trouble_dialog_rv_l, RuntimeCache.mainDicModels - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: DictionaryModel.DataModel - ) { - viewHolder.setText(R.id.itemTextView, item.name) - viewHolder.getView(R.id.itemRootView) - .setOnFocusChangeListener { v, hasFocus -> - val textView = v.findViewById(R.id.itemTextView) - if (hasFocus) { - textView.typeface = Typeface.DEFAULT_BOLD - v.setBackgroundResource(R.drawable.dialog_view_item_border_selected) - } else { - textView.typeface = Typeface.DEFAULT - v.setBackgroundResource(R.drawable.dialog_view_item_border) - } - } - } + val mainTypeArray = ArrayList() + RuntimeCache.mainDicModels.forEach { + mainTypeArray.add(it.name) } - binding.mainRecyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, 0, marginOffset, 0) + val mainTypeAdapter = ArrayAdapter( + context, android.R.layout.simple_list_item_1, mainTypeArray ) - binding.mainRecyclerView.adapter = mainTypeAdapter - mainTypeAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - mainDictionary = t - } - }) + binding.mainTypeSpinner.adapter = mainTypeAdapter + binding.mainTypeSpinner.setSelection(0) + binding.mainTypeSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + selectedMainTypePosition = position + } - val subTypeAdapter = object : NormalRecyclerAdapter( - R.layout.item_add_trouble_dialog_rv_l, RuntimeCache.subDicModels - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: DictionaryModel.DataModel - ) { - viewHolder.setText(R.id.itemTextView, item.name) - viewHolder.getView(R.id.itemRootView) - .setOnFocusChangeListener { v, hasFocus -> - val textView = v.findViewById(R.id.itemTextView) - if (hasFocus) { - textView.typeface = Typeface.DEFAULT_BOLD - v.setBackgroundResource(R.drawable.dialog_view_item_border_selected) - } else { - textView.typeface = Typeface.DEFAULT - v.setBackgroundResource(R.drawable.dialog_view_item_border) - } - } + override fun onNothingSelected(parent: AdapterView<*>?) { + + } } + + val subTypeArray = ArrayList() + RuntimeCache.subDicModels.forEach { dic -> + subTypeArray.add(dic.name) } - binding.subRecyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, 0, marginOffset, 0) + val subTypeAdapter = ArrayAdapter( + context, android.R.layout.simple_list_item_1, subTypeArray ) - binding.subRecyclerView.adapter = subTypeAdapter - subTypeAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - subDictionary = t + binding.subTypeSpinner.adapter = subTypeAdapter + binding.subTypeSpinner.setSelection(0) + binding.subTypeSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + selectedSubTypePosition = position + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } } - }) binding.checkPassButton.setOnClickListener { listener.onConfirmClick( - mainDictionary, - subDictionary, + RuntimeCache.mainDicModels[selectedMainTypePosition], + RuntimeCache.subDicModels[selectedSubTypePosition], binding.hiddenTroubleNameView.text.toString(), binding.hiddenTroubleContentView.text.toString() ) diff --git a/app/src/main/res/drawable/dialog_view_item_border.xml b/app/src/main/res/drawable/dialog_view_item_border.xml deleted file mode 100644 index ee5fc50..0000000 --- a/app/src/main/res/drawable/dialog_view_item_border.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/dialog_view_item_border_selected.xml b/app/src/main/res/drawable/dialog_view_item_border_selected.xml deleted file mode 100644 index 3e415f7..0000000 --- a/app/src/main/res/drawable/dialog_view_item_border_selected.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_add_hidden_trouble.xml b/app/src/main/res/layout/dialog_add_hidden_trouble.xml index 5bcb36f..1e1b39a 100644 --- a/app/src/main/res/layout/dialog_add_hidden_trouble.xml +++ b/app/src/main/res/layout/dialog_add_hidden_trouble.xml @@ -1,6 +1,5 @@ - + android:background="@color/white" /> - + android:background="@color/white" /> ( - R.layout.item_add_trouble_dialog_rv_l, RuntimeCache.mainDicModels - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: DictionaryModel.DataModel - ) { - viewHolder.setText(R.id.itemTextView, item.name) - viewHolder.getView(R.id.itemRootView) - .setOnFocusChangeListener { v, hasFocus -> - val textView = v.findViewById(R.id.itemTextView) - if (hasFocus) { - textView.typeface = Typeface.DEFAULT_BOLD - v.setBackgroundResource(R.drawable.dialog_view_item_border_selected) - } else { - textView.typeface = Typeface.DEFAULT - v.setBackgroundResource(R.drawable.dialog_view_item_border) - } - } - } + val mainTypeArray = ArrayList() + RuntimeCache.mainDicModels.forEach { + mainTypeArray.add(it.name) } - binding.mainRecyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, 0, marginOffset, 0) + val mainTypeAdapter = ArrayAdapter( + context, android.R.layout.simple_list_item_1, mainTypeArray ) - binding.mainRecyclerView.adapter = mainTypeAdapter - mainTypeAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - mainDictionary = t - } - }) + binding.mainTypeSpinner.adapter = mainTypeAdapter + binding.mainTypeSpinner.setSelection(0) + binding.mainTypeSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + selectedMainTypePosition = position + } - val subTypeAdapter = object : NormalRecyclerAdapter( - R.layout.item_add_trouble_dialog_rv_l, RuntimeCache.subDicModels - ) { - override fun convertView( - viewHolder: ViewHolder, position: Int, - item: DictionaryModel.DataModel - ) { - viewHolder.setText(R.id.itemTextView, item.name) - viewHolder.getView(R.id.itemRootView) - .setOnFocusChangeListener { v, hasFocus -> - val textView = v.findViewById(R.id.itemTextView) - if (hasFocus) { - textView.typeface = Typeface.DEFAULT_BOLD - v.setBackgroundResource(R.drawable.dialog_view_item_border_selected) - } else { - textView.typeface = Typeface.DEFAULT - v.setBackgroundResource(R.drawable.dialog_view_item_border) - } - } + override fun onNothingSelected(parent: AdapterView<*>?) { + + } } + + val subTypeArray = ArrayList() + RuntimeCache.subDicModels.forEach { dic -> + subTypeArray.add(dic.name) } - binding.subRecyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, 0, marginOffset, 0) + val subTypeAdapter = ArrayAdapter( + context, android.R.layout.simple_list_item_1, subTypeArray ) - binding.subRecyclerView.adapter = subTypeAdapter - subTypeAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked(position: Int, t: DictionaryModel.DataModel) { - subDictionary = t + binding.subTypeSpinner.adapter = subTypeAdapter + binding.subTypeSpinner.setSelection(0) + binding.subTypeSpinner.onItemSelectedListener = + object : AdapterView.OnItemSelectedListener { + override fun onItemSelected( + parent: AdapterView<*>?, view: View?, position: Int, id: Long + ) { + selectedSubTypePosition = position + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } } - }) binding.checkPassButton.setOnClickListener { listener.onConfirmClick( - mainDictionary, - subDictionary, + RuntimeCache.mainDicModels[selectedMainTypePosition], + RuntimeCache.subDicModels[selectedSubTypePosition], binding.hiddenTroubleNameView.text.toString(), binding.hiddenTroubleContentView.text.toString() ) diff --git a/app/src/main/res/drawable/dialog_view_item_border.xml b/app/src/main/res/drawable/dialog_view_item_border.xml deleted file mode 100644 index ee5fc50..0000000 --- a/app/src/main/res/drawable/dialog_view_item_border.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/dialog_view_item_border_selected.xml b/app/src/main/res/drawable/dialog_view_item_border_selected.xml deleted file mode 100644 index 3e415f7..0000000 --- a/app/src/main/res/drawable/dialog_view_item_border_selected.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_add_hidden_trouble.xml b/app/src/main/res/layout/dialog_add_hidden_trouble.xml index 5bcb36f..1e1b39a 100644 --- a/app/src/main/res/layout/dialog_add_hidden_trouble.xml +++ b/app/src/main/res/layout/dialog_add_hidden_trouble.xml @@ -1,6 +1,5 @@ - + android:background="@color/white" /> - + android:background="@color/white" /> - - - - \ No newline at end of file