dwindows: android/DWindows.kt comparison

comparison android/DWindows.kt @ 2580:473eb9ff3f04

Android: Implement dw_container_set_stripe() and center the images in the rows. Also switch to using jlong (Long) types for passing the colors internally.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 23 May 2021 02:27:12 +0000
parents	68ee9a89e0f0
children	9dea42f27b0a

comparison

equal deleted inserted replaced

-:68ee9a89e0f0
+:473eb9ff3f04
 {
 private var context = c
 var model = DWContainerModel()
 var selectedItem: Int = -1
 var simpleMode: Boolean = true
+var oddColor: Int? = null
+var evenColor: Int? = null
 override fun getCount(): Int {
 return model.numberOfRows()
 }
 val content = model.getRowAndColumn(position, i)
 // Image
 if((model.getColumnType(i) and 1) != 0) {
 val imageview = ImageView(context)
+val params = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
+LinearLayout.LayoutParams.WRAP_CONTENT)
+params.gravity = Gravity.CENTER
+imageview.layoutParams = params
 imageview.id = View.generateViewId()
-imageview.layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
-LinearLayout.LayoutParams.WRAP_CONTENT)
 if (content is Drawable) {
 imageview.setImageDrawable(content)
 }
 rowView.addView(imageview)
 } else  {
 // Everything else id displayed as text
 val textview = TextView(context)
+val params = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
+LinearLayout.LayoutParams.WRAP_CONTENT)
+params.gravity = Gravity.CENTER
+textview.layoutParams = params
 textview.id = View.generateViewId()
-textview.layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
-LinearLayout.LayoutParams.WRAP_CONTENT)
 if (content is String) {
 textview.text = content
 } else if(content is Int) {
 textview.text = content.toString()
 }
 } else if (content is Int) {
 textview.text = content.toString()
 }
 }
 }
+}
+}
+// Handle row stripe
+if (position % 2 == 0) {
+if(evenColor != null) {
+rowView.setBackgroundColor(evenColor!!)
+}
+} else {
+if(oddColor != null) {
+rowView.setBackgroundColor(oddColor!!)
 }
 }
 return rowView
 }
 }
 }
 }
 return cont
 }
+fun containerSetStripe(cont: ListView, oddcolor: Long, evencolor: Long)
+{
+waitOnUiThread {
+val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
+if(oddcolor == -1L) {
+adapter.oddColor = null
+} else if(evencolor == -2L) {
+if(darkMode == 1) {
+adapter.oddColor = Color.rgb(100, 100, 100)
+} else {
+adapter.oddColor = Color.rgb(230, 230, 230)
+}
+} else {
+adapter.oddColor = colorFromDW(oddcolor)
+}
+if(evencolor == -1L || evencolor == -2L) {
+adapter.evenColor = null
+} else {
+adapter.evenColor = colorFromDW(evencolor)
+}
+}
+}
 fun containerGetTitleStart(cont: ListView, flags: Int): String?
 {
 var retval: String? = null
 waitOnUiThread {
 }
 }
 return retval
 }
-fun drawPoint(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, fgColor: Int, bgColor: Int)
+fun drawPoint(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, fgColor: Long, bgColor: Long)
 {
 waitOnUiThread {
 var canvas: Canvas? = null
 if(render != null) {
 canvas.drawPoint(x.toFloat(), y.toFloat(), Paint())
 }
 }
 }
-fun drawLine(render: DWRender?, bitmap: Bitmap?, x1: Int, y1: Int, x2: Int, y2: Int, fgColor: Int, bgColor: Int)
+fun drawLine(render: DWRender?, bitmap: Bitmap?, x1: Int, y1: Int, x2: Int, y2: Int, fgColor: Long, bgColor: Long)
 {
 waitOnUiThread {
 var canvas: Canvas? = null
 if(render != null) {
 }
 return dimensions
 }
 fun drawText(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, text:String, typeface: Typeface?,
-fontsize: Int, window: View?, fgColor: Int, bgColor: Int)
+fontsize: Int, window: View?, fgColor: Long, bgColor: Long)
 {
 waitOnUiThread {
 var canvas: Canvas? = null
 if(render != null && render.cachedCanvas != null) {
 canvas.drawText(text, x.toFloat(), y.toFloat() + textheight.toFloat(), paint)
 }
 }
 }
-fun drawRect(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, width: Int, height: Int, fgColor: Int, bgColor: Int)
+fun drawRect(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, width: Int, height: Int, fgColor: Long, bgColor: Long)
 {
 waitOnUiThread {
 var canvas: Canvas? = null
 if(render != null) {
 }
 }
 }
 fun drawPolygon(render: DWRender?, bitmap: Bitmap?, flags: Int, npoints: Int,
-x: IntArray, y: IntArray, fgColor: Int, bgColor: Int)
+x: IntArray, y: IntArray, fgColor: Long, bgColor: Long)
 {
 // Create a path with all our points
 val path = Path()
 path.moveTo(x[0].toFloat(), y[0].toFloat())
 }
 }
 }
 fun drawArc(render: DWRender?, bitmap: Bitmap?, flags: Int, xorigin: Int, yorigin: Int,
-x1: Int, y1: Int, x2: Int, y2: Int, fgColor: Int, bgColor: Int)
+x1: Int, y1: Int, x2: Int, y2: Int, fgColor: Long, bgColor: Long)
 {
 waitOnUiThread {
 var canvas: Canvas? = null
 if(render != null) {
 }
 }
 }
 }
-fun colorSet(alpha: Int, red: Int, green: Int, blue: Int)
+fun colorFromDW(color: Long): Int
 {
-waitOnUiThread {
+val red: Int = (color and 0x000000FF).toInt()
-if(alpha != 0) {
+val green: Int = ((color and 0x0000FF00) shr 8).toInt()
-paint.color = Color.argb(alpha, red, green, blue)
+val blue: Int = ((color and 0x00FF0000) shr 16).toInt()
-} else {
-paint.color = Color.rgb(red, green, blue)
+return Color.rgb(red, green, blue)
 }
-}
-}
+fun colorsSet(fgColor: Long, bgColor: Long)
+{
-fun bgColorSet(alpha: Int, red: Int, green: Int, blue: Int)
+waitOnUiThread {
-{
+paint.color = colorFromDW(fgColor)
-if(alpha != 0) {
+this.bgcolor = colorFromDW(bgColor)
-this.bgcolor = Color.argb(alpha, red, green, blue)
+}
-} else {
-this.bgcolor = Color.rgb(red, green, blue)
-}
-}
-fun colorsSet(fgColor: Int, bgColor: Int)
-{
-val fgRed: Int = (fgColor and 0x000000FF)
-val fgGreen: Int = (fgColor and 0x0000FF00) shr 8
-val fgBlue: Int = (fgColor and 0x00FF0000) shr 16
-val bgRed: Int = (bgColor and 0x000000FF)
-val bgGreen: Int = (bgColor and 0x0000FF00) shr 8
-val bgBlue: Int = (bgColor and 0x00FF0000) shr 16
-paint.color = Color.rgb(fgRed, fgGreen, fgBlue)
-this.bgcolor = Color.rgb(bgRed, bgGreen, bgBlue)
 }
 fun timerConnect(interval: Long, sigfunc: Long, data: Long): Timer
 {
 // creating timer task, timer

Mercurial > dwindows

comparison android/DWindows.kt @ 2580:473eb9ff3f04