dwindows: android/DWindows.kt comparison

comparison android/DWindows.kt @ 2845:64c528d38fb8

Android: Attempt at fixing the container selection issues after clear. Some container information persists after a clear() that shouldn't... this was an attempt at fixing that but, it didn't work... however I want to switch locations so commiting so I don't lose the work.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 26 Sep 2022 08:35:26 +0000
parents	bacac2eb1677
children	e6edeb2b63bc

comparison

equal deleted inserted replaced

-:1df137a1a4b9
+:64c528d38fb8
 var columns = mutableListOf<String?>()
 var types = mutableListOf<Int>()
 var data = mutableListOf<Any?>()
 var rowdata = mutableListOf<Long>()
 var rowtitle = mutableListOf<String?>()
+var selected = mutableListOf<Boolean>()
 var querypos: Int = -1
 fun numberOfColumns(): Int
 {
 return columns.size
 return rowdata[row]
 }
 return 0
 }
+fun changeRowSelected(row: Int, rselected: Boolean)
+{
+if(row > -1 && row < selected.size) {
+selected[row] = rselected
+}
+}
+fun getRowSelected(row: Int): Boolean
+{
+if(row > -1 && row < selected.size) {
+return selected[row]
+}
+return false
+}
 fun changeRowTitle(row: Int, title: String?)
 {
 if(row > -1 && row < rowtitle.size) {
 rowtitle[row] = title
 }
 for(j in 0 until columns.size) {
 data.removeAt(0)
 }
 rowdata.removeAt(0)
 rowtitle.removeAt(0)
+selected.removeAt(0)
 }
 } else {
 data.clear()
 rowdata.clear()
 rowtitle.clear()
+selected.clear()
 }
 }
 fun deleteRowByTitle(title: String?)
 {
 for(j in 0 until columns.size) {
 data.removeAt(i * columns.size)
 }
 rowdata.removeAt(i)
 rowtitle.removeAt(i)
+selected.removeAt(i)
 }
 }
 }
 fun deleteRowByData(rdata: Long)
 for(j in 0 until columns.size) {
 data.removeAt(i * columns.size)
 }
 rowdata.removeAt(i)
 rowtitle.removeAt(i)
+selected.removeAt(i)
 }
 }
 }
 fun positionByTitle(title: String?): Int
 // Fill in with nulls to be set later
 data.add(null)
 }
 rowdata.add(0)
 rowtitle.add(null)
+selected.add(false)
 }
 return startRow
 }
 fun clear()
 {
 data.clear()
 rowdata.clear()
 rowtitle.clear()
+selected.clear()
 }
 }
 class DWContainerRow : RelativeLayout, Checkable {
 private var mChecked = false
 private var colorSelection = Color.DKGRAY
+var position: Int = -1
 var imageview: ImageView = ImageView(context)
 var text: TextView = TextView(context)
 var stack: LinearLayout = LinearLayout(context)
 fun setup(context: Context?) {
 if(mChecked) {
 this.setBackgroundColor(colorSelection)
 } else {
 this.setBackgroundColor(Color.TRANSPARENT)
 }
+if(this.parent is ListView && position != -1) {
+val cont = this.parent as ListView
+val adapter = cont.adapter as DWContainerAdapter
+adapter.model.changeRowSelected(position, mChecked)
+}
 }
 override fun setChecked(b: Boolean) {
 mChecked = b
 updateBackground()
 }
 // If the view passed in is null we need to create the layout
 if(rowView == null) {
 rowView = DWContainerRow(context)
+// Save the position for later use
+rowView.position = position
 // Handle DW_CONTAINER_MODE_MULTI by setting the orientation vertical
 if(contMode == 2) {
 rowView.stack.orientation = LinearLayout.VERTICAL
 rowView.stack.gravity = Gravity.LEFT
 }
 rowView.stack.addView(textview)
 }
 }
 } else {
+// Need to save the position to set the check state
+rowView.position = position
+// Refresh the selected state from the model
+rowView.isChecked = model.getRowSelected(position)
 // Otherwise we just need to update the existing layout
 for(i in extraColumns until displayColumns) {
 var content = model.getRowAndColumn(position, i)
 // Image
 }
 }
 }
 }
+// Check the main column content, image or text
 var content = model.getRowAndColumn(position, 0)
 // Setup the built-in Image and Text based on if we are fileystem mode or not
 if(isFilesystem) {
 if(content is Drawable) {
 rowView.text.text = content.toString()
 }
 } else {
 if(content is Drawable) {
 rowView.imageview.setImageDrawable(content)
+rowView.text.text = ""
 } else if (content is String) {
 rowView.text.text = content
+rowView.imageview.setImageDrawable(null)
 } else if(content is Long || content is Int) {
 rowView.text.text = content.toString()
+rowView.imageview.setImageDrawable(null)
 }
 }
 // Handle row stripe
 if (position % 2 == 0) {
 fun containerClear(cont: ListView)
 {
 waitOnUiThread {
 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
+adapter.lastClick = 0L
+adapter.lastClickRow = -1
+adapter.selectedItem = -1
 adapter.model.clear()
 }
 }
 fun containerScroll(cont: ListView, direction: Int, rows: Int)

Mercurial > dwindows

comparison android/DWindows.kt @ 2845:64c528d38fb8