dwindows: android/DWindows.kt comparison

comparison android/DWindows.kt @ 2551:127779860ac1

Android: Implement DW_CLR_DEFAULT and some basic dark mode support.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 15 May 2021 00:44:24 +0000
parents	a8d90e2896bc
children	303f544d14fa

comparison

equal deleted inserted replaced

-:a8d90e2896bc
+:127779860ac1
 import android.text.InputType
 import android.text.method.PasswordTransformationMethod
 import android.util.Base64
 import android.util.Log
 import android.util.SparseBooleanArray
+import android.util.TypedValue
 import android.view.*
 import android.view.View.OnTouchListener
 import android.view.inputmethod.EditorInfo
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.widget.*
 import android.widget.AdapterView.OnItemClickListener
 import android.widget.SeekBar.OnSeekBarChangeListener
+import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatEditText
 import androidx.collection.SimpleArrayMap
 import androidx.core.app.NotificationCompat
 var firstWindow: Boolean = true
 var windowLayout: LinearLayout? = null
 var threadLock = ReentrantLock()
 var threadCond = threadLock.newCondition()
 var notificationID: Int = 0
+var darkMode: Int = -1
 private var paint = Paint()
 private var bgcolor: Int = 0
 private var menuBar: DWMenu? = null
 // Our version of runOnUiThread that waits for execution
 }
 override fun onConfigurationChanged(newConfig: Configuration) {
 super.onConfigurationChanged(newConfig)
+val currentNightMode = newConfig.uiMode and Configuration.UI_MODE_NIGHT_MASK
+when (currentNightMode) {
+Configuration.UI_MODE_NIGHT_NO -> { darkMode = 0 } // Night mode is not active, we're using the light theme
+Configuration.UI_MODE_NIGHT_YES -> { darkMode = 1 } // Night mode is active, we're using dark theme
+}
 // Send a DW_SIGNAL_CONFIGURE on orientation change
 if(windowLayout != null) {
 var width: Int = windowLayout!!.width
 var height: Int = windowLayout!!.height
 } else {
 menuBar = DWMenu()
 menuBar!!.createMenu(menu)
 }
 return super.onPrepareOptionsMenu(menu)
+}
+fun darkModeDetected(): Int
+{
+return darkMode
 }
 fun menuBarNew(location: View): DWMenu?
 {
 // TODO: Make sure location is this activity
 }
 }
 }
 }
-fun windowSetColor(window: View, falpha: Int, fred: Int, fgreen: Int, fblue: Int,
+fun windowSetColor(window: View, fore: Int, falpha: Int, fred: Int, fgreen: Int, fblue: Int,
-balpha: Int, bred: Int, bgreen: Int, bblue: Int) {
+back: Int, balpha: Int, bred: Int, bgreen: Int, bblue: Int) {
+var colorfore: Int = Color.rgb(fred, fgreen, fblue)
+var colorback: Int = Color.rgb(bred, bgreen, bblue)
+// DW_CLR_DEFAULT on background sets it transparent...
+// so the background drawable shows through
+if(back == 16) {
+colorback = Color.TRANSPARENT
+}
 waitOnUiThread {
 if (window is TextView) {
 var textview: TextView = window
-textview.setTextColor(Color.rgb(fred, fgreen, fblue))
-textview.setBackgroundColor(Color.rgb(bred, bgreen, bblue))
+// Handle DW_CLR_DEFAULT
+if(fore == 16) {
+val value = TypedValue()
+this.theme.resolveAttribute(R.attr.editTextColor, value, true)
+colorfore = value.data
+}
+textview.setTextColor(colorfore)
+textview.setBackgroundColor(colorback)
 } else if (window is Button) {
 var button: Button = window
-button.setTextColor(Color.rgb(fred, fgreen, fblue))
-button.setBackgroundColor(Color.rgb(bred, bgreen, bblue))
+// Handle DW_CLR_DEFAULT
+if(fore == 16) {
+val value = TypedValue()
+// colorButtonNormal requires API 21... use the editTextColor...
+// on older versions as a placeholder... this is probably wrong
+if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+this.theme.resolveAttribute(R.attr.colorButtonNormal, value, true)
+} else {
+this.theme.resolveAttribute(R.attr.editTextColor, value, true)
+}
+colorfore = value.data
+}
+button.setTextColor(colorfore)
+button.setBackgroundColor(colorback)
 } else if(window is LinearLayout) {
 var box: LinearLayout = window
-box.setBackgroundColor(Color.rgb(bred, bgreen, bblue))
+box.setBackgroundColor(colorback)
 }
 }
 }
 fun windowSetText(window: View, text: String) {

Mercurial > dwindows

comparison android/DWindows.kt @ 2551:127779860ac1