dwindows: android/DWindows.kt annotate

annotate android/DWindows.kt @ 2722:cacde852e2db

Android: Add dialog dismiss and color change handlers to the color chooser. dw_color_choose() now blocks and waits for the user to pick a color.... previously it opened the dialog and returned the original color. Probably need to add a GradientBar for the brightness... maybe some buttons to apply or cancel, but for now the Android < button closes it.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 09 Dec 2021 11:52:59 +0000
parents	9ce1649b0fbd
children	bf585f375286

rev	line source
2713 6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	1 // (C) 2021 Brian Smith <brian@dbsoft.org>
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	2 // (C) 2019 Anton Popov
2484 cb5b67154399 Android: The DWindows class should be org.dbsoft.dwindows, remove dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2483 diff changeset	3 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	4
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5 import android.R
2608 a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	6 import android.annotation.SuppressLint
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	7 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	8 import android.app.Dialog
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	9 import android.app.NotificationChannel
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	10 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	11 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	12 import android.content.pm.ActivityInfo
2496 3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	13 import android.content.res.Configuration
2643 28ca1e59e76f Android: Catch NotFoundException when loading resource... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2642 diff changeset	14 import android.content.res.Resources
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	15 import android.database.Cursor
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	16 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	17 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	18 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	19 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	20 import android.media.AudioManager
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	21 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	22 import android.net.Uri
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	23 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	24 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	25 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	26 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	27 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	28 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	29 import android.text.method.PasswordTransformationMethod
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
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	43 import androidx.constraintlayout.widget.ConstraintLayout
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	44 import androidx.constraintlayout.widget.ConstraintSet
2675 a7868380098f Android: LinearLayout does not allow null views, if null, create a Placeholder view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2670 diff changeset	45 import androidx.constraintlayout.widget.Placeholder
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	46 import androidx.core.app.NotificationCompat
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	47 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	48 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	49 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	50 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	51 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	52 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	53 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	54 import com.google.android.material.tabs.TabLayoutMediator
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	55 import java.io.BufferedInputStream
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	56 import java.io.File
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	57 import java.io.FileOutputStream
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	58 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	59 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	60 import java.util.concurrent.locks.ReentrantLock
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	61 import java.util.zip.ZipEntry
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	62 import java.util.zip.ZipFile
2694 cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	63 import android.content.Intent
2713 6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	64 import android.util.*
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	65 import android.util.Base64
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	66 import kotlin.math.*
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	67 import android.content.ContentUris
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	68 import androidx.appcompat.widget.AppCompatSeekBar
2722 cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	69 import android.content.DialogInterface
cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	70
cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	71
cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	72
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	73
2713 6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	74
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	75 // Color Wheel section
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	76 private val HUE_COLORS = intArrayOf(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	77 Color.RED,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	78 Color.YELLOW,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	79 Color.GREEN,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	80 Color.CYAN,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	81 Color.BLUE,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	82 Color.MAGENTA,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	83 Color.RED
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	84 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	85
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	86 private val SATURATION_COLORS = intArrayOf(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	87 Color.WHITE,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	88 setAlpha(Color.WHITE, 0)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	89 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	90
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	91 open class ColorWheel @JvmOverloads constructor(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	92 context: Context,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	93 attrs: AttributeSet? = null,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	94 defStyleAttr: Int = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	95 ) : View(context, attrs, defStyleAttr) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	96
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	97 private val hueGradient = GradientDrawable().apply {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	98 gradientType = GradientDrawable.SWEEP_GRADIENT
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	99 shape = GradientDrawable.OVAL
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	100 colors = HUE_COLORS
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	101 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	102
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	103 private val saturationGradient = GradientDrawable().apply {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	104 gradientType = GradientDrawable.RADIAL_GRADIENT
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	105 shape = GradientDrawable.OVAL
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	106 colors = SATURATION_COLORS
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	107 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	108
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	109 private val thumbDrawable = ThumbDrawable()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	110 private val hsvColor = HsvColor(value = 1f)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	111
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	112 private var wheelCenterX = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	113 private var wheelCenterY = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	114 private var wheelRadius = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	115 private var downX = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	116 private var downY = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	117
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	118 var rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	119 get() = hsvColor.rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	120 set(rgb) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	121 hsvColor.rgb = rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	122 hsvColor.set(value = 1f)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	123 fireColorListener()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	124 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	125 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	126
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	127 var thumbRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	128 get() = thumbDrawable.radius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	129 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	130 thumbDrawable.radius = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	131 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	132 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	133
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	134 var thumbColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	135 get() = thumbDrawable.thumbColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	136 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	137 thumbDrawable.thumbColor = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	138 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	139 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	140
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	141 var thumbStrokeColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	142 get() = thumbDrawable.strokeColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	143 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	144 thumbDrawable.strokeColor = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	145 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	146 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	147
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	148 var thumbColorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	149 get() = thumbDrawable.colorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	150 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	151 thumbDrawable.colorCircleScale = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	152 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	153 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	154
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	155 var colorChangeListener: ((Int) -> Unit)? = null
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	156
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	157 var interceptTouchEvent = true
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	158
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	159 init {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	160 thumbRadius = 13
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	161 thumbColor = Color.WHITE
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	162 thumbStrokeColor = Color.DKGRAY
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	163 thumbColorCircleScale = 0.7f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	164 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	165
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	166 fun setRgb(r: Int, g: Int, b: Int) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	167 rgb = Color.rgb(r, g, b)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	168 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	169
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	170 override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	171 val minDimension = minOf(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	172 MeasureSpec.getSize(widthMeasureSpec),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	173 MeasureSpec.getSize(heightMeasureSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	174 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	175
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	176 setMeasuredDimension(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	177 resolveSize(minDimension, widthMeasureSpec),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	178 resolveSize(minDimension, heightMeasureSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	179 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	180 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	181
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	182 override fun onDraw(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	183 drawColorWheel(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	184 drawThumb(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	185 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	186
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	187 private fun drawColorWheel(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	188 val hSpace = width - paddingLeft - paddingRight
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	189 val vSpace = height - paddingTop - paddingBottom
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	190
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	191 wheelCenterX = paddingLeft + hSpace / 2
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	192 wheelCenterY = paddingTop + vSpace / 2
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	193 wheelRadius = maxOf(minOf(hSpace, vSpace) / 2, 0)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	194
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	195 val left = wheelCenterX - wheelRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	196 val top = wheelCenterY - wheelRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	197 val right = wheelCenterX + wheelRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	198 val bottom = wheelCenterY + wheelRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	199
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	200 hueGradient.setBounds(left, top, right, bottom)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	201 saturationGradient.setBounds(left, top, right, bottom)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	202 saturationGradient.gradientRadius = wheelRadius.toFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	203
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	204 hueGradient.draw(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	205 saturationGradient.draw(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	206 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	207
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	208 private fun drawThumb(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	209 val r = hsvColor.saturation * wheelRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	210 val hueRadians = toRadians(hsvColor.hue)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	211 val x = cos(hueRadians) * r + wheelCenterX
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	212 val y = sin(hueRadians) * r + wheelCenterY
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	213
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	214 thumbDrawable.indicatorColor = hsvColor.rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	215 thumbDrawable.setCoordinates(x, y)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	216 thumbDrawable.draw(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	217 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	218
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	219 override fun onTouchEvent(event: MotionEvent): Boolean {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	220 when (event.actionMasked) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	221 MotionEvent.ACTION_DOWN -> onActionDown(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	222 MotionEvent.ACTION_MOVE -> updateColorOnMotionEvent(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	223 MotionEvent.ACTION_UP -> {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	224 updateColorOnMotionEvent(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	225 if (isTap(event, downX, downY)) performClick()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	226 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	227 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	228
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	229 return true
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	230 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	231
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	232 private fun onActionDown(event: MotionEvent) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	233 parent.requestDisallowInterceptTouchEvent(interceptTouchEvent)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	234 updateColorOnMotionEvent(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	235 downX = event.x
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	236 downY = event.y
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	237 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	238
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	239 override fun performClick() = super.performClick()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	240
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	241 private fun updateColorOnMotionEvent(event: MotionEvent) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	242 calculateColor(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	243 fireColorListener()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	244 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	245 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	246
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	247 private fun calculateColor(event: MotionEvent) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	248 val legX = event.x - wheelCenterX
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	249 val legY = event.y - wheelCenterY
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	250 val hypot = minOf(hypot(legX, legY), wheelRadius.toFloat())
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	251 val hue = (toDegrees(atan2(legY, legX)) + 360) % 360
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	252 val saturation = hypot / wheelRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	253 hsvColor.set(hue, saturation, 1f)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	254 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	255
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	256 private fun fireColorListener() {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	257 colorChangeListener?.invoke(hsvColor.rgb)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	258 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	259
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	260 override fun onSaveInstanceState(): Parcelable {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	261 val superState = super.onSaveInstanceState()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	262 val thumbState = thumbDrawable.saveState()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	263 return ColorWheelState(superState, this, thumbState)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	264 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	265
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	266 override fun onRestoreInstanceState(state: Parcelable) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	267 if (state is ColorWheelState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	268 super.onRestoreInstanceState(state.superState)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	269 readColorWheelState(state)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	270 } else {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	271 super.onRestoreInstanceState(state)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	272 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	273 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	274
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	275 private fun readColorWheelState(state: ColorWheelState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	276 thumbDrawable.restoreState(state.thumbState)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	277 interceptTouchEvent = state.interceptTouchEvent
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	278 rgb = state.rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	279 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	280 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	281
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	282 internal class ColorWheelState : View.BaseSavedState {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	283
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	284 val thumbState: ThumbDrawableState
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	285 val interceptTouchEvent: Boolean
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	286 val rgb: Int
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	287
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	288 constructor(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	289 superState: Parcelable?,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	290 view: ColorWheel,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	291 thumbState: ThumbDrawableState
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	292 ) : super(superState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	293 this.thumbState = thumbState
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	294 interceptTouchEvent = view.interceptTouchEvent
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	295 rgb = view.rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	296 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	297
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	298 constructor(source: Parcel) : super(source) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	299 thumbState = source.readThumbState()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	300 interceptTouchEvent = source.readBooleanCompat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	301 rgb = source.readInt()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	302 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	303
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	304 override fun writeToParcel(out: Parcel, flags: Int) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	305 super.writeToParcel(out, flags)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	306 out.writeThumbState(thumbState, flags)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	307 out.writeBooleanCompat(interceptTouchEvent)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	308 out.writeInt(rgb)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	309 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	310
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	311 companion object CREATOR : Parcelable.Creator<ColorWheelState> {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	312
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	313 override fun createFromParcel(source: Parcel) = ColorWheelState(source)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	314
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	315 override fun newArray(size: Int) = arrayOfNulls<ColorWheelState>(size)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	316 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	317 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	318 internal fun Parcel.writeBooleanCompat(value: Boolean) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	319 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	320 this.writeBoolean(value)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	321 } else {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	322 this.writeInt(if (value) 1 else 0)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	323 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	324 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	325
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	326 internal fun Parcel.readBooleanCompat(): Boolean {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	327 return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	328 this.readBoolean()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	329 } else {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	330 this.readInt() == 1
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	331 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	332 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	333 private const val MAX_ALPHA = 255
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	334
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	335 open class GradientSeekBar @JvmOverloads constructor(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	336 context: Context,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	337 attrs: AttributeSet? = null,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	338 defStyleAttr: Int = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	339 ) : View(context, attrs, defStyleAttr) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	340
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	341 private val gradientColors = IntArray(2)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	342 private val thumbDrawable = ThumbDrawable()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	343 private val gradientDrawable = GradientDrawable()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	344 private val argbEvaluator = android.animation.ArgbEvaluator()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	345
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	346 private lateinit var orientationStrategy: OrientationStrategy
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	347 private var downX = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	348 private var downY = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	349
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	350 var startColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	351 get() = gradientColors[0]
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	352 set(color) { setColors(start = color) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	353
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	354 var endColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	355 get() = gradientColors[1]
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	356 set(color) { setColors(end = color) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	357
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	358 var offset = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	359 set(offset) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	360 field = ensureOffsetWithinRange(offset)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	361 calculateArgb()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	362 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	363
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	364 var barSize = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	365 set(width) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	366 field = width
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	367 requestLayout()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	368 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	369
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	370 var cornersRadius = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	371 set(radius) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	372 field = radius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	373 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	374 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	375
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	376 var orientation = Orientation.VERTICAL
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	377 set(orientation) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	378 field = orientation
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	379 orientationStrategy = createOrientationStrategy()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	380 requestLayout()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	381 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	382
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	383 var thumbColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	384 get() = thumbDrawable.thumbColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	385 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	386 thumbDrawable.thumbColor = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	387 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	388 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	389
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	390 var thumbStrokeColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	391 get() = thumbDrawable.strokeColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	392 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	393 thumbDrawable.strokeColor = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	394 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	395 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	396
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	397 var thumbColorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	398 get() = thumbDrawable.colorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	399 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	400 thumbDrawable.colorCircleScale = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	401 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	402 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	403
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	404 var thumbRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	405 get() = thumbDrawable.radius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	406 set(radius) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	407 thumbDrawable.radius = radius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	408 requestLayout()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	409 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	410
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	411 var argb = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	412 private set
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	413
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	414 var colorChangeListener: ((Float, Int) -> Unit)? = null
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	415
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	416 var interceptTouchEvent = true
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	417
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	418 init {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	419 thumbColor = Color.WHITE
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	420 thumbStrokeColor = Color.DKGRAY
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	421 thumbColorCircleScale = 0.7f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	422 thumbRadius = 13
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	423 barSize = 10
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	424 cornersRadius = 5.0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	425 offset = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	426 orientation = Orientation.VERTICAL
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	427 setColors(Color.TRANSPARENT, Color.BLACK)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	428 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	429
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	430 private fun createOrientationStrategy(): OrientationStrategy {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	431 return when (orientation) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	432 Orientation.VERTICAL -> VerticalStrategy()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	433 Orientation.HORIZONTAL -> HorizontalStrategy()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	434 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	435 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	436
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	437 fun setColors(start: Int = startColor, end: Int = endColor) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	438 updateGradientColors(start, end)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	439 calculateArgb()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	440 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	441
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	442 private fun updateGradientColors(start: Int, end: Int) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	443 gradientColors[0] = start
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	444 gradientColors[1] = end
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	445 gradientDrawable.colors = gradientColors
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	446 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	447
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	448 override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	449 val dimens = orientationStrategy.measure(this, widthMeasureSpec, heightMeasureSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	450 setMeasuredDimension(dimens.width(), dimens.height())
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	451 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	452
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	453 override fun onDraw(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	454 drawGradientRect(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	455 drawThumb(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	456 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	457
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	458 private fun drawGradientRect(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	459 gradientDrawable.orientation = orientationStrategy.gradientOrientation
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	460 gradientDrawable.bounds = orientationStrategy.getGradientBounds(this)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	461 gradientDrawable.cornerRadius = cornersRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	462 gradientDrawable.draw(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	463 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	464
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	465 private fun drawThumb(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	466 val coordinates = orientationStrategy.getThumbPosition(this, gradientDrawable.bounds)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	467 thumbDrawable.indicatorColor = argb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	468 thumbDrawable.setCoordinates(coordinates.x, coordinates.y)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	469 thumbDrawable.draw(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	470 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	471
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	472 override fun onTouchEvent(event: MotionEvent): Boolean {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	473 when (event.actionMasked) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	474 MotionEvent.ACTION_DOWN -> onActionDown(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	475 MotionEvent.ACTION_MOVE -> calculateOffsetOnMotionEvent(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	476 MotionEvent.ACTION_UP -> {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	477 calculateOffsetOnMotionEvent(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	478 if (isTap(event, downX, downY)) performClick()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	479 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	480 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	481
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	482 return true
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	483 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	484
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	485 private fun onActionDown(event: MotionEvent) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	486 parent.requestDisallowInterceptTouchEvent(interceptTouchEvent)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	487 calculateOffsetOnMotionEvent(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	488 downX = event.x
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	489 downY = event.y
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	490 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	491
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	492 override fun performClick() = super.performClick()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	493
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	494 private fun calculateOffsetOnMotionEvent(event: MotionEvent) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	495 offset = orientationStrategy.getOffset(this, event, gradientDrawable.bounds)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	496 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	497
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	498 private fun calculateArgb() {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	499 argb = argbEvaluator.evaluate(offset, startColor, endColor) as Int
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	500 fireListener()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	501 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	502 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	503
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	504 private fun fireListener() {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	505 colorChangeListener?.invoke(offset, argb)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	506 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	507
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	508 override fun onSaveInstanceState(): Parcelable {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	509 val superState = super.onSaveInstanceState()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	510 val thumbState = thumbDrawable.saveState()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	511 return GradientSeekBarState(superState, this, thumbState)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	512 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	513
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	514 override fun onRestoreInstanceState(state: Parcelable) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	515 if (state is GradientSeekBarState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	516 super.onRestoreInstanceState(state.superState)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	517 readGradientSeekBarState(state)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	518 } else {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	519 super.onRestoreInstanceState(state)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	520 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	521 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	522
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	523 private fun readGradientSeekBarState(state: GradientSeekBarState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	524 updateGradientColors(state.startColor, state.endColor)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	525 offset = state.offset
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	526 barSize = state.barSize
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	527 cornersRadius = state.cornerRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	528 orientation = Orientation.values()[state.orientation]
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	529 interceptTouchEvent = state.interceptTouchEvent
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	530 thumbDrawable.restoreState(state.thumbState)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	531 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	532
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	533 private fun ensureOffsetWithinRange(offset: Float) = ensureWithinRange(offset, 0f, 1f)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	534
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	535 enum class Orientation { VERTICAL, HORIZONTAL }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	536 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	537
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	538 val GradientSeekBar.currentColorAlpha get() = Color.alpha(argb)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	539
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	540 fun GradientSeekBar.setTransparentToColor(color: Int, respectAlpha: Boolean = true) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	541 if (respectAlpha) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	542 this.offset = Color.alpha(color) / MAX_ALPHA.toFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	543 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	544 this.setColors(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	545 setAlpha(color, 0),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	546 setAlpha(color, MAX_ALPHA)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	547 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	548 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	549
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	550 inline fun GradientSeekBar.setAlphaChangeListener(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	551 crossinline listener: (Float, Int, Int) -> Unit
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	552 ) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	553 this.colorChangeListener = { offset, color ->
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	554 listener(offset, color, this.currentColorAlpha)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	555 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	556 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	557
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	558 fun GradientSeekBar.setBlackToColor(color: Int) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	559 this.setColors(Color.BLACK, color)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	560 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	561
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	562 internal class GradientSeekBarState : View.BaseSavedState {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	563
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	564 val startColor: Int
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	565 val endColor: Int
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	566 val offset: Float
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	567 val barSize: Int
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	568 val cornerRadius: Float
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	569 val orientation: Int
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	570 val interceptTouchEvent: Boolean
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	571 val thumbState: ThumbDrawableState
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	572
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	573 constructor(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	574 superState: Parcelable?,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	575 view: GradientSeekBar,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	576 thumbState: ThumbDrawableState
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	577 ) : super(superState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	578 startColor = view.startColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	579 endColor = view.endColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	580 offset = view.offset
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	581 barSize = view.barSize
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	582 cornerRadius = view.cornersRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	583 orientation = view.orientation.ordinal
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	584 interceptTouchEvent = view.interceptTouchEvent
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	585 this.thumbState = thumbState
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	586 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	587
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	588 constructor(source: Parcel) : super(source) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	589 startColor = source.readInt()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	590 endColor = source.readInt()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	591 offset = source.readFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	592 barSize = source.readInt()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	593 cornerRadius = source.readFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	594 orientation = source.readInt()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	595 interceptTouchEvent = source.readBooleanCompat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	596 thumbState = source.readThumbState()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	597 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	598
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	599 override fun writeToParcel(out: Parcel, flags: Int) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	600 super.writeToParcel(out, flags)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	601 out.writeInt(startColor)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	602 out.writeInt(endColor)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	603 out.writeFloat(offset)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	604 out.writeInt(barSize)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	605 out.writeFloat(cornerRadius)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	606 out.writeInt(orientation)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	607 out.writeBooleanCompat(interceptTouchEvent)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	608 out.writeThumbState(thumbState, flags)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	609 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	610
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	611 companion object CREATOR : Parcelable.Creator<GradientSeekBarState> {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	612
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	613 override fun createFromParcel(source: Parcel) = GradientSeekBarState(source)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	614
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	615 override fun newArray(size: Int) = arrayOfNulls<GradientSeekBarState>(size)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	616 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	617 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	618
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	619 internal class HorizontalStrategy : OrientationStrategy {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	620
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	621 private val rect = Rect()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	622 private val point = PointF()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	623
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	624 override val gradientOrientation = GradientDrawable.Orientation.LEFT_RIGHT
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	625
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	626 override fun measure(view: GradientSeekBar, widthSpec: Int, heightSpec: Int): Rect {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	627 val widthSize = View.MeasureSpec.getSize(widthSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	628 val maxHeight = maxOf(view.barSize, view.thumbRadius * 2)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	629 val preferredWidth = widthSize + view.paddingLeft + view.paddingRight
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	630 val preferredHeight = maxHeight + view.paddingTop + view.paddingBottom
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	631 val finalWidth = View.resolveSize(preferredWidth, widthSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	632 val finalHeight = View.resolveSize(preferredHeight, heightSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	633 return rect.apply { set(0, 0, finalWidth, finalHeight) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	634 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	635
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	636 override fun getGradientBounds(view: GradientSeekBar): Rect {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	637 val availableHeight = view.height - view.paddingTop - view.paddingRight
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	638 val left = view.paddingLeft + view.thumbRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	639 val right = view.width - view.paddingRight - view.thumbRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	640 val top = view.paddingTop + (availableHeight - view.barSize) / 2
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	641 val bottom = top + view.barSize
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	642 return rect.apply { set(left, top, right, bottom) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	643 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	644
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	645 override fun getThumbPosition(view: GradientSeekBar, gradient: Rect): PointF {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	646 val x = (gradient.left + view.offset * gradient.width())
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	647 val y = view.height / 2f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	648 return point.apply { set(x, y) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	649 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	650
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	651 override fun getOffset(view: GradientSeekBar, event: MotionEvent, gradient: Rect): Float {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	652 val checkedX = ensureWithinRange(event.x.roundToInt(), gradient.left, gradient.right)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	653 val relativeX = (checkedX - gradient.left).toFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	654 return relativeX / gradient.width()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	655 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	656 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	657
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	658 internal fun View.isTap(lastEvent: MotionEvent, initialX: Float, initialY: Float): Boolean {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	659 val config = ViewConfiguration.get(context)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	660 val duration = lastEvent.eventTime - lastEvent.downTime
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	661 val distance = hypot(lastEvent.x - initialX, lastEvent.y - initialY)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	662 return duration < ViewConfiguration.getTapTimeout() && distance < config.scaledTouchSlop
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	663 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	664
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	665 internal const val PI = Math.PI.toFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	666
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	667 internal fun toRadians(degrees: Float) = degrees / 180f * PI
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	668
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	669 internal fun toDegrees(radians: Float) = radians * 180f / PI
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	670
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	671 internal fun <T> ensureWithinRange(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	672 value: T,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	673 start: T,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	674 end: T
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	675 ): T where T : Number, T : Comparable<T> = minOf(maxOf(value, start), end)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	676
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	677 internal fun setAlpha(argb: Int, alpha: Int) =
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	678 Color.argb(alpha, Color.red(argb), Color.green(argb), Color.blue(argb))
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	679
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	680 class HsvColor(hue: Float = 0f, saturation: Float = 0f, value: Float = 0f) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	681
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	682 private val hsv = floatArrayOf(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	683 ensureHue(hue),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	684 ensureSaturation(saturation),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	685 ensureValue(value)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	686 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	687
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	688 var hue
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	689 get() = hsv[0]
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	690 set(hue) { hsv[0] = ensureHue(hue) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	691
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	692 var saturation
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	693 get() = hsv[1]
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	694 set(saturation) { hsv[1] = ensureSaturation(saturation) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	695
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	696 var value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	697 get() = hsv[2]
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	698 set(value) { hsv[2] = ensureValue(value) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	699
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	700 var rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	701 get() = Color.HSVToColor(hsv)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	702 set(rgb) { Color.colorToHSV(rgb, hsv) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	703
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	704 fun set(hue: Float = hsv[0], saturation: Float = hsv[1], value: Float = hsv[2]) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	705 hsv[0] = ensureHue(hue)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	706 hsv[1] = ensureSaturation(saturation)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	707 hsv[2] = ensureValue(value)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	708 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	709
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	710 private fun ensureHue(hue: Float) = ensureWithinRange(hue, 0f, 360f)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	711
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	712 private fun ensureValue(value: Float) = ensureWithinRange(value, 0f, 1f)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	713
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	714 private fun ensureSaturation(saturation: Float) = ensureValue(saturation)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	715 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	716
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	717 internal interface OrientationStrategy {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	718
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	719 val gradientOrientation: GradientDrawable.Orientation
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	720
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	721 fun measure(view: GradientSeekBar, widthSpec: Int, heightSpec: Int): Rect
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	722
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	723 fun getGradientBounds(view: GradientSeekBar): Rect
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	724
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	725 fun getThumbPosition(view: GradientSeekBar, gradient: Rect): PointF
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	726
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	727 fun getOffset(view: GradientSeekBar, event: MotionEvent, gradient: Rect): Float
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	728 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	729
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	730 internal class ThumbDrawableState private constructor(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	731 val radius: Int,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	732 val thumbColor: Int,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	733 val strokeColor: Int,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	734 val colorCircleScale: Float
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	735 ) : Parcelable {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	736
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	737 constructor(thumbDrawable: ThumbDrawable) : this(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	738 thumbDrawable.radius,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	739 thumbDrawable.thumbColor,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	740 thumbDrawable.strokeColor,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	741 thumbDrawable.colorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	742 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	743
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	744 constructor(parcel: Parcel) : this(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	745 parcel.readInt(),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	746 parcel.readInt(),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	747 parcel.readInt(),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	748 parcel.readFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	749 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	750
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	751 override fun writeToParcel(parcel: Parcel, flags: Int) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	752 parcel.writeInt(radius)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	753 parcel.writeInt(thumbColor)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	754 parcel.writeInt(strokeColor)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	755 parcel.writeFloat(colorCircleScale)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	756 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	757
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	758 override fun describeContents() = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	759
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	760 companion object {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	761
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	762 val EMPTY_STATE = ThumbDrawableState(0, 0, 0, 0f)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	763
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	764 @JvmField
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	765 val CREATOR = object : Parcelable.Creator<ThumbDrawableState> {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	766
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	767 override fun createFromParcel(parcel: Parcel) = ThumbDrawableState(parcel)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	768
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	769 override fun newArray(size: Int) = arrayOfNulls<ThumbDrawableState>(size)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	770 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	771 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	772 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	773
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	774 internal fun Parcel.writeThumbState(state: ThumbDrawableState, flags: Int) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	775 this.writeParcelable(state, flags)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	776 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	777
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	778 internal fun Parcel.readThumbState(): ThumbDrawableState {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	779 return this.readParcelable(ThumbDrawableState::class.java.classLoader)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	780 ?: ThumbDrawableState.EMPTY_STATE
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	781 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	782
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	783 internal class ThumbDrawable {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	784
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	785 private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { strokeWidth = 1f }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	786 private var x = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	787 private var y = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	788
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	789 var indicatorColor = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	790 var strokeColor = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	791 var thumbColor = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	792 var radius = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	793
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	794 var colorCircleScale = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	795 set(value) { field = ensureWithinRange(value, 0f, 1f) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	796
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	797 fun setCoordinates(x: Float, y: Float) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	798 this.x = x
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	799 this.y = y
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	800 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	801
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	802 fun draw(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	803 drawThumb(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	804 drawStroke(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	805 drawColorIndicator(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	806 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	807
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	808 private fun drawThumb(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	809 paint.color = thumbColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	810 paint.style = Paint.Style.FILL
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	811 canvas.drawCircle(x, y, radius.toFloat(), paint)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	812 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	813
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	814 private fun drawStroke(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	815 val strokeCircleRadius = radius - paint.strokeWidth / 2f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	816
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	817 paint.color = strokeColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	818 paint.style = Paint.Style.STROKE
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	819 canvas.drawCircle(x, y, strokeCircleRadius, paint)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	820 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	821
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	822 private fun drawColorIndicator(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	823 val colorIndicatorCircleRadius = radius * colorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	824
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	825 paint.color = indicatorColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	826 paint.style = Paint.Style.FILL
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	827 canvas.drawCircle(x, y, colorIndicatorCircleRadius, paint)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	828 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	829
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	830 fun restoreState(state: ThumbDrawableState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	831 radius = state.radius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	832 thumbColor = state.thumbColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	833 strokeColor = state.strokeColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	834 colorCircleScale = state.colorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	835 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	836
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	837 fun saveState() = ThumbDrawableState(this)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	838 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	839
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	840 internal class VerticalStrategy : OrientationStrategy {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	841
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	842 private val rect = Rect()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	843 private val point = PointF()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	844
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	845 override val gradientOrientation = GradientDrawable.Orientation.BOTTOM_TOP
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	846
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	847 override fun measure(view: GradientSeekBar, widthSpec: Int, heightSpec: Int): Rect {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	848 val heightSize = View.MeasureSpec.getSize(heightSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	849 val maxWidth = maxOf(view.barSize, view.thumbRadius * 2)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	850 val preferredWidth = maxWidth + view.paddingLeft + view.paddingRight
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	851 val preferredHeight = heightSize + view.paddingTop + view.paddingBottom
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	852 val finalWidth = View.resolveSize(preferredWidth, widthSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	853 val finalHeight = View.resolveSize(preferredHeight, heightSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	854 return rect.apply { set(0, 0, finalWidth, finalHeight) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	855 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	856
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	857 override fun getGradientBounds(view: GradientSeekBar): Rect {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	858 val availableWidth = view.width - view.paddingLeft - view.paddingRight
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	859 val left = view.paddingLeft + (availableWidth - view.barSize) / 2
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	860 val right = left + view.barSize
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	861 val top = view.paddingTop + view.thumbRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	862 val bottom = view.height - view.paddingBottom - view.thumbRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	863 return rect.apply { set(left, top, right, bottom) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	864 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	865
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	866 override fun getThumbPosition(view: GradientSeekBar, gradient: Rect): PointF {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	867 val y = (gradient.top + (1f - view.offset) * gradient.height())
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	868 val x = view.width / 2f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	869 return point.apply { set(x, y) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	870 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	871
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	872 override fun getOffset(view: GradientSeekBar, event: MotionEvent, gradient: Rect): Float {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	873 val checkedY = ensureWithinRange(event.y.roundToInt(), gradient.top, gradient.bottom)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	874 val relativeY = (checkedY - gradient.top).toFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	875 return 1f - relativeY / gradient.height()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	876 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	877 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	878
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	879 // Main Dynamic Windows section
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	880 object DWEvent {
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	881 const val TIMER = 0
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	882 const val CONFIGURE = 1
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	883 const val KEY_PRESS = 2
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	884 const val BUTTON_PRESS = 3
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	885 const val BUTTON_RELEASE = 4
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	886 const val MOTION_NOTIFY = 5
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	887 const val DELETE = 6
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	888 const val EXPOSE = 7
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	889 const val CLICKED = 8
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	890 const val ITEM_ENTER = 9
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	891 const val ITEM_CONTEXT = 10
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	892 const val LIST_SELECT = 11
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	893 const val ITEM_SELECT = 12
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	894 const val SET_FOCUS = 13
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	895 const val VALUE_CHANGED = 14
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	896 const val SWITCH_PAGE = 15
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	897 const val TREE_EXPAND = 16
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	898 const val COLUMN_CLICK = 17
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	899 const val HTML_RESULT = 18
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	900 const val HTML_CHANGED = 19
dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	901 }
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	902
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	903 val DWImageExts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	904
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	905 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	906 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	907 val pageList = mutableListOf<Long>()
2692 231f9489a38a Android: Keep a list of tab titles in the ViewPager2 adapter and set titles in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2691 diff changeset	908 val titleList = mutableListOf<String?>()
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	909 var currentPageID = 0L
2667 2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	910 var recyclerView: RecyclerView? = null
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	911
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	912 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	913 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	914
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	915 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	916 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	917 return position
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	918 }
2667 2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	919 override fun onAttachedToRecyclerView(rv: RecyclerView) {
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	920 recyclerView = rv
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	921 }
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	922 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	923 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	924 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	925
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	926 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	927 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	928
2505 a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	929 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	930 //Implement shouldOverrideUrlLoading//
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	931 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	932 // 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	933 // 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	934 return false
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	935 }
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	936 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	937 // Handle the DW_HTML_CHANGE_STARTED event
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	938 eventHandlerHTMLChanged(view, DWEvent.HTML_CHANGED, url, 1)
2505 a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	939 }
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	940
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	941 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	942 // Handle the DW_HTML_CHANGE_COMPLETE event
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	943 eventHandlerHTMLChanged(view, DWEvent.HTML_CHANGED, url, 4)
2505 a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	944 }
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	945
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	946 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	947 }
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	948
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	949 class DWSlider
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	950 @JvmOverloads constructor(context: Context): FrameLayout(context) {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	951 val slider: SeekBar = SeekBar(context)
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	952
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	953 init {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	954 slider.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT,
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	955 LayoutParams.WRAP_CONTENT, Gravity.CENTER)
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	956 addView(slider)
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	957 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	958
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	959 @Synchronized
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	960 override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	961 if(slider.rotation == 90F \|\| slider.rotation == 270F) {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	962 val layoutHeight = MeasureSpec.getSize(heightMeasureSpec)
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	963 // set slider width to layout heigth
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	964 slider.layoutParams.width = layoutHeight
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	965 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	966 super.onMeasure(widthMeasureSpec, heightMeasureSpec)
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	967 if(slider.rotation == 90F \|\| slider.rotation == 270F) {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	968 // update layout width to the rotated height of the slider
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	969 // otherwise the layout remains quadratic
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	970 setMeasuredDimension(slider.measuredHeight, measuredHeight)
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	971 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	972 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	973 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	974
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	975 class DWSpinButton(context: Context) : AppCompatEditText(context), OnTouchListener {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	976 var value: Long = 0
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	977 var minimum: Long = 0
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	978 var maximum: Long = 65535
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	979
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	980 init {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	981 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	982 setOnTouchListener(this)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	983 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	984
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	985 override fun onTouch(v: View, event: MotionEvent): Boolean {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	986 val DRAWABLE_RIGHT = 2
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	987 val DRAWABLE_LEFT = 0
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	988
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	989 if (event.action == MotionEvent.ACTION_UP) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	990 if (event.x >= v.width - (v as EditText)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	991 .compoundDrawables[DRAWABLE_RIGHT].bounds.width()
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	992 ) {
2527 eec926265888 Android: Use toLongOrNull() whenever converting from string to long... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2526 diff changeset	993 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	994
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	995 if(newvalue != null) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	996 value = newvalue + 1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	997 } else {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	998 value += 1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	999 }
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1000 if(value > maximum) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1001 value = maximum
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1002 }
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1003 if(value < minimum) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1004 value = minimum
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1005 }
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1006 setText(value.toString())
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	1007 eventHandlerInt(DWEvent.VALUE_CHANGED, value.toInt(), 0, 0, 0)
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1008 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	1009 } 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	1010 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	1011
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1012 if(newvalue != null) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1013 value = newvalue - 1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1014 } else {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1015 value -= 1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1016 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1017 if(value > maximum) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1018 value = maximum
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1019 }
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1020 if(value < minimum) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1021 value = minimum
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1022 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1023 setText(value.toString())
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	1024 eventHandlerInt(DWEvent.VALUE_CHANGED, value.toInt(), 0, 0, 0)
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1025 return true
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1026 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1027 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1028 return false
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1029 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1030
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1031 external fun eventHandlerInt(
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1032 message: Int,
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1033 inta: Int,
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1034 intb: Int,
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1035 intc: Int,
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1036 intd: Int
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1037 )
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1038 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1039
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1040 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	1041 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	1042 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	1043 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	1044
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1045 init {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1046 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	1047 setOnTouchListener(this)
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1048 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	1049 lpw!!.setAdapter(
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1050 ArrayAdapter(
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1051 context,
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1052 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	1053 )
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1054 )
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1055 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	1056 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	1057 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	1058 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1059
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1060 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	1061 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	1062 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	1063 setText(item)
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1064 lpw!!.dismiss()
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	1065 eventHandlerInt(DWEvent.LIST_SELECT, 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	1066 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1067
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1068 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	1069 val DRAWABLE_RIGHT = 2
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1070
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1071 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	1072 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	1073 .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	1074 ) {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1075 lpw!!.show()
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1076 return true
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1077 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1078 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1079 return false
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1080 }
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1081
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1082 external fun eventHandlerInt(
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1083 message: Int,
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1084 inta: Int,
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1085 intb: Int,
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1086 intc: Int,
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1087 intd: Int
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1088 )
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1089 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1090
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1091 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	1092 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	1093 var selected: Int = -1
2677 c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1094 var colorFore: Int? = null
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1095 var colorBack: Int? = null
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1096
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1097 init {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1098 setAdapter(
2677 c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1099 object : ArrayAdapter<String>(
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1100 context,
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1101 R.layout.simple_list_item_1, list
2677 c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1102 ) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1103 override fun getView(pos: Int, view: View?, parent: ViewGroup): View {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1104 val thisview = super.getView(pos, view, parent)
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1105 val textview = thisview as TextView
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1106 if (colorFore != null) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1107 textview.setTextColor(colorFore!!)
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1108 }
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1109 if (colorBack != null) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1110 textview.setBackgroundColor(colorBack!!)
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1111 }
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1112 return thisview
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1113 }
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1114 }
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1115 )
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	1116 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	1117 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1118
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1119 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	1120 selected = position
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	1121 eventHandlerInt(DWEvent.LIST_SELECT, position, 0, 0, 0)
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1122 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1123
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1124 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	1125 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	1126 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	1127 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	1128 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	1129 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	1130 )
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1131 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1132
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1133 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	1134 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	1135 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	1136 var fontsize: Float? = null
2608 a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	1137 var evx: Float = 0f
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	1138 var evy: Float = 0f
2611 ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	1139 var button: Int = 1
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1140
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1141 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	1142 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	1143 // Send DW_SIGNAL_CONFIGURE
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	1144 eventHandlerInt(DWEvent.CONFIGURE, width, height, 0, 0)
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1145 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1146
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1147 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	1148 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	1149 cachedCanvas = canvas
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1150 // Send DW_SIGNAL_EXPOSE
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	1151 eventHandlerInt(DWEvent.EXPOSE, 0, 0, this.width, this.height)
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1152 cachedCanvas = null
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1153 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1154
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1155 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	1156 message: Int,
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1157 inta: Int,
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1158 intb: Int,
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1159 intc: Int,
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1160 intd: Int
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1161 )
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1162 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1163
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1164 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	1165 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	1166 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	1167 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	1168
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1169 // 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	1170 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	1171 fun setExtension(extension: String?) {
2708 3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	1172 this.extension = extension?.toLowerCase(Locale.ROOT)
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1173 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1174
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1175 // 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	1176 interface FileSelectedListener {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1177 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	1178 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1179
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1180 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	1181 this.fileListener = fileListener
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1182 return this
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1183 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1184
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1185 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	1186 fun showDialog() {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1187 dialog.show()
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1188 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1189
2527 eec926265888 Android: Use toLongOrNull() whenever converting from string to long... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2526 diff changeset	1190 /*
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1191 * 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	1192 */
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1193 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	1194 currentPath = path
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1195 if (path != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1196 if (path.exists()) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1197 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	1198 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	1199 if (!file.isDirectory) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1200 if (!file.canRead()) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1201 false
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1202 } 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	1203 true
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1204 } else {
2708 3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	1205 file.name.toLowerCase(Locale.ROOT).endsWith(extension!!)
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1206 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1207 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1208 false
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1209 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1210 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1211
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1212 // 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	1213 var i = 0
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1214 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	1215 var filecount = 0
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1216 var dircount = 0
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1217 if(files != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1218 filecount = files.size
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1219 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1220 if(dirs != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1221 dircount = dirs.size
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1222 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1223 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	1224 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	1225 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1226 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	1227 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	1228 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1229 if(dirs != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1230 Arrays.sort(dirs)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1231 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	1232 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	1233 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1234 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1235 if(files != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1236 Arrays.sort(files)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1237 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	1238 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	1239 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1240 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1241
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1242 // 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	1243 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	1244 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	1245 activity,
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1246 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	1247 ) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1248 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	1249 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	1250 (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	1251 return thisview
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1252 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1253 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1254 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1255 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1256 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1257
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1258 /**
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1259 * 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	1260 */
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1261 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	1262 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	1263 currentPath!!.parentFile
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1264 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1265 File(currentPath, fileChosen)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1266 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1267 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1268
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1269 companion object {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1270 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	1271 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1272
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1273 init {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1274 list.onItemClickListener =
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1275 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	1276 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	1277 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	1278 if (chosenFile != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1279 if (chosenFile.isDirectory) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1280 refresh(chosenFile)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1281 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1282 if (fileListener != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1283 fileListener!!.fileSelected(chosenFile)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1284 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1285 dialog.dismiss()
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1286 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1287 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1288 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1289 dialog.setContentView(list)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1290 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	1291 refresh(Environment.getExternalStorageDirectory())
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1292 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1293 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1294
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1295 // 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	1296 // 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	1297 // 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	1298 class DWMenuItem
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1299 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1300 var title: String? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1301 var menu: DWMenu? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1302 var submenu: DWMenu? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1303 var checked: Boolean = false
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1304 var check: Boolean = false
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	1305 var enabled: Boolean = true
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1306 var menuitem: MenuItem? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1307 var submenuitem: SubMenu? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1308 var id: Int = 0
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1309 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1310
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1311 class DWMenu {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1312 var menu: Menu? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1313 var children = mutableListOf<DWMenuItem>()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1314 var id: Int = 0
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1315
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1316 fun createMenu(newmenu: Menu?, recreate: Boolean) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1317 var refresh = recreate
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1318
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1319 if(newmenu != null) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1320 if(newmenu != menu) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1321 menu = newmenu
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1322 refresh = true
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1323 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1324 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1325 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	1326 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	1327
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1328 if(refresh) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1329 menu!!.clear()
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1330 }
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1331
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	1332 // 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	1333 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	1334
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1335 for (menuitem in children) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1336 // 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	1337 if (menuitem.submenu != null && menu !is SubMenu) {
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1338 if(menuitem.submenuitem == null \|\| refresh) {
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	1339 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	1340 }
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1341 menuitem.submenu!!.createMenu(menuitem.submenuitem, refresh)
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1342 } 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	1343 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	1344 group += 1
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1345 } else if(menuitem.menuitem == null \|\| refresh) {
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	1346 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	1347 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	1348 menuitem.menuitem!!.isChecked = menuitem.checked
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	1349 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	1350 menuitem.menuitem!!.setOnMenuItemClickListener { item: MenuItem? ->
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	1351 eventHandlerSimple(menuitem, DWEvent.CLICKED)
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	1352 true
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1353 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1354 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1355 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1356 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1357 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1358 }
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	1359
dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	1360 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	1361 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1362
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1363 // Class for storing container data
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1364 class DWContainerModel {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1365 var columns = mutableListOf<String?>()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1366 var types = mutableListOf<Int>()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1367 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	1368 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	1369 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	1370 var querypos: Int = -1
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1371
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1372 fun numberOfColumns(): Int
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1373 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1374 return columns.size
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1375 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1376
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1377 fun numberOfRows(): Int
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1378 {
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	1379 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	1380 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	1381 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	1382 return 0
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1383 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1384
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1385 fun getColumnType(column: Int): Int
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1386 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1387 if(column < types.size) {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1388 return types[column]
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1389 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1390 return -1
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1391 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1392
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1393 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	1394 {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1395 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	1396
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1397 if(index > -1 && index < data.size) {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1398 return data[index]
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1399 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1400 return null
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1401 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1402
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1403 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	1404 {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1405 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	1406
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1407 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	1408 // 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	1409 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	1410 (((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	1411 (((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	1412 data[index] = obj
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1413 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1414 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1415 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1416
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1417 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	1418 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1419 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	1420 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	1421 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1422 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1423
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1424 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	1425 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1426 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	1427 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	1428 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1429 return 0
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1430 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1431
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1432 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	1433 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1434 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	1435 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	1436 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1437 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1438
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1439 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	1440 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1441 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	1442 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	1443 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1444 return null
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1445 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1446
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1447 fun addColumn(title: String?, type: Int)
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1448 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1449 columns.add(title)
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1450 types.add(type)
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1451 // 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	1452 data.clear()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1453 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1454
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1455 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	1456 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1457 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	1458 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	1459 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	1460 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	1461 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1462 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	1463 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	1464 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1465 } else {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1466 data.clear()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1467 rowdata.clear()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1468 rowtitle.clear()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1469 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1470 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1471
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1472 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	1473 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1474 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	1475 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	1476 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	1477 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	1478 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1479 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	1480 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	1481 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1482 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1483 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1484
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1485 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	1486 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1487 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	1488 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	1489 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	1490 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	1491 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1492 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	1493 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	1494 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1495 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1496 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1497
2709 3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1498 fun positionByTitle(title: String?): Int
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1499 {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1500 for(i in 0 until rowtitle.size) {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1501 if(rowtitle[i] != null && rowtitle[i] == title) {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1502 return i
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1503 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1504 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1505 return -1
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1506 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1507
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1508 fun positionByData(rdata: Long): Int
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1509 {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1510 for(i in 0 until rowdata.size) {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1511 if (rowdata[i] == rdata) {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1512 return i
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1513 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1514 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1515 return -1
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1516 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	1517
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	1518 fun addRows(count: Int): Long
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1519 {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1520 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	1521
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1522 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	1523 {
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1524 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	1525 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1526 // 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	1527 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	1528 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1529 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	1530 rowtitle.add(null)
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1531 }
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	1532 return startRow
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1533 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1534
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1535 fun clear()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1536 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1537 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	1538 rowdata.clear()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1539 rowtitle.clear()
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1540 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1541 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1542
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1543 class DWContainerAdapter(c: Context) : BaseAdapter()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1544 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1545 private var context = c
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1546 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	1547 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	1548 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	1549 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	1550 var evenColor: Int? = null
2677 c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1551 var foreColor: Int? = null
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1552 var backColor: Int? = null
2613 72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	1553 var lastClick: Long = 0
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	1554 var lastClickRow: Int = -1
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1555
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1556 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	1557 return model.numberOfRows()
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1558 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1559
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1560 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	1561 return model.getRowAndColumn(position, 0)
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1562 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1563
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1564 override fun getItemId(position: Int): Long {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1565 return position.toLong()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1566 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1567
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1568 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	1569 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	1570 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	1571
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1572 // 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	1573 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	1574 // 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	1575 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	1576 (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	1577 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	1578 } else {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1579 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	1580 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1581 }
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	1582
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	1583 // 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	1584 if(rowView == null) {
2568 b536b7b21682 Android: Switch to using LinearLayout for Container row layout... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2567 diff changeset	1585 rowView = LinearLayout(context)
b536b7b21682 Android: Switch to using LinearLayout for Container row layout... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2567 diff changeset	1586 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	1587
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1588 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	1589 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	1590
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1591 // Image
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1592 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	1593 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	1594 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	1595 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	1596 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	1597 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	1598 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	1599 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	1600 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	1601 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1602 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	1603 } else {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1604 // 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	1605 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	1606 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	1607 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	1608 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	1609 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	1610 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	1611 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	1612 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	1613 } 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	1614 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	1615 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1616 rowView.addView(textview)
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	1617 }
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1618 }
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	1619 // 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	1620 } else {
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	1621 // 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	1622
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1623 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	1624 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	1625
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1626 // Image
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1627 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	1628 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	1629
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1630 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	1631 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	1632 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1633 } else {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1634 // Text
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1635 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	1636
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1637 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	1638 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	1639 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	1640 } 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	1641 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	1642 }
2677 c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1643 if(foreColor != null) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1644 textview.setTextColor(foreColor!!)
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1645 }
2565 5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1646 }
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	1647 }
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1648 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1649 }
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	1650 // 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	1651 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	1652 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	1653 rowView.setBackgroundColor(evenColor!!)
2677 c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1654 } else if(backColor != null) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1655 rowView.setBackgroundColor(backColor!!)
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	1656 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	1657 } 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	1658 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	1659 rowView.setBackgroundColor(oddColor!!)
2677 c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1660 } else if(backColor != null) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1661 rowView.setBackgroundColor(backColor!!)
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	1662 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	1663 }
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1664 return rowView
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1665 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1666 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1667
2702 4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	1668 private class DWMLE(c: Context): AppCompatEditText(c) {
2701 9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1669 protected override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1670 if(!isHorizontalScrollBarEnabled) {
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1671 this.maxWidth = w
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1672 } else {
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1673 this.maxWidth = -1
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1674 }
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1675 super.onSizeChanged(w, h, oldw, oldh)
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1676 }
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1677 }
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1678
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1679 class DWindows : AppCompatActivity() {
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1680 var windowLayout: ViewPager2? = null
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1681 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	1682 var threadCond = threadLock.newCondition()
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	1683 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	1684 var darkMode: Int = -1
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	1685 var lastClickView: View? = null
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	1686 private var appID: String? = null
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	1687 private var paint = Paint()
2637 22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	1688 private var bgcolor: Int? = 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	1689 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	1690 private var fileLock = ReentrantLock()
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	1691 private var fileCond = fileLock.newCondition()
2722 cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	1692 private var colorLock = ReentrantLock()
cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	1693 private var colorCond = colorLock.newCondition()
cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	1694 private var colorChosen: Int = 0
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1695 // Lists of data for our Windows
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1696 private var windowTitles = mutableListOf<String?>()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1697 private var windowMenuBars = mutableListOf<DWMenu?>()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1698 private var windowStyles = mutableListOf<Int>()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1699 private var windowDefault = mutableListOf<View?>()
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1700
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1701 // 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	1702 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	1703 {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1704 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	1705 runnable.run()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1706 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1707 threadLock.lock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1708 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	1709 threadLock.lock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1710 runnable.run()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1711 threadCond.signal()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1712 threadLock.unlock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1713 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1714 runOnUiThread(ourRunnable)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1715 threadCond.await()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1716 threadLock.unlock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1717 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1718 }
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1719
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1720 // Returns true if the filename is a resource ID (non-zero number)
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1721 // with a image file extension in our DWImageExts list
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1722 private fun isDWResource(filename: String): Boolean {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1723 val length = filename.length
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1724
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1725 for (ext in DWImageExts) {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1726 if (ext.isNotEmpty() && filename.endsWith(ext)) {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1727 val filebody: String = filename.substring(7, length - ext.length)
2659 3a14d7fd4b99 Android: Catch NumberFormatException in isDWResource(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2658 diff changeset	1728 try {
3a14d7fd4b99 Android: Catch NumberFormatException in isDWResource(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2658 diff changeset	1729 if (filebody.toInt() > 0) {
3a14d7fd4b99 Android: Catch NumberFormatException in isDWResource(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2658 diff changeset	1730 return true
3a14d7fd4b99 Android: Catch NumberFormatException in isDWResource(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2658 diff changeset	1731 }
3a14d7fd4b99 Android: Catch NumberFormatException in isDWResource(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2658 diff changeset	1732 } catch(e: NumberFormatException) {
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1733 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1734 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1735 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1736 return false
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1737 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1738
2659 3a14d7fd4b99 Android: Catch NumberFormatException in isDWResource(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2658 diff changeset	1739 // Extracts assets/ in the APK to the application cache directory
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1740 private fun extractAssets() {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1741 var zipFile: ZipFile? = null
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1742 val targetDir = cacheDir
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1743
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1744 try {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1745 zipFile = ZipFile(this.applicationInfo.sourceDir)
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1746 val e: Enumeration<out ZipEntry?> = zipFile.entries()
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1747 while (e.hasMoreElements()) {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1748 val entry: ZipEntry? = e.nextElement()
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1749 if (entry == null \|\| entry.isDirectory \|\| !entry.name.startsWith("assets/") \|\|
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1750 isDWResource(entry.name)) {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1751 continue
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1752 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1753 val targetFile = File(targetDir, entry.name.substring("assets/".length))
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1754 targetFile.parentFile!!.mkdirs()
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1755 val tempBuffer = ByteArray(entry.size.toInt())
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1756 var ais: BufferedInputStream? = null
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1757 var aos: FileOutputStream? = null
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1758 try {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1759 ais = BufferedInputStream(zipFile.getInputStream(entry))
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1760 aos = FileOutputStream(targetFile)
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1761 ais.read(tempBuffer)
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1762 aos.write(tempBuffer)
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1763 } catch (e: IOException) {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1764 } finally {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1765 ais?.close()
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1766 aos?.close()
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1767 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1768 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1769 } catch (e: IOException) {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1770 } finally {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1771 zipFile?.close()
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1772 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1773 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1774
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	1775 // 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	1776 // 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	1777 // 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	1778 // 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	1779 // 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	1780 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	1781 super.onCreate(savedInstanceState)
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1782
2480 878d36588aaa Android: Enable app rotation and fix some issues with layout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2479 diff changeset	1783 // Turn on rotation
878d36588aaa Android: Enable app rotation and fix some issues with layout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2479 diff changeset	1784 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	1785
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	1786 // 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	1787 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	1788 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	1789 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	1790 s = p.applicationInfo.dataDir
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1791 val c = cacheDir.path
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1792
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1793 // Extract any non-resource assets to the cache directory
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1794 // So that our C code can access them as files, like on
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1795 // other Dynamic Windows platforms
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1796 extractAssets()
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	1797
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1798 // Setup our ViewPager2 as our activty window container
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1799 windowLayout = ViewPager2(this)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1800 windowLayout!!.id = View.generateViewId()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1801 windowLayout!!.adapter = DWTabViewPagerAdapter()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1802 windowLayout!!.isUserInputEnabled = false
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1803 windowLayout!!.layoutParams =
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1804 ViewGroup.LayoutParams(
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1805 ViewGroup.LayoutParams.MATCH_PARENT,
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1806 ViewGroup.LayoutParams.MATCH_PARENT
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1807 )
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1808
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	1809 // 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	1810 // This will start a new thread that calls the app's dwmain()
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1811 dwindowsInit(s, c, this.getPackageName())
2496 3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	1812 }
3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	1813
3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	1814 override fun onConfigurationChanged(newConfig: Configuration) {
3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	1815 super.onConfigurationChanged(newConfig)
3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	1816
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1817 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	1818 when (currentNightMode) {
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1819 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	1820 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	1821 }
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1822
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	1823 // 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	1824 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	1825 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	1826 val height: Int = windowLayout!!.height
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1827 val adapter: DWTabViewPagerAdapter = windowLayout!!.adapter as DWTabViewPagerAdapter
2685 17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1828 val index = windowLayout!!.currentItem
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1829 val count = adapter.viewList.count()
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1830
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1831 if(count > 0 && index < count) {
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1832 val window = adapter.viewList[index]
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1833
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1834 eventHandlerInt(window, DWEvent.CONFIGURE, width, height, 0, 0)
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1835 }
2496 3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	1836 }
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1837 }
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1838
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1839 override fun onCreateOptionsMenu(menu: Menu?): Boolean {
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1840 if(windowLayout != null) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1841 val index = windowLayout!!.currentItem
2685 17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1842 val count = windowMenuBars.count()
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1843
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1844 if (count > 0 && index < count) {
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1845 var menuBar = windowMenuBars[index]
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1846
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1847 if(menuBar == null) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1848 menuBar = DWMenu()
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1849 windowMenuBars[index] = menuBar
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1850 }
2707 a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	1851 menuBar.menu = menu
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1852 return super.onCreateOptionsMenu(menu)
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1853 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1854 }
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1855 return false
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1856 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1857
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1858 override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1859 if(windowLayout != null) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1860 val index = windowLayout!!.currentItem
2685 17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1861 val count = windowMenuBars.count()
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1862
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1863 if (count > 0 && index < count) {
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1864 var menuBar = windowMenuBars[index]
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1865
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1866 if(menuBar != null) {
2707 a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	1867 menuBar.createMenu(menu, true)
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1868 } else {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1869 menuBar = DWMenu()
2707 a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	1870 menuBar.createMenu(menu, true)
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1871 windowMenuBars[index] = menuBar
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1872 }
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1873 return super.onPrepareOptionsMenu(menu)
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1874 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1875 }
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1876 return false
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1877 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1878
2668 917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	1879 override fun onBackPressed() {
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	1880 if(windowLayout != null) {
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	1881 val adapter: DWTabViewPagerAdapter = windowLayout!!.adapter as DWTabViewPagerAdapter
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	1882 val index = windowLayout!!.currentItem
2685 17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1883 val count = windowStyles.count()
2668 917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	1884
2670 e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	1885 // If the current window has a close button...
2685 17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1886 if (count > 1 && index > 0 && index < count && (windowStyles[index] and 1) == 1) {
2670 e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	1887 // Send the DW_SIGNAL_DELETE to the event handler
e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	1888 eventHandlerSimple(adapter.viewList[index], DWEvent.DELETE)
2668 917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	1889 }
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	1890 }
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	1891 }
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	1892
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1893 // 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	1894 // 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	1895
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1896 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	1897 {
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1898 return darkMode
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1899 }
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1900
2694 cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1901 fun browseURL(url: String): Int {
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1902 var retval: Int = -1 // DW_ERROR_UNKNOWN
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1903
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1904 waitOnUiThread {
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1905 val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1906 try {
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1907 retval = 0 // DW_ERROR_NONE
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1908 startActivity(browserIntent)
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1909 } catch (e: ActivityNotFoundException) {
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1910 retval = -1 // DW_ERROR_UNKNOWN
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1911 }
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1912 }
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1913 return retval
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1914 }
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1915
2607 3b9bbd69bb9c Android: Implement dw_menu_popup() ... still need to implement the context events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2596 diff changeset	1916 fun menuPopup(menu: DWMenu, parent: View, x: Int, y: Int)
3b9bbd69bb9c Android: Implement dw_menu_popup() ... still need to implement the context events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2596 diff changeset	1917 {
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	1918 var anchor: View? = parent
dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	1919
dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	1920 // If lastClickView is valid, use that instead of parent
dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	1921 if(lastClickView != null) {
dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	1922 anchor = lastClickView
dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	1923 }
dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	1924
2607 3b9bbd69bb9c Android: Implement dw_menu_popup() ... still need to implement the context events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2596 diff changeset	1925 runOnUiThread {
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	1926 val popup = PopupMenu(this, anchor)
2607 3b9bbd69bb9c Android: Implement dw_menu_popup() ... still need to implement the context events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2596 diff changeset	1927
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1928 menu.createMenu(popup.menu, false)
2607 3b9bbd69bb9c Android: Implement dw_menu_popup() ... still need to implement the context events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2596 diff changeset	1929 popup.show()
3b9bbd69bb9c Android: Implement dw_menu_popup() ... still need to implement the context events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2596 diff changeset	1930 }
3b9bbd69bb9c Android: Implement dw_menu_popup() ... still need to implement the context events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2596 diff changeset	1931 }
3b9bbd69bb9c Android: Implement dw_menu_popup() ... still need to implement the context events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2596 diff changeset	1932
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1933 fun menuBarNew(location: View): DWMenu?
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1934 {
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1935 var menuBar: DWMenu? = null
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1936
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1937 if(windowLayout != null) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1938 waitOnUiThread {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1939 val adapter: DWTabViewPagerAdapter = windowLayout!!.adapter as DWTabViewPagerAdapter
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1940 val index = adapter.viewList.indexOf(location)
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1941
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1942 if (index != -1) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1943 menuBar = DWMenu()
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1944 windowMenuBars[index] = menuBar
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1945 }
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1946 }
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1947 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1948 return menuBar
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1949 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1950
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1951 fun menuNew(cid: Int): DWMenu
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1952 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1953 val menu = DWMenu()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1954 menu.id = cid
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1955 return menu
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1956 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1957
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1958 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	1959 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1960 val menuitem = DWMenuItem()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1961 menuitem.id = cid
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1962 menuitem.title = title
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1963 menuitem.check = check != 0
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1964 if(submenu != null) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1965 menuitem.submenu = submenu
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1966 }
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	1967 if((flags and (1 shl 1)) != 0) {
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	1968 menuitem.enabled = false
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	1969 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1970 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	1971 menuitem.checked = true
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1972 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1973 if(end == 0) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1974 menu.children.add(0, menuitem)
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1975 } else {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1976 menu.children.add(menuitem)
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1977 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1978 return menuitem
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1979 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1980
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	1981 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	1982 {
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	1983 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	1984 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	1985 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	1986 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	1987 }
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	1988 }
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	1989
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	1990 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	1991 {
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	1992 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	1993 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	1994 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	1995 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	1996 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	1997 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	1998 }
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	1999 }
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	2000 }
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	2001 }
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	2002
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	2003 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	2004 {
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	2005 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	2006 if(menuitem.id == cid) {
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2007 // Handle DW_MIS_ENABLED/DISABLED
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2008 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	2009 var enabled = false
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2010
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2011 // Handle DW_MIS_ENABLED
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2012 if ((state and 1) != 0) {
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2013 enabled = true
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2014 }
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2015 menuitem.enabled = enabled
2642 3edc64443b71 Android: Fix a null pointer exception in the menu code running HandyFTP on Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2637 diff changeset	2016 if(menuitem.menuitem != null) {
3edc64443b71 Android: Fix a null pointer exception in the menu code running HandyFTP on Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2637 diff changeset	2017 runOnUiThread {
3edc64443b71 Android: Fix a null pointer exception in the menu code running HandyFTP on Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2637 diff changeset	2018 menuitem.menuitem!!.isEnabled = enabled
3edc64443b71 Android: Fix a null pointer exception in the menu code running HandyFTP on Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2637 diff changeset	2019 invalidateOptionsMenu()
3edc64443b71 Android: Fix a null pointer exception in the menu code running HandyFTP on Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2637 diff changeset	2020 }
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2021 }
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2022 }
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2023
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	2024 // 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	2025 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	2026 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	2027
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	2028 // 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	2029 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	2030 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	2031 }
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	2032 menuitem.checked = checked
2642 3edc64443b71 Android: Fix a null pointer exception in the menu code running HandyFTP on Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2637 diff changeset	2033 if(menuitem.menuitem != null) {
3edc64443b71 Android: Fix a null pointer exception in the menu code running HandyFTP on Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2637 diff changeset	2034 runOnUiThread {
3edc64443b71 Android: Fix a null pointer exception in the menu code running HandyFTP on Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2637 diff changeset	2035 menuitem.menuitem!!.isChecked = checked
3edc64443b71 Android: Fix a null pointer exception in the menu code running HandyFTP on Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2637 diff changeset	2036 invalidateOptionsMenu()
3edc64443b71 Android: Fix a null pointer exception in the menu code running HandyFTP on Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2637 diff changeset	2037 }
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	2038 }
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	2039 }
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	2040 }
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	2041 }
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	2042 }
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	2043
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2044 fun windowNew(title: String, style: Int): LinearLayout? {
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2045 var window: LinearLayout? = null
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2046
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2047 if(windowLayout != null) {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2048 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2049 val dataArrayMap = SimpleArrayMap<String, Long>()
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2050 val adapter: DWTabViewPagerAdapter = windowLayout!!.adapter as DWTabViewPagerAdapter
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2051
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2052 setContentView(windowLayout)
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2053
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2054 window = LinearLayout(this)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2055 window!!.visibility = View.GONE
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2056 window!!.tag = dataArrayMap
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2057 window!!.layoutParams =
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2058 LinearLayout.LayoutParams(
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2059 LinearLayout.LayoutParams.MATCH_PARENT,
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2060 LinearLayout.LayoutParams.MATCH_PARENT
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2061 )
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2062
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2063 // Update our window list
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2064 adapter.viewList.add(window!!)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2065 windowTitles.add(title)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2066 windowMenuBars.add(null)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2067 windowStyles.add(style)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2068 windowDefault.add(null)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2069
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2070 // If this is our first/only window...
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2071 // We can set stuff immediately
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2072 if (adapter.viewList.count() == 1) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2073 this.title = title
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2074 windowLayout!!.setCurrentItem(0, false)
2670 e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2075 if((windowStyles[0] and 2) != 2) {
e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2076 supportActionBar?.hide()
e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2077 }
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2078 }
2691 e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	2079 adapter.notifyDataSetChanged()
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2080 }
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2081 }
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2082 return window
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2083 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2084
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	2085 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	2086 {
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	2087 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	2088 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	2089 }
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	2090 }
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	2091
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	2092 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	2093 {
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2094 if(windowLayout != null) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2095 val adapter: DWTabViewPagerAdapter = windowLayout!!.adapter as DWTabViewPagerAdapter
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2096 val index = adapter.viewList.indexOf(window)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2097
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2098 if (index != -1) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2099 windowDefault[index] = default
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2100 }
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2101 }
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	2102 }
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	2103
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2104 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	2105 {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2106 waitOnUiThread {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2107 if (window is TextView && window !is EditText) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2108 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	2109
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2110 if (ourmask != 0) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2111 // 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	2112 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	2113
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2114 window.gravity = newgravity
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2115 }
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2116 }
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2117 }
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2118 }
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2119
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2120 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	2121 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	2122 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2123
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2124 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	2125 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	2126 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	2127
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2128 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	2129 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	2130 } else {
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2131 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	2132 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2133 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2134 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2135
2686 95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2136 fun windowGetPreferredSize(window: View): Long
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2137 {
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2138 var retval: Long = 0
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2139
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2140 waitOnUiThread {
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2141 window.measure(0, 0)
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2142 val width = window.measuredWidth
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2143 val height = window.measuredHeight
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2144 retval = width.toLong() or (height.toLong() shl 32)
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2145 if(window is SeekBar) {
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2146 val slider = window as SeekBar
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2147
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2148 // If the widget is rotated, swap width and height
2687 42ff9d95e87b Android: Fix the logic error, had height and width reversed in bitfields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2686 diff changeset	2149 if(slider.rotation == 270F \|\| slider.rotation == 90F) {
2686 95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2150 retval = height.toLong() or (width.toLong() shl 32)
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2151 }
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2152 }
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2153 }
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2154 return retval
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2155 }
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2156
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2157 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	2158 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	2159
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2160 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	2161 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	2162
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	2163 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	2164 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	2165 }
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2166 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2167 return retval
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2168 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2169
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2170 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	2171 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2172 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	2173 }
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	2174 }
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2175
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2176 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	2177 {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2178 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	2179 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	2180 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	2181 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	2182 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	2183 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	2184
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2185 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	2186 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	2187 } 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	2188 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	2189 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2190
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2191 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	2192 if (bold && italic) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2193 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	2194 } else if (bold) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2195 style = Typeface.BOLD
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2196 } else if (italic) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2197 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	2198 }
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2199 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	2200
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2201 return typeface
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2202 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2203 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	2204 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2205
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2206 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	2207 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	2208 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	2209
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2210 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	2211 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	2212 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2213
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2214 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	2215 waitOnUiThread {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2216 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	2217 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	2218 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	2219 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	2220 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	2221 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2222 } 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	2223 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	2224 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	2225 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	2226 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	2227 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2228 } 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	2229 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	2230 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	2231 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	2232 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	2233 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2234 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2235 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2236 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2237 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2238
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	2239 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	2240 {
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	2241 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	2242
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	2243 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	2244 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	2245 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	2246
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	2247 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	2248 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	2249 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	2250 } 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	2251 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	2252 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	2253 } 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	2254 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	2255 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	2256 }
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	2257
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	2258 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	2259 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	2260 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	2261
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	2262 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	2263 }
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	2264 }
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	2265 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	2266 }
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	2267
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2268 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	2269 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	2270 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	2271 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	2272
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2273 // 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	2274 // 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	2275 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	2276 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	2277 }
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2278
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2279 waitOnUiThread {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2280 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	2281 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	2282
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2283 // 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	2284 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	2285 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	2286 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	2287 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	2288 }
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2289 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	2290 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	2291 } 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	2292 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	2293
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2294 // 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	2295 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	2296 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	2297 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	2298 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	2299 }
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2300 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	2301 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	2302 } 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	2303 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	2304
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2305 box.setBackgroundColor(colorback)
2677 c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2306 } else if(window is DWListBox) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2307 val listbox = window as DWListBox
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2308
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2309 // Handle DW_CLR_DEFAULT
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2310 if(fore == 16) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2311 val value = TypedValue()
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2312 this.theme.resolveAttribute(R.attr.editTextColor, value, true)
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2313 colorfore = value.data
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2314 }
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2315
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2316 listbox.colorFore = colorfore
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2317 listbox.colorBack = colorback
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2318
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2319 listbox.setBackgroundColor(colorback)
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2320 } else if(window is ListView) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2321 val cont = window as ListView
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2322 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2323
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2324 // Handle DW_CLR_DEFAULT
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2325 if(fore == 16) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2326 val value = TypedValue()
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2327 this.theme.resolveAttribute(R.attr.editTextColor, value, true)
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2328 colorfore = value.data
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2329 }
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2330
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2331 adapter.foreColor = colorfore
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2332 adapter.backColor = colorback
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2333
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2334 cont.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	2335 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2336 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2337 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2338
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2339 fun windowSetText(window: View, text: String) {
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2340 if(windowLayout != null) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2341 waitOnUiThread {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2342 if (window is TextView) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2343 val textview: TextView = window
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2344 textview.text = text
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2345 } else if (window is Button) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2346 val button: Button = window
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2347 button.text = text
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2348 } else if (window is LinearLayout) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2349 val adapter: DWTabViewPagerAdapter = windowLayout!!.adapter as DWTabViewPagerAdapter
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2350 val index = adapter.viewList.indexOf(window)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2351
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2352 if(index != -1) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2353 windowTitles[index] = text
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2354 if(index == windowLayout!!.currentItem) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2355 this.title = text
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2356 }
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2357 }
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2358 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2359 }
2489 6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2360 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2361 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2362
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2363 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	2364 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	2365
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2366 if(windowLayout != null) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2367 waitOnUiThread {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2368 if (window is TextView) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2369 val textview: TextView = window
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2370 text = textview.text.toString()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2371 } else if (window is Button) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2372 val button: Button = window
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2373 text = button.text.toString()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2374 } else if (window is LinearLayout) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2375 val adapter: DWTabViewPagerAdapter = windowLayout!!.adapter as DWTabViewPagerAdapter
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2376 val index = adapter.viewList.indexOf(window)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2377
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2378 if(index != -1) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2379 text = windowTitles[index]
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2380 }
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2381 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2382 }
2489 6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2383 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2384 return text
2489 6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2385 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2386
2667 2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2387 private fun windowSwitchWindow(index: Int)
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2388 {
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2389 val adapter: DWTabViewPagerAdapter = windowLayout!!.adapter as DWTabViewPagerAdapter
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2390
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2391 if (index != -1) {
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2392 val window = adapter.viewList[index] as View
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2393
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2394 // Only allow a window to become active if it is shown
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2395 if(window.visibility == View.VISIBLE) {
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2396 // Update the action bar title
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2397 this.title = windowTitles[index]
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2398 // Switch the visible view in the pager
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2399 if(adapter.recyclerView != null) {
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2400 adapter.recyclerView!!.scrollToPosition(index)
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2401 }
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2402 // This is how I prefered to do it, but it doesn't work...
2669 2ad924c6493d Android: Still need to call setCurrentItem() on ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2668 diff changeset	2403 // So using RecyclerView.scrollToPosition() also
2ad924c6493d Android: Still need to call setCurrentItem() on ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2668 diff changeset	2404 windowLayout!!.setCurrentItem(index, true)
2667 2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2405
2670 e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2406 // Hide or show the actionbar based on the titlebar flag
e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2407 if((windowStyles[index] and 2) == 2) {
e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2408 supportActionBar?.show()
e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2409 } else {
e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2410 supportActionBar?.hide()
e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2411 }
2667 2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2412 // If the new view has a default item, focus it
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2413 if(windowDefault[index] != null) {
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2414 windowDefault[index]?.requestFocus()
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2415 }
2668 917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2416 // Add or remove a back button depending on the visible window
2670 e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2417 if(index > 0 && (windowStyles[index] and 1) == 1) {
2668 917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2418 this.actionBar?.setDisplayHomeAsUpEnabled(true)
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2419 } else {
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2420 this.actionBar?.setDisplayHomeAsUpEnabled(false)
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2421 }
2667 2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2422 // Invalidate the menu, so it gets updated for the new window
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2423 invalidateOptionsMenu()
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2424 }
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2425 }
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2426 }
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2427
2503 1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	2428 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	2429 {
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2430 if(windowLayout != null) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2431 waitOnUiThread {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2432 val adapter: DWTabViewPagerAdapter = windowLayout!!.adapter as DWTabViewPagerAdapter
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2433 val index = adapter.viewList.indexOf(window)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2434
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2435 if(state == 0) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2436 window.visibility = View.GONE
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2437 } else {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2438 window.visibility = View.VISIBLE
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2439 }
2691 e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	2440 adapter.notifyDataSetChanged()
2667 2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2441 windowSwitchWindow(index)
2503 1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	2442 }
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	2443 }
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	2444 }
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	2445
2668 917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2446 fun windowDestroy(window: View): Int {
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2447 var retval: Int = 1 // DW_ERROR_GENERAL
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2448
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2449 if(windowLayout != null) {
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2450 waitOnUiThread {
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2451 val adapter: DWTabViewPagerAdapter = windowLayout!!.adapter as DWTabViewPagerAdapter
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2452 val index = adapter.viewList.indexOf(window)
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2453
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2454 // We need to have at least 1 window...
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2455 // so only destroy secondary windows
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2456 if(index > 0) {
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2457 val newindex = index - 1
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2458 val newwindow = adapter.viewList[newindex]
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2459
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2460 // Make sure the previous window is visible...
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2461 // not sure if we should search the list for a visible
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2462 // window or force it visible. Forcing visible for now.
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2463 if(newwindow.visibility != View.VISIBLE) {
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2464 newwindow.visibility = View.VISIBLE
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2465 }
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2466 // Switch to the previous window
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2467 windowSwitchWindow(newindex)
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2468
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2469 // Update our window list
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2470 adapter.viewList.removeAt(index)
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2471 windowTitles.removeAt(index)
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2472 windowMenuBars.removeAt(index)
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2473 windowStyles.removeAt(index)
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2474 windowDefault.removeAt(index)
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2475
2691 e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	2476 adapter.notifyDataSetChanged()
e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	2477
2668 917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2478 retval = 0 // DW_ERROR_NONE
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2479 } else {
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2480 // If we are removing an individual widget,
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2481 // find the parent layout and remove it.
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2482 if(window.parent is ViewGroup) {
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2483 val group = window.parent as ViewGroup
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2484
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2485 group.removeView(window)
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2486 retval = 0 // DW_ERROR_NONE
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2487 }
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2488 }
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2489 }
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2490 }
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2491 return retval
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2492 }
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2493
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2494 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	2495 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	2496 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	2497
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2498 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	2499 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	2500 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2501 return ""
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2502 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2503
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2504 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	2505 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	2506 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	2507
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2508 cm.setPrimaryClip(clipdata)
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2509 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2510
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2511 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	2512 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	2513 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2514 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	2515 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	2516
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2517 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	2518 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	2519 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	2520 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	2521 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	2522 )
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2523 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	2524 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	2525 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2526 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	2527 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2528 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	2529 }
16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	2530 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	2531 }
16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	2532
2689 7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2533 fun groupBoxNew(type: Int, pad: Int, title: String?): LinearLayout? {
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2534 var box: LinearLayout? = null
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2535 waitOnUiThread {
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2536 box = RadioGroup(this)
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2537 val dataArrayMap = SimpleArrayMap<String, Long>()
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2538
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2539 box!!.tag = dataArrayMap
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2540 box!!.layoutParams =
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2541 LinearLayout.LayoutParams(
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2542 LinearLayout.LayoutParams.WRAP_CONTENT,
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2543 LinearLayout.LayoutParams.WRAP_CONTENT
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2544 )
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2545 if (type > 0) {
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2546 box!!.orientation = LinearLayout.VERTICAL
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2547 } else {
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2548 box!!.orientation = LinearLayout.HORIZONTAL
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2549 }
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2550 box!!.setPadding(pad, pad, pad, pad)
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2551 }
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2552 return box
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2553 }
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2554
2706 4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2555 fun scrollBoxNew(type: Int, pad: Int): ScrollView? {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2556 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	2557
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2558 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2559 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	2560 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	2561 val dataArrayMap = SimpleArrayMap<String, Long>()
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2562
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2563 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	2564 box.layoutParams =
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2565 LinearLayout.LayoutParams(
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2566 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	2567 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	2568 )
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2569 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	2570 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	2571 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2572 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	2573 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2574 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	2575 // 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	2576 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	2577 scrollBox!!.addView(box)
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2578 }
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2579 return scrollBox
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2580 }
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2581
2706 4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2582 fun scrollBoxGetPos(scrollBox: ScrollView, orient: Int): Int {
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2583 var retval: Int = -1
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2584
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2585 waitOnUiThread {
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2586 // DW_VERT 1
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2587 if(orient == 1) {
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2588 retval = scrollBox.scrollY
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2589 } else {
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2590 retval = scrollBox.scrollX
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2591 }
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2592 }
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2593 return retval
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2594 }
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2595
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2596 fun scrollBoxGetRange(scrollBox: ScrollView, orient: Int): Int {
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2597 var retval: Int = -1
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2598
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2599 waitOnUiThread {
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2600 // DW_VERT 1
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2601 if(orient == 1) {
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2602 retval = scrollBox.getChildAt(0).height
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2603 } else {
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2604 retval = scrollBox.getChildAt(0).width
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2605 }
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2606 }
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2607 return retval
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2608 }
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2609
2683 e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2610 // Update the layoutParams of a box after a change
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2611 private fun boxUpdate(box: LinearLayout)
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2612 {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2613 val parent = box.parent
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2614
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2615 if(parent is LinearLayout) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2616 val params = box.layoutParams as LinearLayout.LayoutParams
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2617
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2618 if(parent.orientation == LinearLayout.VERTICAL) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2619 if(params.height == 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2620 box.measure(0, 0)
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2621 val calch = box.measuredHeight
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2622
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2623 if(calch > 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2624 params.weight = calch.toFloat()
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2625 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2626 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2627 } else {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2628 if(params.width == 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2629 box.measure(0, 0)
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2630 val calcw = box.measuredWidth
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2631
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2632 if(calcw > 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2633 params.weight = calcw.toFloat()
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2634 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2635 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2636 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2637 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2638 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2639
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	2640 fun boxPack(
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2641 boxview: View,
2675 a7868380098f Android: LinearLayout does not allow null views, if null, create a Placeholder view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2670 diff changeset	2642 packitem: 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	2643 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	2644 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	2645 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	2646 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	2647 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	2648 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	2649 ) {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2650 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2651 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	2652 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	2653 var box: LinearLayout? = null
2675 a7868380098f Android: LinearLayout does not allow null views, if null, create a Placeholder view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2670 diff changeset	2654 var item: View? = packitem
a7868380098f Android: LinearLayout does not allow null views, if null, create a Placeholder view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2670 diff changeset	2655
a7868380098f Android: LinearLayout does not allow null views, if null, create a Placeholder view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2670 diff changeset	2656 // We can't pack nothing, so create an empty placeholder to pack
a7868380098f Android: LinearLayout does not allow null views, if null, create a Placeholder view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2670 diff changeset	2657 if(item == null) {
2688 c359cbd0b20f Android: Revert the change from Placeholder to View since it didn't solve the problem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2687 diff changeset	2658 item = Placeholder(this)
c359cbd0b20f Android: Revert the change from Placeholder to View since it didn't solve the problem. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2687 diff changeset	2659 item.emptyVisibility = View.VISIBLE
2675 a7868380098f Android: LinearLayout does not allow null views, if null, create a Placeholder view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2670 diff changeset	2660 }
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	2661
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2662 // 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	2663 // 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	2664 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	2665 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	2666 } 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	2667 val sv: ScrollView = boxview
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2668
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2669 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	2670 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	2671 }
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2672 }
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2673
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2674 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	2675 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	2676
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2677 // 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	2678 if ((item is LinearLayout) \|\| (item is ScrollView)) {
2683 e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2679 item.measure(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	2680 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	2681 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	2682 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	2683 }
2683 e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2684 if (vsize != 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2685 val calch = item.measuredHeight
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2686
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2687 if(calch > 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2688 weight = calch.toFloat()
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2689 } else {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2690 weight = 1F
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2691 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2692 h = 0
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2693 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2694 } else {
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2695 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	2696 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	2697 }
2683 e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2698 if (hsize != 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2699 val calcw = item.measuredWidth
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2700
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2701 if(calcw > 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2702 weight = calcw.toFloat()
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2703 } else {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2704 weight = 1F
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2705 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2706 w = 0
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2707 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2708 }
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2709 // 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	2710 } else {
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2711 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	2712 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	2713 }
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2714 if(hsize == 0) {
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2715 if (width > 0) {
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2716 w = width
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2717 }
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2718 } 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	2719 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	2720 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	2721 } 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	2722 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	2723 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	2724 } 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	2725 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	2726
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	2727 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	2728 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	2729 }
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2730 }
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2731 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2732 }
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2733 if(vsize == 0) {
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2734 if (height > 0) {
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2735 h = height
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2736 }
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2737 } 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	2738 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	2739 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	2740 } 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	2741 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	2742 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	2743 } 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	2744 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	2745
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	2746 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	2747 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	2748 }
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2749 }
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2750 }
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2751 }
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2752 }
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2753
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2754 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	2755
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2756 // 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	2757 // 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	2758 if (box.orientation == LinearLayout.VERTICAL) {
2681 c1482518b643 Android: Fix weight based layout problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2677 diff changeset	2759 if (vsize != 0 && weight > 0F) {
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2760 params.weight = weight
2681 c1482518b643 Android: Fix weight based layout problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2677 diff changeset	2761 params.height = 0
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2762 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2763 } else {
2681 c1482518b643 Android: Fix weight based layout problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2677 diff changeset	2764 if (hsize != 0 && weight > 0F) {
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2765 params.weight = weight
2681 c1482518b643 Android: Fix weight based layout problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2677 diff changeset	2766 params.width = 0
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2767 }
2480 878d36588aaa Android: Enable app rotation and fix some issues with layout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2479 diff changeset	2768 }
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2769 // 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	2770 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	2771 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	2772 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	2773 } 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	2774 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	2775 } 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	2776 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	2777 }
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2778 // 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	2779 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	2780 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	2781 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2782 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	2783 box.addView(item, index)
2683 e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2784 boxUpdate(box)
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2785 }
2478 b0230e378667 Android: Improvements to boxPack to handle more parameters... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2477 diff changeset	2786 }
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	2787 }
16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	2788
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2789 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	2790 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2791 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	2792 box.removeView(item)
2683 e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2793 boxUpdate(box)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2794 }
2477 3fbf8783122d Android: First functional version. Notebook-less first page of dwtest works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2476 diff changeset	2795 }
3fbf8783122d Android: First functional version. Notebook-less first page of dwtest works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2476 diff changeset	2796
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2797 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	2798 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	2799
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2800 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2801 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	2802 box.removeView(item)
2683 e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2803 boxUpdate(box)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2804 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2805 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	2806 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2807
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2808 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	2809 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	2810 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2811 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	2812 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	2813
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2814 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	2815 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	2816 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	2817 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	2818 button!!.setOnClickListener {
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	2819 lastClickView = button!!
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	2820 eventHandlerSimple(button!!, DWEvent.CLICKED)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2821 }
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	2822 }
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2823 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	2824 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2825
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2826 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	2827 var button: ImageButton? = null
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2828 waitOnUiThread {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2829 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	2830 val dataArrayMap = SimpleArrayMap<String, Long>()
2653 297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2831 var filename: String? = null
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2832
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2833 button!!.tag = dataArrayMap
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2834 button!!.id = resid
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2835 button!!.setOnClickListener {
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	2836 lastClickView = button!!
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	2837 eventHandlerSimple(button!!, DWEvent.CLICKED)
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2838 }
2653 297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2839
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2840 if(resid > 0 && resid < 65536) {
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2841 filename = resid.toString()
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	2842 } else {
755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	2843 button!!.setImageResource(resid)
2653 297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2844 }
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2845
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2846 if(filename != null) {
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	2847 for (ext in DWImageExts) {
2653 297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2848 // Try to load the image, and protect against exceptions
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2849 try {
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2850 val f = this.assets.open(filename + ext)
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2851 val b = BitmapFactory.decodeStream(f)
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2852
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2853 if (b != null) {
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2854 button!!.setImageBitmap(b)
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2855 break
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2856 }
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2857 } catch (e: IOException) {
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2858 }
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2859 }
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2860 }
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2861 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2862 return button
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2863 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2864
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2865 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	2866 var button: ImageButton? = null
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2867 waitOnUiThread {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2868 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	2869 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	2870
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2871 button!!.tag = dataArrayMap
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2872 button!!.id = cid
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2873 button!!.setOnClickListener {
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	2874 lastClickView = button!!
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	2875 eventHandlerSimple(button!!, DWEvent.CLICKED)
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2876 }
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2877
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	2878 for (ext in DWImageExts) {
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2879 // 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	2880 try {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2881 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	2882 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	2883
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2884 if(b != null) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2885 button!!.setImageBitmap(b)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2886 break
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2887 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2888 } catch (e: IOException) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2889 }
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2890 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2891 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2892 return button
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2893 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2894
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2895 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	2896 var button: ImageButton? = null
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2897 waitOnUiThread {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2898 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	2899 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	2900 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	2901
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2902 button!!.tag = dataArrayMap
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2903 button!!.id = cid
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2904 button!!.setOnClickListener {
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	2905 lastClickView = button!!
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	2906 eventHandlerSimple(button!!, DWEvent.CLICKED)
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2907 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2908 button!!.setImageBitmap(b)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2909 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2910 return button
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2911 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2912
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2913 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	2914 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	2915
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2916 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2917 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	2918 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	2919
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2920 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	2921 entryfield!!.id = cid
2554 4c75fb6089a9 Android: Need to set isSingleLine for entryfields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2553 diff changeset	2922 entryfield!!.isSingleLine = true
2702 4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	2923 entryfield!!.inputType = (InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2924 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	2925 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	2926 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2927 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	2928 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2929 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	2930 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2931
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2932 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	2933 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2934 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	2935 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2936 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2937
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2938 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	2939 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	2940
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2941 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2942 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	2943 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	2944
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2945 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	2946 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	2947 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	2948 radiobutton!!.setOnClickListener {
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	2949 lastClickView = radiobutton!!
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	2950 eventHandlerSimple(radiobutton!!, DWEvent.CLICKED)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2951 }
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	2952 }
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2953 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	2954 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2955
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2956 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	2957 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	2958
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2959 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2960 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	2961
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2962 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	2963 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	2964 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	2965 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	2966 checkbox!!.setOnClickListener {
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	2967 lastClickView = checkbox!!
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	2968 eventHandlerSimple(checkbox!!, DWEvent.CLICKED)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2969 }
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	2970 }
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2971 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	2972 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2973
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2974 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	2975 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2976 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2977 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	2978 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	2979 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	2980 } 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	2981 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	2982 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	2983 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2984 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2985 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2986
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2987 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	2988 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2989 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	2990
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2991 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2992 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	2993 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	2994 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	2995 } 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	2996 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	2997 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	2998 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2999 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3000 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	3001 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3002
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3003 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	3004 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	3005
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3006 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3007 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	3008
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3009 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	3010 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	3011 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	3012 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	3013 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	3014 val border = GradientDrawable()
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3015
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3016 // 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	3017 // 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	3018 // 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	3019 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	3020 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	3021 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	3022 }
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3023 }
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	3024 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	3025 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	3026
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3027 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	3028 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3029 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	3030
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3031 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3032 val dataArrayMap = SimpleArrayMap<String, Long>()
2702 4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3033 val 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	3034
2701 9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	3035 mle = DWMLE(this)
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3036 mle!!.tag = dataArrayMap
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3037 mle!!.id = cid
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3038 mle!!.isSingleLine = false
2676 a43cf048ff17 Android: Fix what I thought was a MLE layout issue... but it turns out the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2675 diff changeset	3039 mle!!.maxLines = Integer.MAX_VALUE
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3040 mle!!.imeOptions = EditorInfo.IME_FLAG_NO_ENTER_ACTION
2702 4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3041 mle!!.inputType = (inputType or InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS)
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3042 mle!!.isVerticalScrollBarEnabled = true
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3043 mle!!.scrollBarStyle = View.SCROLLBARS_INSIDE_INSET
2703 321e2cf1282a Android: Via testing, MLE is set to word wrap by default on most platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2702 diff changeset	3044 mle!!.setHorizontallyScrolling(false)
321e2cf1282a Android: Via testing, MLE is set to word wrap by default on most platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2702 diff changeset	3045 mle!!.isHorizontalScrollBarEnabled = false
2581 9dea42f27b0a Android: MLE should have TOP/LEFT gravity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2580 diff changeset	3046 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	3047 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3048 return mle
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3049 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3050
2707 a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	3051 fun mleSetVisible(mle: EditText, line: Int)
a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	3052 {
a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	3053 waitOnUiThread {
2716 a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3054 val layout = mle.layout
a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3055
a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3056 if(layout != null) {
a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3057 val y: Int = layout.getLineTop(line)
a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3058
a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3059 mle.scrollTo(0, y)
a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3060 }
2707 a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	3061 }
a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	3062 }
a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	3063
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3064 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	3065 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3066 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3067 if (state != 0) {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3068 mle.setHorizontallyScrolling(false)
2676 a43cf048ff17 Android: Fix what I thought was a MLE layout issue... but it turns out the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2675 diff changeset	3069 mle.isHorizontalScrollBarEnabled = false
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3070 } else {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3071 mle.setHorizontallyScrolling(true)
2676 a43cf048ff17 Android: Fix what I thought was a MLE layout issue... but it turns out the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2675 diff changeset	3072 mle.isHorizontalScrollBarEnabled = true
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3073 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3074 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3075 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3076
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3077 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	3078 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3079 waitOnUiThread {
2676 a43cf048ff17 Android: Fix what I thought was a MLE layout issue... but it turns out the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2675 diff changeset	3080 mle.isFocusable = state != 0
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3081 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3082 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3083
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3084 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	3085 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3086 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3087 mle.setSelection(point)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3088 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3089 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3090
2702 4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3091 fun mleSetAutoComplete(mle: EditText, state: Int)
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3092 {
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3093 waitOnUiThread {
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3094 val inputType = (InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE)
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3095
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3096 // DW_MLE_COMPLETE_TEXT 1
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3097 if((state and 1) == 1) {
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3098 mle.inputType = (inputType or InputType.TYPE_TEXT_FLAG_AUTO_CORRECT)
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3099 } else {
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3100 mle.inputType = (inputType or InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS)
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3101 }
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3102 }
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3103 }
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3104
2708 3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3105 fun mleSearch(mle: EditText, text: String, point: Int, flags: Int): Int
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3106 {
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3107 var retval: Int = -1
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3108 var ignorecase: Boolean = true
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3109
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3110 // DW_MLE_CASESENSITIVE 1
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3111 if(flags == 1) {
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3112 ignorecase = false
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3113 }
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3114
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3115 waitOnUiThread {
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3116 retval = mle.text.indexOf(text, point, ignorecase)
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3117
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3118 if(retval > -1) {
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3119 mle.setSelection(retval, retval + text.length)
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3120 }
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3121 }
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3122 return retval
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3123 }
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3124
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3125 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	3126 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3127 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3128 mle.setText("")
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3129 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3130 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3131
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3132 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	3133 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3134 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	3135
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3136 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3137 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	3138 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	3139
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3140 if(startpoint < 1) {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3141 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	3142
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3143 mle.setText(newtext)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3144 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	3145 } 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	3146 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	3147
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3148 mle.setText(newtext)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3149 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	3150 } else {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3151 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	3152
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3153 mle.setText(newtext)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3154 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	3155 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3156 mle.setSelection(retval)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3157 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3158 return retval
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3159 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3160
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3161 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	3162 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3163 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3164 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	3165 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	3166
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3167 mle.setText(newtext)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3168 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3169 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3170
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3171 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	3172 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3173 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	3174
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3175 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3176 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	3177 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	3178 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	3179 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	3180 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	3181
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3182 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	3183 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	3184 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	3185 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	3186 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	3187 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	3188 TabLayoutMediator(tabs, pager) { tab, position ->
2692 231f9489a38a Android: Keep a list of tab titles in the ViewPager2 adapter and set titles in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2691 diff changeset	3189 val adapter = pager.adapter as DWTabViewPagerAdapter
231f9489a38a Android: Keep a list of tab titles in the ViewPager2 adapter and set titles in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2691 diff changeset	3190 tab.text = adapter.titleList[position]
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3191 }.attach()
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	3192
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3193 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	3194 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	3195 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	3196 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3197 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	3198 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3199 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	3200 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	3201 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	3202 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	3203 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	3204 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	3205 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3206 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	3207 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3208 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	3209 // 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	3210 // 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	3211 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	3212 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	3213 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	3214 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	3215
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3216 pager.currentItem = tab.position
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	3217 eventHandlerNotebook(notebook!!, DWEvent.SWITCH_PAGE, adapter.pageList[tab.position])
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3218 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3219
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3220 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	3221 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	3222 })
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3223 }
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	3224 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	3225 }
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	3226
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3227 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	3228 {
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3229 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	3230
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3231 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3232 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	3233 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	3234
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3235 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	3236 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	3237 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	3238 } 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	3239 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	3240 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	3241 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3242
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3243 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	3244 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	3245 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	3246
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3247 // 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	3248 do {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3249 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	3250 } 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	3251 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	3252 // Temporarily add a black tab with an empty layout/box
2682 856d3c8b559f Android: Fix an exception when displaying a notebook with a placeholder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2681 diff changeset	3253 val placeholder = LinearLayout(this)
856d3c8b559f Android: Fix an exception when displaying a notebook with a placeholder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2681 diff changeset	3254 placeholder.layoutParams = LinearLayout.LayoutParams(
856d3c8b559f Android: Fix an exception when displaying a notebook with a placeholder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2681 diff changeset	3255 LinearLayout.LayoutParams.MATCH_PARENT,
856d3c8b559f Android: Fix an exception when displaying a notebook with a placeholder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2681 diff changeset	3256 LinearLayout.LayoutParams.MATCH_PARENT
856d3c8b559f Android: Fix an exception when displaying a notebook with a placeholder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2681 diff changeset	3257 )
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3258 if (front != 0) {
2682 856d3c8b559f Android: Fix an exception when displaying a notebook with a placeholder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2681 diff changeset	3259 adapter.viewList.add(0, placeholder)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3260 adapter.pageList.add(0, pageID)
2692 231f9489a38a Android: Keep a list of tab titles in the ViewPager2 adapter and set titles in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2691 diff changeset	3261 adapter.titleList.add(0, null)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3262 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	3263 } else {
2682 856d3c8b559f Android: Fix an exception when displaying a notebook with a placeholder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2681 diff changeset	3264 adapter.viewList.add(placeholder)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3265 adapter.pageList.add(pageID)
2692 231f9489a38a Android: Keep a list of tab titles in the ViewPager2 adapter and set titles in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2691 diff changeset	3266 adapter.titleList.add(null)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3267 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	3268 }
2691 e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	3269 adapter.notifyDataSetChanged()
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	3270 }
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	3271 }
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3272 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	3273 }
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	3274
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	3275 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	3276 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	3277 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	3278 }
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	3279 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	3280 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	3281 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	3282 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	3283 } 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	3284 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	3285 }
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	3286 }
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	3287 }
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	3288
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3289 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	3290 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3291 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3292 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	3293 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	3294
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3295 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	3296 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	3297 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	3298 } 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	3299 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	3300 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	3301 }
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	3302
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3303 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	3304 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	3305 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	3306 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	3307
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3308 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	3309 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	3310 adapter.pageList.removeAt(index)
2692 231f9489a38a Android: Keep a list of tab titles in the ViewPager2 adapter and set titles in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2691 diff changeset	3311 adapter.titleList.removeAt(index)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3312 tabs.removeTab(tab)
2691 e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	3313 adapter.notifyDataSetChanged()
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3314 }
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3315 }
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	3316 }
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	3317 }
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	3318
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3319 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	3320 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3321 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3322 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	3323 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	3324
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3325 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	3326 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	3327 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	3328 } 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	3329 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	3330 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	3331 }
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	3332
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3333 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	3334 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	3335 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	3336 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	3337
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3338 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	3339 tab.text = text
2692 231f9489a38a Android: Keep a list of tab titles in the ViewPager2 adapter and set titles in bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2691 diff changeset	3340 adapter.titleList[index] = text
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3341 }
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	3342
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	3343 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	3344 }
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	3345 }
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	3346 }
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	3347
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3348 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	3349 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3350 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3351 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	3352 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	3353
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3354 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	3355 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	3356 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	3357 } 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	3358 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	3359 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	3360 }
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	3361
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3362 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	3363 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	3364 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	3365
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3366 // 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	3367 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	3368 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	3369 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	3370 )
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3371
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3372 adapter.viewList[index] = box
2691 e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	3373 adapter.notifyDataSetChanged()
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3374 }
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	3375 }
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	3376 }
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	3377
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3378 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	3379 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3380 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	3381
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3382 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3383 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	3384 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	3385
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3386 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	3387 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	3388 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	3389 } 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	3390 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	3391 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	3392 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3393
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3394 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	3395 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	3396 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	3397 }
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	3398 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3399 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	3400 }
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	3401
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3402 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	3403 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3404 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3405 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	3406 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	3407
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3408 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	3409 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	3410 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	3411 } 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	3412 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	3413 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	3414 }
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	3415
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3416 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	3417 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	3418 val index = adapter.pageList.indexOf(pageID)
2691 e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	3419
e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	3420 if (index > -1 && index < adapter.pageList.count()) {
e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	3421 tabs.setScrollPosition(index, 0F, true)
e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	3422 pager.setCurrentItem(index, true)
e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	3423 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3424 }
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	3425 }
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3426 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3427
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3428 fun splitBarNew(type: Int, topleft: View?, bottomright: View?, cid: Int): ConstraintLayout?
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3429 {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3430 var splitbar: ConstraintLayout? = null
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3431
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3432 waitOnUiThread {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3433 splitbar = ConstraintLayout(this)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3434 if(splitbar != null) {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3435 val constraintSet = ConstraintSet()
2656 2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3436 val dataArrayMap = SimpleArrayMap<String, Long>()
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3437
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3438 constraintSet.clone(splitbar)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3439
2656 2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3440 splitbar!!.tag = dataArrayMap
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3441 splitbar!!.id = cid
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3442
2656 2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3443 // Add the special data to the array map
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3444 dataArrayMap.put("_dw_type", type.toLong())
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3445 dataArrayMap.put("_dw_percent", 50000000L)
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3446
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3447 // Place the top/left item
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3448 if(topleft != null) {
2651 7700c8022af3 Android: Unset ID is -1 on Android not 0, so generate a View ID if < 1 not just 0. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2650 diff changeset	3449 if(topleft.id < 1) {
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3450 topleft.id = View.generateViewId()
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3451 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3452 splitbar!!.addView(topleft)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3453 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3454 topleft.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3455 ConstraintLayout.LayoutParams.TOP,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3456 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3457 ConstraintLayout.LayoutParams.TOP
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3458 )
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3459 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3460 topleft.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3461 ConstraintLayout.LayoutParams.LEFT,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3462 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3463 ConstraintLayout.LayoutParams.LEFT
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3464 )
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3465
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3466 if (type == 0) {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3467 // Horizontal
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3468 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3469 topleft.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3470 ConstraintLayout.LayoutParams.BOTTOM,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3471 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3472 ConstraintLayout.LayoutParams.BOTTOM
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3473 )
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3474 constraintSet.constrainPercentWidth(topleft.id, 0.5F)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3475 } else {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3476 // Vertical
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3477 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3478 topleft.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3479 ConstraintLayout.LayoutParams.RIGHT,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3480 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3481 ConstraintLayout.LayoutParams.RIGHT
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3482 )
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3483 constraintSet.constrainPercentHeight(topleft.id, 0.5F)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3484 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3485 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3486
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3487 // Place the bottom/right item
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3488 if(bottomright != null) {
2651 7700c8022af3 Android: Unset ID is -1 on Android not 0, so generate a View ID if < 1 not just 0. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2650 diff changeset	3489 if (bottomright.id < 1) {
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3490 bottomright.id = View.generateViewId()
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3491 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3492 splitbar!!.addView(bottomright)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3493 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3494 bottomright.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3495 ConstraintLayout.LayoutParams.BOTTOM,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3496 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3497 ConstraintLayout.LayoutParams.BOTTOM
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3498 )
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3499 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3500 bottomright.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3501 ConstraintLayout.LayoutParams.RIGHT,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3502 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3503 ConstraintLayout.LayoutParams.RIGHT
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3504 )
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3505
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3506 if (type == 0) {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3507 // Horizontal
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3508 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3509 bottomright.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3510 ConstraintLayout.LayoutParams.TOP,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3511 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3512 ConstraintLayout.LayoutParams.TOP
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3513 )
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3514 constraintSet.constrainPercentWidth(bottomright.id, 0.5F)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3515 } else {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3516 // Vertical
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3517 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3518 bottomright.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3519 ConstraintLayout.LayoutParams.LEFT,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3520 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3521 ConstraintLayout.LayoutParams.LEFT
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3522 )
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3523 constraintSet.constrainPercentHeight(bottomright.id, 0.5F)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3524 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3525 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3526
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3527 // finally, apply the constraint set to layout
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3528 constraintSet.applyTo(splitbar)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3529 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3530 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3531 return splitbar
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3532 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3533
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3534 fun splitBarGet(splitbar: ConstraintLayout): Float {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3535 var position: Float = 50.0F
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3536
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3537 waitOnUiThread {
2656 2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3538 val dataArrayMap: SimpleArrayMap<String, Long> = splitbar.tag as SimpleArrayMap<String, Long>
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3539 var percent: Long = 50000000L
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3540
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3541 if(dataArrayMap.containsKey("_dw_percent")) {
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3542 percent = dataArrayMap.get("_dw_percent")!!
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3543 }
2656 2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3544
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3545 position = percent.toFloat() / 1000000.0F
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3546 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3547 return position
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3548 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3549
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3550 fun splitBarSet(splitbar: ConstraintLayout, position: Float) {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3551 waitOnUiThread {
2656 2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3552 val dataArrayMap: SimpleArrayMap<String, Long> = splitbar.tag as SimpleArrayMap<String, Long>
2707 a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	3553 val percent: Float = position * 1000000.0F
2656 2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3554
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3555 if(percent > 0F) {
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3556 val topleft: View? = splitbar.getChildAt(0)
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3557 val bottomright: View? = splitbar.getChildAt(1)
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3558 val constraintSet = ConstraintSet()
2656 2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3559 var type: Long = 0L
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3560
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3561 if (dataArrayMap.containsKey("_dw_type")) {
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3562 type = dataArrayMap.get("_dw_type")!!
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3563 }
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3564 dataArrayMap.put("_dw_percent", percent.toLong())
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3565
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3566 constraintSet.clone(splitbar)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3567 if (topleft != null) {
2656 2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3568 if (type == 1L) {
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3569 constraintSet.constrainPercentHeight(topleft.id, position / 100.0F)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3570 } else {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3571 constraintSet.constrainPercentWidth(topleft.id, position / 100.0F)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3572 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3573 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3574 if (bottomright != null) {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3575 val altper: Float = (100.0F - position) / 100.0F
2656 2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3576 if (type == 1L) {
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3577 constraintSet.constrainPercentHeight(bottomright.id, altper)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3578 } else {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3579 constraintSet.constrainPercentWidth(bottomright.id, altper)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3580 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3581 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3582 constraintSet.applyTo(splitbar)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3583 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3584 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3585 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3586
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3587 fun scrollBarNew(vertical: Int, cid: Int): DWSlider?
2719 6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3588 {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3589 var scrollbar: DWSlider? = null
2719 6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3590
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3591 waitOnUiThread {
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3592 val dataArrayMap = SimpleArrayMap<String, Long>()
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3593
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3594 scrollbar = DWSlider(this)
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3595 scrollbar!!.tag = dataArrayMap
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3596 scrollbar!!.id = cid
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3597 scrollbar!!.slider.max = 1
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3598 scrollbar!!.slider.progressTintList = null
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3599 scrollbar!!.slider.progressBackgroundTintList = null
2719 6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3600 if (vertical != 0) {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3601 scrollbar!!.slider.rotation = 90F
2719 6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3602 }
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3603 scrollbar!!.slider.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
2719 6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3604 override fun onStopTrackingTouch(seekBar: SeekBar) {
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3605 }
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3606
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3607 override fun onStartTrackingTouch(seekBar: SeekBar) {
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3608 }
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3609
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3610 override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3611 eventHandlerInt(scrollbar as View, DWEvent.VALUE_CHANGED, scrollbar!!.slider.progress, 0, 0, 0)
2719 6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3612 }
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3613 })
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3614 }
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3615 return scrollbar
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3616 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3617
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3618 fun sliderNew(vertical: Int, increments: Int, cid: Int): DWSlider?
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3619 {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3620 var slider: DWSlider? = null
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3621
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3622 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3623 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	3624
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3625 slider = DWSlider(this)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3626 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	3627 slider!!.id = cid
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3628 slider!!.slider.max = increments
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3629 if (vertical != 0) {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3630 slider!!.slider.rotation = 90F
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3631 }
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3632 slider!!.slider.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3633 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	3634 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3635
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3636 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	3637 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3638
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3639 override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3640 eventHandlerInt(slider as View, DWEvent.VALUE_CHANGED, slider!!.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	3641 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3642 })
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3643 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3644 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	3645 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3646
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3647 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	3648 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3649 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	3650
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3651 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3652 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	3653
2574 5b13bb267364 Android: Percent widget should be using horizontal ProgressBar. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2573 diff changeset	3654 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	3655 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	3656 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	3657 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	3658 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3659 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	3660 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3661
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3662 fun percentGetPos(percent: View): Int
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3663 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3664 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	3665
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3666 waitOnUiThread {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3667 var progress: ProgressBar
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3668
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3669 if(percent is ProgressBar) {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3670 progress = percent as ProgressBar
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3671 } else {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3672 val slider = percent as DWSlider
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3673 progress = slider.slider
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3674 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3675 retval = progress.progress
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3676 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3677 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	3678 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3679
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3680 fun percentSetPos(percent: View, position: Int)
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3681 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3682 waitOnUiThread {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3683 var progress: ProgressBar
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3684
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3685 if(percent is ProgressBar) {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3686 progress = percent as ProgressBar
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3687 } else {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3688 val slider = percent as DWSlider
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3689 progress = slider.slider
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3690 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3691 progress.progress = position
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3692 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3693 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3694
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3695 fun percentSetRange(percent: View, range: Int)
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3696 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3697 waitOnUiThread {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3698 var progress: ProgressBar
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3699
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3700 if(percent is ProgressBar) {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3701 progress = percent as ProgressBar
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3702 } else {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3703 val slider = percent as DWSlider
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3704 progress = slider.slider
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3705 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3706 progress.max = range
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3707 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3708 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3709
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3710 fun htmlNew(cid: Int): WebView?
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3711 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3712 var html: WebView? = null
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3713
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3714 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3715 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	3716
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3717 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	3718 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	3719 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	3720 // 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	3721 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	3722 html!!.settings.javaScriptEnabled = true
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3723 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3724 return html
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3725 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3726
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3727 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	3728 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3729 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3730 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	3731 }
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3732 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3733
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3734 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	3735 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3736 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3737 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	3738 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	3739 }
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3740 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3741
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3742 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	3743 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3744 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3745 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	3746 // Execute onReceiveValue's code
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	3747 eventHandlerHTMLResult(html, DWEvent.HTML_RESULT, value, data)
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3748 }
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3749 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3750 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3751
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3752 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	3753 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3754 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3755 when (action) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3756 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	3757 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	3758 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	3759 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	3760 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	3761 }
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3762 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3763 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3764
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3765 fun spinButtonNew(text: String, cid: Int): DWSpinButton?
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3766 {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3767 var spinbutton: DWSpinButton? = null
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3768
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3769 waitOnUiThread {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3770 val dataArrayMap = SimpleArrayMap<String, Long>()
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3771 val newval = text.toLongOrNull()
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3772
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3773 spinbutton = DWSpinButton(this)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3774 spinbutton!!.tag = dataArrayMap
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3775 spinbutton!!.id = cid
2702 4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3776 spinbutton!!.inputType = (InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS)
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3777 spinbutton!!.setText(text)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3778 if(newval != null) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3779 spinbutton!!.value = newval
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3780 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3781 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3782 return spinbutton
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3783 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3784
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3785 fun spinButtonSetPos(spinbutton: DWSpinButton, position: Long)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3786 {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3787 waitOnUiThread {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3788 spinbutton.value = position
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3789 spinbutton.setText(position.toString())
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3790 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3791 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3792
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3793 fun spinButtonSetLimits(spinbutton: DWSpinButton, upper: Long, lower: Long)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3794 {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3795 waitOnUiThread {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3796 spinbutton.maximum = upper
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3797 spinbutton.minimum = lower
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3798 if(spinbutton.value > upper) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3799 spinbutton.value = upper
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3800 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3801 if(spinbutton.value < lower) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3802 spinbutton.value = lower
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3803 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3804 spinbutton.setText(spinbutton.value.toString())
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3805 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3806 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3807
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3808 fun spinButtonGetPos(spinbutton: DWSpinButton): Long
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3809 {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3810 var retval: Long = 0
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3811
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3812 waitOnUiThread {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3813 val newvalue = spinbutton.text.toString().toLongOrNull()
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3814
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3815 if(newvalue == null) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3816 retval = spinbutton.value
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3817 } else {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3818 retval = newvalue
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3819 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3820 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3821 return retval
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3822 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3823
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3824 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	3825 {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3826 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	3827
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3828 waitOnUiThread {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3829 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	3830
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3831 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	3832 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	3833 combobox!!.id = cid
2702 4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3834 combobox!!.inputType = (InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS)
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	3835 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	3836 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3837 return combobox
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3838 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3839
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3840 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	3841 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3842 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	3843
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3844 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3845 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	3846 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	3847
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3848 cont = ListView(this)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3849 cont!!.tag = dataArrayMap
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3850 cont!!.id = cid
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3851 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	3852 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	3853 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	3854 }
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3855 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	3856 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	3857 val data = adapter.model.getRowData(position)
2613 72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3858 val now = System.currentTimeMillis()
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3859
2563 56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	3860 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	3861 adapter.selectedItem = position
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	3862 lastClickView = cont!!
2613 72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3863 // If we are single select or we got a double tap...
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3864 // Generate an ENTER event
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3865 if(cont!!.choiceMode != ListView.CHOICE_MODE_MULTIPLE \|\|
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3866 (position == adapter.lastClickRow &&
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3867 (now - adapter.lastClick) < ViewConfiguration.getDoubleTapTimeout())) {
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	3868 eventHandlerContainer(cont!!, DWEvent.ITEM_ENTER, title, 0, 0, data)
2613 72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3869 } else {
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3870 // If we are mutiple select, generate a SELECT event
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	3871 eventHandlerContainer(cont!!, DWEvent.ITEM_SELECT, title, 0, 0, data)
2613 72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3872 }
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3873 adapter.lastClick = now
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3874 adapter.lastClickRow = position
2563 56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	3875 }
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	3876 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	3877 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	3878 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	3879 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	3880
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	3881 lastClickView = cont!!
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	3882 eventHandlerContainer(cont!!, DWEvent.ITEM_CONTEXT, title, 0, 0, data)
2563 56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	3883 }
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	3884 true
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3885 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3886 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	3887 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	3888 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	3889
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	3890 lastClickView = cont!!
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	3891 eventHandlerContainer(cont!!, DWEvent.ITEM_CONTEXT, 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	3892 true
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3893 }
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3894 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3895 return cont
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3896 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3897
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	3898 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	3899 {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3900 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	3901 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	3902
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3903 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	3904 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	3905 } 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	3906 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	3907 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	3908 } 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	3909 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	3910 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3911 } 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	3912 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	3913 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3914 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	3915 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	3916 } 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	3917 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	3918 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3919 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3920 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3921
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3922 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	3923 {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3924 var retval: String? = null
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3925
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3926 waitOnUiThread {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3927 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	3928
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3929 // Handle DW_CRA_SELECTED
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3930 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	3931 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	3932 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	3933
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3934 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	3935 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	3936 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3937 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	3938 adapter.model.querypos = -1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3939 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3940 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	3941 adapter.model.querypos = 0
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3942 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3943 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3944 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3945 return retval
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3946 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3947
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3948 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	3949 {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3950 var retval: String? = null
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3951
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3952 waitOnUiThread {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3953 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	3954
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3955 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	3956 // Handle DW_CRA_SELECTED
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3957 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	3958 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	3959
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3960 // 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	3961 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	3962 // Item position in adapter
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3963 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	3964
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3965 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	3966 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	3967
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3968 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	3969 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	3970 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3971 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3972 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3973 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	3974 adapter.model.querypos += 1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3975 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	3976 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3977 adapter.model.querypos = -1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3978 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3979 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3980 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3981 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3982 return retval
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3983 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3984
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3985 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	3986 {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3987 var retval: Long = 0
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3988
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3989 waitOnUiThread {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3990 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	3991
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3992 // Handle DW_CRA_SELECTED
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3993 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	3994 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	3995 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	3996
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3997 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	3998 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	3999 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4000 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	4001 adapter.model.querypos = -1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4002 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4003 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	4004 adapter.model.querypos = 0
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4005 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4006 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4007 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4008 return retval
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4009 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4010
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4011 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	4012 {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4013 var retval: Long = 0
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4014
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4015 waitOnUiThread {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4016 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	4017
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4018 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	4019 // Handle DW_CRA_SELECTED
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4020 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	4021 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	4022
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4023 // 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	4024 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	4025 // Item position in adapter
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4026 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	4027
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4028 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	4029 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	4030
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4031 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	4032 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	4033 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4034 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4035 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4036 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	4037 adapter.model.querypos += 1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4038 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	4039 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4040 adapter.model.querypos = -1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4041 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4042 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4043 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4044 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4045 return retval
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4046 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4047
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4048 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	4049 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4050 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4051 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	4052
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4053 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	4054 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4055 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4056
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4057 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	4058 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4059 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4060 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	4061 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	4062
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4063 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	4064 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4065 return cont
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4066 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4067
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4068 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	4069 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4070 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4071 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	4072
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4073 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	4074 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4075 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4076
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4077 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	4078 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4079 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4080 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	4081
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4082 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	4083 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4084 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4085
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4086 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	4087 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4088 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4089 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	4090
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4091 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	4092 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4093 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4094
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4095 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	4096 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4097 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4098 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	4099
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4100 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	4101 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4102 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4103
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4104 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	4105 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4106 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4107 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	4108
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4109 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	4110 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4111 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4112
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4113 fun containerRefresh(cont: ListView)
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4114 {
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4115 waitOnUiThread {
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4116 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	4117
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4118 adapter.notifyDataSetChanged()
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4119 }
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4120 }
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4121
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4122 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	4123 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	4124 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	4125
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4126 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4127 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	4128
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4129 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	4130 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4131 return type
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4132 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4133
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4134 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	4135 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4136 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4137 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	4138
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4139 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	4140 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4141 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4142
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4143 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	4144 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4145 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4146 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	4147
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4148 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	4149 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4150 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4151
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4152 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	4153 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4154 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4155 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	4156
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4157 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	4158 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4159 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4160
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4161 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	4162 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4163 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4164 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	4165
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4166 adapter.model.clear()
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4167 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4168 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4169
2709 3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4170 fun containerScroll(cont: ListView, direction: Int, rows: Int)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4171 {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4172 waitOnUiThread {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4173 // DW_SCROLL_UP 0
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4174 if(direction == 0) {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4175 cont.smoothScrollByOffset(-rows)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4176 // DW_SCROLL_DOWN 1
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4177 } else if(direction == 1) {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4178 cont.smoothScrollByOffset(rows)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4179 // DW_SCROLL_TOP 2
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4180 } else if(direction == 2) {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4181 cont.setSelection(0)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4182 cont.smoothScrollToPosition(0)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4183 // DW_SCROLL_BOTTOM 3
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4184 } else if(direction == 3) {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4185 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4186 val pos = adapter.model.rowdata.size
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4187
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4188 if(pos > 0) {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4189 cont.setSelection(pos - 1)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4190 cont.smoothScrollToPosition(pos - 1)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4191 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4192 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4193 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4194 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4195
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4196 fun containerCursor(cont: ListView, title: String?)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4197 {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4198 waitOnUiThread {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4199 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4200 val pos = adapter.model.positionByTitle(title)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4201
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4202 if(pos > -1) {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4203 cont.setSelection(pos)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4204 cont.smoothScrollToPosition(pos)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4205 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4206
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4207 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4208 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4209
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4210 fun containerCursorByData(cont: ListView, rdata: Long)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4211 {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4212 waitOnUiThread {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4213 val adapter: DWContainerAdapter = cont.adapter as DWContainerAdapter
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4214 val pos = adapter.model.positionByData(rdata)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4215
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4216 if(pos > -1) {
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4217 cont.setSelection(pos)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4218 cont.smoothScrollToPosition(pos)
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4219 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4220
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4221 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4222 }
3cb5aa73dace Android: Implement dw_container_scroll(), dw_container_cursor() and dw_container_cursor_by_data(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2708 diff changeset	4223
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4224 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	4225 {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4226 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	4227
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4228 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4229 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	4230
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4231 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	4232 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	4233 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	4234 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	4235 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	4236 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4237 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4238 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	4239 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4240
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4241 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	4242 {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4243 waitOnUiThread {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4244 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	4245 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	4246
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4247 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	4248 } 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	4249 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	4250
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4251 listbox.list.add(text)
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4252 val adapter = listbox.adapter as ArrayAdapter<String>
755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4253 adapter.notifyDataSetChanged()
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4254 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4255 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4256 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4257
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4258 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	4259 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4260 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4261 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	4262 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4263
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4264 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	4265 } 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	4266 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	4267
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4268 listbox.list.add(pos, text)
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4269 val adapter = listbox.adapter as ArrayAdapter<String>
755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4270 adapter.notifyDataSetChanged()
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4271 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4272 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4273 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4274
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4275 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	4276 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4277 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4278 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	4279 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4280
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4281 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	4282 } 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	4283 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	4284
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4285 listbox.list.clear()
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4286 val adapter = listbox.adapter as ArrayAdapter<String>
755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4287 adapter.notifyDataSetChanged()
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4288 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4289 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4290 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4291
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4292 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	4293 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	4294 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	4295
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4296 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4297 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	4298 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4299
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4300 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	4301 } 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	4302 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	4303
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4304 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	4305 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4306 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4307 return retval
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4308 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4309
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4310 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	4311 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4312 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4313 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	4314 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4315
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4316 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	4317 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	4318 } 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	4319 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	4320
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4321 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	4322 listbox.list[index] = text
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4323 val adapter = listbox.adapter as ArrayAdapter<String>
755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4324 adapter.notifyDataSetChanged()
755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4325 }
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4326 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4327 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4328 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4329
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4330 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	4331 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4332 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	4333
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4334 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4335 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	4336 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4337
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4338 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	4339 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	4340 } 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	4341 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	4342
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4343 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	4344 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	4345 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4346 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4347 return retval
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4348 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4349
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4350 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	4351 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4352 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	4353
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4354 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4355 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	4356 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4357
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4358 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	4359 } 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	4360 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	4361
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4362 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	4363 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4364 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4365 return retval
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4366 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4367
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4368 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	4369 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4370 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4371 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	4372 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4373
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4374 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	4375 combobox.selected = index
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4376 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	4377 }
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4378 } 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	4379 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	4380
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4381 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	4382 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	4383 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	4384 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	4385 } else {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	4386 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	4387 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4388 }
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4389 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4390 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4391 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4392
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4393 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	4394 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4395 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4396 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	4397 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4398
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4399 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	4400 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	4401 }
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4402 } 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	4403 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	4404
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4405 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	4406 listbox.list.removeAt(index)
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4407 val adapter = listbox.adapter as ArrayAdapter<String>
755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4408 adapter.notifyDataSetChanged()
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4409 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4410 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4411 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4412 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4413
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4414 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	4415 {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4416 waitOnUiThread {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4417 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	4418 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	4419
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4420 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	4421 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	4422 }
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4423 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4424 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4425 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4426
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4427 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	4428 {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4429 var retval: Int = -1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4430
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4431 waitOnUiThread {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4432 if(window is DWListBox) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4433 val listbox = window
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4434 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	4435
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4436 // 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	4437 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	4438 retval = checked.keyAt(0)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4439 } else {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4440 // 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	4441 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	4442 // Item position in adapter
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4443 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	4444 // 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	4445 // 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	4446 // 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	4447 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	4448 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	4449 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4450 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4451 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4452 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4453 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4454 return retval
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4455 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4456
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4457 fun calendarNew(cid: Int): CalendarView?
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4458 {
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4459 var calendar: CalendarView? = null
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4460
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4461 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4462 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	4463
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4464 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	4465 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	4466 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	4467 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	4468 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	4469 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	4470 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	4471 }
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4472 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4473
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4474 return calendar
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4475 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4476
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4477 fun calendarSetDate(calendar: CalendarView, date: Long)
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4478 {
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4479 waitOnUiThread {
2524 d5c3c573c74e Android: Calendar fixes, need to be in milliseconds not seconds... also... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2523 diff changeset	4480 // 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	4481 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	4482 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4483 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4484
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4485 fun calendarGetDate(calendar: CalendarView): Long
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4486 {
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4487 var date: Long = 0
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4488
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4489 waitOnUiThread {
2524 d5c3c573c74e Android: Calendar fixes, need to be in milliseconds not seconds... also... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2523 diff changeset	4490 // 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	4491 date = calendar.date / 1000
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4492 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4493 return date
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4494 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4495
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	4496 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	4497 {
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	4498 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	4499
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	4500 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4501 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	4502
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	4503 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	4504 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	4505 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	4506 }
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	4507
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	4508 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	4509 }
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	4510
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4511 fun windowSetBitmap(window: View, resID: Int, file: String?)
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	4512 {
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	4513 waitOnUiThread {
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4514 var filename: String? = file
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4515
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4516 if(resID > 0 && resID < 65536) {
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4517 filename = resID.toString()
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4518 } else if(resID != 0) {
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4519 if (window is ImageButton) {
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	4520 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	4521
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	4522 button.setImageResource(resID)
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4523 } else if (window is ImageView) {
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	4524 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	4525
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	4526 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	4527 }
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4528 }
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4529 if(filename != null) {
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	4530 for (ext in DWImageExts) {
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4531 // 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	4532 try {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4533 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	4534 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	4535
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4536 if(b != null) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4537 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	4538 val button = window
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4539
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4540 button.setImageBitmap(b)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4541 } 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	4542 val imageview = window
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4543
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4544 imageview.setImageBitmap(b)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4545 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4546 break
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4547 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4548 } 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	4549 }
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	4550 }
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	4551 }
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	4552 }
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	4553 }
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	4554
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	4555 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	4556 {
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	4557 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	4558 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	4559 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	4560 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	4561
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	4562 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	4563 } 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	4564 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	4565
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	4566 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	4567 }
2655 5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4568 }
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4569 if(data != null) {
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	4570 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	4571
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	4572 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	4573 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	4574
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	4575 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	4576 } 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	4577 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	4578
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	4579 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	4580 }
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	4581 }
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	4582 }
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	4583 }
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	4584
2652 42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4585 fun iconNew(file: String?, data: ByteArray?, length: Int, resID: Int): Drawable?
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4586 {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4587 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	4588
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4589 waitOnUiThread {
2655 5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4590 var filename: String? = null
2652 42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4591
42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4592 // Handle Dynamic Windows resource IDs
42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4593 if(resID > 0 && resID < 65536) {
42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4594 filename = resID.toString()
2655 5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4595 // Handle Android resource IDs
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4596 } else if(resID != 0) {
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4597 try {
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4598 icon = ResourcesCompat.getDrawable(resources, resID, null)
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4599 } catch (e: Resources.NotFoundException) {
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4600 }
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4601 // Handle bitmap data
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4602 } else if(data != null) {
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4603 icon = BitmapDrawable(resources, BitmapFactory.decodeByteArray(data, 0, length))
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4604 } else {
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4605 filename = file
2652 42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4606 }
42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4607 // Handle filename or DW resource IDs
42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4608 // these will be located in the assets folder
42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4609 if(filename != null) {
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	4610 for (ext in DWImageExts) {
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4611 // 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	4612 try {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4613 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	4614 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	4615 } catch (e: IOException) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4616 }
2652 42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4617 if (icon != null) {
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4618 break
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4619 }
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4620 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4621 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4622 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4623 return icon
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4624 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4625
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4626 fun pixmapNew(width: Int, height: Int, file: String?, data: ByteArray?, length: Int, resID: Int): Bitmap?
2529 060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4627 {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4628 var pixmap: Bitmap? = null
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4629
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4630 waitOnUiThread {
2655 5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4631 var filename: String? = null
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4632
2529 060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4633 if(width > 0 && height > 0) {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4634 pixmap = Bitmap.createBitmap(null, width, height, Bitmap.Config.ARGB_8888)
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4635 } else if(resID > 0 && resID < 65536) {
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4636 filename = resID.toString()
2529 060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4637 } 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	4638 pixmap = BitmapFactory.decodeResource(resources, resID)
2655 5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4639 } else if(data != null) {
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4640 pixmap = BitmapFactory.decodeByteArray(data, 0, length)
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4641 } else {
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4642 filename = file
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4643 }
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4644 if(filename != null) {
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	4645 for (ext in DWImageExts) {
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4646 // 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	4647 try {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4648 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	4649 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	4650 } catch (e: IOException) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4651 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4652 if(pixmap != null) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4653 break
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4654 }
2529 060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4655 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4656 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4657 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4658 return pixmap
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4659 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4660
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4661 fun pixmapGetDimensions(pixmap: Bitmap): Long
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4662 {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4663 var dimensions: Long = 0
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4664
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4665 waitOnUiThread {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4666 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	4667 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4668 return dimensions
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4669 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4670
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	4671 fun screenGetDimensions(): Long
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	4672 {
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	4673 val dm = resources.displayMetrics
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	4674 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	4675 }
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	4676
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4677 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	4678 {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4679 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	4680
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4681 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4682 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	4683
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4684 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	4685 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	4686 render!!.id = cid
2608 a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4687 render!!.setOnTouchListener(object : View.OnTouchListener {
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4688 @SuppressLint("ClickableViewAccessibility")
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4689 override fun onTouch(v: View, event: MotionEvent): Boolean {
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4690 when (event.action) {
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4691 MotionEvent.ACTION_DOWN -> {
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4692 render!!.evx = event.x
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4693 render!!.evy = event.y
2611 ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	4694 // Event will be generated in the onClickListener or
ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	4695 // onLongClickListener below, just save the location
2608 a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4696 }
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4697 MotionEvent.ACTION_UP -> {
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4698 render!!.evx = event.x
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4699 render!!.evy = event.y
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	4700 lastClickView = render!!
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	4701 eventHandlerInt(render!!, DWEvent.BUTTON_RELEASE, event.x.toInt(), event.y.toInt(), render!!.button, 0)
2611 ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	4702 }
ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	4703 MotionEvent.ACTION_MOVE -> {
ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	4704 render!!.evx = event.x
ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	4705 render!!.evy = event.y
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	4706 lastClickView = render!!
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	4707 eventHandlerInt(render!!, DWEvent.MOTION_NOTIFY, event.x.toInt(), event.y.toInt(), 1, 0)
2608 a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4708 }
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4709 }
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4710 return false
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4711 }
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4712 })
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4713 render!!.setOnLongClickListener{
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4714 // Long click functions as button 2
2611 ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	4715 render!!.button = 2
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	4716 lastClickView = render!!
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	4717 eventHandlerInt(render!!, DWEvent.BUTTON_PRESS, render!!.evx.toInt(), render!!.evy.toInt(), 2, 0)
2608 a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4718 true
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4719 }
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4720 render!!.setOnClickListener{
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4721 // Normal click functions as button 1
2611 ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	4722 render!!.button = 1
2614 dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	4723 lastClickView = render!!
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	4724 eventHandlerInt(render!!, DWEvent.BUTTON_PRESS, render!!.evx.toInt(), render!!.evy.toInt(), 1, 0)
2608 a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4725 }
2596 60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	4726 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	4727 if (event.action == KeyEvent.ACTION_DOWN) {
2620 dcd71b04cc46 Android: Add internal event constants for more clarity about what code does. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2614 diff changeset	4728 eventHandlerKey(render!!, DWEvent.KEY_PRESS, keyCode, event.unicodeChar, event.modifiers, event.characters)
2596 60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	4729 }
60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	4730 false
60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	4731 })
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4732 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4733 return render
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4734 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4735
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4736 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	4737 {
2539 822f814a54f4 Android: Fix memory corruption issue due to incorrectly allocating HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2538 diff changeset	4738 runOnUiThread {
822f814a54f4 Android: Fix memory corruption issue due to incorrectly allocating HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2538 diff changeset	4739 render.invalidate()
822f814a54f4 Android: Fix memory corruption issue due to incorrectly allocating HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2538 diff changeset	4740 }
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4741 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4742
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4743 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	4744 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	4745 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4746 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	4747 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	4748 var retval = 1
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4749
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4750 if(srcw == -1) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4751 src.right = srcx + dstw
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4752 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4753 if(srch == -1) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4754 src.bottom = srcy + dsth
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4755 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4756
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4757 waitOnUiThread {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4758 var canvas: Canvas? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4759 var bitmap: Bitmap? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4760
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4761 if(dstr != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4762 canvas = dstr.cachedCanvas
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4763 } else if(dstp != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4764 canvas = Canvas(dstp)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4765 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4766
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4767 if(srcp != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4768 bitmap = srcp
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4769 } else if(srcr != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4770 bitmap = Bitmap.createBitmap(srcr.layoutParams.width,
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4771 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	4772 val c = Canvas(bitmap)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4773 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	4774 srcr.draw(c)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4775 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4776
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4777 if(canvas != null && bitmap != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4778 canvas.drawBitmap(bitmap, src, dst, null)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4779 retval = 0
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4780 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4781 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4782 return retval
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4783 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4784
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	4785 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	4786 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4787 waitOnUiThread {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4788 var canvas: Canvas? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4789
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4790 if(render != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4791 canvas = render.cachedCanvas
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4792 } else if(bitmap != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4793 canvas = Canvas(bitmap)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4794 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4795
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4796 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	4797 colorsSet(fgColor, bgColor)
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4798 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	4799 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4800 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4801 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4802
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	4803 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	4804 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4805 waitOnUiThread {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4806 var canvas: Canvas? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4807
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4808 if(render != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4809 canvas = render.cachedCanvas
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4810 } else if(bitmap != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4811 canvas = Canvas(bitmap)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4812 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4813
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4814 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	4815 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	4816 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	4817 paint.style = Paint.Style.STROKE
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4818 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	4819 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4820 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4821 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4822
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4823 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	4824 {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4825 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	4826
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4827 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4828 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	4829
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4830 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	4831 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	4832 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	4833 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	4834 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	4835 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4836 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4837 } 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	4838 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	4839 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	4840 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	4841 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	4842 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4843 } 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	4844 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	4845
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4846 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	4847 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	4848 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	4849 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	4850 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4851 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4852 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4853 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4854 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	4855 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	4856 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	4857 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	4858 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4859 return dimensions
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4860 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4861
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	4862 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	4863 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	4864 {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4865 waitOnUiThread {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4866 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	4867
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4868 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	4869 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	4870 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	4871 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	4872 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	4873 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	4874 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4875 }
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4876 } 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	4877 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	4878 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	4879 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	4880 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	4881 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	4882 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4883 } 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	4884 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	4885
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4886 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	4887 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	4888 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	4889 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	4890 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4891 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4892 }
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4893 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4894
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4895 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	4896 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	4897 // 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	4898 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	4899 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	4900 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	4901 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	4902 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	4903 val textheight = rect.bottom - rect.top
2637 22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4904 if(bgcolor != null) {
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4905 val oldcolor = paint.color
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4906 // Prepare to draw the background rect
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4907 paint.color = bgcolor as Int
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4908 rect.top += y + textheight
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4909 rect.bottom += y + textheight
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4910 rect.left += x
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4911 rect.right += x
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4912 canvas.drawRect(rect, paint)
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4913 // Restore the color and prepare to draw text
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4914 paint.color = oldcolor
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4915 }
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4916 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	4917 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	4918 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4919 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4920 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4921
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	4922 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	4923 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4924 waitOnUiThread {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4925 var canvas: Canvas? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4926
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4927 if(render != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4928 canvas = render.cachedCanvas
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4929 } else if(bitmap != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4930 canvas = Canvas(bitmap)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4931 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4932
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4933 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	4934 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	4935 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	4936 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	4937 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	4938 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4939 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4940 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4941
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	4942 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	4943 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	4944 {
2537 cd9d2ba251d5 Android: Reimplement drawPolygon() using drawPath() instead of drawLines/Points(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2536 diff changeset	4945 // 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	4946 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	4947
2537 cd9d2ba251d5 Android: Reimplement drawPolygon() using drawPath() instead of drawLines/Points(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2536 diff changeset	4948 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	4949 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	4950 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	4951 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4952
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4953 waitOnUiThread {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4954 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	4955
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4956 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	4957 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	4958 } 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	4959 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	4960 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4961
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4962 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	4963 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	4964 // 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	4965 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	4966 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	4967 } else {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4968 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	4969 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4970 // 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	4971 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	4972 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	4973 } else {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4974 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	4975 }
2537 cd9d2ba251d5 Android: Reimplement drawPolygon() using drawPath() instead of drawLines/Points(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2536 diff changeset	4976 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	4977 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4978 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4979 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4980
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4981 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	4982 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	4983 {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4984 waitOnUiThread {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4985 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	4986
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4987 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	4988 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	4989 } 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	4990 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	4991 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4992
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4993 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	4994 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	4995
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4996 // 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	4997 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	4998 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	4999 } else {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	5000 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	5001 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	5002 // 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	5003 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	5004 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	5005 } else {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	5006 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	5007 }
2536 d172ab2eddb6 Android: Implement DW_DRAW_FULL flag for dw_draw_arc(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2535 diff changeset	5008 // 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	5009 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	5010 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	5011 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	5012 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	5013 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	5014
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5015 if(x2 < x1) {
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5016 left = x2.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5017 right = x1.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5018 }
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5019 if(y2 < y1) {
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5020 top = y2.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5021 bottom = y1.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5022 }
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5023
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5024 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	5025 } else {
2576 db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5026 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	5027 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	5028 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	5029 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	5030 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	5031 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	5032 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	5033 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	5034
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5035 // Convert to degrees
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5036 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	5037 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	5038 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	5039
2536 d172ab2eddb6 Android: Implement DW_DRAW_FULL flag for dw_draw_arc(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2535 diff changeset	5040 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	5041 }
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	5042 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	5043 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	5044 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	5045
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	5046 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	5047 {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	5048 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	5049 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	5050 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	5051
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	5052 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	5053 }
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	5054
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	5055 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	5056 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	5057 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	5058 paint.color = colorFromDW(fgColor)
2637 22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	5059 if(bgColor != -1L) {
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	5060 this.bgcolor = colorFromDW(bgColor)
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	5061 } else {
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	5062 this.bgcolor = null
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	5063 }
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	5064 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	5065 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	5066
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5067 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	5068 {
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5069 // creating timer task, timer
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5070 val t = Timer()
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5071 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	5072 override fun run() {
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5073 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	5074 t.cancel()
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5075 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5076 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5077 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5078 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	5079 return t
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5080 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5081
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5082 fun timerDisconnect(timer: Timer)
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5083 {
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5084 timer.cancel()
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5085 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5086
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5087 fun doBeep(duration: Int)
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5088 {
2491 bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	5089 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	5090 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	5091 val handler = Handler(Looper.getMainLooper())
bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	5092 handler.postDelayed({
bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	5093 toneGen.release()
bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	5094 }, (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	5095 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	5096
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	5097 fun debugMessage(text: String)
4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	5098 {
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	5099 Log.d(appID, text)
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	5100 }
4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	5101
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	5102 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	5103 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	5104 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	5105 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	5106 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	5107 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	5108 } 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	5109 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	5110 }
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	5111 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	5112 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	5113 }
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	5114 }
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	5115
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5116 fun getDataColumn(context: Context, uri: Uri?, selection: String?, selectionArgs: Array<String?>?): String? {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5117 var cursor: Cursor? = null
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5118 val column = "_data"
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5119 val projection = arrayOf(column)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5120
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5121 try {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5122 cursor = context.contentResolver.query(
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5123 uri!!, projection, selection, selectionArgs,
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5124 null
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5125 )
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5126 if (cursor != null && cursor.moveToFirst()) {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5127 val index = cursor.getColumnIndexOrThrow(column)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5128 return cursor.getString(index)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5129 }
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5130 } finally {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5131 cursor?.close()
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5132 }
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5133 return null
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5134 }
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5135
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5136 // Defpath does not seem to be supported on Android using the ACTION_GET_CONTENT Intent
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	5137 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	5138 {
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	5139 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	5140
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	5141 // 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	5142 if(Looper.getMainLooper() != Looper.myLooper()) {
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5143 var success = true
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5144
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	5145 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	5146 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	5147 val fileintent = Intent(Intent.ACTION_GET_CONTENT)
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5148 // TODO: Filtering requires MIME types, not extensions
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5149 fileintent.type = "/"
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	5150 fileintent.addCategory(Intent.CATEGORY_OPENABLE)
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5151 try {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5152 startActivityForResult(fileintent, 100)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5153 } catch (e: ActivityNotFoundException) {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5154 success = false
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5155 }
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	5156 }
6b5057dd6b8e Android: Experimental change for the new file browser... require it be on secondary... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2594 diff changeset	5157
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5158 if(success) {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5159 // Wait until the intent finishes.
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5160 fileCond.await()
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5161 fileLock.unlock()
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5162
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5163 if (DocumentsContract.isDocumentUri(this, fileURI)) {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5164 // ExternalStorageProvider
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5165 if (fileURI?.authority == "com.android.externalstorage.documents") {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5166 val docId = DocumentsContract.getDocumentId(fileURI)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5167 val split = docId.split(":").toTypedArray()
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5168 retval = Environment.getExternalStorageDirectory().toString() + "/" + split[1]
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5169 } else if (fileURI?.authority == "com.android.providers.downloads.documents") {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5170 val id = DocumentsContract.getDocumentId(fileURI)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5171 val contentUri = ContentUris.withAppendedId(
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5172 Uri.parse("content://downloads/public_downloads"),
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5173 java.lang.Long.valueOf(id)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5174 )
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5175 retval = getDataColumn(this, contentUri, null, null)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5176 } else if (fileURI?.authority == "com.android.providers.media.documents") {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5177 val docId = DocumentsContract.getDocumentId(fileURI)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5178 val split = docId.split(":").toTypedArray()
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5179 val type = split[0]
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5180 var contentUri: Uri? = null
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5181 if ("image" == type) {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5182 contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5183 } else if ("video" == type) {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5184 contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5185 } else if ("audio" == type) {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5186 contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5187 }
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5188 val selection = "_id=?"
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5189 val selectionArgs = arrayOf<String?>(
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5190 split[1]
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5191 )
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5192 retval = getDataColumn(this, contentUri, selection, selectionArgs)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5193 }
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5194 } else if (fileURI?.scheme == "content") {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5195 retval = getDataColumn(this, fileURI, null, null)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5196 }
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5197 // File
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5198 else if (fileURI?.scheme == "file") {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5199 retval = fileURI?.path
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5200 }
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5201
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5202 // If we are opening a directory DW_DIRECTORY_OPEN
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5203 if(retval != null && flags == 2) {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5204 val split = retval.split("/")
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5205 val filename = split.last()
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5206
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5207 if(filename != null) {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5208 val pathlen = retval.length
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5209 val filelen = filename.length
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5210
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5211 retval = retval.substring(0, pathlen - filelen - 1)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5212 }
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5213 }
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5214 } else {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5215 // If we failed to start the intent... use old dialog
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5216 fileLock.unlock()
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5217 retval = fileBrowse(title, defpath, ext, flags)
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	5218 }
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	5219 }
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	5220 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	5221 }
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	5222
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5223 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	5224 {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5225 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	5226
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5227 waitOnUiThread {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5228 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	5229 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	5230 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	5231 // 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	5232 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	5233 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	5234 }
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	5235 })
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5236 if(ext != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5237 fc.setExtension(ext)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5238 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5239 fc.showDialog()
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5240 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5241
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5242 // 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	5243 try {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5244 Looper.loop()
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5245 } catch (e2: RuntimeException) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5246 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5247
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5248 return retval
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5249 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5250
2714 26bb1e4a97d0 Android: Add glue to bring up the color wheel when calling dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2713 diff changeset	5251 fun colorChoose(color: Int, alpha: Int, red: Int, green: Int, blue: Int): Int
26bb1e4a97d0 Android: Add glue to bring up the color wheel when calling dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2713 diff changeset	5252 {
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5253 var retval: Int = color
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5254
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5255 // This can't be called from the main thread
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5256 if(Looper.getMainLooper() != Looper.myLooper()) {
2722 cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	5257 colorLock.lock()
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5258 waitOnUiThread {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5259 val dialog = Dialog(this)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5260 val colorWheel = ColorWheel(this, null, 0)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5261
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5262 dialog.setContentView(colorWheel)
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5263 colorWheel.rgb = Color.rgb(red, green, blue)
2722 cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	5264 colorChosen = colorWheel.rgb
cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	5265 colorWheel.colorChangeListener = { rgb: Int -> colorChosen = rgb }
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5266 dialog.window?.setLayout(
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5267 ViewGroup.LayoutParams.MATCH_PARENT,
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5268 ViewGroup.LayoutParams.MATCH_PARENT
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5269 )
2722 cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	5270 dialog.setOnDismissListener {
cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	5271 colorLock.lock()
cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	5272 colorCond.signal()
cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	5273 colorLock.unlock()
cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	5274 }
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5275 dialog.show()
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5276 }
2722 cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	5277 colorCond.await()
cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	5278 retval = colorChosen
cacde852e2db Android: Add dialog dismiss and color change handlers to the color chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2720 diff changeset	5279 colorLock.unlock()
2714 26bb1e4a97d0 Android: Add glue to bring up the color wheel when calling dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2713 diff changeset	5280 }
26bb1e4a97d0 Android: Add glue to bring up the color wheel when calling dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2713 diff changeset	5281 return retval
26bb1e4a97d0 Android: Add glue to bring up the color wheel when calling dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2713 diff changeset	5282 }
26bb1e4a97d0 Android: Add glue to bring up the color wheel when calling dw_color_choose(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2713 diff changeset	5283
2486 cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	5284 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	5285 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5286 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	5287
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5288 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5289 // 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	5290 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	5291
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5292 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	5293 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	5294 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	5295 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	5296 )
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5297 //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	5298 { _: DialogInterface, _: Int ->
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5299 retval = 1
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5300 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	5301 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5302 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5303 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	5304 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	5305 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	5306 ) { _: DialogInterface, _: Int ->
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5307 retval = 0
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5308 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	5309 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5310 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5311 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	5312 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	5313 )
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5314 //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	5315 { _: DialogInterface, _: Int ->
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5316 retval = 0
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5317 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	5318 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5319 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5320 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	5321 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	5322 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	5323 ) { _: DialogInterface, _: Int ->
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5324 retval = 2
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5325 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	5326 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5327 }
2573 ea75e295025b Android: Make message boxes modal (not cancelable). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2572 diff changeset	5328 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	5329 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	5330
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5331 // 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	5332 try {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5333 Looper.loop()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5334 } 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	5335 }
2486 cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	5336 }
cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	5337 return retval
cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	5338 }
cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	5339
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	5340 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	5341 {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	5342 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	5343 return true
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	5344 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	5345 return false
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	5346 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	5347
2514 5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5348 fun mainSleep(milliseconds: Int)
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5349 {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5350 // 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	5351 // 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	5352 // 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	5353 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	5354 val starttime = System.currentTimeMillis()
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5355
2637 22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	5356 // Waiting for Idle to check for sleep expiration
2514 5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5357 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	5358 var thrown: Boolean = false
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5359
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5360 override fun queueIdle(): Boolean {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5361 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	5362 if (thrown == false) {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5363 thrown = true
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5364 throw java.lang.RuntimeException()
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5365 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5366 return false
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5367 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5368 return true
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5369 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5370 })
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5371
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5372 // 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	5373 try {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5374 Looper.loop()
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5375 } catch (e2: RuntimeException) {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5376 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5377 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5378 else
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5379 {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5380 // 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	5381 Thread.sleep(milliseconds.toLong())
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5382 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5383 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5384
2487 83f8f4f58a98 Android: Implement dw_exit() using Activity.finishActivity() instead of exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2486 diff changeset	5385 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	5386 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5387 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5388 this.finishAffinity()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5389 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	5390 }
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	5391 }
b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	5392
b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	5393 fun dwindowsShutdown()
b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	5394 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5395 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5396 this.finishAffinity()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5397 }
2487 83f8f4f58a98 Android: Implement dw_exit() using Activity.finishActivity() instead of exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2486 diff changeset	5398 }
83f8f4f58a98 Android: Implement dw_exit() using Activity.finishActivity() instead of exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2486 diff changeset	5399
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5400 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	5401 {
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	5402 appID = appid
755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	5403
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5404 waitOnUiThread {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5405 // 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	5406 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	5407 // Create the NotificationChannel
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5408 val importance = NotificationManager.IMPORTANCE_DEFAULT
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5409 val mChannel = NotificationChannel(appid, appname, importance)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5410 // 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	5411 // or other notification behaviors after this
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5412 val notificationManager =
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5413 getSystemService(NOTIFICATION_SERVICE) as NotificationManager
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5414 notificationManager.createNotificationChannel(mChannel)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5415 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5416 }
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5417 return Build.VERSION.SDK_INT
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5418 }
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5419
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5420 fun dwMain()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5421 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5422 runOnUiThread {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5423 // 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	5424 invalidateOptionsMenu()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5425 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5426 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5427
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5428 fun androidGetRelease(): String
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5429 {
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5430 return Build.VERSION.RELEASE
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5431 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5432
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5433 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	5434 {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5435 var builder: NotificationCompat.Builder? = null
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5436
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5437 waitOnUiThread {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5438 builder = NotificationCompat.Builder(this, appid)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5439 .setContentTitle(title)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5440 .setContentText(text)
2715 e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5441 .setSmallIcon(R.mipmap.sym_def_app_icon)
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5442 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5443 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5444 return builder
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5445 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5446
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5447 fun notificationSend(builder: NotificationCompat.Builder)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5448 {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5449 waitOnUiThread {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5450 notificationID += 1
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5451 with(NotificationManagerCompat.from(this)) {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5452 // 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	5453 notify(notificationID, builder.build())
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5454 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5455 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5456 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5457
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	5458 /*
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	5459 * 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	5460 * 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	5461 */
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	5462 external fun dwindowsInit(dataDir: String, cacheDir: 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	5463 external fun eventHandler(
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5464 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	5465 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	5466 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	5467 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	5468 str2: String?,
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5469 inta: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5470 intb: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5471 intc: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5472 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	5473 ): Int
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5474 external fun eventHandlerInt(
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5475 obj1: View,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5476 message: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5477 inta: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5478 intb: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5479 intc: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5480 intd: Int
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5481 )
2483 9f7af6d8c6a4 Android: Fix signal handlers so they actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2482 diff changeset	5482 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	5483 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	5484 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	5485 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	5486 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	5487 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	5488
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	5489 companion object
a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	5490 {
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5491 // 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	5492 init
a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	5493 {
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5494 System.loadLibrary("dwindows")
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5495 }
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5496 }
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5497 }

Mercurial > dwindows

annotate android/DWindows.kt @ 2722:cacde852e2db