dwindows: android/DWindows.kt annotate

annotate android/DWindows.kt @ 2597:99fdcb7f2a2a

Don't reuse timerid since on iOS and Android it is not an index to a timer table... it is the actual handle to the timer object. After calling dw_timer_disconnect() on it, the object will be invalid so set the timerid variable to 0 which is an invalid handle.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 31 May 2021 16:53:11 +0000
parents	60ec91d23746
children	3b9bbd69bb9c

rev	line source
2484 cb5b67154399 Android: The DWindows class should be org.dbsoft.dwindows, remove dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2483 diff changeset	1 package org.dbsoft.dwindows
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3 import android.R
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	4 import android.app.Activity
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5 import android.app.Dialog
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	6 import android.app.NotificationChannel
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	7 import android.app.NotificationManager
2594 2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	8 import android.content.*
2480 878d36588aaa Android: Enable app rotation and fix some issues with layout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2479 diff changeset	9 import android.content.pm.ActivityInfo
2496 3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	10 import android.content.res.Configuration
2594 2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	11 import android.database.Cursor
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	12 import android.graphics.*
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	13 import android.graphics.drawable.BitmapDrawable
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	14 import android.graphics.drawable.Drawable
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	15 import android.graphics.drawable.GradientDrawable
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	16 import android.media.AudioManager
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	17 import android.media.ToneGenerator
2594 2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	18 import android.net.Uri
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	19 import android.os.*
2594 2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	20 import android.provider.DocumentsContract
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	21 import android.provider.MediaStore
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	22 import android.text.InputFilter
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	23 import android.text.InputFilter.LengthFilter
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	24 import android.text.InputType
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	25 import android.text.method.PasswordTransformationMethod
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	26 import android.util.Base64
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	27 import android.util.Log
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	28 import android.util.SparseBooleanArray
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	29 import android.util.TypedValue
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	30 import android.view.*
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	31 import android.view.View.OnTouchListener
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	32 import android.view.ViewGroup
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	33 import android.view.inputmethod.EditorInfo
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	34 import android.webkit.WebView
2505 a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	35 import android.webkit.WebViewClient
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	36 import android.widget.*
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	37 import android.widget.AdapterView.OnItemClickListener
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	38 import android.widget.SeekBar.OnSeekBarChangeListener
2486 cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	39 import androidx.appcompat.app.AlertDialog
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	40 import androidx.appcompat.app.AppCompatActivity
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	41 import androidx.appcompat.widget.AppCompatEditText
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	42 import androidx.collection.SimpleArrayMap
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	43 import androidx.core.app.NotificationCompat
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	44 import androidx.core.app.NotificationManagerCompat
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	45 import androidx.core.content.res.ResourcesCompat
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	46 import androidx.core.view.MenuCompat
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	47 import androidx.recyclerview.widget.RecyclerView
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	48 import androidx.viewpager2.widget.ViewPager2
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	49 import com.google.android.material.tabs.TabLayout
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	50 import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	51 import com.google.android.material.tabs.TabLayoutMediator
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	52 import java.io.File
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	53 import java.io.IOException
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	54 import java.util.*
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	55 import java.util.concurrent.locks.ReentrantLock
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	56
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	57
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	58 class DWTabViewPagerAdapter : RecyclerView.Adapter<DWTabViewPagerAdapter.DWEventViewHolder>() {
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	59 val viewList = mutableListOf<LinearLayout>()
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	60 val pageList = mutableListOf<Long>()
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	61 var currentPageID = 0L
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	62
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	63 override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	64 DWEventViewHolder(viewList.get(viewType))
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	65
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	66 override fun getItemCount() = viewList.count()
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	67 override fun getItemViewType(position: Int): Int {
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	68 return position
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	69 }
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	70 override fun onBindViewHolder(holder: DWEventViewHolder, position: Int) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	71 holder.setIsRecyclable(false)
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	72 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	73
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	74 class DWEventViewHolder(var view: View) : RecyclerView.ViewHolder(view)
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	75 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	76
2505 a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	77 private class DWWebViewClient : WebViewClient() {
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	78 //Implement shouldOverrideUrlLoading//
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	79 override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	80 // We always want to load in our own WebView,
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	81 // to match the behavior on the other platforms
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	82 return false
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	83 }
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	84 override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	85 // Handle the DW_HTML_CHANGE_STARTED event
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	86 eventHandlerHTMLChanged(view, 19, url, 1)
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	87 }
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	88
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	89 override fun onPageFinished(view: WebView, url: String) {
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	90 // Handle the DW_HTML_CHANGE_COMPLETE event
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	91 eventHandlerHTMLChanged(view, 19, url, 4)
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	92 }
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	93
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	94 external fun eventHandlerHTMLChanged(obj1: View, message: Int, URI: String, status: Int)
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	95 }
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	96
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	97 class DWSpinButton(context: Context) : AppCompatEditText(context), OnTouchListener {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	98 var value: Long = 0
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	99 var minimum: Long = 0
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	100 var maximum: Long = 65535
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	101
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	102 init {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	103 setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_media_previous, 0, R.drawable.ic_media_next, 0)
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	104 setOnTouchListener(this)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	105 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	106
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	107 override fun onTouch(v: View, event: MotionEvent): Boolean {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	108 val DRAWABLE_RIGHT = 2
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	109 val DRAWABLE_LEFT = 0
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	110
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	111 if (event.action == MotionEvent.ACTION_UP) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	112 if (event.x >= v.width - (v as EditText)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	113 .compoundDrawables[DRAWABLE_RIGHT].bounds.width()
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	114 ) {
2527 eec926265888 Android: Use toLongOrNull() whenever converting from string to long... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2526 diff changeset	115 val newvalue = this.text.toString().toLongOrNull()
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	116
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	117 if(newvalue != null) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	118 value = newvalue + 1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	119 } else {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	120 value += 1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	121 }
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	122 if(value > maximum) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	123 value = maximum
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	124 }
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	125 if(value < minimum) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	126 value = minimum
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	127 }
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	128 setText(value.toString())
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	129 eventHandlerInt(14, value.toInt(), 0, 0, 0)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	130 return true
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	131 } else if (event.x <= v.compoundDrawables[DRAWABLE_LEFT].bounds.width()) {
2527 eec926265888 Android: Use toLongOrNull() whenever converting from string to long... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2526 diff changeset	132 val newvalue = this.text.toString().toLongOrNull()
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	133
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	134 if(newvalue != null) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	135 value = newvalue - 1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	136 } else {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	137 value -= 1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	138 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	139 if(value > maximum) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	140 value = maximum
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	141 }
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	142 if(value < minimum) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	143 value = minimum
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	144 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	145 setText(value.toString())
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	146 eventHandlerInt(14, value.toInt(), 0, 0, 0)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	147 return true
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	148 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	149 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	150 return false
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	151 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	152
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	153 external fun eventHandlerInt(
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	154 message: Int,
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	155 inta: Int,
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	156 intb: Int,
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	157 intc: Int,
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	158 intd: Int
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	159 )
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	160 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	161
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	162 class DWComboBox(context: Context) : AppCompatEditText(context), OnTouchListener, OnItemClickListener {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	163 var lpw: ListPopupWindow? = null
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	164 var list = mutableListOf<String>()
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	165 var selected: Int = -1
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	166
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	167 init {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	168 setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.arrow_down_float, 0)
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	169 setOnTouchListener(this)
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	170 lpw = ListPopupWindow(context)
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	171 lpw!!.setAdapter(
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	172 ArrayAdapter(
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	173 context,
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	174 R.layout.simple_list_item_1, list
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	175 )
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	176 )
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	177 lpw!!.anchorView = this
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	178 lpw!!.isModal = true
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	179 lpw!!.setOnItemClickListener(this)
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	180 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	181
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	182 override fun onItemClick(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	183 val item = list[position]
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	184 selected = position
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	185 setText(item)
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	186 lpw!!.dismiss()
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	187 eventHandlerInt(11, position, 0, 0, 0)
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	188 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	189
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	190 override fun onTouch(v: View, event: MotionEvent): Boolean {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	191 val DRAWABLE_RIGHT = 2
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	192
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	193 if (event.action == MotionEvent.ACTION_UP) {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	194 if (event.x >= v.width - (v as EditText)
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	195 .compoundDrawables[DRAWABLE_RIGHT].bounds.width()
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	196 ) {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	197 lpw!!.show()
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	198 return true
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	199 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	200 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	201 return false
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	202 }
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	203
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	204 external fun eventHandlerInt(
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	205 message: Int,
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	206 inta: Int,
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	207 intb: Int,
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	208 intc: Int,
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	209 intd: Int
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	210 )
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	211 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	212
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	213 class DWListBox(context: Context) : ListView(context), OnItemClickListener {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	214 var list = mutableListOf<String>()
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	215 var selected: Int = -1
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	216
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	217 init {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	218 setAdapter(
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	219 ArrayAdapter(
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	220 context,
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	221 R.layout.simple_list_item_1, list
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	222 )
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	223 )
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	224 onItemClickListener = this
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	225 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	226
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	227 override fun onItemClick(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	228 selected = position
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	229 eventHandlerInt(11, position, 0, 0, 0)
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	230 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	231
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	232 external fun eventHandlerInt(
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	233 message: Int,
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	234 inta: Int,
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	235 intb: Int,
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	236 intc: Int,
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	237 intd: Int
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	238 )
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	239 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	240
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	241 class DWRender(context: Context) : View(context) {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	242 var cachedCanvas: Canvas? = null
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	243 var typeface: Typeface? = null
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	244 var fontsize: Float? = null
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	245
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	246 override fun onSizeChanged(width: Int, height: Int, oldWidth: Int, oldHeight: Int) {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	247 super.onSizeChanged(width, height, oldWidth, oldHeight)
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	248 // Send DW_SIGNAL_CONFIGURE
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	249 eventHandlerInt(1, width, height, 0, 0)
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	250 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	251
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	252 override fun onDraw(canvas: Canvas) {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	253 super.onDraw(canvas)
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	254 cachedCanvas = canvas
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	255 // Send DW_SIGNAL_EXPOSE
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	256 eventHandlerInt(7, 0, 0, this.width, this.height)
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	257 cachedCanvas = null
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	258 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	259
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	260 external fun eventHandlerInt(
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	261 message: Int,
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	262 inta: Int,
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	263 intb: Int,
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	264 intc: Int,
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	265 intd: Int
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	266 )
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	267 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	268
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	269 class DWFileChooser(private val activity: Activity) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	270 private val list: ListView = ListView(activity)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	271 private val dialog: Dialog = Dialog(activity)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	272 private var currentPath: File? = null
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	273
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	274 // filter on file extension
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	275 private var extension: String? = null
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	276 fun setExtension(extension: String?) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	277 this.extension = extension?.toLowerCase(Locale.ROOT)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	278 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	279
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	280 // file selection event handling
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	281 interface FileSelectedListener {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	282 fun fileSelected(file: File?)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	283 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	284
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	285 fun setFileListener(fileListener: FileSelectedListener?): DWFileChooser {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	286 this.fileListener = fileListener
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	287 return this
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	288 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	289
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	290 private var fileListener: FileSelectedListener? = null
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	291 fun showDialog() {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	292 dialog.show()
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	293 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	294
2527 eec926265888 Android: Use toLongOrNull() whenever converting from string to long... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2526 diff changeset	295 /*
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	296 * Sort, filter and display the files for the given path.
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	297 */
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	298 private fun refresh(path: File?) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	299 currentPath = path
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	300 if (path != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	301 if (path.exists()) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	302 val dirs = path.listFiles { file -> file.isDirectory && file.canRead() }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	303 val files = path.listFiles { file ->
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	304 if (!file.isDirectory) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	305 if (!file.canRead()) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	306 false
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	307 } else if (extension == null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	308 true
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	309 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	310 file.name.toLowerCase(Locale.ROOT).endsWith(extension!!)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	311 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	312 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	313 false
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	314 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	315 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	316
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	317 // convert to an array
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	318 var i = 0
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	319 val fileList: Array<String?>
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	320 var filecount = 0
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	321 var dircount = 0
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	322 if(files != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	323 filecount = files.size
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	324 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	325 if(dirs != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	326 dircount = dirs.size
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	327 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	328 if (path.parentFile == null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	329 fileList = arrayOfNulls(dircount + filecount)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	330 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	331 fileList = arrayOfNulls(dircount + filecount + 1)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	332 fileList[i++] = PARENT_DIR
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	333 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	334 if(dirs != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	335 Arrays.sort(dirs)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	336 for (dir in dirs) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	337 fileList[i++] = dir.name
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	338 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	339 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	340 if(files != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	341 Arrays.sort(files)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	342 for (file in files) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	343 fileList[i++] = file.name
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	344 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	345 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	346
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	347 // refresh the user interface
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	348 dialog.setTitle(currentPath!!.path)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	349 list.adapter = object : ArrayAdapter<Any?>(
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	350 activity,
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	351 R.layout.simple_list_item_1, fileList
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	352 ) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	353 override fun getView(pos: Int, view: View?, parent: ViewGroup): View {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	354 val thisview = super.getView(pos, view, parent)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	355 (thisview as TextView).isSingleLine = true
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	356 return thisview
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	357 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	358 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	359 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	360 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	361 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	362
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	363 /**
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	364 * Convert a relative filename into an actual File object.
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	365 */
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	366 private fun getChosenFile(fileChosen: String): File? {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	367 return if (fileChosen == PARENT_DIR) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	368 currentPath!!.parentFile
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	369 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	370 File(currentPath, fileChosen)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	371 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	372 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	373
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	374 companion object {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	375 private const val PARENT_DIR = ".."
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	376 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	377
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	378 init {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	379 list.onItemClickListener =
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	380 OnItemClickListener { parent, view, which, id ->
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	381 val fileChosen = list.getItemAtPosition(which) as String
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	382 val chosenFile: File? = getChosenFile(fileChosen)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	383 if (chosenFile != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	384 if (chosenFile.isDirectory) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	385 refresh(chosenFile)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	386 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	387 if (fileListener != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	388 fileListener!!.fileSelected(chosenFile)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	389 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	390 dialog.dismiss()
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	391 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	392 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	393 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	394 dialog.setContentView(list)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	395 dialog.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	396 refresh(Environment.getExternalStorageDirectory())
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	397 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	398 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	399
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	400 // On Android we can't pre-create submenus...
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	401 // So create our own placeholder classes, and create the actual menus
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	402 // on demand when required by Android
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	403 class DWMenuItem
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	404 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	405 var title: String? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	406 var menu: DWMenu? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	407 var submenu: DWMenu? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	408 var checked: Boolean = false
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	409 var check: Boolean = false
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	410 var enabled: Boolean = true
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	411 var menuitem: MenuItem? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	412 var submenuitem: SubMenu? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	413 var id: Int = 0
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	414 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	415
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	416 class DWMenu {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	417 var menu: Menu? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	418 var children = mutableListOf<DWMenuItem>()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	419 var id: Int = 0
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	420
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	421 fun createMenu(newmenu: Menu?) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	422 if(menu == null) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	423 menu = newmenu
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	424 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	425 if(menu != null) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	426 var group = 0
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	427
dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	428 // Enable group dividers for separators
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	429 MenuCompat.setGroupDividerEnabled(menu, true)
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	430
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	431 for (menuitem in children) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	432 // Submenus on Android can't have submenus, so stop at depth 1
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	433 if (menuitem.submenu != null && menu !is SubMenu) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	434 if(menuitem.submenuitem == null) {
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	435 menuitem.submenuitem = menu?.addSubMenu(group, menuitem.id, 0, menuitem.title)
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	436 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	437 menuitem.submenu!!.createMenu(menuitem.submenuitem)
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	438 } else if(menuitem.submenu == null) {
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	439 if(menuitem.title!!.isEmpty()) {
dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	440 group += 1
dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	441 } else if(menuitem.menuitem == null) {
dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	442 menuitem.menuitem = menu?.add(group, menuitem.id, 0, menuitem.title)
2545 f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	443 menuitem.menuitem!!.isCheckable = menuitem.check
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	444 menuitem.menuitem!!.isChecked = menuitem.checked
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	445 menuitem.menuitem!!.isEnabled = menuitem.enabled
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	446 menuitem.menuitem!!.setOnMenuItemClickListener { item: MenuItem? ->
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	447 eventHandlerSimple(menuitem, 8)
dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	448 true
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	449 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	450 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	451 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	452 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	453 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	454 }
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	455
dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	456 external fun eventHandlerSimple(item: DWMenuItem, message: Int)
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	457 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	458
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	459 // Class for storing container data
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	460 class DWContainerModel {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	461 var columns = mutableListOf<String?>()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	462 var types = mutableListOf<Int>()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	463 var data = mutableListOf<Any?>()
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	464 var rowdata = mutableListOf<Long>()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	465 var rowtitle = mutableListOf<String?>()
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	466 var querypos: Int = -1
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	467
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	468 fun numberOfColumns(): Int
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	469 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	470 return columns.size
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	471 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	472
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	473 fun numberOfRows(): Int
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	474 {
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	475 if(columns.size > 0) {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	476 return data.size / columns.size
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	477 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	478 return 0
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	479 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	480
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	481 fun getColumnType(column: Int): Int
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	482 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	483 if(column < types.size) {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	484 return types[column]
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	485 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	486 return -1
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	487 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	488
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	489 fun getRowAndColumn(row: Int, column: Int): Any?
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	490 {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	491 val index: Int = (row * columns.size) + column
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	492
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	493 if(index > -1 && index < data.size) {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	494 return data[index]
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	495 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	496 return null
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	497 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	498
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	499 fun setRowAndColumn(row: Int, column: Int, obj: Any?)
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	500 {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	501 val index: Int = (row * columns.size) + column
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	502
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	503 if(index > -1 && index < data.size && column < types.size) {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	504 // Verify the data matches the column type
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	505 if((((types[column] and 1) != 0) && (obj is Drawable)) \|\|
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	506 (((types[column] and (1 shl 1)) != 0) && (obj is String)) \|\|
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	507 (((types[column] and (1 shl 2)) != 0) && (obj is Int))) {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	508 data[index] = obj
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	509 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	510 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	511 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	512
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	513 fun changeRowData(row: Int, rdata: Long)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	514 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	515 if(row > -1 && row < rowdata.size) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	516 rowdata[row] = rdata
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	517 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	518 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	519
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	520 fun getRowData(row: Int): Long
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	521 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	522 if(row > -1 && row < rowdata.size) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	523 return rowdata[row]
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	524 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	525 return 0
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	526 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	527
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	528 fun changeRowTitle(row: Int, title: String?)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	529 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	530 if(row > -1 && row < rowtitle.size) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	531 rowtitle[row] = title
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	532 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	533 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	534
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	535 fun getRowTitle(row: Int): String?
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	536 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	537 if(row > -1 && row < rowtitle.size) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	538 return rowtitle[row]
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	539 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	540 return null
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	541 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	542
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	543 fun addColumn(title: String?, type: Int)
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	544 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	545 columns.add(title)
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	546 types.add(type)
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	547 // If we change the columns we have to invalidate the data
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	548 data.clear()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	549 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	550
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	551 fun deleteRows(count: Int)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	552 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	553 if(count < rowdata.size) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	554 for(i in 0 until count) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	555 for(j in 0 until columns.size) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	556 data.removeAt(0)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	557 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	558 rowdata.removeAt(0)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	559 rowtitle.removeAt(0)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	560 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	561 } else {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	562 data.clear()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	563 rowdata.clear()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	564 rowtitle.clear()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	565 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	566 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	567
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	568 fun deleteRowByTitle(title: String?)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	569 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	570 for(i in 0 until rowtitle.size) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	571 if(rowtitle[i] != null && rowtitle[i] == title) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	572 for(j in 0 until columns.size) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	573 data.removeAt(i * columns.size)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	574 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	575 rowdata.removeAt(i)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	576 rowtitle.removeAt(i)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	577 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	578 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	579 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	580
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	581 fun deleteRowByData(rdata: Long)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	582 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	583 for(i in 0 until rowdata.size) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	584 if(rowdata[i] == rdata) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	585 for(j in 0 until columns.size) {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	586 data.removeAt(i * columns.size)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	587 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	588 rowdata.removeAt(i)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	589 rowtitle.removeAt(i)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	590 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	591 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	592 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	593
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	594 fun addRows(count: Int): Long
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	595 {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	596 val startRow: Long = numberOfRows().toLong()
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	597
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	598 for(i in 0 until count)
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	599 {
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	600 for(j in 0 until columns.size)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	601 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	602 // Fill in with nulls to be set later
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	603 data.add(null)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	604 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	605 rowdata.add(0)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	606 rowtitle.add(null)
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	607 }
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	608 return startRow
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	609 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	610
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	611 fun clear()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	612 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	613 data.clear()
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	614 rowdata.clear()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	615 rowtitle.clear()
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	616 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	617 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	618
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	619 class DWContainerAdapter(c: Context) : BaseAdapter()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	620 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	621 private var context = c
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	622 var model = DWContainerModel()
2563 56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	623 var selectedItem: Int = -1
2565 5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	624 var simpleMode: Boolean = true
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	625 var oddColor: Int? = null
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	626 var evenColor: Int? = null
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	627
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	628 override fun getCount(): Int {
2567 19d82c1f135f Android: Fix incorrect display of first container entry with the new layout code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2565 diff changeset	629 return model.numberOfRows()
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	630 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	631
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	632 override fun getItem(position: Int): Any? {
2565 5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	633 return model.getRowAndColumn(position, 0)
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	634 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	635
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	636 override fun getItemId(position: Int): Long {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	637 return position.toLong()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	638 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	639
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	640 override fun getView(position: Int, view: View?, parent: ViewGroup): View {
2568 b536b7b21682 Android: Switch to using LinearLayout for Container row layout... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2567 diff changeset	641 var rowView: LinearLayout? = view as LinearLayout?
2565 5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	642 var displayColumns = model.numberOfColumns()
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	643
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	644 // In simple mode, limit the columns to 1 or 2
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	645 if(simpleMode == true) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	646 // If column 1 is bitmap and column 2 is text...
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	647 if(displayColumns > 1 && (model.getColumnType(0) and 1) != 0 &&
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	648 (model.getColumnType(1) and (1 shl 1)) != 0) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	649 displayColumns = 2
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	650 } else {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	651 displayColumns = 1
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	652 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	653 }
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	654
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	655 // If the view passed in is null we need to create the layout
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	656 if(rowView == null) {
2568 b536b7b21682 Android: Switch to using LinearLayout for Container row layout... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2567 diff changeset	657 rowView = LinearLayout(context)
b536b7b21682 Android: Switch to using LinearLayout for Container row layout... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2567 diff changeset	658 rowView.orientation = LinearLayout.HORIZONTAL
2565 5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	659
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	660 for(i in 0 until displayColumns) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	661 val content = model.getRowAndColumn(position, i)
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	662
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	663 // Image
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	664 if((model.getColumnType(i) and 1) != 0) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	665 val imageview = ImageView(context)
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	666 val params = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	667 LinearLayout.LayoutParams.WRAP_CONTENT)
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	668 params.gravity = Gravity.CENTER
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	669 imageview.layoutParams = params
2565 5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	670 imageview.id = View.generateViewId()
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	671 if (content is Drawable) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	672 imageview.setImageDrawable(content)
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	673 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	674 rowView.addView(imageview)
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	675 } else {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	676 // Everything else id displayed as text
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	677 val textview = TextView(context)
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	678 val params = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	679 LinearLayout.LayoutParams.WRAP_CONTENT)
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	680 params.gravity = Gravity.CENTER
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	681 textview.layoutParams = params
2565 5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	682 textview.id = View.generateViewId()
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	683 if (content is String) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	684 textview.text = content
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	685 } else if(content is Int) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	686 textview.text = content.toString()
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	687 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	688 rowView.addView(textview)
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	689 }
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	690 }
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	691 // TODO: Add code to optionally add other columns
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	692 } else {
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	693 // Otherwise we just need to update the existing layout
2565 5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	694
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	695 for(i in 0 until displayColumns) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	696 val content = model.getRowAndColumn(position, i)
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	697
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	698 // Image
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	699 if((model.getColumnType(i) and 1) != 0) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	700 val imageview = rowView.getChildAt(i)
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	701
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	702 if (imageview is ImageView && content is Drawable) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	703 imageview.setImageDrawable(content)
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	704 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	705 } else {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	706 // Text
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	707 val textview = rowView.getChildAt(i)
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	708
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	709 if (textview is TextView) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	710 if (content is String) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	711 textview.text = content
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	712 } else if (content is Int) {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	713 textview.text = content.toString()
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	714 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	715 }
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	716 }
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	717 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	718 }
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	719 // Handle row stripe
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	720 if (position % 2 == 0) {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	721 if(evenColor != null) {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	722 rowView.setBackgroundColor(evenColor!!)
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	723 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	724 } else {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	725 if(oddColor != null) {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	726 rowView.setBackgroundColor(oddColor!!)
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	727 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	728 }
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	729 return rowView
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	730 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	731 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	732
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	733 class DWindows : AppCompatActivity() {
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	734 var firstWindow: Boolean = true
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	735 var windowLayout: LinearLayout? = null
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	736 var threadLock = ReentrantLock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	737 var threadCond = threadLock.newCondition()
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	738 var notificationID: Int = 0
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	739 var darkMode: Int = -1
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	740 private var paint = Paint()
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	741 private var bgcolor: Int = 0
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	742 private var menuBar: DWMenu? = null
2582 01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	743 private var defaultItem: View? = null
2594 2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	744 private var fileURI: Uri? = null
2595 6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	745 private var fileLock = ReentrantLock()
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	746 private var fileCond = threadLock.newCondition()
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	747
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	748 // Our version of runOnUiThread that waits for execution
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	749 fun waitOnUiThread(runnable: Runnable)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	750 {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	751 if(Looper.myLooper() == Looper.getMainLooper()) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	752 runnable.run()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	753 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	754 threadLock.lock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	755 val ourRunnable = Runnable {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	756 threadLock.lock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	757 runnable.run()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	758 threadCond.signal()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	759 threadLock.unlock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	760 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	761 runOnUiThread(ourRunnable)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	762 threadCond.await()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	763 threadLock.unlock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	764 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	765 }
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	766
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	767 // We only want to call this once when the app starts up
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	768 // By default Android will call onCreate for rotation and other
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	769 // changes. This is incompatible with Dynamic Windows...
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	770 // Make sure the following is in your AndroidManifest.xml
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	771 // android:configChanges="orientation\|screenSize\|screenLayout\|keyboardHidden"
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	772 override fun onCreate(savedInstanceState: Bundle?) {
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	773 super.onCreate(savedInstanceState)
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	774
2480 878d36588aaa Android: Enable app rotation and fix some issues with layout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2479 diff changeset	775 // Turn on rotation
878d36588aaa Android: Enable app rotation and fix some issues with layout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2479 diff changeset	776 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR)
878d36588aaa Android: Enable app rotation and fix some issues with layout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2479 diff changeset	777
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	778 // Get the Android app path
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	779 val m = packageManager
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	780 var s = packageName
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	781 val p = m.getPackageInfo(s!!, 0)
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	782 s = p.applicationInfo.dataDir
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	783
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	784 // Initialize the Dynamic Windows code...
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	785 // This will start a new thread that calls the app's dwmain()
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	786 dwindowsInit(s, this.getPackageName())
2496 3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	787 }
3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	788
3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	789 override fun onConfigurationChanged(newConfig: Configuration) {
3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	790 super.onConfigurationChanged(newConfig)
3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	791
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	792 val currentNightMode = newConfig.uiMode and Configuration.UI_MODE_NIGHT_MASK
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	793 when (currentNightMode) {
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	794 Configuration.UI_MODE_NIGHT_NO -> { darkMode = 0 } // Night mode is not active, we're using the light theme
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	795 Configuration.UI_MODE_NIGHT_YES -> { darkMode = 1 } // Night mode is active, we're using dark theme
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	796 }
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	797
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	798 // Send a DW_SIGNAL_CONFIGURE on orientation change
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	799 if(windowLayout != null) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	800 val width: Int = windowLayout!!.width
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	801 val height: Int = windowLayout!!.height
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	802
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	803 eventHandlerInt(windowLayout as View, 1, width, height, 0, 0)
2496 3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	804 }
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	805 }
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	806
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	807 override fun onCreateOptionsMenu(menu: Menu?): Boolean {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	808 if(menuBar == null) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	809 menuBar = DWMenu()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	810 menuBar!!.menu = menu
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	811 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	812 return super.onCreateOptionsMenu(menu)
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	813 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	814
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	815 override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	816 if(menuBar != null) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	817 menuBar!!.createMenu(menu)
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	818 } else {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	819 menuBar = DWMenu()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	820 menuBar!!.createMenu(menu)
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	821 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	822 return super.onPrepareOptionsMenu(menu)
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	823 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	824
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	825 // These are the Android calls to actually create the UI...
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	826 // forwarded from the C Dynamic Windows API
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	827
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	828 fun darkModeDetected(): Int
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	829 {
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	830 return darkMode
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	831 }
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	832
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	833 fun menuBarNew(location: View): DWMenu?
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	834 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	835 // TODO: Make sure location is this activity
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	836 return menuBar
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	837 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	838
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	839 fun menuNew(cid: Int): DWMenu
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	840 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	841 val menu = DWMenu()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	842 menu.id = cid
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	843 return menu
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	844 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	845
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	846 fun menuAppendItem(menu: DWMenu, title: String, cid: Int, flags: Int, end: Int, check: Int, submenu: DWMenu?): DWMenuItem
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	847 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	848 val menuitem = DWMenuItem()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	849 menuitem.id = cid
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	850 menuitem.title = title
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	851 menuitem.check = check != 0
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	852 if(submenu != null) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	853 menuitem.submenu = submenu
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	854 }
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	855 if((flags and (1 shl 1)) != 0) {
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	856 menuitem.enabled = false
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	857 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	858 if((flags and (1 shl 2)) != 0) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	859 menuitem.checked = true
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	860 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	861 if(end == 0) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	862 menu.children.add(0, menuitem)
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	863 } else {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	864 menu.children.add(menuitem)
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	865 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	866 return menuitem
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	867 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	868
2545 f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	869 fun menuDestroy(menu: DWMenu)
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	870 {
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	871 menu.children.clear()
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	872 runOnUiThread {
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	873 menu.menu!!.clear()
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	874 invalidateOptionsMenu()
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	875 }
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	876 }
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	877
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	878 fun menuDeleteItem(menu: DWMenu, cid: Int)
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	879 {
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	880 for(menuitem in menu.children) {
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	881 if(menuitem.id == cid) {
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	882 menu.children.remove(menuitem)
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	883 runOnUiThread {
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	884 menu.menu!!.removeItem(menuitem.id)
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	885 invalidateOptionsMenu()
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	886 }
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	887 }
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	888 }
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	889 }
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	890
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	891 fun menuSetState(menu: DWMenu, cid: Int, state: Int)
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	892 {
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	893 for(menuitem in menu.children) {
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	894 if(menuitem.id == cid) {
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	895 // Handle DW_MIS_ENABLED/DISABLED
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	896 if((state and (1 or (1 shl 1))) != 0) {
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	897 var enabled = false
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	898
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	899 // Handle DW_MIS_ENABLED
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	900 if ((state and 1) != 0) {
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	901 enabled = true
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	902 }
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	903 menuitem.enabled = enabled
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	904 runOnUiThread {
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	905 menuitem.menuitem!!.isEnabled = enabled
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	906 invalidateOptionsMenu()
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	907 }
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	908 }
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	909
2545 f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	910 // Handle DW_MIS_CHECKED/UNCHECKED
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	911 if((state and ((1 shl 2) or (1 shl 3))) != 0) {
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	912 var checked = false
2545 f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	913
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	914 // Handle DW_MIS_CHECKED
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	915 if ((state and (1 shl 2)) != 0) {
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	916 checked = true
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	917 }
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	918 menuitem.checked = checked
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	919 runOnUiThread {
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	920 menuitem.menuitem!!.isChecked = checked
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	921 invalidateOptionsMenu()
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	922 }
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	923 }
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	924 }
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	925 }
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	926 }
f803f3b164cf Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2544 diff changeset	927
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	928 fun windowNew(title: String, style: Int): LinearLayout? {
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	929 if (firstWindow) {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	930 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	931 val dataArrayMap = SimpleArrayMap<String, Long>()
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	932 windowLayout = LinearLayout(this)
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	933
2503 1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	934 windowLayout!!.visibility = View.GONE
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	935 windowLayout!!.tag = dataArrayMap
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	936 setContentView(windowLayout)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	937 this.title = title
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	938 // For now we just return our DWindows' main activity layout...
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	939 // in the future, later calls should create new activities
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	940 firstWindow = false
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	941 }
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	942 return windowLayout
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	943 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	944 return null
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	945 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	946
2582 01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	947 fun windowSetFocus(window: View)
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	948 {
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	949 waitOnUiThread {
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	950 window.requestFocus()
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	951 }
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	952 }
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	953
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	954 fun windowDefault(window: View, default: View)
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	955 {
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	956 // TODO: Verify this is the correct activity...
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	957 defaultItem = default
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	958 }
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	959
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	960 fun windowSetStyle(window: View, style: Int, mask: Int)
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	961 {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	962 waitOnUiThread {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	963 if (window is TextView && window !is EditText) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	964 val text = window
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	965 val ourmask = (Gravity.HORIZONTAL_GRAVITY_MASK or Gravity.VERTICAL_GRAVITY_MASK) and mask
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	966
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	967 if (ourmask != 0) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	968 // Gravity with the masked parts zeroed out
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	969 val newgravity = style and ourmask
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	970
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	971 text.gravity = newgravity
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	972 }
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	973 }
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	974 }
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	975 }
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	976
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	977 fun windowFromId(window: View, cid: Int): View {
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	978 return window.findViewById(cid)
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	979 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	980
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	981 fun windowSetData(window: View, name: String, data: Long) {
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	982 if (window.tag != null) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	983 val dataArrayMap: SimpleArrayMap<String, Long> = window.tag as SimpleArrayMap<String, Long>
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	984
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	985 if (data != 0L) {
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	986 dataArrayMap.put(name, data)
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	987 } else {
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	988 dataArrayMap.remove(name)
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	989 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	990 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	991 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	992
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	993 fun windowGetData(window: View, name: String): Long {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	994 var retval = 0L
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	995
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	996 if (window.tag != null) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	997 val dataArrayMap: SimpleArrayMap<String, Long> = window.tag as SimpleArrayMap<String, Long>
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	998
2557 756331246f94 Android: Implement Java exception handling, make sure all return values from JNI are sane. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2556 diff changeset	999 if(dataArrayMap.containsKey(name)) {
756331246f94 Android: Implement Java exception handling, make sure all return values from JNI are sane. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2556 diff changeset	1000 retval = dataArrayMap.get(name)!!
756331246f94 Android: Implement Java exception handling, make sure all return values from JNI are sane. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2556 diff changeset	1001 }
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1002 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1003 return retval
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1004 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1005
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1006 fun windowSetEnabled(window: View, state: Boolean) {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1007 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1008 window.setEnabled(state)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1009 }
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	1010 }
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1011
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1012 fun typefaceFromFontName(fontname: String?): Typeface?
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1013 {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1014 if(fontname != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1015 val bold: Boolean = fontname.contains(" Bold")
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1016 val italic: Boolean = fontname.contains(" Italic")
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1017 val font = fontname.substringAfter('.')
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1018 var fontFamily = font
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1019 val typeface: Typeface?
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1020
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1021 if (bold) {
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1022 fontFamily = font.substringBefore(" Bold")
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1023 } else if (italic) {
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1024 fontFamily = font.substringBefore(" Italic")
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1025 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1026
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1027 var style: Int = Typeface.NORMAL
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1028 if (bold && italic) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1029 style = Typeface.BOLD_ITALIC
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1030 } else if (bold) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1031 style = Typeface.BOLD
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1032 } else if (italic) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1033 style = Typeface.ITALIC
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1034 }
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1035 typeface = Typeface.create(fontFamily, style)
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1036
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1037 return typeface
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1038 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1039 return Typeface.DEFAULT
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1040 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1041
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1042 fun windowSetFont(window: View, fontname: String?) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1043 val typeface: Typeface? = typefaceFromFontName(fontname)
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1044 var size: Float? = null
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1045
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1046 if(fontname != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1047 size = fontname.substringBefore('.').toFloatOrNull()
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1048 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1049
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1050 if(typeface != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1051 waitOnUiThread {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1052 if (window is TextView) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1053 val textview: TextView = window
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1054 textview.typeface = typeface
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1055 if(size != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1056 textview.textSize = size
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1057 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1058 } else if (window is Button) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1059 val button: Button = window
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1060 button.typeface = typeface
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1061 if(size != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1062 button.textSize = size
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1063 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1064 } else if(window is DWRender) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1065 val render: DWRender = window
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1066 render.typeface = typeface
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1067 if(size != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1068 render.fontsize = size
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1069 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1070 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1071 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1072 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1073 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1074
2582 01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1075 fun windowGetFont(window: View): String?
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1076 {
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1077 var fontname: String? = null
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1078
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1079 waitOnUiThread {
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1080 var typeface: Typeface? = null
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1081 var fontsize: Float? = null
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1082
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1083 if(window is DWRender) {
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1084 typeface = window.typeface
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1085 fontsize = window.fontsize
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1086 } else if(window is TextView) {
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1087 typeface = window.typeface
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1088 fontsize = window.textSize
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1089 } else if(window is Button) {
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1090 typeface = window.typeface
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1091 fontsize = window.textSize
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1092 }
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1093
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1094 if(typeface != null && fontsize != null) {
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1095 val isize = fontsize.toInt()
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1096 val name = typeface.toString()
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1097
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1098 fontname = "$isize.$name"
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1099 }
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1100 }
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1101 return null
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1102 }
01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1103
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1104 fun windowSetColor(window: View, fore: Int, falpha: Int, fred: Int, fgreen: Int, fblue: Int,
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1105 back: Int, balpha: Int, bred: Int, bgreen: Int, bblue: Int) {
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1106 var colorfore: Int = Color.rgb(fred, fgreen, fblue)
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1107 var colorback: Int = Color.rgb(bred, bgreen, bblue)
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1108
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1109 // DW_CLR_DEFAULT on background sets it transparent...
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1110 // so the background drawable shows through
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1111 if(back == 16) {
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1112 colorback = Color.TRANSPARENT
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1113 }
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1114
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1115 waitOnUiThread {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1116 if (window is TextView) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1117 val textview: TextView = window
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1118
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1119 // Handle DW_CLR_DEFAULT
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1120 if(fore == 16) {
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1121 val value = TypedValue()
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1122 this.theme.resolveAttribute(R.attr.editTextColor, value, true)
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1123 colorfore = value.data
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1124 }
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1125 textview.setTextColor(colorfore)
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1126 textview.setBackgroundColor(colorback)
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1127 } else if (window is Button) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1128 val button: Button = window
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1129
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1130 // Handle DW_CLR_DEFAULT
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1131 if(fore == 16) {
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1132 val value = TypedValue()
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1133 this.theme.resolveAttribute(R.attr.colorButtonNormal, value, true)
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1134 colorfore = value.data
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1135 }
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1136 button.setTextColor(colorfore)
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1137 button.setBackgroundColor(colorback)
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1138 } else if(window is LinearLayout) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1139 val box: LinearLayout = window
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1140
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1141 box.setBackgroundColor(colorback)
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1142 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1143 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1144 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	1145
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1146 fun windowSetText(window: View, text: String) {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1147 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1148 if (window is TextView) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1149 val textview: TextView = window
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1150 textview.text = text
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1151 } else if (window is Button) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1152 val button: Button = window
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1153 button.text = text
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1154 } else if (window is LinearLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1155 // TODO: Make sure this is actually the top-level layout, not just a box
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1156 this.title = text
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1157 }
2489 6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1158 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1159 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1160
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1161 fun windowGetText(window: View): String? {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1162 var text: String? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1163
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1164 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1165 if (window is TextView) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1166 val textview: TextView = window
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1167 text = textview.text.toString()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1168 } else if (window is Button) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1169 val button: Button = window
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1170 text = button.text.toString()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1171 } else if (window is LinearLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1172 // TODO: Make sure this is actually the top-level layout, not just a box
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1173 text = this.title.toString()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1174 }
2489 6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1175 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1176 return text
2489 6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1177 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1178
2503 1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	1179 fun windowHideShow(window: View, state: Int)
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	1180 {
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	1181 waitOnUiThread {
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	1182 if(state == 0) {
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	1183 window.visibility = View.GONE
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	1184 } else {
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	1185 window.visibility = View.VISIBLE
2582 01fca1937806 Android: Implement dw_window_set_focus(), dw_window_default() and dw_window_get_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2581 diff changeset	1186 defaultItem?.requestFocus()
2503 1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	1187 }
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	1188 }
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	1189 }
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	1190
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1191 fun clipboardGetText(): String {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1192 val cm: ClipboardManager = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1193 val clipdata = cm.primaryClip
2489 6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1194
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1195 if (clipdata != null && clipdata.itemCount > 0) {
2489 6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1196 return clipdata.getItemAt(0).coerceToText(this).toString()
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1197 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1198 return ""
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1199 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1200
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1201 fun clipboardSetText(text: String) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1202 val cm: ClipboardManager = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1203 val clipdata = ClipData.newPlainText("text", text)
2489 6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1204
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1205 cm.setPrimaryClip(clipdata)
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1206 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	1207
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1208 fun boxNew(type: Int, pad: Int): LinearLayout? {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1209 var box: LinearLayout? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1210 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1211 box = LinearLayout(this)
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1212 val dataArrayMap = SimpleArrayMap<String, Long>()
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1213
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1214 box!!.tag = dataArrayMap
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1215 box!!.layoutParams =
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1216 LinearLayout.LayoutParams(
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1217 LinearLayout.LayoutParams.WRAP_CONTENT,
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1218 LinearLayout.LayoutParams.WRAP_CONTENT
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1219 )
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1220 if (type > 0) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1221 box!!.orientation = LinearLayout.VERTICAL
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1222 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1223 box!!.orientation = LinearLayout.HORIZONTAL
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1224 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1225 box!!.setPadding(pad, pad, pad, pad)
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	1226 }
16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	1227 return box
16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	1228 }
16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	1229
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1230 fun scrollBoxNew(type: Int, pad: Int) : ScrollView? {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1231 var scrollBox: ScrollView? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1232
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1233 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1234 val box = LinearLayout(this)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1235 scrollBox = ScrollView(this)
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1236 val dataArrayMap = SimpleArrayMap<String, Long>()
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1237
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1238 scrollBox!!.tag = dataArrayMap
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1239 box.layoutParams =
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1240 LinearLayout.LayoutParams(
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1241 LinearLayout.LayoutParams.MATCH_PARENT,
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1242 LinearLayout.LayoutParams.MATCH_PARENT
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1243 )
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1244 if (type > 0) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1245 box.orientation = LinearLayout.VERTICAL
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1246 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1247 box.orientation = LinearLayout.HORIZONTAL
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1248 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1249 box.setPadding(pad, pad, pad, pad)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1250 // Add a pointer back to the ScrollView
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1251 box.tag = scrollBox
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1252 scrollBox!!.addView(box)
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1253 }
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1254 return scrollBox
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1255 }
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1256
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1257 fun boxPack(
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1258 boxview: View,
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1259 item: View,
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1260 index: Int,
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1261 width: Int,
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1262 height: Int,
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1263 hsize: Int,
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1264 vsize: Int,
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1265 pad: Int
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1266 ) {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1267 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1268 var w: Int = LinearLayout.LayoutParams.WRAP_CONTENT
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1269 var h: Int = LinearLayout.LayoutParams.WRAP_CONTENT
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1270 var box: LinearLayout? = null
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	1271
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1272 // Handle scrollboxes by pulling the LinearLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1273 // out of the ScrollView to pack into
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1274 if (boxview is LinearLayout) {
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1275 box = boxview
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1276 } else if (boxview is ScrollView) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1277 val sv: ScrollView = boxview
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1278
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1279 if (sv.getChildAt(0) is LinearLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1280 box = sv.getChildAt(0) as LinearLayout
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1281 }
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1282 }
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1283
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1284 if (box != null) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1285 var weight = 1F
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1286
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1287 // If it is a box, match parent based on direction
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1288 if ((item is LinearLayout) \|\| (item is ScrollView)) {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1289 if (box.orientation == LinearLayout.VERTICAL) {
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1290 if (hsize != 0) {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1291 w = LinearLayout.LayoutParams.MATCH_PARENT
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1292 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1293 } else {
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1294 if (vsize != 0) {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1295 h = LinearLayout.LayoutParams.MATCH_PARENT
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1296 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1297 }
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1298 // If it isn't a box... set or calculate the size as needed
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1299 } else {
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1300 if(width != -1 \|\| height != -1) {
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1301 item.measure(0, 0)
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1302 }
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1303 if(hsize == 0) {
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1304 if (width > 0) {
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1305 w = width
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1306 }
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1307 } else {
2575 5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1308 if (box.orientation == LinearLayout.VERTICAL) {
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1309 w = LinearLayout.LayoutParams.MATCH_PARENT
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1310 } else {
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1311 if (width > 0) {
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1312 weight = width.toFloat()
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1313 } else if (width == -1) {
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1314 val newwidth = item.getMeasuredWidth()
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1315
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1316 if (newwidth > 0) {
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1317 weight = newwidth.toFloat()
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1318 }
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1319 }
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1320 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1321 }
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1322 if(vsize == 0) {
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1323 if (height > 0) {
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1324 h = height
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1325 }
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1326 } else {
2575 5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1327 if (box.orientation == LinearLayout.HORIZONTAL) {
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1328 h = LinearLayout.LayoutParams.MATCH_PARENT
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1329 } else {
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1330 if (height > 0) {
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1331 weight = height.toFloat()
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1332 } else if (height == -1) {
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1333 val newheight = item.getMeasuredHeight()
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1334
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1335 if (newheight > 0) {
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1336 weight = newheight.toFloat()
5beaaa4e9b03 Android: Improve the layout, if an item expands in the opposite direction of the box... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2574 diff changeset	1337 }
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1338 }
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1339 }
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1340 }
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1341 }
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1342
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1343 val params: LinearLayout.LayoutParams = LinearLayout.LayoutParams(w, h)
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1344
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1345 // Handle expandable items by giving them a weight...
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1346 // in the direction of the box.
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1347 if (box.orientation == LinearLayout.VERTICAL) {
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1348 if (vsize != 0) {
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1349 params.weight = weight
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1350 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1351 } else {
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1352 if (hsize != 0) {
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	1353 params.weight = weight
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1354 }
2480 878d36588aaa Android: Enable app rotation and fix some issues with layout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2479 diff changeset	1355 }
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1356 // Gravity needs to match the expandable settings
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1357 val grav: Int = Gravity.CLIP_HORIZONTAL or Gravity.CLIP_VERTICAL
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1358 if (hsize != 0 && vsize != 0) {
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1359 params.gravity = Gravity.FILL or grav
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1360 } else if (hsize != 0) {
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1361 params.gravity = Gravity.FILL_HORIZONTAL or grav
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1362 } else if (vsize != 0) {
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1363 params.gravity = Gravity.FILL_VERTICAL or grav
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1364 }
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1365 // Finally add the padding
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1366 if (pad > 0) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1367 params.setMargins(pad, pad, pad, pad)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1368 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1369 item.layoutParams = params
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1370 box.addView(item, index)
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	1371 }
2478 b0230e378667 Android: Improvements to boxPack to handle more parameters... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2477 diff changeset	1372 }
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	1373 }
16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	1374
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1375 fun boxUnpack(item: View) {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1376 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1377 val box: LinearLayout = item.parent as LinearLayout
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1378 box.removeView(item)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1379 }
2477 3fbf8783122d Android: First functional version. Notebook-less first page of dwtest works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2476 diff changeset	1380 }
3fbf8783122d Android: First functional version. Notebook-less first page of dwtest works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2476 diff changeset	1381
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1382 fun boxUnpackAtIndex(box: LinearLayout, index: Int): View? {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1383 var item: View? = null
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1384
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1385 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1386 item = box.getChildAt(index)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1387
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1388 box.removeView(item)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1389 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1390 return item
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1391 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1392
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1393 fun buttonNew(text: String, cid: Int): Button? {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1394 var button: Button? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1395 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1396 button = Button(this)
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1397 val dataArrayMap = SimpleArrayMap<String, Long>()
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1398
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1399 button!!.tag = dataArrayMap
2590 8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1400 button!!.isAllCaps = false
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1401 button!!.text = text
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1402 button!!.id = cid
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1403 button!!.setOnClickListener {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1404 eventHandlerSimple(button!!, 8)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1405 }
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	1406 }
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1407 return button
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1408 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1409
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1410 fun bitmapButtonNew(text: String, resid: Int): ImageButton? {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1411 var button: ImageButton? = null
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1412 waitOnUiThread {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1413 button = ImageButton(this)
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1414 val dataArrayMap = SimpleArrayMap<String, Long>()
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1415
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1416 button!!.tag = dataArrayMap
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1417 button!!.id = resid
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1418 button!!.setImageResource(resid)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1419 button!!.setOnClickListener {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1420 eventHandlerSimple(button!!, 8)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1421 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1422 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1423 return button
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1424 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1425
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1426 fun bitmapButtonNewFromFile(text: String, cid: Int, filename: String): ImageButton? {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1427 var button: ImageButton? = null
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1428 waitOnUiThread {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1429 button = ImageButton(this)
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1430 val dataArrayMap = SimpleArrayMap<String, Long>()
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1431 val exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1432
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1433 button!!.tag = dataArrayMap
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1434 button!!.id = cid
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1435 button!!.setOnClickListener {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1436 eventHandlerSimple(button!!, 8)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1437 }
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1438
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1439 for (ext in exts) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1440 // Try to load the image, and protect against exceptions
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1441 try {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1442 val f = this.assets.open(filename + ext)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1443 val b = BitmapFactory.decodeStream(f)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1444
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1445 if(b != null) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1446 button!!.setImageBitmap(b)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1447 break
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1448 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1449 } catch (e: IOException) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	1450 }
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1451 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1452 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1453 return button
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1454 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1455
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1456 fun bitmapButtonNewFromData(text: String, cid: Int, data: ByteArray, length: Int): ImageButton? {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1457 var button: ImageButton? = null
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1458 waitOnUiThread {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1459 button = ImageButton(this)
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1460 val dataArrayMap = SimpleArrayMap<String, Long>()
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1461 val b = BitmapFactory.decodeByteArray(data,0, length)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1462
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1463 button!!.tag = dataArrayMap
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1464 button!!.id = cid
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1465 button!!.setOnClickListener {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1466 eventHandlerSimple(button!!, 8)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1467 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1468 button!!.setImageBitmap(b)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1469 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1470 return button
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1471 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1472
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1473 fun entryfieldNew(text: String, cid: Int, password: Int): EditText? {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1474 var entryfield: EditText? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1475
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1476 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1477 val dataArrayMap = SimpleArrayMap<String, Long>()
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1478 entryfield = EditText(this)
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1479
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1480 entryfield!!.tag = dataArrayMap
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1481 entryfield!!.id = cid
2554 4c75fb6089a9 Android: Need to set isSingleLine for entryfields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2553 diff changeset	1482 entryfield!!.isSingleLine = true
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1483 if (password > 0) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1484 entryfield!!.transformationMethod = PasswordTransformationMethod.getInstance()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1485 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1486 entryfield!!.setText(text)
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1487 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1488 return entryfield
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1489 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1490
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1491 fun entryfieldSetLimit(entryfield: EditText, limit: Long) {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1492 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1493 entryfield.filters = arrayOf<InputFilter>(LengthFilter(limit.toInt()))
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1494 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1495 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1496
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1497 fun radioButtonNew(text: String, cid: Int): RadioButton? {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1498 var radiobutton: RadioButton? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1499
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1500 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1501 val dataArrayMap = SimpleArrayMap<String, Long>()
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1502 radiobutton = RadioButton(this)
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1503
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1504 radiobutton!!.tag = dataArrayMap
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1505 radiobutton!!.id = cid
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1506 radiobutton!!.text = text
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1507 radiobutton!!.setOnClickListener {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1508 eventHandlerSimple(radiobutton!!, 8)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1509 }
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	1510 }
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1511 return radiobutton
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1512 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1513
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1514 fun checkboxNew(text: String, cid: Int): CheckBox? {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1515 var checkbox: CheckBox? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1516
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1517 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1518 val dataArrayMap = SimpleArrayMap<String, Long>()
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1519
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1520 checkbox = CheckBox(this)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1521 checkbox!!.tag = dataArrayMap
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1522 checkbox!!.id = cid
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1523 checkbox!!.text = text
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1524 checkbox!!.setOnClickListener {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1525 eventHandlerSimple(checkbox!!, 8)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1526 }
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	1527 }
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1528 return checkbox
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1529 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1530
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1531 fun checkOrRadioSetChecked(control: View, state: Int)
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1532 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1533 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1534 if (control is CheckBox) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1535 val checkbox: CheckBox = control
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1536 checkbox.isChecked = state != 0
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1537 } else if (control is RadioButton) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1538 val radiobutton: RadioButton = control
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1539 radiobutton.isChecked = state != 0
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1540 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1541 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1542 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1543
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1544 fun checkOrRadioGetChecked(control: View): Boolean
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1545 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1546 var retval = false
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1547
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1548 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1549 if (control is CheckBox) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1550 val checkbox: CheckBox = control
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1551 retval = checkbox.isChecked
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1552 } else if (control is RadioButton) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1553 val radiobutton: RadioButton = control
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1554 retval = radiobutton.isChecked
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1555 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1556 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1557 return retval
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1558 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1559
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1560 fun textNew(text: String, cid: Int, status: Int): TextView? {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1561 var textview: TextView? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1562
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1563 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1564 val dataArrayMap = SimpleArrayMap<String, Long>()
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1565
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1566 textview = TextView(this)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1567 textview!!.tag = dataArrayMap
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1568 textview!!.id = cid
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1569 textview!!.text = text
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1570 if (status != 0) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1571 val border = GradientDrawable()
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	1572
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1573 // Set a black border on white background...
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1574 // might need to change this to invisible...
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1575 // or the color from windowSetColor
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1576 border.setColor(-0x1)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1577 border.setStroke(1, -0x1000000)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1578 textview!!.background = border
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1579 }
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	1580 }
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1581 return textview
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1582 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	1583
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1584 fun mleNew(cid: Int): EditText?
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1585 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1586 var mle: EditText? = null
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1587
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1588 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1589 val dataArrayMap = SimpleArrayMap<String, Long>()
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1590
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1591 mle = EditText(this)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1592 mle!!.tag = dataArrayMap
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1593 mle!!.id = cid
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1594 mle!!.isSingleLine = false
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1595 mle!!.imeOptions = EditorInfo.IME_FLAG_NO_ENTER_ACTION
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1596 mle!!.inputType = (InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1597 mle!!.isVerticalScrollBarEnabled = true
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1598 mle!!.scrollBarStyle = View.SCROLLBARS_INSIDE_INSET
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1599 mle!!.setHorizontallyScrolling(true)
2581 9dea42f27b0a Android: MLE should have TOP/LEFT gravity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2580 diff changeset	1600 mle!!.gravity = Gravity.TOP or Gravity.LEFT
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1601 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1602 return mle
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1603 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1604
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1605 fun mleSetWordWrap(mle: EditText, state: Int)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1606 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1607 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1608 if (state != 0) {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1609 mle.setHorizontallyScrolling(false)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1610 } else {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1611 mle.setHorizontallyScrolling(true)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1612 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1613 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1614 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1615
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1616 fun mleSetEditable(mle: EditText, state: Int)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1617 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1618 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1619 if (state != 0) {
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1620 mle.inputType = (InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1621 } else {
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1622 mle.inputType = InputType.TYPE_NULL
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1623 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1624 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1625 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1626
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1627 fun mleSetCursor(mle: EditText, point: Int)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1628 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1629 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1630 mle.setSelection(point)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1631 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1632 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1633
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1634 fun mleClear(mle: EditText)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1635 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1636 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1637 mle.setText("")
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1638 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1639 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1640
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1641 fun mleImport(mle: EditText, text: String, startpoint: Int): Int
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1642 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1643 var retval: Int = startpoint
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1644
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1645 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1646 val origtext = mle.text
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1647 val origlen = origtext.toString().length
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1648
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1649 if(startpoint < 1) {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1650 val newtext = text + origtext.toString()
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1651
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1652 mle.setText(newtext)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1653 retval = origlen + text.length
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1654 } else if(startpoint >= origlen) {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1655 val newtext = origtext.toString() + text
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1656
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1657 mle.setText(newtext)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1658 retval = origlen + text.length
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1659 } else {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1660 val newtext = origtext.substring(0, startpoint) + text + origtext.substring(startpoint)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1661
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1662 mle.setText(newtext)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1663 retval = startpoint + text.length
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1664 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1665 mle.setSelection(retval)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1666 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1667 return retval
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1668 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1669
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1670 fun mleDelete(mle: EditText, startpoint: Int, length: Int)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1671 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1672 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1673 val origtext = mle.text
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1674 val newtext = origtext.substring(0, startpoint) + origtext.substring(startpoint + length)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1675
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1676 mle.setText(newtext)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1677 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1678 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1679
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1680 fun notebookNew(cid: Int, top: Int): RelativeLayout?
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	1681 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1682 var notebook: RelativeLayout? = null
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1683
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1684 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1685 val pager = ViewPager2(this)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1686 val tabs = TabLayout(this)
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1687 val w: Int = RelativeLayout.LayoutParams.MATCH_PARENT
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1688 val h: Int = RelativeLayout.LayoutParams.WRAP_CONTENT
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1689 val dataArrayMap = SimpleArrayMap<String, Long>()
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1690
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1691 notebook = RelativeLayout(this)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1692 notebook!!.tag = dataArrayMap
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1693 notebook!!.id = cid
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1694 tabs.id = View.generateViewId()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1695 pager.id = View.generateViewId()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1696 pager.adapter = DWTabViewPagerAdapter()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1697 TabLayoutMediator(tabs, pager) { tab, position ->
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1698 // This code never gets called?
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1699 }.attach()
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1700
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1701 var params: RelativeLayout.LayoutParams = RelativeLayout.LayoutParams(w, h)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1702 if (top != 0) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1703 params.addRule(RelativeLayout.ALIGN_PARENT_TOP)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1704 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1705 params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1706 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1707 tabs.tabGravity = TabLayout.GRAVITY_FILL
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1708 tabs.tabMode = TabLayout.MODE_FIXED
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1709 notebook!!.addView(tabs, params)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1710 params = RelativeLayout.LayoutParams(w, w)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1711 if (top != 0) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1712 params.addRule(RelativeLayout.BELOW, tabs.id)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1713 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1714 params.addRule(RelativeLayout.ABOVE, tabs.id)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1715 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1716 notebook!!.addView(pager, params)
2550 a8d90e2896bc Android: For the moment disable swiping to change notebook pages. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2547 diff changeset	1717 // TODO: Not sure if we want this all the time...
a8d90e2896bc Android: For the moment disable swiping to change notebook pages. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2547 diff changeset	1718 // Might want to make a flag for this
a8d90e2896bc Android: For the moment disable swiping to change notebook pages. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2547 diff changeset	1719 pager.isUserInputEnabled = false
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1720 tabs.addOnTabSelectedListener(object : OnTabSelectedListener {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1721 override fun onTabSelected(tab: TabLayout.Tab) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1722 val adapter = pager.adapter as DWTabViewPagerAdapter
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1723
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1724 pager.currentItem = tab.position
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1725 eventHandlerNotebook(notebook!!, 15, adapter.pageList[tab.position])
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1726 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1727
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1728 override fun onTabUnselected(tab: TabLayout.Tab) {}
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1729 override fun onTabReselected(tab: TabLayout.Tab) {}
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1730 })
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	1731 }
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1732 return notebook
bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1733 }
bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1734
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1735 fun notebookPageNew(notebook: RelativeLayout, flags: Long, front: Int): Long
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1736 {
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1737 var pageID = 0L
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1738
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1739 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1740 var pager: ViewPager2? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1741 var tabs: TabLayout? = null
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1742
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1743 if (notebook.getChildAt(0) is ViewPager2 && notebook.getChildAt(1) is TabLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1744 pager = notebook.getChildAt(0) as ViewPager2
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1745 tabs = notebook.getChildAt(1) as TabLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1746 } else if (notebook.getChildAt(1) is ViewPager2 && notebook.getChildAt(0) is TabLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1747 pager = notebook.getChildAt(1) as ViewPager2
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1748 tabs = notebook.getChildAt(0) as TabLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1749 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1750
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1751 if (pager != null && tabs != null) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1752 val adapter: DWTabViewPagerAdapter = pager.adapter as DWTabViewPagerAdapter
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1753 val tab = tabs.newTab()
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1754
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1755 // Increment our page ID... making sure no duplicates exist
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1756 do {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1757 adapter.currentPageID += 1
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1758 } while (adapter.currentPageID == 0L \|\| adapter.pageList.contains(adapter.currentPageID))
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1759 pageID = adapter.currentPageID
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1760 // Temporarily add a black tab with an empty layout/box
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1761 if (front != 0) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1762 adapter.viewList.add(0, LinearLayout(this))
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1763 adapter.pageList.add(0, pageID)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1764 tabs.addTab(tab, 0)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1765 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1766 adapter.viewList.add(LinearLayout(this))
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1767 adapter.pageList.add(pageID)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1768 tabs.addTab(tab)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1769 }
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1770 }
bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1771 }
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1772 return pageID
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1773 }
bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1774
2590 8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1775 fun notebookCapsOff(view: View?) {
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1776 if (view !is ViewGroup) {
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1777 return
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1778 }
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1779 for (i in 0 until view.childCount) {
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1780 val child = view.getChildAt(i)
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1781 if (child is TextView) {
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1782 child.isAllCaps = false
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1783 } else {
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1784 notebookCapsOff(child)
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1785 }
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1786 }
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1787 }
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1788
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1789 fun notebookPageDestroy(notebook: RelativeLayout, pageID: Long)
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1790 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1791 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1792 var pager: ViewPager2? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1793 var tabs: TabLayout? = null
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1794
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1795 if (notebook.getChildAt(0) is ViewPager2 && notebook.getChildAt(1) is TabLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1796 pager = notebook.getChildAt(0) as ViewPager2
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1797 tabs = notebook.getChildAt(1) as TabLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1798 } else if (notebook.getChildAt(1) is ViewPager2 && notebook.getChildAt(0) is TabLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1799 pager = notebook.getChildAt(1) as ViewPager2
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1800 tabs = notebook.getChildAt(0) as TabLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1801 }
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1802
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1803 if (pager != null && tabs != null) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1804 val adapter: DWTabViewPagerAdapter = pager.adapter as DWTabViewPagerAdapter
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1805 val index = adapter.pageList.indexOf(pageID)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1806 val tab = tabs.getTabAt(index)
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1807
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1808 if (tab != null) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1809 adapter.viewList.removeAt(index)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1810 adapter.pageList.removeAt(index)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1811 tabs.removeTab(tab)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1812 }
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1813 }
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1814 }
bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1815 }
bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1816
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1817 fun notebookPageSetText(notebook: RelativeLayout, pageID: Long, text: String)
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1818 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1819 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1820 var pager: ViewPager2? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1821 var tabs: TabLayout? = null
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1822
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1823 if (notebook.getChildAt(0) is ViewPager2 && notebook.getChildAt(1) is TabLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1824 pager = notebook.getChildAt(0) as ViewPager2
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1825 tabs = notebook.getChildAt(1) as TabLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1826 } else if (notebook.getChildAt(1) is ViewPager2 && notebook.getChildAt(0) is TabLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1827 pager = notebook.getChildAt(1) as ViewPager2
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1828 tabs = notebook.getChildAt(0) as TabLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1829 }
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1830
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1831 if (pager != null && tabs != null) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1832 val adapter: DWTabViewPagerAdapter = pager.adapter as DWTabViewPagerAdapter
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1833 val index = adapter.pageList.indexOf(pageID)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1834 val tab = tabs.getTabAt(index)
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1835
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1836 if (tab != null) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1837 tab.text = text
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1838 }
2590 8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1839
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	1840 notebookCapsOff(tabs)
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1841 }
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1842 }
bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1843 }
bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1844
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1845 fun notebookPagePack(notebook: RelativeLayout, pageID: Long, box: LinearLayout)
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1846 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1847 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1848 var pager: ViewPager2? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1849 var tabs: TabLayout? = null
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1850
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1851 if (notebook.getChildAt(0) is ViewPager2 && notebook.getChildAt(1) is TabLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1852 pager = notebook.getChildAt(0) as ViewPager2
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1853 tabs = notebook.getChildAt(1) as TabLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1854 } else if (notebook.getChildAt(1) is ViewPager2 && notebook.getChildAt(0) is TabLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1855 pager = notebook.getChildAt(1) as ViewPager2
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1856 tabs = notebook.getChildAt(0) as TabLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1857 }
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1858
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1859 if (pager != null && tabs != null) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1860 val adapter: DWTabViewPagerAdapter = pager.adapter as DWTabViewPagerAdapter
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1861 val index = adapter.pageList.indexOf(pageID)
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1862
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1863 // Make sure the box is MATCH_PARENT
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1864 box.layoutParams = LinearLayout.LayoutParams(
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1865 LinearLayout.LayoutParams.MATCH_PARENT,
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1866 LinearLayout.LayoutParams.MATCH_PARENT
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1867 )
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1868
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1869 adapter.viewList[index] = box
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1870 }
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1871 }
bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1872 }
bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1873
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1874 fun notebookPageGet(notebook: RelativeLayout): Long
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1875 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1876 var retval = 0L
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1877
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1878 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1879 var pager: ViewPager2? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1880 var tabs: TabLayout? = null
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1881
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1882 if (notebook.getChildAt(0) is ViewPager2 && notebook.getChildAt(1) is TabLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1883 pager = notebook.getChildAt(0) as ViewPager2
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1884 tabs = notebook.getChildAt(1) as TabLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1885 } else if (notebook.getChildAt(1) is ViewPager2 && notebook.getChildAt(0) is TabLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1886 pager = notebook.getChildAt(1) as ViewPager2
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1887 tabs = notebook.getChildAt(0) as TabLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1888 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1889
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1890 if (pager != null && tabs != null) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1891 val adapter: DWTabViewPagerAdapter = pager.adapter as DWTabViewPagerAdapter
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1892 retval = adapter.pageList.get(tabs.selectedTabPosition)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1893 }
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1894 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1895 return retval
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1896 }
bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1897
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1898 fun notebookPageSet(notebook: RelativeLayout, pageID: Long)
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1899 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1900 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1901 var pager: ViewPager2? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1902 var tabs: TabLayout? = null
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1903
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1904 if (notebook.getChildAt(0) is ViewPager2 && notebook.getChildAt(1) is TabLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1905 pager = notebook.getChildAt(0) as ViewPager2
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1906 tabs = notebook.getChildAt(1) as TabLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1907 } else if (notebook.getChildAt(1) is ViewPager2 && notebook.getChildAt(0) is TabLayout) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1908 pager = notebook.getChildAt(1) as ViewPager2
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1909 tabs = notebook.getChildAt(0) as TabLayout
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1910 }
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1911
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1912 if (pager != null && tabs != null) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1913 val adapter: DWTabViewPagerAdapter = pager.adapter as DWTabViewPagerAdapter
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1914 val index = adapter.pageList.indexOf(pageID)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1915 val tab = tabs.getTabAt(index)
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	1916
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1917 tabs.selectTab(tab)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1918 }
2493 bca7e0ab0ccc Android: Work on the notebook control, doesn't work yet but everything filled in. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2492 diff changeset	1919 }
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	1920 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	1921
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1922 fun sliderNew(vertical: Int, increments: Int, cid: Int): SeekBar?
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1923 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1924 var slider: SeekBar? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1925
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1926 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1927 val dataArrayMap = SimpleArrayMap<String, Long>()
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1928
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1929 slider = SeekBar(this)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1930 slider!!.tag = dataArrayMap
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1931 slider!!.id = cid
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1932 slider!!.max = increments
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1933 if (vertical != 0) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1934 slider!!.rotation = 270F
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1935 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1936 slider!!.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1937 override fun onStopTrackingTouch(seekBar: SeekBar) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1938 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1939
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1940 override fun onStartTrackingTouch(seekBar: SeekBar) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1941 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1942
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1943 override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	1944 eventHandlerInt(slider as View, 14, slider!!.progress, 0, 0, 0)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1945 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1946 })
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1947 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1948 return slider
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1949 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1950
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1951 fun percentNew(cid: Int): ProgressBar?
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1952 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1953 var percent: ProgressBar? = null
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1954
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1955 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1956 val dataArrayMap = SimpleArrayMap<String, Long>()
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1957
2574 5b13bb267364 Android: Percent widget should be using horizontal ProgressBar. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2573 diff changeset	1958 percent = ProgressBar(this,null, R.attr.progressBarStyleHorizontal)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1959 percent!!.tag = dataArrayMap
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1960 percent!!.id = cid
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1961 percent!!.max = 100
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1962 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1963 return percent
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1964 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1965
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1966 fun percentGetPos(percent: ProgressBar): Int
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1967 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1968 var retval = 0
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1969
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1970 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1971 retval = percent.progress
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1972 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1973 return retval
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1974 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1975
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1976 fun percentSetPos(percent: ProgressBar, position: Int)
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1977 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1978 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1979 percent.progress = position
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1980 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1981 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1982
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1983 fun percentSetRange(percent: ProgressBar, range: Int)
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1984 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1985 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1986 percent.max = range
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1987 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1988 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	1989
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	1990 fun htmlNew(cid: Int): WebView?
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	1991 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1992 var html: WebView? = null
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	1993
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1994 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1995 val dataArrayMap = SimpleArrayMap<String, Long>()
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1996
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1997 html = WebView(this)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1998 html!!.tag = dataArrayMap
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1999 html!!.id = cid
2505 a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	2000 // Configure a few settings to make it behave as we expect
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	2001 html!!.webViewClient = DWWebViewClient()
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	2002 html!!.settings.javaScriptEnabled = true
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2003 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2004 return html
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2005 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2006
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2007 fun htmlLoadURL(html: WebView, url: String)
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2008 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2009 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2010 html.loadUrl(url)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2011 }
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2012 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2013
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2014 fun htmlRaw(html: WebView, data: String)
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2015 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2016 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2017 val encodedHtml: String = Base64.encodeToString(data.toByteArray(), Base64.NO_PADDING)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2018 html.loadData(encodedHtml, "text/html", "base64")
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2019 }
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2020 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2021
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2022 fun htmlJavascriptRun(html: WebView, javascript: String, data: Long)
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2023 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2024 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2025 html.evaluateJavascript(javascript) { value ->
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2026 // Execute onReceiveValue's code
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2027 eventHandlerHTMLResult(html, 18, value, data)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2028 }
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2029 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2030 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2031
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2032 fun htmlAction(html: WebView, action: Int)
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2033 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2034 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2035 when (action) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2036 0 -> html.goBack()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2037 1 -> html.goForward()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2038 2 -> html.loadUrl("http://dwindows.netlabs.org")
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2039 4 -> html.reload()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2040 5 -> html.stopLoading()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2041 }
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2042 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2043 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	2044
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2045 fun spinButtonNew(text: String, cid: Int): DWSpinButton?
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2046 {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2047 var spinbutton: DWSpinButton? = null
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2048
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2049 waitOnUiThread {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2050 val dataArrayMap = SimpleArrayMap<String, Long>()
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2051 val newval = text.toLongOrNull()
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2052
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2053 spinbutton = DWSpinButton(this)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2054 spinbutton!!.tag = dataArrayMap
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2055 spinbutton!!.id = cid
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2056 spinbutton!!.setText(text)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2057 if(newval != null) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2058 spinbutton!!.value = newval
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2059 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2060 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2061 return spinbutton
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2062 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2063
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2064 fun spinButtonSetPos(spinbutton: DWSpinButton, position: Long)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2065 {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2066 waitOnUiThread {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2067 spinbutton.value = position
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2068 spinbutton.setText(position.toString())
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2069 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2070 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2071
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2072 fun spinButtonSetLimits(spinbutton: DWSpinButton, upper: Long, lower: Long)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2073 {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2074 waitOnUiThread {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2075 spinbutton.maximum = upper
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2076 spinbutton.minimum = lower
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2077 if(spinbutton.value > upper) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2078 spinbutton.value = upper
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2079 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2080 if(spinbutton.value < lower) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2081 spinbutton.value = lower
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2082 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2083 spinbutton.setText(spinbutton.value.toString())
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2084 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2085 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2086
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2087 fun spinButtonGetPos(spinbutton: DWSpinButton): Long
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2088 {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2089 var retval: Long = 0
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2090
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2091 waitOnUiThread {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2092 val newvalue = spinbutton.text.toString().toLongOrNull()
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2093
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2094 if(newvalue == null) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2095 retval = spinbutton.value
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2096 } else {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2097 retval = newvalue
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2098 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2099 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2100 return retval
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2101 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	2102
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2103 fun comboBoxNew(text: String, cid: Int): DWComboBox?
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2104 {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2105 var combobox: DWComboBox? = null
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2106
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2107 waitOnUiThread {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2108 val dataArrayMap = SimpleArrayMap<String, Long>()
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2109
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2110 combobox = DWComboBox(this)
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2111 combobox!!.tag = dataArrayMap
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2112 combobox!!.id = cid
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2113 combobox!!.setText(text)
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2114 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2115 return combobox
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2116 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2117
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2118 fun containerNew(cid: Int, multi: Int): ListView?
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2119 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2120 var cont: ListView? = null
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2121
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2122 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2123 val dataArrayMap = SimpleArrayMap<String, Long>()
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2124 val adapter = DWContainerAdapter(this)
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2125
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2126 cont = ListView(this)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2127 cont!!.tag = dataArrayMap
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2128 cont!!.id = cid
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2129 cont!!.adapter = adapter
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2130 if(multi != 0) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2131 cont!!.choiceMode = ListView.CHOICE_MODE_MULTIPLE
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2132 }
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2133 cont!!.setOnItemClickListener { parent, view, position, id ->
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2134 val title = adapter.model.getRowTitle(position)
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2135 val data = adapter.model.getRowData(position)
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2136
2563 56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2137 view.isSelected = !view.isSelected
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2138 adapter.selectedItem = position
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2139 eventHandlerContainer(cont!!, 12, title, 0, 0, data)
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2140 }
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2141 cont!!.setOnContextClickListener {
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2142 if(adapter.selectedItem > -1 && adapter.selectedItem < adapter.model.numberOfRows()) {
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2143 val title = adapter.model.getRowTitle(adapter.selectedItem)
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2144 val data = adapter.model.getRowData(adapter.selectedItem)
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2145
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2146 eventHandlerContainer(cont!!, 10, title, 0, 0, data)
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2147 }
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2148 true
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2149 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2150 cont!!.setOnItemLongClickListener { parent, view, position, id ->
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2151 val title = adapter.model.getRowTitle(position)
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2152 val data = adapter.model.getRowData(position)
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2153
2563 56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	2154 eventHandlerContainer(cont!!, 9, title, 0, 0, data)
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2155 true
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2156 }
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2157 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2158 return cont
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2159 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2160
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2161 fun containerSetStripe(cont: ListView, oddcolor: Long, evencolor: Long)
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2162 {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2163 waitOnUiThread {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2164 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2165
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2166 if(oddcolor == -1L) {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2167 adapter.oddColor = null
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2168 } else if(evencolor == -2L) {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2169 if(darkMode == 1) {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2170 adapter.oddColor = Color.rgb(100, 100, 100)
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2171 } else {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2172 adapter.oddColor = Color.rgb(230, 230, 230)
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2173 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2174 } else {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2175 adapter.oddColor = colorFromDW(oddcolor)
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2176 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2177 if(evencolor == -1L \|\| evencolor == -2L) {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2178 adapter.evenColor = null
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2179 } else {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2180 adapter.evenColor = colorFromDW(evencolor)
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2181 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2182 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2183 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2184
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2185 fun containerGetTitleStart(cont: ListView, flags: Int): String?
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2186 {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2187 var retval: String? = null
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2188
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2189 waitOnUiThread {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2190 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2191
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2192 // Handle DW_CRA_SELECTED
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2193 if((flags and 1) != 0) {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2194 val checked: SparseBooleanArray = cont.getCheckedItemPositions()
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2195 val position = checked.keyAt(0)
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2196
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2197 adapter.model.querypos = position
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2198 retval = adapter.model.getRowTitle(position)
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2199 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2200 if(adapter.model.rowdata.size == 0) {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2201 adapter.model.querypos = -1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2202 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2203 retval = adapter.model.getRowTitle(0)
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2204 adapter.model.querypos = 0
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2205 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2206 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2207 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2208 return retval
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2209 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2210
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2211 fun containerGetTitleNext(cont: ListView, flags: Int): String?
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2212 {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2213 var retval: String? = null
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2214
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2215 waitOnUiThread {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2216 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2217
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2218 if(adapter.model.querypos != -1) {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2219 // Handle DW_CRA_SELECTED
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2220 if ((flags and 1) != 0) {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2221 val checked: SparseBooleanArray = cont.getCheckedItemPositions()
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2222
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2223 // Otherwise loop until we find our current place
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2224 for (i in 0 until checked.size()) {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2225 // Item position in adapter
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2226 val position: Int = checked.keyAt(i)
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2227
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2228 if (adapter.model.querypos == position && (i + 1) < checked.size()) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2229 val newpos = checked.keyAt(i + 1)
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2230
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2231 adapter.model.querypos = newpos
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2232 retval = adapter.model.getRowTitle(newpos)
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2233 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2234 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2235 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2236 if (adapter.model.rowtitle.size > adapter.model.querypos) {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2237 adapter.model.querypos += 1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2238 retval = adapter.model.getRowTitle(adapter.model.querypos)
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2239 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2240 adapter.model.querypos = -1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2241 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2242 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2243 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2244 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2245 return retval
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2246 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2247
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2248 fun containerGetDataStart(cont: ListView, flags: Int): Long
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2249 {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2250 var retval: Long = 0
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2251
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2252 waitOnUiThread {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2253 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2254
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2255 // Handle DW_CRA_SELECTED
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2256 if((flags and 1) != 0) {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2257 val checked: SparseBooleanArray = cont.getCheckedItemPositions()
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2258 val position = checked.keyAt(0)
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2259
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2260 adapter.model.querypos = position
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2261 retval = adapter.model.getRowData(position)
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2262 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2263 if(adapter.model.rowdata.size == 0) {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2264 adapter.model.querypos = -1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2265 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2266 retval = adapter.model.getRowData(0)
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2267 adapter.model.querypos = 0
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2268 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2269 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2270 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2271 return retval
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2272 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2273
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2274 fun containerGetDataNext(cont: ListView, flags: Int): Long
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2275 {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2276 var retval: Long = 0
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2277
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2278 waitOnUiThread {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2279 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2280
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2281 if(adapter.model.querypos != -1) {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2282 // Handle DW_CRA_SELECTED
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2283 if ((flags and 1) != 0) {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2284 val checked: SparseBooleanArray = cont.getCheckedItemPositions()
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2285
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2286 // Otherwise loop until we find our current place
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2287 for (i in 0 until checked.size()) {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2288 // Item position in adapter
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2289 val position: Int = checked.keyAt(i)
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2290
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2291 if (adapter.model.querypos == position && (i + 1) < checked.size()) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2292 val newpos = checked.keyAt(i + 1)
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2293
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2294 adapter.model.querypos = newpos
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2295 retval = adapter.model.getRowData(newpos)
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2296 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2297 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2298 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2299 if (adapter.model.rowdata.size > adapter.model.querypos) {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2300 adapter.model.querypos += 1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2301 retval = adapter.model.getRowData(adapter.model.querypos)
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2302 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2303 adapter.model.querypos = -1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2304 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2305 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2306 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2307 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2308 return retval
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2309 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	2310
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2311 fun containerAddColumn(cont: ListView, title: String, flags: Int)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2312 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2313 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2314 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2315
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2316 adapter.model.addColumn(title, flags)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2317 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2318 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2319
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2320 fun containerAlloc(cont: ListView, rowcount: Int): ListView
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2321 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2322 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2323 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2324 val rowStart = adapter.model.addRows(rowcount)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2325
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2326 windowSetData(cont, "_dw_rowstart", rowStart)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2327 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2328 return cont
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2329 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2330
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2331 fun containerChangeItemString(cont: ListView, column: Int, row: Int, text: String)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2332 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2333 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2334 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2335
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2336 adapter.model.setRowAndColumn(row, column, text)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2337 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2338 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2339
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2340 fun containerChangeItemIcon(cont: ListView, column: Int, row: Int, icon: Drawable)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2341 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2342 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2343 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2344
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2345 adapter.model.setRowAndColumn(row, column, icon)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2346 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2347 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2348
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2349 fun containerChangeItemInt(cont: ListView, column: Int, row: Int, num: Int)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2350 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2351 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2352 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2353
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2354 adapter.model.setRowAndColumn(row, column, num)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2355 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2356 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2357
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2358 fun containerChangeRowData(cont: ListView, row: Int, data: Long)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2359 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2360 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2361 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2362
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2363 adapter.model.changeRowData(row, data)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2364 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2365 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2366
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2367 fun containerChangeRowTitle(cont: ListView, row: Int, title: String?)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2368 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2369 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2370 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2371
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2372 adapter.model.changeRowTitle(row, title)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2373 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2374 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2375
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	2376 fun containerRefresh(cont: ListView)
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	2377 {
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	2378 waitOnUiThread {
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	2379 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	2380
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	2381 adapter.notifyDataSetChanged()
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	2382 }
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	2383 }
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	2384
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2385 fun containerGetColumnType(cont: ListView, column: Int): Int
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2386 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2387 var type = 0
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2388
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2389 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2390 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2391
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2392 type = adapter.model.getColumnType(column)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2393 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2394 return type
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2395 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2396
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2397 fun containerDelete(cont: ListView, rowcount: Int)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2398 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2399 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2400 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2401
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2402 adapter.model.deleteRows(rowcount)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2403 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2404 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2405
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2406 fun containerRowDeleteByTitle(cont: ListView, title: String?)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2407 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2408 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2409 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2410
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2411 adapter.model.deleteRowByTitle(title)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2412 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2413 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2414
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2415 fun containerRowDeleteByData(cont: ListView, data: Long)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2416 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2417 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2418 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2419
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2420 adapter.model.deleteRowByData(data)
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2421 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2422 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	2423
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2424 fun containerClear(cont: ListView)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2425 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2426 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2427 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2428
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2429 adapter.model.clear()
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2430 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2431 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	2432
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2433 fun listBoxNew(cid: Int, multi: Int): DWListBox?
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2434 {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2435 var listbox: DWListBox? = null
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2436
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2437 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2438 val dataArrayMap = SimpleArrayMap<String, Long>()
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2439
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2440 listbox = DWListBox(this)
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2441 listbox!!.tag = dataArrayMap
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2442 listbox!!.id = cid
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2443 if(multi != 0) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2444 listbox!!.choiceMode = ListView.CHOICE_MODE_MULTIPLE
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2445 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2446 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2447 return listbox
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2448 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2449
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2450 fun listOrComboBoxAppend(window: View, text: String)
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2451 {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2452 waitOnUiThread {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2453 if(window is DWComboBox) {
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2454 val combobox = window
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2455
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2456 combobox.list.add(text)
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2457 } else if(window is DWListBox) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2458 val listbox = window
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2459
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2460 listbox.list.add(text)
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2461 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2462 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2463 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	2464
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2465 fun listOrComboBoxInsert(window: View, text: String, pos: Int)
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2466 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2467 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2468 if(window is DWComboBox) {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2469 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2470
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2471 combobox.list.add(pos, text)
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2472 } else if(window is DWListBox) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2473 val listbox = window
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2474
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2475 listbox.list.add(pos, text)
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2476 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2477 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2478 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2479
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2480 fun listOrComboBoxClear(window: View)
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2481 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2482 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2483 if(window is DWComboBox) {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2484 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2485
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2486 combobox.list.clear()
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2487 } else if(window is DWListBox) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2488 val listbox = window
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2489
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2490 listbox.list.clear()
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2491 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2492 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2493 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2494
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2495 fun listOrComboBoxCount(window: View): Int
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2496 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2497 var retval = 0
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2498
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2499 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2500 if(window is DWComboBox) {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2501 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2502
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2503 retval = combobox.list.count()
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2504 } else if(window is DWListBox) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2505 val listbox = window
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2506
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2507 retval = listbox.list.count()
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2508 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2509 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2510 return retval
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2511 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2512
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2513 fun listOrComboBoxSetText(window: View, index: Int, text: String)
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2514 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2515 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2516 if(window is DWComboBox) {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2517 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2518
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2519 if(index > -1 && index < combobox.list.count())
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2520 combobox.list[index] = text
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2521 } else if(window is DWListBox) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2522 val listbox = window
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2523
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2524 if(index > -1 && index < listbox.list.count())
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2525 listbox.list[index] = text
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2526 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2527 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2528 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2529
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2530 fun listOrComboBoxGetText(window: View, index: Int): String?
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2531 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2532 var retval: String? = null
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2533
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2534 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2535 if(window is DWComboBox) {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2536 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2537
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2538 if(index > -1 && index < combobox.list.count())
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2539 retval = combobox.list[index]
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2540 } else if(window is DWListBox) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2541 val listbox = window
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2542
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2543 if(index > -1 && index < listbox.list.count())
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2544 retval = listbox.list[index]
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2545 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2546 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2547 return retval
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2548 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2549
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2550 fun listOrComboBoxGetSelected(window: View): Int
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2551 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2552 var retval: Int = -1
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2553
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2554 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2555 if(window is DWComboBox) {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2556 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2557
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2558 retval = combobox.selected
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2559 } else if(window is DWListBox) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2560 val listbox = window
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2561
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2562 retval = listbox.selected
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2563 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2564 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2565 return retval
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2566 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2567
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2568 fun listOrComboBoxSelect(window: View, index: Int, state: Int)
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2569 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2570 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2571 if(window is DWComboBox) {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2572 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2573
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2574 if(index < combobox.list.count() && state != 0) {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2575 combobox.selected = index
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2576 combobox.setText(combobox.list[index])
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2577 }
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2578 } else if(window is DWListBox) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2579 val listbox = window
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2580
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2581 if(index < listbox.list.count()) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2582 if(state != 0) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2583 listbox.selected = index
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2584 listbox.setItemChecked(index, true)
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2585 } else {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2586 listbox.setItemChecked(index, false)
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2587 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2588 }
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2589 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2590 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2591 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2592
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2593 fun listOrComboBoxDelete(window: View, index: Int)
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2594 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2595 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2596 if(window is DWComboBox) {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2597 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2598
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2599 if(index < combobox.list.count()) {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2600 combobox.list.removeAt(index)
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2601 }
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2602 } else if(window is DWListBox) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2603 val listbox = window
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2604
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2605 if(index < listbox.list.count()) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2606 listbox.list.removeAt(index)
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2607 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2608 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2609 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2610 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2611
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2612 fun listBoxSetTop(window: View, top: Int)
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2613 {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2614 waitOnUiThread {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2615 if(window is DWListBox) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2616 val listbox = window
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2617
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2618 if(top < listbox.list.count()) {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2619 listbox.smoothScrollToPosition(top)
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	2620 }
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2621 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2622 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2623 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	2624
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2625 fun listBoxSelectedMulti(window: View, where: Int): Int
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2626 {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2627 var retval: Int = -1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2628
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2629 waitOnUiThread {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2630 if(window is DWListBox) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2631 val listbox = window
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2632 val checked: SparseBooleanArray = listbox.getCheckedItemPositions()
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2633
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2634 // If we are starting over....
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2635 if(where == -1 && checked.size() > 0) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2636 retval = checked.keyAt(0)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2637 } else {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2638 // Otherwise loop until we find our current place
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2639 for (i in 0 until checked.size()) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2640 // Item position in adapter
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2641 val position: Int = checked.keyAt(i)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2642 // If we are at our current point... check to see
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2643 // if there is another one, and return it...
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2644 // otherwise we will return -1 to indicated we are done.
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2645 if (where == position && (i+1) < checked.size()) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2646 retval = checked.keyAt(i+1)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2647 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2648 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2649 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2650 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2651 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2652 return retval
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2653 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2654
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2655 fun calendarNew(cid: Int): CalendarView?
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2656 {
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2657 var calendar: CalendarView? = null
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2658
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2659 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2660 val dataArrayMap = SimpleArrayMap<String, Long>()
2528 03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2661
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2662 calendar = CalendarView(this)
2528 03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2663 calendar!!.tag = dataArrayMap
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2664 calendar!!.id = cid
2524 d5c3c573c74e Android: Calendar fixes, need to be in milliseconds not seconds... also... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2523 diff changeset	2665 calendar!!.setOnDateChangeListener { calendar, year, month, day ->
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2666 val c: Calendar = Calendar.getInstance()
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2667 c.set(year, month, day)
2524 d5c3c573c74e Android: Calendar fixes, need to be in milliseconds not seconds... also... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2523 diff changeset	2668 calendar.date = c.timeInMillis
d5c3c573c74e Android: Calendar fixes, need to be in milliseconds not seconds... also... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2523 diff changeset	2669 }
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2670 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2671
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2672 return calendar
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2673 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2674
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2675 fun calendarSetDate(calendar: CalendarView, date: Long)
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2676 {
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2677 waitOnUiThread {
2524 d5c3c573c74e Android: Calendar fixes, need to be in milliseconds not seconds... also... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2523 diff changeset	2678 // Convert from seconds to milliseconds
d5c3c573c74e Android: Calendar fixes, need to be in milliseconds not seconds... also... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2523 diff changeset	2679 calendar.setDate(date * 1000, true, true)
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2680 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2681 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2682
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2683 fun calendarGetDate(calendar: CalendarView): Long
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2684 {
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2685 var date: Long = 0
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2686
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2687 waitOnUiThread {
2524 d5c3c573c74e Android: Calendar fixes, need to be in milliseconds not seconds... also... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2523 diff changeset	2688 // Convert from milliseconds to seconds
d5c3c573c74e Android: Calendar fixes, need to be in milliseconds not seconds... also... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2523 diff changeset	2689 date = calendar.date / 1000
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2690 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2691 return date
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2692 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	2693
2528 03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2694 fun bitmapNew(cid: Int): ImageView?
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2695 {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2696 var imageview: ImageView? = null
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2697
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2698 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2699 val dataArrayMap = SimpleArrayMap<String, Long>()
2528 03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2700
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2701 imageview = ImageView(this)
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2702 imageview!!.tag = dataArrayMap
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2703 imageview!!.id = cid
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2704 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2705
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2706 return imageview
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2707 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2708
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2709 fun windowSetBitmap(window: View, resID: Int, filename: String?)
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2710 {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2711 waitOnUiThread {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2712 if(resID != 0) {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2713 if(window is ImageButton) {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2714 val button = window
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2715
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2716 button.setImageResource(resID)
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2717 } else if(window is ImageView) {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2718 val imageview = window
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2719
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2720 imageview.setImageResource(resID)
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2721 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2722 } else if(filename != null) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2723 val exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2724
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2725 for (ext in exts) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2726 // Try to load the image, and protect against exceptions
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2727 try {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2728 val f = this.assets.open(filename + ext)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2729 val b = BitmapFactory.decodeStream(f)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2730
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2731 if(b != null) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2732 if (window is ImageButton) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2733 val button = window
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2734
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2735 button.setImageBitmap(b)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2736 } else if (window is ImageView) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2737 val imageview = window
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2738
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2739 imageview.setImageBitmap(b)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2740 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2741 break
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2742 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2743 } catch (e: IOException) {
2528 03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2744 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2745 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2746 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2747 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2748 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2749
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2750 fun windowSetBitmapFromData(window: View, resID: Int, data: ByteArray?, length: Int)
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2751 {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2752 waitOnUiThread {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2753 if(resID != 0) {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2754 if (window is ImageButton) {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2755 val button = window
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2756
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2757 button.setImageResource(resID)
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2758 } else if (window is ImageView) {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2759 val imageview = window
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2760
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2761 imageview.setImageResource(resID)
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2762 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2763 } else if(data != null) {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2764 val b = BitmapFactory.decodeByteArray(data, 0, length)
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2765
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2766 if (window is ImageButton) {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2767 val button = window
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2768
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2769 button.setImageBitmap(b)
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2770 } else if (window is ImageView) {
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2771 val imageview = window
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2772
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2773 imageview.setImageBitmap(b)
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2774 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2775 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2776 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2777 }
03f6870bcfcc Android: Implement dw_bitmap_new(), dw_dwindow_set_bitmap() and dw_window_set_bitmap_from_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2527 diff changeset	2778
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2779 fun iconNew(filename: String?, data: ByteArray?, length: Int, resID: Int): Drawable?
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2780 {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2781 var icon: Drawable? = null
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2782
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2783 waitOnUiThread {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2784 if(resID != 0) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2785 icon = ResourcesCompat.getDrawable(resources, resID, null)
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2786 } else if(filename != null) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2787 val exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2788
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2789 for (ext in exts) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2790 // Try to load the image, and protect against exceptions
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2791 try {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2792 val f = this.assets.open(filename + ext)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2793 icon = Drawable.createFromStream(f, null)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2794 } catch (e: IOException) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2795 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2796 if(icon != null) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2797 break
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2798 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2799
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2800 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2801 } else if(data != null) {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2802 icon = BitmapDrawable(resources, BitmapFactory.decodeByteArray(data, 0, length))
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2803 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2804 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2805 return icon
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2806 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2807
2529 060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2808 fun pixmapNew(width: Int, height: Int, filename: String?, data: ByteArray?, length: Int, resID: Int): Bitmap?
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2809 {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2810 var pixmap: Bitmap? = null
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2811
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2812 waitOnUiThread {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2813 if(width > 0 && height > 0) {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2814 pixmap = Bitmap.createBitmap(null, width, height, Bitmap.Config.ARGB_8888)
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2815 } else if(resID != 0) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2816 pixmap = BitmapFactory.decodeResource(resources, resID)
2529 060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2817 } else if(filename != null) {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2818 val exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2819
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2820 for (ext in exts) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2821 // Try to load the image, and protect against exceptions
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2822 try {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2823 val f = this.assets.open(filename + ext)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2824 pixmap = BitmapFactory.decodeStream(f)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2825 } catch (e: IOException) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2826 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2827 if(pixmap != null) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2828 break
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2829 }
2529 060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2830 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2831 } else if(data != null) {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2832 pixmap = BitmapFactory.decodeByteArray(data, 0, length)
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2833 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2834 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2835 return pixmap
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2836 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2837
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2838 fun pixmapGetDimensions(pixmap: Bitmap): Long
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2839 {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2840 var dimensions: Long = 0
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2841
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2842 waitOnUiThread {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2843 dimensions = pixmap.width.toLong() or (pixmap.height.toLong() shl 32)
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2844 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2845 return dimensions
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2846 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	2847
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	2848 fun screenGetDimensions(): Long
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	2849 {
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	2850 val dm = resources.displayMetrics
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	2851 return dm.widthPixels.toLong() or (dm.heightPixels.toLong() shl 32)
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	2852 }
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	2853
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2854 fun renderNew(cid: Int): DWRender?
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2855 {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2856 var render: DWRender? = null
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2857
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2858 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2859 val dataArrayMap = SimpleArrayMap<String, Long>()
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2860
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2861 render = DWRender(this)
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2862 render!!.tag = dataArrayMap
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2863 render!!.id = cid
2596 60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	2864 render!!.setOnKeyListener(View.OnKeyListener { v, keyCode, event ->
60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	2865 if (event.action == KeyEvent.ACTION_DOWN) {
60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	2866 eventHandlerKey(render!!, 2, keyCode, event.unicodeChar, event.modifiers, event.characters)
60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	2867 true
60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	2868 }
60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	2869 false
60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	2870 })
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2871 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2872 return render
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2873 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2874
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2875 fun renderRedraw(render: DWRender)
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2876 {
2539 822f814a54f4 Android: Fix memory corruption issue due to incorrectly allocating HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2538 diff changeset	2877 runOnUiThread {
822f814a54f4 Android: Fix memory corruption issue due to incorrectly allocating HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2538 diff changeset	2878 render.invalidate()
822f814a54f4 Android: Fix memory corruption issue due to incorrectly allocating HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2538 diff changeset	2879 }
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2880 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	2881
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2882 fun pixmapBitBlt(dstr: DWRender?, dstp: Bitmap?, dstx: Int, dsty: Int, dstw: Int, dsth: Int,
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2883 srcr: DWRender?, srcp: Bitmap?, srcy: Int, srcx: Int, srcw: Int, srch: Int): Int
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2884 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2885 val dst = Rect(dstx, dsty, dstx + dstw, dsty + dsth)
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2886 val src = Rect(srcx, srcy, srcx + srcw, srcy + srch)
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2887 var retval = 1
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2888
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2889 if(srcw == -1) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2890 src.right = srcx + dstw
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2891 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2892 if(srch == -1) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2893 src.bottom = srcy + dsth
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2894 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2895
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2896 waitOnUiThread {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2897 var canvas: Canvas? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2898 var bitmap: Bitmap? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2899
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2900 if(dstr != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2901 canvas = dstr.cachedCanvas
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2902 } else if(dstp != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2903 canvas = Canvas(dstp)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2904 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2905
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2906 if(srcp != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2907 bitmap = srcp
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2908 } else if(srcr != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2909 bitmap = Bitmap.createBitmap(srcr.layoutParams.width,
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2910 srcr.layoutParams.height, Bitmap.Config.ARGB_8888)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2911 val c = Canvas(bitmap)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2912 srcr.layout(srcr.left, srcr.top, srcr.right, srcr.bottom)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2913 srcr.draw(c)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2914 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2915
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2916 if(canvas != null && bitmap != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2917 canvas.drawBitmap(bitmap, src, dst, null)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2918 retval = 0
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2919 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2920 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2921 return retval
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2922 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2923
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2924 fun drawPoint(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, fgColor: Long, bgColor: Long)
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2925 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2926 waitOnUiThread {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2927 var canvas: Canvas? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2928
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2929 if(render != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2930 canvas = render.cachedCanvas
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2931 } else if(bitmap != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2932 canvas = Canvas(bitmap)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2933 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2934
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2935 if(canvas != null) {
2572 bbe693293be5 Android: New color handling system, save the color in the C API and pass bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2568 diff changeset	2936 colorsSet(fgColor, bgColor)
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2937 canvas.drawPoint(x.toFloat(), y.toFloat(), Paint())
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2938 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2939 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2940 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2941
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	2942 fun drawLine(render: DWRender?, bitmap: Bitmap?, x1: Int, y1: Int, x2: Int, y2: Int, fgColor: Long, bgColor: Long)
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2943 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2944 waitOnUiThread {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2945 var canvas: Canvas? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2946
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2947 if(render != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2948 canvas = render.cachedCanvas
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2949 } else if(bitmap != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2950 canvas = Canvas(bitmap)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2951 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2952
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2953 if(canvas != null) {
2572 bbe693293be5 Android: New color handling system, save the color in the C API and pass bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2568 diff changeset	2954 colorsSet(fgColor, bgColor)
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	2955 paint.flags = 0
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	2956 paint.style = Paint.Style.STROKE
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2957 canvas.drawLine(x1.toFloat(), y1.toFloat(), x2.toFloat(), y2.toFloat(), paint)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2958 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2959 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2960 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	2961
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2962 fun fontTextExtentsGet(render: DWRender?, bitmap: Bitmap?, text:String, typeface: Typeface?, fontsize: Int, window: View?): Long
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2963 {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2964 var dimensions: Long = 0
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2965
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2966 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2967 val rect = Rect()
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2968
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2969 if (render != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2970 if (render.typeface != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2971 paint.typeface = render.typeface
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2972 if (render.fontsize != null && render.fontsize!! > 0F) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2973 paint.textSize = render.fontsize!!
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2974 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2975 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2976 } else if (bitmap != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2977 if (typeface != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2978 paint.typeface = typeface
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2979 if (fontsize > 0) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2980 paint.textSize = fontsize.toFloat()
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2981 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2982 } else if (window != null && window is DWRender) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2983 val secondary: DWRender = window
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2984
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2985 if (secondary.typeface != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2986 paint.typeface = secondary.typeface
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2987 if (secondary.fontsize != null && secondary.fontsize!! > 0F) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2988 paint.textSize = secondary.fontsize!!
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2989 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2990 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2991 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2992 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2993 paint.getTextBounds(text, 0, text.length, rect)
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2994 val textheight = rect.bottom - rect.top
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2995 val textwidth = rect.right - rect.left
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2996 dimensions = textwidth.toLong() or (textheight.toLong() shl 32)
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2997 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2998 return dimensions
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2999 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3000
2572 bbe693293be5 Android: New color handling system, save the color in the C API and pass bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2568 diff changeset	3001 fun drawText(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, text:String, typeface: Typeface?,
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3002 fontsize: Int, window: View?, fgColor: Long, bgColor: Long)
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3003 {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3004 waitOnUiThread {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3005 var canvas: Canvas? = null
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3006
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3007 if(render != null && render.cachedCanvas != null) {
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3008 canvas = render.cachedCanvas
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3009 if(render.typeface != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3010 paint.typeface = render.typeface
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3011 if(render.fontsize != null && render.fontsize!! > 0F) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3012 paint.textSize = render.fontsize!!
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3013 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3014 }
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3015 } else if(bitmap != null) {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3016 canvas = Canvas(bitmap)
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3017 if(typeface != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3018 paint.typeface = typeface
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3019 if(fontsize > 0) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3020 paint.textSize = fontsize.toFloat()
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3021 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3022 } else if(window != null && window is DWRender) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3023 val secondary: DWRender = window
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3024
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3025 if(secondary.typeface != null) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3026 paint.typeface = secondary.typeface
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3027 if(secondary.fontsize != null && secondary.fontsize!! > 0F) {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3028 paint.textSize = secondary.fontsize!!
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3029 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3030 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	3031 }
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3032 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3033
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3034 if(canvas != null) {
2572 bbe693293be5 Android: New color handling system, save the color in the C API and pass bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2568 diff changeset	3035 colorsSet(fgColor, bgColor)
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3036 // Save the old color for later...
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3037 val rect = Rect()
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3038 val oldcolor = paint.color
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3039 // Prepare to draw the background rect
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3040 paint.color = bgcolor
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3041 paint.flags = 0
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3042 paint.style = Paint.Style.FILL_AND_STROKE
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3043 paint.textAlign = Paint.Align.LEFT
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3044 paint.getTextBounds(text, 0, text.length, rect)
2538 1b3b40c89cd0 Android: Move the text to below the point, not above it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2537 diff changeset	3045 val textheight = rect.bottom - rect.top
1b3b40c89cd0 Android: Move the text to below the point, not above it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2537 diff changeset	3046 rect.top += y + textheight
1b3b40c89cd0 Android: Move the text to below the point, not above it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2537 diff changeset	3047 rect.bottom += y + textheight
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3048 rect.left += x
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3049 rect.right += x
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3050 canvas.drawRect(rect, paint)
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3051 // Restore the color and prepare to draw text
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3052 paint.color = oldcolor
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3053 paint.style = Paint.Style.STROKE
2538 1b3b40c89cd0 Android: Move the text to below the point, not above it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2537 diff changeset	3054 canvas.drawText(text, x.toFloat(), y.toFloat() + textheight.toFloat(), paint)
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3055 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3056 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3057 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3058
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3059 fun drawRect(render: DWRender?, bitmap: Bitmap?, x: Int, y: Int, width: Int, height: Int, fgColor: Long, bgColor: Long)
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3060 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3061 waitOnUiThread {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3062 var canvas: Canvas? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3063
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3064 if(render != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3065 canvas = render.cachedCanvas
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3066 } else if(bitmap != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3067 canvas = Canvas(bitmap)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3068 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3069
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3070 if(canvas != null) {
2572 bbe693293be5 Android: New color handling system, save the color in the C API and pass bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2568 diff changeset	3071 colorsSet(fgColor, bgColor)
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3072 paint.flags = 0
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3073 paint.style = Paint.Style.FILL_AND_STROKE
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3074 canvas.drawRect(x.toFloat(), y.toFloat(), x.toFloat() + width.toFloat(), y.toFloat() + height.toFloat(), paint)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3075 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3076 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3077 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3078
2572 bbe693293be5 Android: New color handling system, save the color in the C API and pass bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2568 diff changeset	3079 fun drawPolygon(render: DWRender?, bitmap: Bitmap?, flags: Int, npoints: Int,
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3080 x: IntArray, y: IntArray, fgColor: Long, bgColor: Long)
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3081 {
2537 cd9d2ba251d5 Android: Reimplement drawPolygon() using drawPath() instead of drawLines/Points(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2536 diff changeset	3082 // Create a path with all our points
cd9d2ba251d5 Android: Reimplement drawPolygon() using drawPath() instead of drawLines/Points(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2536 diff changeset	3083 val path = Path()
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3084
2537 cd9d2ba251d5 Android: Reimplement drawPolygon() using drawPath() instead of drawLines/Points(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2536 diff changeset	3085 path.moveTo(x[0].toFloat(), y[0].toFloat())
cd9d2ba251d5 Android: Reimplement drawPolygon() using drawPath() instead of drawLines/Points(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2536 diff changeset	3086 for (i in 1 until npoints) {
cd9d2ba251d5 Android: Reimplement drawPolygon() using drawPath() instead of drawLines/Points(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2536 diff changeset	3087 path.lineTo(x[i].toFloat(), y[i].toFloat())
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3088 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3089
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3090 waitOnUiThread {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3091 var canvas: Canvas? = null
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3092
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3093 if(render != null) {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3094 canvas = render.cachedCanvas
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3095 } else if(bitmap != null) {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3096 canvas = Canvas(bitmap)
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3097 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3098
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3099 if(canvas != null) {
2572 bbe693293be5 Android: New color handling system, save the color in the C API and pass bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2568 diff changeset	3100 colorsSet(fgColor, bgColor)
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3101 // Handle the DW_DRAW_NOAA flag
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3102 if((flags and (1 shl 2)) == 0) {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3103 paint.flags = Paint.ANTI_ALIAS_FLAG
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3104 } else {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3105 paint.flags = 0
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3106 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3107 // Handle the DW_DRAW_FILL flag
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3108 if((flags and 1) == 1) {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3109 paint.style = Paint.Style.FILL_AND_STROKE
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3110 } else {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3111 paint.style = Paint.Style.STROKE
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3112 }
2537 cd9d2ba251d5 Android: Reimplement drawPolygon() using drawPath() instead of drawLines/Points(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2536 diff changeset	3113 canvas.drawPath(path, paint)
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3114 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3115 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3116 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3117
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3118 fun drawArc(render: DWRender?, bitmap: Bitmap?, flags: Int, xorigin: Int, yorigin: Int,
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3119 x1: Int, y1: Int, x2: Int, y2: Int, fgColor: Long, bgColor: Long)
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3120 {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3121 waitOnUiThread {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3122 var canvas: Canvas? = null
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3123
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3124 if(render != null) {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3125 canvas = render.cachedCanvas
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3126 } else if(bitmap != null) {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3127 canvas = Canvas(bitmap)
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3128 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3129
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3130 if(canvas != null) {
2572 bbe693293be5 Android: New color handling system, save the color in the C API and pass bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2568 diff changeset	3131 colorsSet(fgColor, bgColor)
bbe693293be5 Android: New color handling system, save the color in the C API and pass bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2568 diff changeset	3132
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3133 // Handle the DW_DRAW_NOAA flag
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3134 if((flags and (1 shl 2)) == 0) {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3135 paint.flags = Paint.ANTI_ALIAS_FLAG
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3136 } else {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3137 paint.flags = 0
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3138 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3139 // Handle the DW_DRAW_FILL flag
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3140 if((flags and 1) == 1) {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3141 paint.style = Paint.Style.FILL_AND_STROKE
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3142 } else {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3143 paint.style = Paint.Style.STROKE
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3144 }
2536 d172ab2eddb6 Android: Implement DW_DRAW_FULL flag for dw_draw_arc(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2535 diff changeset	3145 // Handle the DW_DRAW_FULL flag
d172ab2eddb6 Android: Implement DW_DRAW_FULL flag for dw_draw_arc(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2535 diff changeset	3146 if((flags and (1 shl 1)) != 0) {
2576 db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3147 var left: Float = x1.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3148 var top: Float = y1.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3149 var right: Float = x2.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3150 var bottom: Float = y2.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3151
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3152 if(x2 < x1) {
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3153 left = x2.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3154 right = x1.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3155 }
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3156 if(y2 < y1) {
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3157 top = y2.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3158 bottom = y1.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3159 }
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3160
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3161 canvas.drawOval(left, top, right, bottom, paint)
2536 d172ab2eddb6 Android: Implement DW_DRAW_FULL flag for dw_draw_arc(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2535 diff changeset	3162 } else {
2576 db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3163 var a1: Double = Math.atan2((y1 - yorigin).toDouble(), (x1 - xorigin).toDouble())
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3164 var a2: Double = Math.atan2((y2 - yorigin).toDouble(), (x2 - xorigin).toDouble())
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3165 val dx = (xorigin - x1).toDouble()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3166 val dy = (yorigin - y1).toDouble()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3167 val r: Double = Math.sqrt(dx * dx + dy * dy)
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3168 val left = (xorigin-r).toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3169 val top = (yorigin-r).toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3170 val rect = RectF(left, top, (left + (r2)).toFloat(), (top + (r2)).toFloat())
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3171
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3172 // Convert to degrees
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3173 a1 *= 180.0 / Math.PI
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3174 a2 *= 180.0 / Math.PI
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3175 val sweep = Math.abs(a1 - a2)
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	3176
2536 d172ab2eddb6 Android: Implement DW_DRAW_FULL flag for dw_draw_arc(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2535 diff changeset	3177 canvas.drawArc(rect, a1.toFloat(), sweep.toFloat(), false, paint)
d172ab2eddb6 Android: Implement DW_DRAW_FULL flag for dw_draw_arc(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2535 diff changeset	3178 }
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3179 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3180 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3181 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	3182
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3183 fun colorFromDW(color: Long): Int
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3184 {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3185 val red: Int = (color and 0x000000FF).toInt()
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3186 val green: Int = ((color and 0x0000FF00) shr 8).toInt()
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3187 val blue: Int = ((color and 0x00FF0000) shr 16).toInt()
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3188
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3189 return Color.rgb(red, green, blue)
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3190 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3191
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3192 fun colorsSet(fgColor: Long, bgColor: Long)
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3193 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3194 waitOnUiThread {
2580 473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3195 paint.color = colorFromDW(fgColor)
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3196 this.bgcolor = colorFromDW(bgColor)
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3197 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3198 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	3199
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3200 fun timerConnect(interval: Long, sigfunc: Long, data: Long): Timer
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3201 {
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3202 // creating timer task, timer
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3203 val t = Timer()
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3204 val tt: TimerTask = object : TimerTask() {
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3205 override fun run() {
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3206 if(eventHandlerTimer(sigfunc, data) == 0) {
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3207 t.cancel()
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3208 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3209 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3210 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3211 t.scheduleAtFixedRate(tt, interval, interval)
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3212 return t
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3213 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3214
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3215 fun timerDisconnect(timer: Timer)
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3216 {
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3217 timer.cancel()
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3218 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3219
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3220 fun doBeep(duration: Int)
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3221 {
2491 bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	3222 val toneGen = ToneGenerator(AudioManager.STREAM_ALARM, 100)
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3223 toneGen.startTone(ToneGenerator.TONE_CDMA_PIP, duration)
2491 bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	3224 val handler = Handler(Looper.getMainLooper())
bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	3225 handler.postDelayed({
bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	3226 toneGen.release()
bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	3227 }, (duration + 50).toLong())
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	3228 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	3229
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	3230 fun debugMessage(text: String)
4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	3231 {
4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	3232 Log.d(null, text)
4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	3233 }
4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	3234
2594 2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3235 override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3236 super.onActivityResult(requestCode, resultCode, data)
2595 6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3237 if(requestCode == 100) {
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3238 fileLock.lock()
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3239 if(resultCode == Activity.RESULT_OK) {
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3240 fileURI = data!!.data
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3241 } else {
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3242 fileURI = null
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3243 }
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3244 fileCond.signal()
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3245 fileLock.unlock()
2594 2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3246 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3247 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3248
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3249 fun fileBrowseNew(title: String, defpath: String?, ext: String?, flags: Int): String?
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3250 {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3251 var retval: String? = null
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3252
2595 6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3253 // This can't be called from the main thread
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3254 if(Looper.getMainLooper() != Looper.myLooper()) {
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3255 fileLock.lock()
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3256 waitOnUiThread {
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3257 val fileintent = Intent(Intent.ACTION_GET_CONTENT)
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3258 fileintent.type = "text/plain"
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3259 fileintent.addCategory(Intent.CATEGORY_OPENABLE)
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3260 startActivityForResult(fileintent, 100)
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3261 }
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3262
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3263 // Wait until the intent finishes.
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3264 fileCond.await()
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3265 fileLock.unlock()
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3266
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3267 if(fileURI != null) {
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3268 retval = getUriRealPath(this, fileURI)
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	3269 }
2594 2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3270 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3271 return retval
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3272 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3273
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3274 fun fileBrowse(title: String, defpath: String?, ext: String?, flags: Int): String?
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3275 {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3276 var retval: String? = null
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3277
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3278 waitOnUiThread {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3279 val fc = DWFileChooser(this)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3280 fc.setFileListener(object: DWFileChooser.FileSelectedListener {
2594 2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3281 override fun fileSelected(file: File?) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3282 // do something with the file
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3283 retval = file!!.absolutePath
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3284 throw java.lang.RuntimeException()
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3285 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3286 })
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3287 if(ext != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3288 fc.setExtension(ext)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3289 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3290 fc.showDialog()
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3291 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3292
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3293 // loop till a runtime exception is triggered.
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3294 try {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3295 Looper.loop()
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3296 } catch (e2: RuntimeException) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3297 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3298
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3299 return retval
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3300 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	3301
2486 cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	3302 fun messageBox(title: String, body: String, flags: Int): Int
cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	3303 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3304 var retval = 0
2486 cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	3305
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3306 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3307 // make a text input dialog and show it
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3308 val alert = AlertDialog.Builder(this)
2486 cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	3309
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3310 alert.setTitle(title)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3311 alert.setMessage(body)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3312 if ((flags and (1 shl 3)) != 0) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3313 alert.setPositiveButton("Yes"
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3314 )
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3315 //R.string.yes,
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3316 { _: DialogInterface, _: Int ->
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3317 retval = 1
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3318 throw java.lang.RuntimeException()
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3319 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3320 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3321 if ((flags and ((1 shl 1) or (1 shl 2))) != 0) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3322 alert.setNegativeButton(
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3323 R.string.ok
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3324 ) { _: DialogInterface, _: Int ->
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3325 retval = 0
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3326 throw java.lang.RuntimeException()
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3327 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3328 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3329 if ((flags and ((1 shl 3) or (1 shl 4))) != 0) {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3330 alert.setNegativeButton("No"
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3331 )
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3332 //R.string.no,
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3333 { _: DialogInterface, _: Int ->
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3334 retval = 0
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3335 throw java.lang.RuntimeException()
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3336 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3337 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3338 if ((flags and ((1 shl 2) or (1 shl 4))) != 0) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3339 alert.setNeutralButton(
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3340 R.string.cancel
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3341 ) { _: DialogInterface, _: Int ->
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3342 retval = 2
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3343 throw java.lang.RuntimeException()
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3344 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3345 }
2573 ea75e295025b Android: Make message boxes modal (not cancelable). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2572 diff changeset	3346 alert.setCancelable(false)
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3347 alert.show()
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3348
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3349 // loop till a runtime exception is triggered.
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3350 try {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3351 Looper.loop()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3352 } catch (e2: RuntimeException) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3353 }
2486 cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	3354 }
cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	3355 return retval
cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	3356 }
cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	3357
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	3358 fun isUIThread(): Boolean
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	3359 {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	3360 if(Looper.getMainLooper() == Looper.myLooper()) {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	3361 return true
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	3362 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	3363 return false
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	3364 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	3365
2514 5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3366 fun mainSleep(milliseconds: Int)
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3367 {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3368 // If we are on the main UI thread... add an idle handler
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3369 // Then loop until we throw an exception when the time expires
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3370 // in the idle handler, if we are already thrown... remove the handler
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3371 if(Looper.getMainLooper() == Looper.myLooper()) {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3372 val starttime = System.currentTimeMillis()
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3373
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3374 // Waiting for Idle to make sure Toast gets rendered.
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3375 Looper.myQueue().addIdleHandler(object : MessageQueue.IdleHandler {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3376 var thrown: Boolean = false
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3377
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3378 override fun queueIdle(): Boolean {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3379 if(System.currentTimeMillis() - starttime >= milliseconds) {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3380 if (thrown == false) {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3381 thrown = true
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3382 throw java.lang.RuntimeException()
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3383 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3384 return false
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3385 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3386 return true
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3387 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3388 })
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3389
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3390 // loop till a runtime exception is triggered.
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3391 try {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3392 Looper.loop()
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3393 } catch (e2: RuntimeException) {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3394 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3395 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3396 else
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3397 {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3398 // If we are in a different thread just sleep
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3399 Thread.sleep(milliseconds.toLong())
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3400 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3401 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	3402
2487 83f8f4f58a98 Android: Implement dw_exit() using Activity.finishActivity() instead of exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2486 diff changeset	3403 fun dwindowsExit(exitcode: Int)
83f8f4f58a98 Android: Implement dw_exit() using Activity.finishActivity() instead of exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2486 diff changeset	3404 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3405 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3406 this.finishAffinity()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3407 System.exit(exitcode)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3408 }
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3409 }
b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3410
b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3411 fun dwindowsShutdown()
b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3412 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3413 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3414 this.finishAffinity()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3415 }
2487 83f8f4f58a98 Android: Implement dw_exit() using Activity.finishActivity() instead of exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2486 diff changeset	3416 }
83f8f4f58a98 Android: Implement dw_exit() using Activity.finishActivity() instead of exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2486 diff changeset	3417
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	3418 fun dwInit(appid: String, appname: String): Int
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3419 {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3420 waitOnUiThread {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3421 // Create the notification channel in dw_init()
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3422 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3423 // Create the NotificationChannel
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3424 val importance = NotificationManager.IMPORTANCE_DEFAULT
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3425 val mChannel = NotificationChannel(appid, appname, importance)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3426 // Register the channel with the system; you can't change the importance
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3427 // or other notification behaviors after this
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3428 val notificationManager =
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3429 getSystemService(NOTIFICATION_SERVICE) as NotificationManager
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3430 notificationManager.createNotificationChannel(mChannel)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3431 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3432 }
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	3433 return Build.VERSION.SDK_INT
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	3434 }
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	3435
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	3436 fun dwMain()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	3437 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	3438 runOnUiThread {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	3439 // Trigger the options menu to update when dw_main() is called
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	3440 invalidateOptionsMenu()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	3441 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	3442 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	3443
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	3444 fun androidGetRelease(): String
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	3445 {
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	3446 return Build.VERSION.RELEASE
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3447 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3448
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3449 fun notificationNew(title: String, imagepath: String, text: String, appid: String): NotificationCompat.Builder?
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3450 {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3451 var builder: NotificationCompat.Builder? = null
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3452
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3453 waitOnUiThread {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3454 builder = NotificationCompat.Builder(this, appid)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3455 .setContentTitle(title)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3456 .setContentText(text)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3457 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3458 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3459 return builder
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3460 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3461
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3462 fun notificationSend(builder: NotificationCompat.Builder)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3463 {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3464 waitOnUiThread {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3465 notificationID += 1
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3466 with(NotificationManagerCompat.from(this)) {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3467 // notificationId is a unique int for each notification that you must define
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3468 notify(notificationID, builder.build())
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3469 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3470 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3471 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3472
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	3473 /*
2594 2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3474 * This method will parse out the real local file path from the file content URI.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3475 */
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3476 private fun getUriRealPath(ctx: Context?, uri: Uri?): String? {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3477 var ret: String? = ""
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3478 if (ctx != null && uri != null) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3479 if (isContentUri(uri)) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3480 if (isGooglePhotoDoc(uri.authority)) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3481 ret = uri.lastPathSegment
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3482 } else {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3483 ret = getImageRealPath(contentResolver, uri, null)
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3484 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3485 } else if (isFileUri(uri)) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3486 ret = uri.path
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3487 } else if (isDocumentUri(ctx, uri)) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3488
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3489 // Get uri related document id.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3490 val documentId = DocumentsContract.getDocumentId(uri)
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3491
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3492 // Get uri authority.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3493 val uriAuthority: String? = uri.authority
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3494 if (isMediaDoc(uriAuthority)) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3495 val idArr = documentId.split(":").toTypedArray()
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3496 if (idArr.size == 2) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3497 // First item is document type.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3498 val docType = idArr[0]
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3499
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3500 // Second item is document real id.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3501 val realDocId = idArr[1]
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3502
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3503 // Get content uri by document type.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3504 var mediaContentUri: Uri? = MediaStore.Images.Media.EXTERNAL_CONTENT_URI
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3505 if ("image" == docType) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3506 mediaContentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3507 } else if ("video" == docType) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3508 mediaContentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3509 } else if ("audio" == docType) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3510 mediaContentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3511 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3512
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3513 // Get where clause with real document id.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3514 val whereClause = MediaStore.Images.Media._ID + " = " + realDocId
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3515 ret = getImageRealPath(contentResolver, mediaContentUri, whereClause)
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3516 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3517 } else if (isDownloadDoc(uriAuthority)) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3518 // Build download uri.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3519 val downloadUri: Uri = Uri.parse("content://downloads/public_downloads")
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3520
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3521 // Append download document id at uri end.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3522 val downloadUriAppendId: Uri =
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3523 ContentUris.withAppendedId(downloadUri, java.lang.Long.valueOf(documentId))
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3524 ret = getImageRealPath(contentResolver, downloadUriAppendId, null)
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3525 } else if (isExternalStoreDoc(uriAuthority)) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3526 val idArr = documentId.split(":").toTypedArray()
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3527 if (idArr.size == 2) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3528 val type = idArr[0]
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3529 val realDocId = idArr[1]
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3530 if ("primary".equals(type, ignoreCase = true)) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3531 ret = Environment.getExternalStorageDirectory()
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3532 .toString() + "/" + realDocId
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3533 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3534 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3535 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3536 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3537 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3538 return ret
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3539 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3540
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3541 /* Check whether this uri represent a document or not. */
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3542 private fun isDocumentUri(ctx: Context?, uri: Uri?): Boolean {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3543 var ret = false
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3544 if (ctx != null && uri != null) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3545 ret = DocumentsContract.isDocumentUri(ctx, uri)
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3546 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3547 return ret
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3548 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3549
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3550 /* Check whether this uri is a content uri or not.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3551 * content uri like content://media/external/images/media/1302716
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3552 */
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3553 private fun isContentUri(uri: Uri?): Boolean {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3554 var ret = false
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3555 if (uri != null) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3556 val uriSchema: String? = uri.scheme
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3557 if ("content".equals(uriSchema, ignoreCase = true)) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3558 ret = true
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3559 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3560 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3561 return ret
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3562 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3563
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3564 /* Check whether this uri is a file uri or not.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3565 * file uri like file:///storage/41B7-12F1/DCIM/Camera/IMG_20180211_095139.jpg
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3566 */
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3567 private fun isFileUri(uri: Uri?): Boolean {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3568 var ret = false
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3569 if (uri != null) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3570 val uriSchema: String? = uri.scheme
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3571 if ("file".equals(uriSchema, ignoreCase = true)) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3572 ret = true
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3573 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3574 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3575 return ret
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3576 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3577
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3578
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3579 /* Check whether this document is provided by ExternalStorageProvider. Return true means the file is saved in external storage. */
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3580 private fun isExternalStoreDoc(uriAuthority: String?): Boolean {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3581 var ret = false
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3582 if (uriAuthority != null && "com.android.externalstorage.documents" == uriAuthority) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3583 ret = true
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3584 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3585 return ret
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3586 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3587
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3588 /* Check whether this document is provided by DownloadsProvider. return true means this file is a downloaed file. */
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3589 private fun isDownloadDoc(uriAuthority: String?): Boolean {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3590 var ret = false
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3591 if (uriAuthority != null && "com.android.providers.downloads.documents" == uriAuthority) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3592 ret = true
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3593 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3594 return ret
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3595 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3596
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3597 /*
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3598 * Check if MediaProvider provide this document, if true means this image is created in android media app.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3599 */
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3600 private fun isMediaDoc(uriAuthority: String?): Boolean {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3601 var ret = false
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3602 if (uriAuthority != null && "com.android.providers.media.documents" == uriAuthority) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3603 ret = true
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3604 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3605 return ret
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3606 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3607
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3608 /*
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3609 * Check whether google photos provide this document, if true means this image is created in google photos app.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3610 */
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3611 private fun isGooglePhotoDoc(uriAuthority: String?): Boolean {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3612 var ret = false
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3613 if (uriAuthority != null && "com.google.android.apps.photos.content" == uriAuthority) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3614 ret = true
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3615 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3616 return ret
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3617 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3618
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3619 /* Return uri represented document file real local path.*/
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3620 private fun getImageRealPath(
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3621 contentResolver: ContentResolver,
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3622 uri: Uri?,
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3623 whereClause: String?
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3624 ): String {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3625 var ret = ""
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3626
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3627 if(uri != null) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3628 // Query the uri with condition.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3629 val cursor: Cursor? = contentResolver.query(uri, null, whereClause, null, null)
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3630 if (cursor != null) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3631 val moveToFirst: Boolean = cursor.moveToFirst()
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3632 if (moveToFirst) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3633
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3634 // Get columns name by uri type.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3635 var columnName = MediaStore.Images.Media.DATA
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3636 if (uri === MediaStore.Images.Media.EXTERNAL_CONTENT_URI) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3637 columnName = MediaStore.Images.Media.DATA
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3638 } else if (uri === MediaStore.Audio.Media.EXTERNAL_CONTENT_URI) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3639 columnName = MediaStore.Audio.Media.DATA
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3640 } else if (uri === MediaStore.Video.Media.EXTERNAL_CONTENT_URI) {
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3641 columnName = MediaStore.Video.Media.DATA
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3642 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3643
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3644 // Get column index.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3645 val imageColumnIndex: Int = cursor.getColumnIndex(columnName)
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3646
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3647 // Get column value which is the uri related file local path.
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3648 ret = cursor.getString(imageColumnIndex)
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3649 // Clean up
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3650 cursor.close()
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3651 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3652 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3653 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3654 return ret
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3655 }
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3656
2c15b3d41fe4 Android: Add preliminary new file browser that uses the system ACTION_GET_CONTENT Intent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2590 diff changeset	3657 /*
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	3658 * Native methods that are implemented by the 'dwindows' native library,
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3659 * which is packaged with this application.
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3660 */
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	3661 external fun dwindowsInit(dataDir: String, appid: String)
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	3662 external fun eventHandler(
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3663 obj1: View?,
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	3664 obj2: View?,
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	3665 message: Int,
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	3666 str1: String?,
5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	3667 str2: String?,
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3668 inta: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3669 intb: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3670 intc: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3671 intd: Int
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	3672 ): Int
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3673 external fun eventHandlerInt(
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3674 obj1: View,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3675 message: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3676 inta: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3677 intb: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3678 intc: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3679 intd: Int
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	3680 )
2483 9f7af6d8c6a4 Android: Fix signal handlers so they actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2482 diff changeset	3681 external fun eventHandlerSimple(obj1: View, message: Int)
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	3682 external fun eventHandlerNotebook(obj1: View, message: Int, pageID: Long)
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3683 external fun eventHandlerTimer(sigfunc: Long, data: Long): Int
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3684 external fun eventHandlerHTMLResult(obj1: View, message: Int, result: String, data: Long)
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3685 external fun eventHandlerContainer(obj1: View, message: Int, title: String?, x: Int, y: Int, data: Long)
2596 60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	3686 external fun eventHandlerKey(obj1: View, message: Int, character: Int, vk: Int, modifiers: Int, str: String)
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3687
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	3688 companion object
a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	3689 {
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3690 // Used to load the 'dwindows' library on application startup.
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	3691 init
a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	3692 {
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3693 System.loadLibrary("dwindows")
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3694 }
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3695 }
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3696 }

Mercurial > dwindows

annotate android/DWindows.kt @ 2597:99fdcb7f2a2a