dwindows: android/DWindows.kt annotate

annotate android/DWindows.kt @ 2721:c0be28906839

Android: Update the manifest with READ/MANAGE_EXTERNAL_STORAGE. These need to be present, and enabled in the Application settings.... Otherwise we won't be able to open the files selected by the picker.

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

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
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	69
2713 6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	70
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	71 // Color Wheel section
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	72 private val HUE_COLORS = intArrayOf(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	73 Color.RED,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	74 Color.YELLOW,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	75 Color.GREEN,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	76 Color.CYAN,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	77 Color.BLUE,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	78 Color.MAGENTA,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	79 Color.RED
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	80 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	81
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	82 private val SATURATION_COLORS = intArrayOf(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	83 Color.WHITE,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	84 setAlpha(Color.WHITE, 0)
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	87 open class ColorWheel @JvmOverloads constructor(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	88 context: Context,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	89 attrs: AttributeSet? = null,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	90 defStyleAttr: Int = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	91 ) : View(context, attrs, defStyleAttr) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	92
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	93 private val hueGradient = GradientDrawable().apply {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	94 gradientType = GradientDrawable.SWEEP_GRADIENT
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	95 shape = GradientDrawable.OVAL
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	96 colors = HUE_COLORS
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	97 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	98
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	99 private val saturationGradient = GradientDrawable().apply {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	100 gradientType = GradientDrawable.RADIAL_GRADIENT
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	101 shape = GradientDrawable.OVAL
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	102 colors = SATURATION_COLORS
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	103 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	104
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	105 private val thumbDrawable = ThumbDrawable()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	106 private val hsvColor = HsvColor(value = 1f)
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 private var wheelCenterX = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	109 private var wheelCenterY = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	110 private var wheelRadius = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	111 private var downX = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	112 private var downY = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	113
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	114 var rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	115 get() = hsvColor.rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	116 set(rgb) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	117 hsvColor.rgb = rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	118 hsvColor.set(value = 1f)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	119 fireColorListener()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	120 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	121 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	122
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	123 var thumbRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	124 get() = thumbDrawable.radius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	125 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	126 thumbDrawable.radius = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	127 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	128 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	129
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	130 var thumbColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	131 get() = thumbDrawable.thumbColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	132 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	133 thumbDrawable.thumbColor = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	134 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	135 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	136
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	137 var thumbStrokeColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	138 get() = thumbDrawable.strokeColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	139 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	140 thumbDrawable.strokeColor = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	141 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	142 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	143
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	144 var thumbColorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	145 get() = thumbDrawable.colorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	146 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	147 thumbDrawable.colorCircleScale = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	148 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	149 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	150
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	151 var colorChangeListener: ((Int) -> Unit)? = null
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	152
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	153 var interceptTouchEvent = true
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 init {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	156 thumbRadius = 13
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	157 thumbColor = Color.WHITE
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	158 thumbStrokeColor = Color.DKGRAY
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	159 thumbColorCircleScale = 0.7f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	160 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	161
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	162 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	163 rgb = Color.rgb(r, g, b)
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 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	167 val minDimension = minOf(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	168 MeasureSpec.getSize(widthMeasureSpec),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	169 MeasureSpec.getSize(heightMeasureSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	170 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	171
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	172 setMeasuredDimension(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	173 resolveSize(minDimension, widthMeasureSpec),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	174 resolveSize(minDimension, heightMeasureSpec)
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 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	177
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	178 override fun onDraw(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	179 drawColorWheel(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	180 drawThumb(canvas)
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	183 private fun drawColorWheel(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	184 val hSpace = width - paddingLeft - paddingRight
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	185 val vSpace = height - paddingTop - paddingBottom
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 wheelCenterX = paddingLeft + hSpace / 2
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	188 wheelCenterY = paddingTop + vSpace / 2
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	189 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	190
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	191 val left = wheelCenterX - wheelRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	192 val top = wheelCenterY - wheelRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	193 val right = wheelCenterX + wheelRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	194 val bottom = wheelCenterY + wheelRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	195
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	196 hueGradient.setBounds(left, top, right, bottom)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	197 saturationGradient.setBounds(left, top, right, bottom)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	198 saturationGradient.gradientRadius = wheelRadius.toFloat()
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.draw(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	201 saturationGradient.draw(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	202 }
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 private fun drawThumb(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	205 val r = hsvColor.saturation * wheelRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	206 val hueRadians = toRadians(hsvColor.hue)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	207 val x = cos(hueRadians) * r + wheelCenterX
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	208 val y = sin(hueRadians) * r + wheelCenterY
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	209
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	210 thumbDrawable.indicatorColor = hsvColor.rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	211 thumbDrawable.setCoordinates(x, y)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	212 thumbDrawable.draw(canvas)
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	215 override fun onTouchEvent(event: MotionEvent): Boolean {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	216 when (event.actionMasked) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	217 MotionEvent.ACTION_DOWN -> onActionDown(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	218 MotionEvent.ACTION_MOVE -> updateColorOnMotionEvent(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	219 MotionEvent.ACTION_UP -> {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	220 updateColorOnMotionEvent(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	221 if (isTap(event, downX, downY)) performClick()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	222 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	223 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	224
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	225 return true
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 private fun onActionDown(event: MotionEvent) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	229 parent.requestDisallowInterceptTouchEvent(interceptTouchEvent)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	230 updateColorOnMotionEvent(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	231 downX = event.x
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	232 downY = event.y
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	233 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	234
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	235 override fun performClick() = super.performClick()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	236
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	237 private fun updateColorOnMotionEvent(event: MotionEvent) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	238 calculateColor(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	239 fireColorListener()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	240 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	241 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	242
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	243 private fun calculateColor(event: MotionEvent) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	244 val legX = event.x - wheelCenterX
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	245 val legY = event.y - wheelCenterY
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	246 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	247 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	248 val saturation = hypot / wheelRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	249 hsvColor.set(hue, saturation, 1f)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	250 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	251
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	252 private fun fireColorListener() {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	253 colorChangeListener?.invoke(hsvColor.rgb)
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 override fun onSaveInstanceState(): Parcelable {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	257 val superState = super.onSaveInstanceState()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	258 val thumbState = thumbDrawable.saveState()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	259 return ColorWheelState(superState, this, thumbState)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	260 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	261
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	262 override fun onRestoreInstanceState(state: Parcelable) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	263 if (state is ColorWheelState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	264 super.onRestoreInstanceState(state.superState)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	265 readColorWheelState(state)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	266 } else {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	267 super.onRestoreInstanceState(state)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	268 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	269 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	270
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	271 private fun readColorWheelState(state: ColorWheelState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	272 thumbDrawable.restoreState(state.thumbState)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	273 interceptTouchEvent = state.interceptTouchEvent
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	274 rgb = state.rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	275 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	276 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	277
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	278 internal class ColorWheelState : View.BaseSavedState {
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 val thumbState: ThumbDrawableState
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	281 val interceptTouchEvent: Boolean
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	282 val rgb: Int
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 constructor(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	285 superState: Parcelable?,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	286 view: ColorWheel,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	287 thumbState: ThumbDrawableState
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	288 ) : super(superState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	289 this.thumbState = thumbState
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	290 interceptTouchEvent = view.interceptTouchEvent
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	291 rgb = view.rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	292 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	293
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	294 constructor(source: Parcel) : super(source) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	295 thumbState = source.readThumbState()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	296 interceptTouchEvent = source.readBooleanCompat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	297 rgb = source.readInt()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	298 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	299
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	300 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	301 super.writeToParcel(out, flags)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	302 out.writeThumbState(thumbState, flags)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	303 out.writeBooleanCompat(interceptTouchEvent)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	304 out.writeInt(rgb)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	305 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	306
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	307 companion object CREATOR : Parcelable.Creator<ColorWheelState> {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	308
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	309 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	310
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	311 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	312 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	313 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	314 internal fun Parcel.writeBooleanCompat(value: Boolean) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	315 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	316 this.writeBoolean(value)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	317 } else {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	318 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	319 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	320 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	321
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	322 internal fun Parcel.readBooleanCompat(): Boolean {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	323 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	324 this.readBoolean()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	325 } else {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	326 this.readInt() == 1
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	327 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	328 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	329 private const val MAX_ALPHA = 255
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	330
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	331 open class GradientSeekBar @JvmOverloads constructor(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	332 context: Context,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	333 attrs: AttributeSet? = null,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	334 defStyleAttr: Int = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	335 ) : View(context, attrs, defStyleAttr) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	336
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	337 private val gradientColors = IntArray(2)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	338 private val thumbDrawable = ThumbDrawable()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	339 private val gradientDrawable = GradientDrawable()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	340 private val argbEvaluator = android.animation.ArgbEvaluator()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	341
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	342 private lateinit var orientationStrategy: OrientationStrategy
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	343 private var downX = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	344 private var downY = 0f
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 var startColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	347 get() = gradientColors[0]
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	348 set(color) { setColors(start = color) }
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 endColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	351 get() = gradientColors[1]
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	352 set(color) { setColors(end = 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 offset = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	355 set(offset) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	356 field = ensureOffsetWithinRange(offset)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	357 calculateArgb()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	358 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	359
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	360 var barSize = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	361 set(width) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	362 field = width
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	363 requestLayout()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	364 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	365
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	366 var cornersRadius = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	367 set(radius) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	368 field = radius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	369 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	370 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	371
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	372 var orientation = Orientation.VERTICAL
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	373 set(orientation) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	374 field = orientation
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	375 orientationStrategy = createOrientationStrategy()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	376 requestLayout()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	377 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	378
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	379 var thumbColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	380 get() = thumbDrawable.thumbColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	381 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	382 thumbDrawable.thumbColor = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	383 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	384 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	385
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	386 var thumbStrokeColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	387 get() = thumbDrawable.strokeColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	388 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	389 thumbDrawable.strokeColor = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	390 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	391 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	392
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	393 var thumbColorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	394 get() = thumbDrawable.colorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	395 set(value) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	396 thumbDrawable.colorCircleScale = value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	397 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	398 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	399
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	400 var thumbRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	401 get() = thumbDrawable.radius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	402 set(radius) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	403 thumbDrawable.radius = radius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	404 requestLayout()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	405 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	406
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	407 var argb = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	408 private set
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 var colorChangeListener: ((Float, Int) -> Unit)? = null
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	411
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	412 var interceptTouchEvent = true
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 init {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	415 thumbColor = Color.WHITE
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	416 thumbStrokeColor = Color.DKGRAY
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	417 thumbColorCircleScale = 0.7f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	418 thumbRadius = 13
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	419 barSize = 10
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	420 cornersRadius = 5.0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	421 offset = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	422 orientation = Orientation.VERTICAL
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	423 setColors(Color.TRANSPARENT, Color.BLACK)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	424 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	425
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	426 private fun createOrientationStrategy(): OrientationStrategy {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	427 return when (orientation) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	428 Orientation.VERTICAL -> VerticalStrategy()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	429 Orientation.HORIZONTAL -> HorizontalStrategy()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	430 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	431 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	432
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	433 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	434 updateGradientColors(start, end)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	435 calculateArgb()
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	438 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	439 gradientColors[0] = start
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	440 gradientColors[1] = end
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	441 gradientDrawable.colors = gradientColors
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	442 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	443
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	444 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	445 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	446 setMeasuredDimension(dimens.width(), dimens.height())
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	449 override fun onDraw(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	450 drawGradientRect(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	451 drawThumb(canvas)
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	454 private fun drawGradientRect(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	455 gradientDrawable.orientation = orientationStrategy.gradientOrientation
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	456 gradientDrawable.bounds = orientationStrategy.getGradientBounds(this)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	457 gradientDrawable.cornerRadius = cornersRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	458 gradientDrawable.draw(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	459 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	460
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	461 private fun drawThumb(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	462 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	463 thumbDrawable.indicatorColor = argb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	464 thumbDrawable.setCoordinates(coordinates.x, coordinates.y)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	465 thumbDrawable.draw(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	466 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	467
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	468 override fun onTouchEvent(event: MotionEvent): Boolean {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	469 when (event.actionMasked) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	470 MotionEvent.ACTION_DOWN -> onActionDown(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	471 MotionEvent.ACTION_MOVE -> calculateOffsetOnMotionEvent(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	472 MotionEvent.ACTION_UP -> {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	473 calculateOffsetOnMotionEvent(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	474 if (isTap(event, downX, downY)) performClick()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	475 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	476 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	477
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	478 return true
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 private fun onActionDown(event: MotionEvent) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	482 parent.requestDisallowInterceptTouchEvent(interceptTouchEvent)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	483 calculateOffsetOnMotionEvent(event)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	484 downX = event.x
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	485 downY = event.y
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	486 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	487
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	488 override fun performClick() = super.performClick()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	489
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	490 private fun calculateOffsetOnMotionEvent(event: MotionEvent) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	491 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	492 }
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 calculateArgb() {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	495 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	496 fireListener()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	497 invalidate()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	498 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	499
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	500 private fun fireListener() {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	501 colorChangeListener?.invoke(offset, argb)
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 override fun onSaveInstanceState(): Parcelable {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	505 val superState = super.onSaveInstanceState()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	506 val thumbState = thumbDrawable.saveState()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	507 return GradientSeekBarState(superState, this, thumbState)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	508 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	509
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	510 override fun onRestoreInstanceState(state: Parcelable) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	511 if (state is GradientSeekBarState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	512 super.onRestoreInstanceState(state.superState)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	513 readGradientSeekBarState(state)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	514 } else {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	515 super.onRestoreInstanceState(state)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	516 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	517 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	518
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	519 private fun readGradientSeekBarState(state: GradientSeekBarState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	520 updateGradientColors(state.startColor, state.endColor)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	521 offset = state.offset
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	522 barSize = state.barSize
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	523 cornersRadius = state.cornerRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	524 orientation = Orientation.values()[state.orientation]
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	525 interceptTouchEvent = state.interceptTouchEvent
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	526 thumbDrawable.restoreState(state.thumbState)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	527 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	528
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	529 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	530
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	531 enum class Orientation { VERTICAL, HORIZONTAL }
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	534 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	535
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	536 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	537 if (respectAlpha) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	538 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	539 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	540 this.setColors(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	541 setAlpha(color, 0),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	542 setAlpha(color, MAX_ALPHA)
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 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	545
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	546 inline fun GradientSeekBar.setAlphaChangeListener(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	547 crossinline listener: (Float, Int, Int) -> Unit
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 this.colorChangeListener = { offset, color ->
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	550 listener(offset, color, this.currentColorAlpha)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	551 }
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	554 fun GradientSeekBar.setBlackToColor(color: Int) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	555 this.setColors(Color.BLACK, color)
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 internal class GradientSeekBarState : View.BaseSavedState {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	559
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	560 val startColor: Int
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	561 val endColor: Int
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	562 val offset: Float
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	563 val barSize: Int
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	564 val cornerRadius: Float
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	565 val orientation: Int
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	566 val interceptTouchEvent: Boolean
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	567 val thumbState: ThumbDrawableState
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	568
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	569 constructor(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	570 superState: Parcelable?,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	571 view: GradientSeekBar,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	572 thumbState: ThumbDrawableState
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	573 ) : super(superState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	574 startColor = view.startColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	575 endColor = view.endColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	576 offset = view.offset
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	577 barSize = view.barSize
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	578 cornerRadius = view.cornersRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	579 orientation = view.orientation.ordinal
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	580 interceptTouchEvent = view.interceptTouchEvent
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	581 this.thumbState = thumbState
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	582 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	583
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	584 constructor(source: Parcel) : super(source) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	585 startColor = source.readInt()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	586 endColor = source.readInt()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	587 offset = source.readFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	588 barSize = source.readInt()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	589 cornerRadius = source.readFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	590 orientation = source.readInt()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	591 interceptTouchEvent = source.readBooleanCompat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	592 thumbState = source.readThumbState()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	593 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	594
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	595 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	596 super.writeToParcel(out, flags)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	597 out.writeInt(startColor)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	598 out.writeInt(endColor)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	599 out.writeFloat(offset)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	600 out.writeInt(barSize)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	601 out.writeFloat(cornerRadius)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	602 out.writeInt(orientation)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	603 out.writeBooleanCompat(interceptTouchEvent)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	604 out.writeThumbState(thumbState, flags)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	605 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	606
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	607 companion object CREATOR : Parcelable.Creator<GradientSeekBarState> {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	608
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	609 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	610
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	611 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	612 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	613 }
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 internal class HorizontalStrategy : OrientationStrategy {
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 private val rect = Rect()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	618 private val point = PointF()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	619
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	620 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	621
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	622 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	623 val widthSize = View.MeasureSpec.getSize(widthSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	624 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	625 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	626 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	627 val finalWidth = View.resolveSize(preferredWidth, widthSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	628 val finalHeight = View.resolveSize(preferredHeight, heightSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	629 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	630 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	631
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	632 override fun getGradientBounds(view: GradientSeekBar): Rect {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	633 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	634 val left = view.paddingLeft + view.thumbRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	635 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	636 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	637 val bottom = top + view.barSize
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	638 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	639 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	640
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	641 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	642 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	643 val y = view.height / 2f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	644 return point.apply { set(x, y) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	645 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	646
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	647 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	648 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	649 val relativeX = (checkedX - gradient.left).toFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	650 return relativeX / gradient.width()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	651 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	652 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	653
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	654 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	655 val config = ViewConfiguration.get(context)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	656 val duration = lastEvent.eventTime - lastEvent.downTime
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	657 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	658 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	659 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	660
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	661 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	662
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	663 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	664
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	665 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	666
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	667 internal fun <T> ensureWithinRange(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	668 value: T,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	669 start: T,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	670 end: T
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	671 ): 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	672
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	673 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	674 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	675
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	676 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	677
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	678 private val hsv = floatArrayOf(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	679 ensureHue(hue),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	680 ensureSaturation(saturation),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	681 ensureValue(value)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	682 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	683
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	684 var hue
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	685 get() = hsv[0]
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	686 set(hue) { hsv[0] = ensureHue(hue) }
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 saturation
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	689 get() = hsv[1]
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	690 set(saturation) { hsv[1] = ensureSaturation(saturation) }
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 value
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	693 get() = hsv[2]
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	694 set(value) { hsv[2] = ensureValue(value) }
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 rgb
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	697 get() = Color.HSVToColor(hsv)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	698 set(rgb) { Color.colorToHSV(rgb, hsv) }
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 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	701 hsv[0] = ensureHue(hue)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	702 hsv[1] = ensureSaturation(saturation)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	703 hsv[2] = ensureValue(value)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	704 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	705
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	706 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	707
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	708 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	709
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	710 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	711 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	712
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	713 internal interface OrientationStrategy {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	714
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	715 val gradientOrientation: GradientDrawable.Orientation
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 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	718
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	719 fun getGradientBounds(view: GradientSeekBar): Rect
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 getThumbPosition(view: GradientSeekBar, gradient: Rect): PointF
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 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	724 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	725
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	726 internal class ThumbDrawableState private constructor(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	727 val radius: Int,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	728 val thumbColor: Int,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	729 val strokeColor: Int,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	730 val colorCircleScale: Float
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	731 ) : Parcelable {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	732
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	733 constructor(thumbDrawable: ThumbDrawable) : this(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	734 thumbDrawable.radius,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	735 thumbDrawable.thumbColor,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	736 thumbDrawable.strokeColor,
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	737 thumbDrawable.colorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	738 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	739
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	740 constructor(parcel: Parcel) : this(
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	741 parcel.readInt(),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	742 parcel.readInt(),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	743 parcel.readInt(),
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	744 parcel.readFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	745 )
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	746
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	747 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	748 parcel.writeInt(radius)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	749 parcel.writeInt(thumbColor)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	750 parcel.writeInt(strokeColor)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	751 parcel.writeFloat(colorCircleScale)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	752 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	753
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	754 override fun describeContents() = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	755
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	756 companion object {
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 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	759
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	760 @JvmField
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	761 val CREATOR = object : Parcelable.Creator<ThumbDrawableState> {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	762
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	763 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	764
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	765 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	766 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	767 }
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	770 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	771 this.writeParcelable(state, flags)
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.readThumbState(): ThumbDrawableState {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	775 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	776 ?: ThumbDrawableState.EMPTY_STATE
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	779 internal class ThumbDrawable {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	780
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	781 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	782 private var x = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	783 private var y = 0f
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 var indicatorColor = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	786 var strokeColor = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	787 var thumbColor = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	788 var radius = 0
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	789
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	790 var colorCircleScale = 0f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	791 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	792
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	793 fun setCoordinates(x: Float, y: Float) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	794 this.x = x
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	795 this.y = y
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	798 fun draw(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	799 drawThumb(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	800 drawStroke(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	801 drawColorIndicator(canvas)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	802 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	803
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	804 private fun drawThumb(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	805 paint.color = thumbColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	806 paint.style = Paint.Style.FILL
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	807 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	808 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	809
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	810 private fun drawStroke(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	811 val strokeCircleRadius = radius - paint.strokeWidth / 2f
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 paint.color = strokeColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	814 paint.style = Paint.Style.STROKE
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	815 canvas.drawCircle(x, y, strokeCircleRadius, paint)
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	818 private fun drawColorIndicator(canvas: Canvas) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	819 val colorIndicatorCircleRadius = radius * colorCircleScale
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 paint.color = indicatorColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	822 paint.style = Paint.Style.FILL
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	823 canvas.drawCircle(x, y, colorIndicatorCircleRadius, paint)
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
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	826 fun restoreState(state: ThumbDrawableState) {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	827 radius = state.radius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	828 thumbColor = state.thumbColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	829 strokeColor = state.strokeColor
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	830 colorCircleScale = state.colorCircleScale
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	831 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	832
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	833 fun saveState() = ThumbDrawableState(this)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	834 }
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 internal class VerticalStrategy : OrientationStrategy {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	837
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	838 private val rect = Rect()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	839 private val point = PointF()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	840
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	841 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	842
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	843 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	844 val heightSize = View.MeasureSpec.getSize(heightSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	845 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	846 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	847 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	848 val finalWidth = View.resolveSize(preferredWidth, widthSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	849 val finalHeight = View.resolveSize(preferredHeight, heightSpec)
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	850 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	851 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	852
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	853 override fun getGradientBounds(view: GradientSeekBar): Rect {
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	854 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	855 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	856 val right = left + view.barSize
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	857 val top = view.paddingTop + view.thumbRadius
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	858 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	859 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	860 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	861
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	862 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	863 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	864 val x = view.width / 2f
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	865 return point.apply { set(x, y) }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	866 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	867
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	868 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	869 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	870 val relativeY = (checkedY - gradient.top).toFloat()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	871 return 1f - relativeY / gradient.height()
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	872 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	873 }
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	874
6594bb323ab5 Android: Import Colow Wheel by Anton Popov. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2709 diff changeset	875 // 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	876 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	877 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	878 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	879 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	880 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	881 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	882 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	883 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	884 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	885 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	886 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	887 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	888 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	889 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	890 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	891 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	892 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	893 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	894 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	895 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	896 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	897 }
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	898
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	899 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	900
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	901 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	902 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	903 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	904 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	905 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	906 var recyclerView: RecyclerView? = null
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	907
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	908 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	909 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	910
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	911 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	912 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	913 return position
4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	914 }
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	915 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	916 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	917 }
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	918 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	919 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	920 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	921
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	922 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	923 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	924
2505 a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	925 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	926 //Implement shouldOverrideUrlLoading//
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	927 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	928 // 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	929 // 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	930 return false
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	931 }
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	932 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	933 // 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	934 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	935 }
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	936
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	937 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	938 // 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	939 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	940 }
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	941
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	942 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	943 }
a149dabf6a1f Android: HTML touchups, implement DW_SIGNAL_HTML_CHANGED: STARTED and COMPLETE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2503 diff changeset	944
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	945 class DWSlider
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	946 @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	947 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	948
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	949 init {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	950 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	951 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	952 addView(slider)
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	953 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	954
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	955 @Synchronized
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	956 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	957 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	958 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	959 // 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	960 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	961 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	962 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	963 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	964 // 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	965 // 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	966 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	967 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	968 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	969 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	970
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	971 class DWSpinButton(context: Context) : AppCompatEditText(context), OnTouchListener {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	972 var value: Long = 0
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	973 var minimum: Long = 0
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	974 var maximum: Long = 65535
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	975
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	976 init {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	977 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	978 setOnTouchListener(this)
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
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	981 override fun onTouch(v: View, event: MotionEvent): Boolean {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	982 val DRAWABLE_RIGHT = 2
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	983 val DRAWABLE_LEFT = 0
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 if (event.action == MotionEvent.ACTION_UP) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	986 if (event.x >= v.width - (v as EditText)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	987 .compoundDrawables[DRAWABLE_RIGHT].bounds.width()
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	988 ) {
2527 eec926265888 Android: Use toLongOrNull() whenever converting from string to long... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2526 diff changeset	989 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	990
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	991 if(newvalue != null) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	992 value = newvalue + 1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	993 } else {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	994 value += 1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	995 }
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	996 if(value > maximum) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	997 value = maximum
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	998 }
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	999 if(value < minimum) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1000 value = minimum
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1001 }
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1002 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	1003 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	1004 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	1005 } 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	1006 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	1007
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1008 if(newvalue != null) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1009 value = newvalue - 1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1010 } else {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1011 value -= 1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1012 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1013 if(value > maximum) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1014 value = maximum
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	1015 }
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1016 if(value < minimum) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1017 value = minimum
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1018 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1019 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	1020 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	1021 return true
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 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1024 return false
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1025 }
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 external fun eventHandlerInt(
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1028 message: Int,
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1029 inta: Int,
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1030 intb: Int,
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1031 intc: Int,
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1032 intd: Int
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1033 )
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1034 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1035
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1036 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	1037 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	1038 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	1039 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	1040
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1041 init {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1042 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	1043 setOnTouchListener(this)
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1044 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	1045 lpw!!.setAdapter(
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1046 ArrayAdapter(
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1047 context,
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1048 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	1049 )
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1050 )
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1051 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	1052 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	1053 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	1054 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1055
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1056 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	1057 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	1058 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	1059 setText(item)
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1060 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	1061 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	1062 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1063
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1064 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	1065 val DRAWABLE_RIGHT = 2
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	1066
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1067 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	1068 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	1069 .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	1070 ) {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1071 lpw!!.show()
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1072 return true
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1073 }
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 return false
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1076 }
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1077
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1078 external fun eventHandlerInt(
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1079 message: Int,
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1080 inta: Int,
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1081 intb: Int,
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1082 intc: Int,
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1083 intd: Int
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	1084 )
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1085 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	1086
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1087 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	1088 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	1089 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	1090 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	1091 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	1092
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1093 init {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1094 setAdapter(
2677 c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1095 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	1096 context,
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1097 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	1098 ) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1099 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	1100 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	1101 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	1102 if (colorFore != null) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1103 textview.setTextColor(colorFore!!)
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1104 }
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1105 if (colorBack != null) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1106 textview.setBackgroundColor(colorBack!!)
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1107 }
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1108 return thisview
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1109 }
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1110 }
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1111 )
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	1112 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	1113 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1114
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1115 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	1116 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	1117 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	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
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1120 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	1121 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	1122 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	1123 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	1124 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	1125 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	1126 )
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1127 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	1128
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1129 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	1130 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	1131 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	1132 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	1133 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	1134 var evy: Float = 0f
2611 ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	1135 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	1136
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1137 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	1138 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	1139 // 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	1140 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	1141 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1142
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1143 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	1144 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	1145 cachedCanvas = canvas
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1146 // 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	1147 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	1148 cachedCanvas = null
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1149 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1150
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1151 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	1152 message: Int,
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1153 inta: Int,
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1154 intb: Int,
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1155 intc: Int,
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1156 intd: Int
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1157 )
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1158 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	1159
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1160 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	1161 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	1162 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	1163 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	1164
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1165 // 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	1166 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	1167 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	1168 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	1169 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1170
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1171 // 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	1172 interface FileSelectedListener {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1173 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	1174 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1175
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1176 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	1177 this.fileListener = fileListener
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1178 return this
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
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1181 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	1182 fun showDialog() {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1183 dialog.show()
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
2527 eec926265888 Android: Use toLongOrNull() whenever converting from string to long... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2526 diff changeset	1186 /*
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1187 * 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	1188 */
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1189 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	1190 currentPath = path
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1191 if (path != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1192 if (path.exists()) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1193 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	1194 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	1195 if (!file.isDirectory) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1196 if (!file.canRead()) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1197 false
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1198 } 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	1199 true
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1200 } else {
2708 3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	1201 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	1202 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1203 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1204 false
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1205 }
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
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1208 // 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	1209 var i = 0
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1210 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	1211 var filecount = 0
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1212 var dircount = 0
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1213 if(files != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1214 filecount = files.size
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1215 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1216 if(dirs != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1217 dircount = dirs.size
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1218 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1219 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	1220 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	1221 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1222 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	1223 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	1224 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1225 if(dirs != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1226 Arrays.sort(dirs)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1227 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	1228 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	1229 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1230 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1231 if(files != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1232 Arrays.sort(files)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1233 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	1234 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	1235 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1236 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1237
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1238 // 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	1239 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	1240 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	1241 activity,
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1242 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	1243 ) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1244 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	1245 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	1246 (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	1247 return thisview
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1248 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1249 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1250 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1251 }
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 * 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	1256 */
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1257 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	1258 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	1259 currentPath!!.parentFile
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1260 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1261 File(currentPath, fileChosen)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1262 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1263 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1264
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1265 companion object {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1266 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	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 init {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1270 list.onItemClickListener =
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1271 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	1272 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	1273 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	1274 if (chosenFile != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1275 if (chosenFile.isDirectory) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1276 refresh(chosenFile)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1277 } else {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1278 if (fileListener != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1279 fileListener!!.fileSelected(chosenFile)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1280 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1281 dialog.dismiss()
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1282 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1283 }
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.setContentView(list)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1286 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	1287 refresh(Environment.getExternalStorageDirectory())
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 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	1290
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1291 // 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	1292 // 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	1293 // 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	1294 class DWMenuItem
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1295 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1296 var title: String? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1297 var menu: DWMenu? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1298 var submenu: DWMenu? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1299 var checked: Boolean = false
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1300 var check: Boolean = false
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	1301 var enabled: Boolean = true
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1302 var menuitem: MenuItem? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1303 var submenuitem: SubMenu? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1304 var id: Int = 0
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1305 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1306
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1307 class DWMenu {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1308 var menu: Menu? = null
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1309 var children = mutableListOf<DWMenuItem>()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1310 var id: Int = 0
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1311
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1312 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	1313 var refresh = recreate
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1314
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1315 if(newmenu != null) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1316 if(newmenu != menu) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1317 menu = newmenu
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1318 refresh = true
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1319 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1320 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1321 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	1322 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	1323
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1324 if(refresh) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1325 menu!!.clear()
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1326 }
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1327
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	1328 // 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	1329 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	1330
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1331 for (menuitem in children) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1332 // 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	1333 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	1334 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	1335 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	1336 }
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1337 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	1338 } 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	1339 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	1340 group += 1
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1341 } 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	1342 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	1343 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	1344 menuitem.menuitem!!.isChecked = menuitem.checked
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	1345 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	1346 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	1347 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	1348 true
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	1349 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1350 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1351 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1352 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1353 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1354 }
2544 dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	1355
dbfcc0e357d6 Android: Clean up the menus... add separator, remove tildes and implement callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2543 diff changeset	1356 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	1357 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1358
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1359 // Class for storing container data
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1360 class DWContainerModel {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1361 var columns = mutableListOf<String?>()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1362 var types = mutableListOf<Int>()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1363 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	1364 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	1365 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	1366 var querypos: Int = -1
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1367
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1368 fun numberOfColumns(): Int
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1369 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1370 return columns.size
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
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1373 fun numberOfRows(): Int
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1374 {
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	1375 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	1376 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	1377 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	1378 return 0
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1379 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1380
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1381 fun getColumnType(column: Int): Int
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1382 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1383 if(column < types.size) {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1384 return types[column]
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1385 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1386 return -1
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1387 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1388
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1389 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	1390 {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1391 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	1392
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1393 if(index > -1 && index < data.size) {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1394 return data[index]
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1395 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1396 return null
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1397 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1398
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1399 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	1400 {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1401 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	1402
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1403 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	1404 // 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	1405 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	1406 (((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	1407 (((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	1408 data[index] = obj
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1409 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1410 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1411 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1412
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1413 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	1414 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1415 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	1416 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	1417 }
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
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1420 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	1421 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1422 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	1423 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	1424 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1425 return 0
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1426 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1427
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1428 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	1429 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1430 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	1431 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	1432 }
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
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1435 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	1436 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1437 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	1438 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	1439 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1440 return null
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1441 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1442
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1443 fun addColumn(title: String?, type: Int)
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1444 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1445 columns.add(title)
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1446 types.add(type)
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1447 // 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	1448 data.clear()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1449 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1450
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1451 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	1452 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1453 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	1454 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	1455 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	1456 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	1457 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1458 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	1459 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	1460 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1461 } else {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1462 data.clear()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1463 rowdata.clear()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1464 rowtitle.clear()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1465 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1466 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1467
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1468 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	1469 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1470 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	1471 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	1472 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	1473 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	1474 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1475 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	1476 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	1477 }
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 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1480
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1481 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	1482 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1483 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	1484 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	1485 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	1486 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	1487 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1488 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	1489 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	1490 }
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 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1493
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	1494 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	1495 {
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	1496 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	1497 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	1498 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	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 }
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 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	1502 }
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 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	1505 {
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 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	1507 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	1508 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	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 }
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 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	1512 }
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
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	1514 fun addRows(count: Int): Long
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1515 {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	1516 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	1517
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1518 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	1519 {
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1520 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	1521 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1522 // 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	1523 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	1524 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1525 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	1526 rowtitle.add(null)
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1527 }
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	1528 return startRow
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1529 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1530
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1531 fun clear()
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1532 {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1533 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	1534 rowdata.clear()
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	1535 rowtitle.clear()
2555 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 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1538
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1539 class DWContainerAdapter(c: Context) : BaseAdapter()
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 private var context = c
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1542 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	1543 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	1544 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	1545 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	1546 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	1547 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	1548 var backColor: Int? = null
2613 72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	1549 var lastClick: Long = 0
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	1550 var lastClickRow: Int = -1
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1551
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1552 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	1553 return model.numberOfRows()
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1554 }
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 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	1557 return model.getRowAndColumn(position, 0)
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 getItemId(position: Int): Long {
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1561 return position.toLong()
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 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	1565 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	1566 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	1567
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1568 // 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	1569 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	1570 // 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	1571 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	1572 (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	1573 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	1574 } else {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1575 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	1576 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1577 }
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	1578
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	1579 // 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	1580 if(rowView == null) {
2568 b536b7b21682 Android: Switch to using LinearLayout for Container row layout... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2567 diff changeset	1581 rowView = LinearLayout(context)
b536b7b21682 Android: Switch to using LinearLayout for Container row layout... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2567 diff changeset	1582 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	1583
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1584 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	1585 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	1586
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1587 // Image
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1588 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	1589 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	1590 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	1591 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	1592 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	1593 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	1594 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	1595 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	1596 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	1597 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1598 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	1599 } else {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1600 // 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	1601 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	1602 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	1603 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	1604 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	1605 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	1606 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	1607 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	1608 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	1609 } 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	1610 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	1611 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1612 rowView.addView(textview)
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	1613 }
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1614 }
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	1615 // 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	1616 } else {
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	1617 // 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	1618
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1619 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	1620 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	1621
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1622 // Image
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1623 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	1624 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	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 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	1627 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	1628 }
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1629 } else {
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1630 // Text
5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1631 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	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 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	1634 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	1635 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	1636 } 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	1637 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	1638 }
2677 c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1639 if(foreColor != null) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1640 textview.setTextColor(foreColor!!)
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	1641 }
2565 5463801a888f Android: Attempt to rewrite container layout code in a more generic manner. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2564 diff changeset	1642 }
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	1643 }
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1644 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1645 }
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	1646 // 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	1647 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	1648 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	1649 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	1650 } 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	1651 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	1652 }
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 } 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	1654 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	1655 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	1656 } 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	1657 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	1658 }
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 }
2555 d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1660 return rowView
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1661 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1662 }
d7d163d70763 Android: Initial implementations of DWContainerModel and DWContainerAdapter. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2554 diff changeset	1663
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	1664 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	1665 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	1666 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	1667 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	1668 } else {
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1669 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	1670 }
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1671 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	1672 }
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1673 }
9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	1674
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1675 class DWindows : AppCompatActivity() {
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1676 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	1677 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	1678 var threadCond = threadLock.newCondition()
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	1679 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	1680 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	1681 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	1682 private var appID: String? = null
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	1683 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	1684 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	1685 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	1686 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	1687 private var fileCond = fileLock.newCondition()
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1688 // 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	1689 private var windowTitles = mutableListOf<String?>()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1690 private var windowMenuBars = mutableListOf<DWMenu?>()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1691 private var windowStyles = mutableListOf<Int>()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1692 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	1693
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1694 // 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	1695 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	1696 {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1697 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	1698 runnable.run()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1699 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1700 threadLock.lock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1701 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	1702 threadLock.lock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1703 runnable.run()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1704 threadCond.signal()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1705 threadLock.unlock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1706 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1707 runOnUiThread(ourRunnable)
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1708 threadCond.await()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1709 threadLock.unlock()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1710 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	1711 }
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1712
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1713 // 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	1714 // 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	1715 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	1716 val length = filename.length
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1717
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1718 for (ext in DWImageExts) {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1719 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	1720 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	1721 try {
3a14d7fd4b99 Android: Catch NumberFormatException in isDWResource(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2658 diff changeset	1722 if (filebody.toInt() > 0) {
3a14d7fd4b99 Android: Catch NumberFormatException in isDWResource(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2658 diff changeset	1723 return true
3a14d7fd4b99 Android: Catch NumberFormatException in isDWResource(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2658 diff changeset	1724 }
3a14d7fd4b99 Android: Catch NumberFormatException in isDWResource(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2658 diff changeset	1725 } catch(e: NumberFormatException) {
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1726 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1727 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1728 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1729 return false
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1730 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1731
2659 3a14d7fd4b99 Android: Catch NumberFormatException in isDWResource(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2658 diff changeset	1732 // 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	1733 private fun extractAssets() {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1734 var zipFile: ZipFile? = null
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1735 val targetDir = cacheDir
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1736
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1737 try {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1738 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	1739 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	1740 while (e.hasMoreElements()) {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1741 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	1742 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	1743 isDWResource(entry.name)) {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1744 continue
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1745 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1746 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	1747 targetFile.parentFile!!.mkdirs()
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1748 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	1749 var ais: BufferedInputStream? = null
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1750 var aos: FileOutputStream? = null
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1751 try {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1752 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	1753 aos = FileOutputStream(targetFile)
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1754 ais.read(tempBuffer)
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1755 aos.write(tempBuffer)
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1756 } catch (e: IOException) {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1757 } finally {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1758 ais?.close()
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1759 aos?.close()
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1760 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1761 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1762 } catch (e: IOException) {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1763 } finally {
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1764 zipFile?.close()
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1765 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1766 }
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1767
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	1768 // 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	1769 // 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	1770 // 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	1771 // 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	1772 // 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	1773 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	1774 super.onCreate(savedInstanceState)
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1775
2480 878d36588aaa Android: Enable app rotation and fix some issues with layout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2479 diff changeset	1776 // Turn on rotation
878d36588aaa Android: Enable app rotation and fix some issues with layout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2479 diff changeset	1777 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	1778
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	1779 // 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	1780 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	1781 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	1782 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	1783 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	1784 val c = cacheDir.path
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1785
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1786 // 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	1787 // 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	1788 // other Dynamic Windows platforms
ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	1789 extractAssets()
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	1790
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1791 // 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	1792 windowLayout = ViewPager2(this)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1793 windowLayout!!.id = View.generateViewId()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1794 windowLayout!!.adapter = DWTabViewPagerAdapter()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1795 windowLayout!!.isUserInputEnabled = false
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1796 windowLayout!!.layoutParams =
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1797 ViewGroup.LayoutParams(
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1798 ViewGroup.LayoutParams.MATCH_PARENT,
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1799 ViewGroup.LayoutParams.MATCH_PARENT
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1800 )
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	1801
2498 4ae2b3b77f25 Android: Get the notebook control functional. Disable recylcing of the views. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2497 diff changeset	1802 // 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	1803 // 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	1804 dwindowsInit(s, c, this.getPackageName())
2496 3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	1805 }
3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	1806
3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	1807 override fun onConfigurationChanged(newConfig: Configuration) {
3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	1808 super.onConfigurationChanged(newConfig)
3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	1809
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1810 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	1811 when (currentNightMode) {
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1812 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	1813 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	1814 }
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1815
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	1816 // 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	1817 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	1818 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	1819 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	1820 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	1821 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	1822 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	1823
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1824 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	1825 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	1826
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1827 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	1828 }
2496 3bf2f08fdc45 Android: Remove ugly workaround for initialization issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2495 diff changeset	1829 }
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1830 }
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	1831
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1832 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	1833 if(windowLayout != null) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1834 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	1835 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	1836
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1837 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	1838 var menuBar = windowMenuBars[index]
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1839
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1840 if(menuBar == null) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1841 menuBar = DWMenu()
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1842 windowMenuBars[index] = menuBar
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1843 }
2707 a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	1844 menuBar.menu = menu
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1845 return super.onCreateOptionsMenu(menu)
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1846 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1847 }
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1848 return false
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1849 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1850
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1851 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	1852 if(windowLayout != null) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1853 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	1854 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	1855
17c34bdaec6c Android: Put in some list bounds safety checks... them getting hit however... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2684 diff changeset	1856 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	1857 var menuBar = windowMenuBars[index]
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1858
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1859 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	1860 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	1861 } else {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1862 menuBar = DWMenu()
2707 a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	1863 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	1864 windowMenuBars[index] = menuBar
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 return super.onPrepareOptionsMenu(menu)
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1867 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1868 }
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1869 return false
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1870 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1871
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	1872 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	1873 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	1874 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	1875 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	1876 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	1877
2670 e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	1878 // 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	1879 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	1880 // 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	1881 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	1882 }
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	1883 }
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 }
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	1885
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	1886 // 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	1887 // 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	1888
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1889 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	1890 {
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1891 return darkMode
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1892 }
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	1893
2694 cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1894 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	1895 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	1896
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1897 waitOnUiThread {
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1898 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	1899 try {
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1900 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	1901 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	1902 } 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	1903 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	1904 }
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1905 }
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1906 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	1907 }
cee79add3669 Andrdoid: Implement dw_browse() to load a URL in a new Activity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2692 diff changeset	1908
2607 3b9bbd69bb9c Android: Implement dw_menu_popup() ... still need to implement the context events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2596 diff changeset	1909 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	1910 {
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	1911 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	1912
dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	1913 // 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	1914 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	1915 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	1916 }
dbcd9416e9c9 Android: Popup menus on Andoird use an anchor View not the touch location. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2613 diff changeset	1917
2607 3b9bbd69bb9c Android: Implement dw_menu_popup() ... still need to implement the context events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2596 diff changeset	1918 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	1919 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	1920
2666 4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1921 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	1922 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	1923 }
3b9bbd69bb9c Android: Implement dw_menu_popup() ... still need to implement the context events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2596 diff changeset	1924 }
3b9bbd69bb9c Android: Implement dw_menu_popup() ... still need to implement the context events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2596 diff changeset	1925
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1926 fun menuBarNew(location: View): DWMenu?
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 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 var menuBar: DWMenu? = null
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1929
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1930 if(windowLayout != null) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1931 waitOnUiThread {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1932 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	1933 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	1934
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1935 if (index != -1) {
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1936 menuBar = DWMenu()
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1937 windowMenuBars[index] = menuBar
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1938 }
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1939 }
4f2d433747e2 Android: Rewrite the menubar code for multi-window support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2665 diff changeset	1940 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1941 return menuBar
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1942 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1943
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1944 fun menuNew(cid: Int): DWMenu
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1945 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1946 val menu = DWMenu()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1947 menu.id = cid
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1948 return menu
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 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	1952 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1953 val menuitem = DWMenuItem()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1954 menuitem.id = cid
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1955 menuitem.title = title
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1956 menuitem.check = check != 0
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1957 if(submenu != null) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1958 menuitem.submenu = submenu
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1959 }
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	1960 if((flags and (1 shl 1)) != 0) {
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	1961 menuitem.enabled = false
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	1962 }
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1963 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	1964 menuitem.checked = true
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1965 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1966 if(end == 0) {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1967 menu.children.add(0, menuitem)
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1968 } else {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1969 menu.children.add(menuitem)
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1970 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	1971 return menuitem
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
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	1974 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	1975 {
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	1976 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	1977 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	1978 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	1979 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	1980 }
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 }
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 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	1984 {
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 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	1986 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	1987 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	1988 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	1989 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	1990 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	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 }
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 }
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 }
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
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 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	1997 {
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 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	1999 if(menuitem.id == cid) {
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2000 // Handle DW_MIS_ENABLED/DISABLED
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2001 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	2002 var enabled = false
2546 897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2003
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2004 // Handle DW_MIS_ENABLED
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2005 if ((state and 1) != 0) {
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2006 enabled = true
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2007 }
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2008 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	2009 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	2010 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	2011 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	2012 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	2013 }
2546 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 }
897d94c20365 Android: Implement disabled menu items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2545 diff changeset	2016
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	2017 // 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	2018 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	2019 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	2020
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	2021 // 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	2022 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	2023 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	2024 }
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 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	2026 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	2027 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	2028 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	2029 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	2030 }
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	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 }
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	2033 }
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	2034 }
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	2035 }
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	2036
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2037 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	2038 var window: LinearLayout? = null
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2039
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2040 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	2041 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2042 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	2043 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	2044
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2045 setContentView(windowLayout)
2665 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 window = LinearLayout(this)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2048 window!!.visibility = View.GONE
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2049 window!!.tag = dataArrayMap
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2050 window!!.layoutParams =
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2051 LinearLayout.LayoutParams(
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2052 LinearLayout.LayoutParams.MATCH_PARENT,
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2053 LinearLayout.LayoutParams.MATCH_PARENT
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2054 )
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2055
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2056 // Update our window list
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2057 adapter.viewList.add(window!!)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2058 windowTitles.add(title)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2059 windowMenuBars.add(null)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2060 windowStyles.add(style)
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2061 windowDefault.add(null)
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 // 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	2064 // We can set stuff immediately
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2065 if (adapter.viewList.count() == 1) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2066 this.title = title
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2067 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	2068 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	2069 supportActionBar?.hide()
e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2070 }
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2071 }
2691 e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	2072 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	2073 }
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2074 }
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2075 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	2076 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2077
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	2078 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	2079 {
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	2080 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	2081 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	2082 }
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	2083 }
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	2084
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 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	2086 {
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2087 if(windowLayout != null) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2088 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	2089 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	2090
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2091 if (index != -1) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2092 windowDefault[index] = default
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2093 }
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2094 }
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	2095 }
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	2096
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2097 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	2098 {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2099 waitOnUiThread {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2100 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	2101 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	2102
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2103 if (ourmask != 0) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2104 // 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	2105 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	2106
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2107 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	2108 }
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 }
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2111 }
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2112
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2113 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	2114 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	2115 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2116
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2117 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	2118 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	2119 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	2120
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2121 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	2122 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	2123 } else {
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2124 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	2125 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2126 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2127 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2128
2686 95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2129 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	2130 {
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2131 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	2132
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2133 waitOnUiThread {
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2134 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	2135 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	2136 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	2137 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	2138 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	2139 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	2140
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2141 // 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	2142 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	2143 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	2144 }
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2145 }
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2146 }
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2147 return retval
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2148 }
95f61d3f3d0d Android: Initial attempt at implmenting dw_window_get_preferred_size(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2685 diff changeset	2149
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2150 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	2151 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	2152
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2153 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	2154 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	2155
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	2156 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	2157 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	2158 }
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2159 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2160 return retval
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2161 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	2162
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2163 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	2164 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2165 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	2166 }
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	2167 }
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2168
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2169 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	2170 {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2171 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	2172 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	2173 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	2174 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	2175 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	2176 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	2177
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2178 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	2179 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	2180 } 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	2181 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	2182 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2183
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2184 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	2185 if (bold && italic) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2186 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	2187 } else if (bold) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2188 style = Typeface.BOLD
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2189 } else if (italic) {
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2190 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	2191 }
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2192 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	2193
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2194 return typeface
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2195 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2196 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	2197 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2198
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2199 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	2200 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	2201 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	2202
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2203 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	2204 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	2205 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2206
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2207 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	2208 waitOnUiThread {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2209 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	2210 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	2211 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	2212 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	2213 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	2214 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2215 } 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	2216 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	2217 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	2218 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	2219 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	2220 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2221 } 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	2222 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	2223 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	2224 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	2225 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	2226 }
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 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2229 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2230 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2231
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	2232 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	2233 {
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	2234 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	2235
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	2236 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	2237 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	2238 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	2239
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 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	2241 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	2242 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	2243 } 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	2244 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	2245 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	2246 } 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	2247 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	2248 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	2249 }
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
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 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	2252 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	2253 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	2254
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 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	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 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	2259 }
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
2551 127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2261 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	2262 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	2263 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	2264 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	2265
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2266 // 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	2267 // 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	2268 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	2269 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	2270 }
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2271
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2272 waitOnUiThread {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2273 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	2274 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	2275
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2276 // 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	2277 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	2278 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	2279 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	2280 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	2281 }
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2282 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	2283 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	2284 } 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	2285 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	2286
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2287 // 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	2288 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	2289 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	2290 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	2291 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	2292 }
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2293 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	2294 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	2295 } 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	2296 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	2297
127779860ac1 Android: Implement DW_CLR_DEFAULT and some basic dark mode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2550 diff changeset	2298 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	2299 } 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	2300 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	2301
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2302 // 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	2303 if(fore == 16) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2304 val value = TypedValue()
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2305 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	2306 colorfore = value.data
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2307 }
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 listbox.colorFore = colorfore
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2310 listbox.colorBack = colorback
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2311
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2312 listbox.setBackgroundColor(colorback)
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2313 } 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	2314 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	2315 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	2316
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2317 // 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	2318 if(fore == 16) {
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2319 val value = TypedValue()
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2320 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	2321 colorfore = value.data
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2322 }
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 adapter.foreColor = colorfore
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2325 adapter.backColor = colorback
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2326
c90b2d7057c8 Android: Implement dw_window_set_color() on Containers and Listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2676 diff changeset	2327 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	2328 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2329 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2330 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	2331
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2332 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	2333 if(windowLayout != null) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2334 waitOnUiThread {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2335 if (window is TextView) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2336 val textview: TextView = window
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2337 textview.text = text
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2338 } else if (window is Button) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2339 val button: Button = window
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2340 button.text = text
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2341 } else if (window is LinearLayout) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2342 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	2343 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	2344
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2345 if(index != -1) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2346 windowTitles[index] = text
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2347 if(index == windowLayout!!.currentItem) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2348 this.title = text
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2349 }
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2350 }
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2351 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2352 }
2489 6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2353 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2354 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2355
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2356 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	2357 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	2358
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2359 if(windowLayout != null) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2360 waitOnUiThread {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2361 if (window is TextView) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2362 val textview: TextView = window
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2363 text = textview.text.toString()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2364 } else if (window is Button) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2365 val button: Button = window
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2366 text = button.text.toString()
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2367 } else if (window is LinearLayout) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2368 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	2369 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	2370
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2371 if(index != -1) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2372 text = windowTitles[index]
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2373 }
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2374 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2375 }
2489 6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2376 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2377 return text
2489 6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2378 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2379
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	2380 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	2381 {
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2382 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	2383
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2384 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	2385 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	2386
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 // 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	2388 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	2389 // 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	2390 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	2391 // 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	2392 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	2393 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	2394 }
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 // 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	2396 // So using RecyclerView.scrollToPosition() also
2ad924c6493d Android: Still need to call setCurrentItem() on ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2668 diff changeset	2397 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	2398
2670 e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2399 // 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	2400 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	2401 supportActionBar?.show()
e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2402 } else {
e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2403 supportActionBar?.hide()
e3a95940c18f Android: Implement DW_FCF_CLOSEBUTTON and DW_FCF_TITLEBAR flags. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2669 diff changeset	2404 }
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 // 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	2406 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	2407 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	2408 }
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	2409 // 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	2410 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	2411 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	2412 } 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	2413 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	2414 }
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	2415 // 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	2416 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	2417 }
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2418 }
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2419 }
2ae70678c845 Android: Use a RecyclerView method to change the ViewPager2 page since the ViewPager2 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2666 diff changeset	2420
2503 1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	2421 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	2422 {
2665 aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2423 if(windowLayout != null) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2424 waitOnUiThread {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2425 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	2426 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	2427
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2428 if(state == 0) {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2429 window.visibility = View.GONE
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2430 } else {
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2431 window.visibility = View.VISIBLE
aca4b56f50dd Android: Attempt at multi-window support using ViewPager2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2659 diff changeset	2432 }
2691 e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	2433 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	2434 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	2435 }
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	2436 }
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	2437 }
1c2a79313b04 Android: Implment dw_window_hide/show(). Set the initial visibility to GONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2502 diff changeset	2438
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	2439 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	2440 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	2441
917f2d1f9cae Android: Implement dw_window_destroy() and try to add a back button to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2667 diff changeset	2442 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	2443 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	2444 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	2445 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	2446
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 // 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	2448 // 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	2449 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	2450 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	2451 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	2452
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 // 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	2454 // 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	2455 // 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	2456 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	2457 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	2458 }
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 // 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	2460 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	2461
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 // 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	2463 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	2464 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	2465 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	2466 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	2467 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	2468
2691 e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	2469 adapter.notifyDataSetChanged()
e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	2470
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	2471 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	2472 } 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	2473 // 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	2474 // 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	2475 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	2476 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	2477
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 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	2479 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	2480 }
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 }
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 }
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 }
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 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	2485 }
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
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2487 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	2488 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	2489 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	2490
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2491 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	2492 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	2493 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2494 return ""
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2495 }
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2496
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2497 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	2498 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	2499 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	2500
6c01b0132813 Android: Implement window and clipboard text setter and getters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2488 diff changeset	2501 cm.setPrimaryClip(clipdata)
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
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2504 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	2505 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	2506 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2507 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	2508 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	2509
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2510 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	2511 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	2512 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	2513 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	2514 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	2515 )
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2516 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	2517 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	2518 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2519 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	2520 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2521 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	2522 }
16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	2523 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	2524 }
16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	2525
2689 7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2526 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	2527 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	2528 waitOnUiThread {
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2529 box = RadioGroup(this)
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2530 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	2531
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2532 box!!.tag = dataArrayMap
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2533 box!!.layoutParams =
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2534 LinearLayout.LayoutParams(
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2535 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	2536 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	2537 )
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2538 if (type > 0) {
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2539 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	2540 } else {
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2541 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	2542 }
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2543 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	2544 }
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2545 return box
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2546 }
7127de139acf Android: Implement groupbox using RadioGroup... still missing the title and bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2688 diff changeset	2547
2706 4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2548 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	2549 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	2550
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2551 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2552 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	2553 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	2554 val dataArrayMap = SimpleArrayMap<String, Long>()
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2555
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2556 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	2557 box.layoutParams =
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2558 LinearLayout.LayoutParams(
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2559 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	2560 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	2561 )
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2562 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	2563 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	2564 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2565 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	2566 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2567 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	2568 // 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	2569 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	2570 scrollBox!!.addView(box)
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2571 }
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2572 return scrollBox
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2573 }
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2574
2706 4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2575 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	2576 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	2577
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2578 waitOnUiThread {
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2579 // 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	2580 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	2581 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	2582 } else {
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2583 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	2584 }
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2585 }
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2586 return retval
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2587 }
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2588
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2589 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	2590 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	2591
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2592 waitOnUiThread {
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2593 // 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	2594 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	2595 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	2596 } else {
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2597 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	2598 }
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2599 }
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2600 return retval
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2601 }
4e9eba7f7226 Android: Implement dw_scrollbox_get_range() and dw_scrollbox_get_pos(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2703 diff changeset	2602
2683 e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2603 // 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	2604 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	2605 {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2606 val parent = box.parent
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2607
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2608 if(parent is LinearLayout) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2609 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	2610
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2611 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	2612 if(params.height == 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2613 box.measure(0, 0)
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2614 val calch = box.measuredHeight
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2615
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2616 if(calch > 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2617 params.weight = calch.toFloat()
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2618 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2619 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2620 } else {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2621 if(params.width == 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2622 box.measure(0, 0)
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2623 val calcw = box.measuredWidth
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2624
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2625 if(calcw > 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2626 params.weight = calcw.toFloat()
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2627 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2628 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2629 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2630 }
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
2495 5664c91d03fb Android: Attempts to sort out the various issues... still not working but... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2494 diff changeset	2633 fun boxPack(
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2634 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	2635 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	2636 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	2637 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	2638 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	2639 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	2640 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	2641 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	2642 ) {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2643 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2644 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	2645 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	2646 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	2647 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	2648
a7868380098f Android: LinearLayout does not allow null views, if null, create a Placeholder view. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2670 diff changeset	2649 // 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	2650 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	2651 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	2652 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	2653 }
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	2654
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2655 // 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	2656 // 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	2657 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	2658 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	2659 } 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	2660 val sv: ScrollView = boxview
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 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 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	2663 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	2664 }
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2665 }
ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2666
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2667 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	2668 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	2669
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2670 // 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	2671 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	2672 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	2673 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	2674 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	2675 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	2676 }
2683 e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2677 if (vsize != 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2678 val calch = item.measuredHeight
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2679
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2680 if(calch > 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2681 weight = calch.toFloat()
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2682 } else {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2683 weight = 1F
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2684 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2685 h = 0
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2686 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2687 } else {
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2688 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	2689 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	2690 }
2683 e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2691 if (hsize != 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2692 val calcw = item.measuredWidth
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2693
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2694 if(calcw > 0) {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2695 weight = calcw.toFloat()
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2696 } else {
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2697 weight = 1F
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2698 }
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2699 w = 0
e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2700 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2701 }
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2702 // 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	2703 } else {
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2704 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	2705 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	2706 }
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2707 if(hsize == 0) {
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2708 if (width > 0) {
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2709 w = width
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2710 }
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2711 } 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	2712 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	2713 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	2714 } 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	2715 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	2716 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	2717 } 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	2718 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	2719
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 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	2721 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	2722 }
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2723 }
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2724 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2725 }
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2726 if(vsize == 0) {
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2727 if (height > 0) {
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2728 h = height
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2729 }
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2730 } 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	2731 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	2732 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	2733 } 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	2734 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	2735 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	2736 } 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	2737 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	2738
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 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	2740 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	2741 }
2553 2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2742 }
2b4f2929408e Android: Fix issue with specifying static sizes... still some issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2552 diff changeset	2743 }
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2744 }
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2745 }
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2746
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2747 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	2748
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2749 // 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	2750 // 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	2751 if (box.orientation == LinearLayout.VERTICAL) {
2681 c1482518b643 Android: Fix weight based layout problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2677 diff changeset	2752 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	2753 params.weight = weight
2681 c1482518b643 Android: Fix weight based layout problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2677 diff changeset	2754 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	2755 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2756 } else {
2681 c1482518b643 Android: Fix weight based layout problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2677 diff changeset	2757 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	2758 params.weight = weight
2681 c1482518b643 Android: Fix weight based layout problems. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2677 diff changeset	2759 params.width = 0
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2760 }
2480 878d36588aaa Android: Enable app rotation and fix some issues with layout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2479 diff changeset	2761 }
2552 303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2762 // 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	2763 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	2764 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	2765 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	2766 } 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	2767 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	2768 } 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	2769 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	2770 }
303f544d14fa Android: Refactor boxPack() to try to fix non-expandable items expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2551 diff changeset	2771 // 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	2772 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	2773 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	2774 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2775 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	2776 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	2777 boxUpdate(box)
2500 ac0b7e579229 Android: Implement dw_scrollbox_new() using ScrollView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2499 diff changeset	2778 }
2478 b0230e378667 Android: Improvements to boxPack to handle more parameters... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2477 diff changeset	2779 }
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	2780 }
16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	2781
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2782 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	2783 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2784 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	2785 box.removeView(item)
2683 e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2786 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	2787 }
2477 3fbf8783122d Android: First functional version. Notebook-less first page of dwtest works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2476 diff changeset	2788 }
3fbf8783122d Android: First functional version. Notebook-less first page of dwtest works. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2476 diff changeset	2789
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2790 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	2791 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	2792
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2793 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2794 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	2795 box.removeView(item)
2683 e7885fd45f7b Android: Apply weights to boxes as well as items. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2682 diff changeset	2796 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	2797 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2798 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	2799 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2800
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2801 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	2802 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	2803 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2804 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	2805 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	2806
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2807 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	2808 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	2809 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	2810 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	2811 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	2812 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	2813 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	2814 }
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	2815 }
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2816 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	2817 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2818
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2819 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	2820 var button: ImageButton? = null
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2821 waitOnUiThread {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2822 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	2823 val dataArrayMap = SimpleArrayMap<String, Long>()
2653 297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2824 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	2825
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2826 button!!.tag = dataArrayMap
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2827 button!!.id = resid
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2828 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	2829 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	2830 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	2831 }
2653 297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2832
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2833 if(resid > 0 && resid < 65536) {
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2834 filename = resid.toString()
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	2835 } else {
755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	2836 button!!.setImageResource(resid)
2653 297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2837 }
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2838
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2839 if(filename != null) {
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	2840 for (ext in DWImageExts) {
2653 297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2841 // 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	2842 try {
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2843 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	2844 val b = BitmapFactory.decodeStream(f)
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 (b != null) {
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2847 button!!.setImageBitmap(b)
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2848 break
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2849 }
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2850 } catch (e: IOException) {
297456a381e4 Android: Similar resource change for bitmap buttons. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2652 diff changeset	2851 }
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 }
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2854 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2855 return button
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2856 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2857
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2858 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	2859 var button: ImageButton? = null
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2860 waitOnUiThread {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2861 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	2862 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	2863
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2864 button!!.tag = dataArrayMap
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2865 button!!.id = cid
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2866 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	2867 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	2868 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	2869 }
2564 607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2870
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	2871 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	2872 // 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	2873 try {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2874 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	2875 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	2876
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2877 if(b != null) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2878 button!!.setImageBitmap(b)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2879 break
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2880 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2881 } catch (e: IOException) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	2882 }
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2883 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2884 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2885 return button
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2886 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2887
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2888 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	2889 var button: ImageButton? = null
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2890 waitOnUiThread {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2891 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	2892 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	2893 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	2894
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2895 button!!.tag = dataArrayMap
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2896 button!!.id = cid
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2897 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	2898 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	2899 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	2900 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2901 button!!.setImageBitmap(b)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2902 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2903 return button
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2904 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	2905
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2906 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	2907 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	2908
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2909 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2910 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	2911 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	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 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	2914 entryfield!!.id = cid
2554 4c75fb6089a9 Android: Need to set isSingleLine for entryfields. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2553 diff changeset	2915 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	2916 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	2917 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	2918 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	2919 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2920 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	2921 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2922 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	2923 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2924
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2925 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	2926 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2927 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	2928 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2929 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2930
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2931 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	2932 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	2933
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2934 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2935 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	2936 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	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 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	2939 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	2940 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	2941 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	2942 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	2943 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	2944 }
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	2945 }
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2946 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	2947 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2948
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2949 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	2950 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	2951
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2952 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	2953 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	2954
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2955 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	2956 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	2957 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	2958 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	2959 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	2960 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	2961 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	2962 }
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	2963 }
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2964 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	2965 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	2966
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2967 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	2968 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2969 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2970 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	2971 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	2972 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	2973 } 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	2974 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	2975 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	2976 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2977 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2978 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2979
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2980 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	2981 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	2982 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	2983
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2984 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2985 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	2986 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	2987 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	2988 } 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	2989 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	2990 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	2991 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2992 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2993 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	2994 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	2995
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2996 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	2997 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	2998
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	2999 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3000 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	3001
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3002 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	3003 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	3004 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	3005 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	3006 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	3007 val border = GradientDrawable()
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 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 // 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	3010 // 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	3011 // 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	3012 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	3013 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	3014 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	3015 }
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3016 }
2476 20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	3017 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	3018 }
20c9e83cba2a Android: Implement dw_entryfield_new, dw_entryfield_password_new() dw_button_new(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2475 diff changeset	3019
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3020 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	3021 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3022 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	3023
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3024 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3025 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	3026 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	3027
2701 9df2c11f020f Android: Fix dw_mle_set_word_wrap() and dw_mle_set_cursor(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2694 diff changeset	3028 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	3029 mle!!.tag = dataArrayMap
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3030 mle!!.id = cid
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3031 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	3032 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	3033 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	3034 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	3035 mle!!.isVerticalScrollBarEnabled = true
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3036 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	3037 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	3038 mle!!.isHorizontalScrollBarEnabled = false
2581 9dea42f27b0a Android: MLE should have TOP/LEFT gravity. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2580 diff changeset	3039 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	3040 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3041 return mle
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3042 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3043
2707 a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	3044 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	3045 {
a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	3046 waitOnUiThread {
2716 a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3047 val layout = mle.layout
a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3048
a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3049 if(layout != null) {
a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3050 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	3051
a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3052 mle.scrollTo(0, y)
a1fea6b9f308 Android: Fix potential null pointer exception in mleSetVisible(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2715 diff changeset	3053 }
2707 a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	3054 }
a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	3055 }
a3f6ca621453 Android: Implement dw_mle_set_visible(). Also fix various warnings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2706 diff changeset	3056
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3057 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	3058 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3059 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3060 if (state != 0) {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3061 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	3062 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	3063 } else {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3064 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	3065 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	3066 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3067 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3068 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3069
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3070 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	3071 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3072 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	3073 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	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 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	3078 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3079 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3080 mle.setSelection(point)
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
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	3084 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	3085 {
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3086 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	3087 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	3088
4f12dc8e8f18 Android: Implement dw_mle_set_auto_complete() in the same way as iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2701 diff changeset	3089 // 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	3090 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	3091 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	3092 } 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	3093 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	3094 }
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 }
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
2708 3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3098 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	3099 {
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3100 var retval: Int = -1
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3101 var ignorecase: Boolean = true
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3102
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3103 // DW_MLE_CASESENSITIVE 1
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3104 if(flags == 1) {
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3105 ignorecase = false
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
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3108 waitOnUiThread {
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3109 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	3110
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3111 if(retval > -1) {
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3112 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	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 return retval
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3116 }
3a7dcc0ae08b Android: Implement dw_mle_search(). Also revert lowercase() change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2707 diff changeset	3117
2510 f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3118 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	3119 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3120 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3121 mle.setText("")
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3122 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3123 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3124
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3125 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	3126 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3127 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	3128
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3129 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3130 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	3131 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	3132
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3133 if(startpoint < 1) {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3134 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	3135
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3136 mle.setText(newtext)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3137 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	3138 } 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	3139 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	3140
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3141 mle.setText(newtext)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3142 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	3143 } else {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3144 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	3145
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3146 mle.setText(newtext)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3147 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	3148 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3149 mle.setSelection(retval)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3150 }
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3151 return retval
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
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3154 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	3155 {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3156 waitOnUiThread {
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3157 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	3158 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	3159
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3160 mle.setText(newtext)
f54051c3f2a5 Android: Implement MLE functions. Fix issues with checkboxes and sliders. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2505 diff changeset	3161 }
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
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3164 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	3165 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3166 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	3167
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3168 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3169 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	3170 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	3171 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	3172 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	3173 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	3174
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3175 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	3176 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	3177 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	3178 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	3179 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	3180 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	3181 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	3182 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	3183 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	3184 }.attach()
2488 666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	3185
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3186 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	3187 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	3188 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	3189 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3190 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	3191 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3192 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	3193 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	3194 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	3195 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	3196 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	3197 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	3198 } else {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3199 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	3200 }
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(pager, params)
2550 a8d90e2896bc Android: For the moment disable swiping to change notebook pages. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2547 diff changeset	3202 // 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	3203 // 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	3204 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	3205 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	3206 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	3207 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	3208
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3209 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	3210 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	3211 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3212
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 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	3214 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	3215 })
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3216 }
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	3217 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	3218 }
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	3219
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3220 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	3221 {
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3222 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	3223
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3224 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3225 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	3226 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	3227
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3228 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	3229 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	3230 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	3231 } 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	3232 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	3233 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	3234 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3235
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3236 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	3237 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	3238 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	3239
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3240 // 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	3241 do {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3242 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	3243 } 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	3244 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	3245 // 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	3246 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	3247 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	3248 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	3249 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	3250 )
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3251 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	3252 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	3253 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	3254 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	3255 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	3256 } else {
2682 856d3c8b559f Android: Fix an exception when displaying a notebook with a placeholder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2681 diff changeset	3257 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	3258 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	3259 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	3260 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	3261 }
2691 e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	3262 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	3263 }
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	3264 }
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3265 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	3266 }
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	3267
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	3268 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	3269 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	3270 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	3271 }
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	3272 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	3273 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	3274 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	3275 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	3276 } 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	3277 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	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 }
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 }
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
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3282 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	3283 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3284 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3285 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	3286 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	3287
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3288 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	3289 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	3290 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	3291 } 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	3292 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	3293 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	3294 }
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	3295
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3296 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	3297 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	3298 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	3299 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	3300
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3301 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	3302 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	3303 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	3304 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	3305 tabs.removeTab(tab)
2691 e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	3306 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	3307 }
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3308 }
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	3309 }
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	3310 }
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	3311
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3312 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	3313 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3314 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3315 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	3316 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	3317
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3318 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	3319 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	3320 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	3321 } 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	3322 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	3323 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	3324 }
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	3325
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3326 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	3327 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	3328 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	3329 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	3330
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3331 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	3332 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	3333 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	3334 }
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	3335
8352c38bc20b Android: Turn off Android's forcing buttons and tabs to be all caps. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2582 diff changeset	3336 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	3337 }
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	3338 }
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	3339 }
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	3340
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3341 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	3342 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3343 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3344 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	3345 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	3346
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3347 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	3348 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	3349 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	3350 } 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	3351 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	3352 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	3353 }
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	3354
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3355 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	3356 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	3357 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	3358
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3359 // 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	3360 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	3361 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	3362 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	3363 )
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3364
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3365 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	3366 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	3367 }
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	3368 }
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	3369 }
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	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 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	3372 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3373 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	3374
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3375 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3376 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	3377 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	3378
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3379 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	3380 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	3381 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	3382 } 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	3383 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	3384 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	3385 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3386
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3387 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	3388 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	3389 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	3390 }
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	3391 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3392 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	3393 }
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	3394
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	3395 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	3396 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3397 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3398 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	3399 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	3400
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3401 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	3402 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	3403 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	3404 } 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	3405 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	3406 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	3407 }
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	3408
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3409 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	3410 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	3411 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	3412
e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	3413 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	3414 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	3415 pager.setCurrentItem(index, true)
e13607b87517 Android: Call notifyDataSetChanged() on ViewPager2 adapters to fix some bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2690 diff changeset	3416 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3417 }
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	3418 }
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3419 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	3420
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3421 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	3422 {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3423 var splitbar: ConstraintLayout? = null
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3424
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3425 waitOnUiThread {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3426 splitbar = ConstraintLayout(this)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3427 if(splitbar != null) {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3428 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	3429 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	3430
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3431 constraintSet.clone(splitbar)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3432
2656 2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3433 splitbar!!.tag = dataArrayMap
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3434 splitbar!!.id = cid
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3435
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 // 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	3437 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	3438 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	3439
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3440 // Place the top/left item
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3441 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	3442 if(topleft.id < 1) {
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3443 topleft.id = View.generateViewId()
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3444 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3445 splitbar!!.addView(topleft)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3446 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3447 topleft.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3448 ConstraintLayout.LayoutParams.TOP,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3449 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3450 ConstraintLayout.LayoutParams.TOP
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 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3453 topleft.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3454 ConstraintLayout.LayoutParams.LEFT,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3455 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3456 ConstraintLayout.LayoutParams.LEFT
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3457 )
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 if (type == 0) {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3460 // Horizontal
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3461 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3462 topleft.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3463 ConstraintLayout.LayoutParams.BOTTOM,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3464 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3465 ConstraintLayout.LayoutParams.BOTTOM
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3466 )
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3467 constraintSet.constrainPercentWidth(topleft.id, 0.5F)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3468 } else {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3469 // Vertical
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3470 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3471 topleft.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3472 ConstraintLayout.LayoutParams.RIGHT,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3473 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3474 ConstraintLayout.LayoutParams.RIGHT
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3475 )
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3476 constraintSet.constrainPercentHeight(topleft.id, 0.5F)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3477 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3478 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3479
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3480 // Place the bottom/right item
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3481 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	3482 if (bottomright.id < 1) {
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3483 bottomright.id = View.generateViewId()
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 splitbar!!.addView(bottomright)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3486 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3487 bottomright.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3488 ConstraintLayout.LayoutParams.BOTTOM,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3489 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3490 ConstraintLayout.LayoutParams.BOTTOM
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 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3493 bottomright.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3494 ConstraintLayout.LayoutParams.RIGHT,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3495 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3496 ConstraintLayout.LayoutParams.RIGHT
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3497 )
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 if (type == 0) {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3500 // Horizontal
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3501 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3502 bottomright.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3503 ConstraintLayout.LayoutParams.TOP,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3504 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3505 ConstraintLayout.LayoutParams.TOP
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3506 )
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3507 constraintSet.constrainPercentWidth(bottomright.id, 0.5F)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3508 } else {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3509 // Vertical
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3510 constraintSet.connect(
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3511 bottomright.id,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3512 ConstraintLayout.LayoutParams.LEFT,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3513 ConstraintLayout.LayoutParams.PARENT_ID,
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3514 ConstraintLayout.LayoutParams.LEFT
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3515 )
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3516 constraintSet.constrainPercentHeight(bottomright.id, 0.5F)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3517 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3518 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3519
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3520 // 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	3521 constraintSet.applyTo(splitbar)
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 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3524 return splitbar
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 fun splitBarGet(splitbar: ConstraintLayout): Float {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3528 var position: Float = 50.0F
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 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	3531 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	3532 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	3533
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3534 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	3535 percent = dataArrayMap.get("_dw_percent")!!
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3536 }
2656 2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3537
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3538 position = percent.toFloat() / 1000000.0F
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3539 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3540 return position
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3541 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3542
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3543 fun splitBarSet(splitbar: ConstraintLayout, position: Float) {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3544 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	3545 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	3546 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	3547
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3548 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	3549 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	3550 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	3551 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	3552 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	3553
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3554 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	3555 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	3556 }
2bdbd5e83654 Android: Save splitbar settings in dataArrayMap instead of attempting to calculate them. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2655 diff changeset	3557 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	3558
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3559 constraintSet.clone(splitbar)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3560 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	3561 if (type == 1L) {
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3562 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	3563 } else {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3564 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	3565 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3566 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3567 if (bottomright != null) {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3568 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	3569 if (type == 1L) {
2650 7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3570 constraintSet.constrainPercentHeight(bottomright.id, altper)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3571 } else {
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3572 constraintSet.constrainPercentWidth(bottomright.id, altper)
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 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3575 constraintSet.applyTo(splitbar)
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3576 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3577 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3578 }
7101b5692601 Android: Attempt at implementing splitbar using ConstraintLayout. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2643 diff changeset	3579
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3580 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	3581 {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3582 var scrollbar: DWSlider? = null
2719 6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3583
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3584 waitOnUiThread {
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3585 val dataArrayMap = SimpleArrayMap<String, Long>()
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 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 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	3588 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	3589 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	3590 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	3591 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	3592 scrollbar!!.slider.progressBackgroundTintList = null
2719 6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3593 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	3594 scrollbar!!.slider.rotation = 90F
2719 6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3595 }
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3596 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	3597 override fun onStopTrackingTouch(seekBar: SeekBar) {
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3598 }
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3599
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3600 override fun onStartTrackingTouch(seekBar: SeekBar) {
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3601 }
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3602
6754e8f70142 Android: Split out scrollbar to a separate implementation. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2716 diff changeset	3603 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	3604 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	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 }
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3608 return scrollbar
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3609 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3610
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3611 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	3612 {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3613 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	3614
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3615 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3616 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	3617
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3618 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	3619 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	3620 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	3621 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	3622 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	3623 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	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!!.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	3626 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	3627 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3628
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3629 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	3630 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3631
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3632 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	3633 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	3634 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3635 })
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3636 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3637 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	3638 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3639
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3640 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	3641 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3642 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	3643
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3644 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3645 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	3646
2574 5b13bb267364 Android: Percent widget should be using horizontal ProgressBar. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2573 diff changeset	3647 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	3648 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	3649 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	3650 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	3651 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3652 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	3653 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3654
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3655 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	3656 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3657 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	3658
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3659 waitOnUiThread {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3660 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	3661
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3662 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	3663 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	3664 } else {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3665 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	3666 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	3667 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3668 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	3669 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3670 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	3671 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3672
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3673 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	3674 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3675 waitOnUiThread {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3676 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	3677
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3678 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	3679 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	3680 } else {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3681 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	3682 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	3683 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3684 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	3685 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3686 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3687
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3688 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	3689 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3690 waitOnUiThread {
2720 9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3691 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	3692
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3693 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	3694 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	3695 } else {
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3696 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	3697 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	3698 }
9ce1649b0fbd Android: Fix vertical sliders/scrollbars by creating a DWSlider class to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2719 diff changeset	3699 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	3700 }
2492 e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3701 }
e2ca6c1a4661 Android: Implement: slider, percent, scrollbar, checkbox_set/get box_unpack_at_index(), bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2491 diff changeset	3702
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3703 fun htmlNew(cid: Int): WebView?
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3704 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3705 var html: WebView? = null
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3706
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3707 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3708 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	3709
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3710 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	3711 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	3712 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	3713 // 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	3714 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	3715 html!!.settings.javaScriptEnabled = true
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3716 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3717 return html
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3718 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3719
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3720 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	3721 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3722 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3723 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	3724 }
2501 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 htmlRaw(html: WebView, data: 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 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	3731 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	3732 }
2501 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
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3735 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	3736 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3737 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3738 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	3739 // 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	3740 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	3741 }
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3742 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3743 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3744
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3745 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	3746 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3747 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3748 when (action) {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	3749 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	3750 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	3751 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	3752 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	3753 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	3754 }
2501 41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3755 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3756 }
41984ffb5ca2 Android: Initial implement of HTML control with WebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2500 diff changeset	3757
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3758 fun spinButtonNew(text: String, cid: Int): DWSpinButton?
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3759 {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3760 var spinbutton: DWSpinButton? = null
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3761
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3762 waitOnUiThread {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3763 val dataArrayMap = SimpleArrayMap<String, Long>()
2520 167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3764 val newval = text.toLongOrNull()
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3765
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3766 spinbutton = DWSpinButton(this)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3767 spinbutton!!.tag = dataArrayMap
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3768 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	3769 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	3770 spinbutton!!.setText(text)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3771 if(newval != null) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3772 spinbutton!!.value = newval
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3773 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3774 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3775 return spinbutton
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3776 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3777
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3778 fun spinButtonSetPos(spinbutton: DWSpinButton, position: Long)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3779 {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3780 waitOnUiThread {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3781 spinbutton.value = position
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3782 spinbutton.setText(position.toString())
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
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3786 fun spinButtonSetLimits(spinbutton: DWSpinButton, upper: Long, lower: Long)
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3787 {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3788 waitOnUiThread {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3789 spinbutton.maximum = upper
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3790 spinbutton.minimum = lower
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3791 if(spinbutton.value > upper) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3792 spinbutton.value = upper
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3793 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3794 if(spinbutton.value < lower) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3795 spinbutton.value = lower
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3796 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3797 spinbutton.setText(spinbutton.value.toString())
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3798 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3799 }
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 fun spinButtonGetPos(spinbutton: DWSpinButton): Long
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3802 {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3803 var retval: Long = 0
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3804
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3805 waitOnUiThread {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3806 val newvalue = spinbutton.text.toString().toLongOrNull()
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 if(newvalue == null) {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3809 retval = spinbutton.value
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3810 } else {
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3811 retval = newvalue
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3812 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3813 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3814 return retval
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3815 }
167af4b0004b Android: Implement spinbuttons and callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2519 diff changeset	3816
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3817 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	3818 {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3819 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	3820
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3821 waitOnUiThread {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	3822 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	3823
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3824 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	3825 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	3826 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	3827 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	3828 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	3829 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3830 return combobox
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3831 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	3832
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3833 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	3834 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3835 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	3836
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3837 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3838 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	3839 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	3840
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3841 cont = ListView(this)
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3842 cont!!.tag = dataArrayMap
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3843 cont!!.id = cid
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3844 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	3845 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	3846 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	3847 }
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3848 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	3849 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	3850 val data = adapter.model.getRowData(position)
2613 72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3851 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	3852
2563 56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	3853 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	3854 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	3855 lastClickView = cont!!
2613 72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3856 // 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	3857 // Generate an ENTER event
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3858 if(cont!!.choiceMode != ListView.CHOICE_MODE_MULTIPLE \|\|
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3859 (position == adapter.lastClickRow &&
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3860 (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	3861 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	3862 } else {
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3863 // 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	3864 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	3865 }
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3866 adapter.lastClick = now
72f1141c07aa Android: Standardize DWContainer behavior part 2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2611 diff changeset	3867 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	3868 }
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	3869 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	3870 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	3871 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	3872 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	3873
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	3874 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	3875 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	3876 }
56183bef6793 Android: Use ItemClick for the ITEM_SELECT event and the API 23 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2562 diff changeset	3877 true
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3878 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3879 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	3880 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	3881 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	3882
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	3883 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	3884 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	3885 true
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3886 }
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3887 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3888 return cont
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3889 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	3890
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	3891 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	3892 {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3893 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	3894 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	3895
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	3896 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	3897 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	3898 } 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	3899 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	3900 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	3901 } 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	3902 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	3903 }
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 } 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	3905 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	3906 }
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 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	3908 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	3909 } 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	3910 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	3911 }
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 }
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
2560 3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3915 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	3916 {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3917 var retval: String? = null
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3918
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3919 waitOnUiThread {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3920 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	3921
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3922 // Handle DW_CRA_SELECTED
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3923 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	3924 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	3925 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	3926
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3927 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	3928 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	3929 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3930 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	3931 adapter.model.querypos = -1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3932 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3933 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	3934 adapter.model.querypos = 0
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3935 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3936 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3937 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3938 return retval
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3939 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3940
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3941 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	3942 {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3943 var retval: String? = null
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 waitOnUiThread {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3946 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	3947
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3948 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	3949 // Handle DW_CRA_SELECTED
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3950 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	3951 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	3952
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3953 // 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	3954 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	3955 // Item position in adapter
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3956 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	3957
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3958 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	3959 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	3960
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3961 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	3962 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	3963 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3964 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3965 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3966 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	3967 adapter.model.querypos += 1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3968 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	3969 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3970 adapter.model.querypos = -1
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 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3973 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3974 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3975 return retval
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3976 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3977
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3978 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	3979 {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3980 var retval: Long = 0
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 waitOnUiThread {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3983 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	3984
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3985 // Handle DW_CRA_SELECTED
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3986 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	3987 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	3988 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	3989
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	3990 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	3991 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	3992 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3993 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	3994 adapter.model.querypos = -1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3995 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3996 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	3997 adapter.model.querypos = 0
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3998 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	3999 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4000 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4001 return retval
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4002 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4003
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4004 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	4005 {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4006 var retval: Long = 0
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 waitOnUiThread {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4009 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	4010
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4011 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	4012 // Handle DW_CRA_SELECTED
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4013 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	4014 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	4015
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4016 // 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	4017 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	4018 // Item position in adapter
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4019 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	4020
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4021 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	4022 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	4023
a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4024 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	4025 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	4026 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4027 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4028 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4029 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	4030 adapter.model.querypos += 1
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4031 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	4032 } else {
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4033 adapter.model.querypos = -1
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 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4036 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4037 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4038 return retval
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4039 }
3da35cd91ca7 Android: Implement querying containers and ENTER and CONTEXT callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2558 diff changeset	4040
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4041 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	4042 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4043 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4044 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	4045
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4046 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	4047 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4048 }
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 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	4051 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4052 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4053 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	4054 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	4055
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4056 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	4057 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4058 return cont
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4059 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4060
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4061 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	4062 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4063 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4064 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	4065
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4066 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	4067 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4068 }
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 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	4071 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4072 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4073 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	4074
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4075 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	4076 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4077 }
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 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	4080 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4081 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4082 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	4083
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4084 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	4085 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4086 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4087
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4088 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	4089 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4090 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4091 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	4092
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4093 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	4094 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4095 }
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 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	4098 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4099 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4100 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	4101
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4102 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	4103 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4104 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4105
2561 f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4106 fun containerRefresh(cont: ListView)
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4107 {
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4108 waitOnUiThread {
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4109 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	4110
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4111 adapter.notifyDataSetChanged()
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4112 }
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4113 }
f28d7d0ca5ed Android: Attempt at implementing updating the container after insertion. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2560 diff changeset	4114
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4115 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	4116 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	4117 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	4118
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4119 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4120 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	4121
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4122 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	4123 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4124 return type
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
2558 ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4127 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	4128 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4129 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4130 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	4131
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4132 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	4133 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4134 }
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 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	4137 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4138 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4139 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	4140
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4141 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	4142 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4143 }
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 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	4146 {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4147 waitOnUiThread {
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4148 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	4149
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4150 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	4151 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4152 }
ebc6a4ff5f1f Android: Implement container row data and titles, required for the callbacks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2557 diff changeset	4153
2556 d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4154 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	4155 {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4156 waitOnUiThread {
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4157 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	4158
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4159 adapter.model.clear()
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4160 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4161 }
d2d8c66ad062 Android: Initial container implementation... getting a NullPointerException crash in dwtest... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2555 diff changeset	4162
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	4163 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	4164 {
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	4165 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	4166 // 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	4167 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	4168 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	4169 // 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	4170 } 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	4171 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	4172 // 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	4173 } 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	4174 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	4175 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	4176 // 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	4177 } 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	4178 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	4179 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	4180
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 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	4182 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	4183 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	4184 }
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 }
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 }
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
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 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	4190 {
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 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	4192 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	4193 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	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 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	4196 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	4197 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	4198 }
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
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 }
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
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 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	4204 {
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 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	4206 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	4207 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	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 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	4210 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	4211 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	4212 }
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
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 }
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
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4217 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	4218 {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4219 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	4220
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4221 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4222 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	4223
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4224 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	4225 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	4226 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	4227 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	4228 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	4229 }
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 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	4232 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4233
2515 211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4234 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	4235 {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4236 waitOnUiThread {
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4237 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	4238 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	4239
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4240 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	4241 } 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	4242 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	4243
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4244 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	4245 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	4246 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	4247 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4248 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4249 }
211044d98e86 Android: Initial attempt at our own ComboBox class, EditText with PopupList. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2514 diff changeset	4250
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4251 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	4252 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4253 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4254 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	4255 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4256
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4257 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	4258 } 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	4259 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	4260
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4261 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	4262 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	4263 adapter.notifyDataSetChanged()
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4264 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4265 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4266 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4267
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4268 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	4269 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4270 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4271 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	4272 val combobox = window
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 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	4275 } 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	4276 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	4277
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4278 listbox.list.clear()
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4279 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	4280 adapter.notifyDataSetChanged()
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4281 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4282 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4283 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4284
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4285 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	4286 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	4287 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	4288
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4289 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4290 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	4291 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4292
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4293 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	4294 } 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	4295 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	4296
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4297 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	4298 }
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 return retval
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4301 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4302
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4303 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	4304 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4305 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4306 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	4307 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4308
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4309 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	4310 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	4311 } 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	4312 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	4313
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4314 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	4315 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	4316 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	4317 adapter.notifyDataSetChanged()
755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	4318 }
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4319 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4320 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4321 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4322
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4323 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	4324 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4325 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	4326
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4327 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4328 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	4329 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4330
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4331 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	4332 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	4333 } 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	4334 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	4335
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4336 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	4337 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	4338 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4339 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4340 return retval
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4341 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4342
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4343 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	4344 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4345 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	4346
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4347 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4348 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	4349 val combobox = window
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4350
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4351 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	4352 } 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	4353 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	4354
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4355 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	4356 }
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 return retval
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4359 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4360
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4361 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	4362 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4363 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4364 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	4365 val combobox = window
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 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	4368 combobox.selected = index
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4369 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	4370 }
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4371 } 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	4372 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	4373
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4374 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	4375 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	4376 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	4377 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	4378 } else {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	4379 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	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 }
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4382 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4383 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4384 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4385
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4386 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	4387 {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4388 waitOnUiThread {
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4389 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	4390 val combobox = window
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 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	4393 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	4394 }
2519 551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4395 } 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	4396 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	4397
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4398 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	4399 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	4400 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	4401 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	4402 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4403 }
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 }
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4406
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4407 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	4408 {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4409 waitOnUiThread {
551313c064f2 Android: Implement ListBox with ListView and fill in the missing listbox functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2517 diff changeset	4410 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	4411 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	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 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	4414 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	4415 }
2517 d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4416 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4417 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4418 }
d746323f2841 Android: Implement most of the dw_listbox_() functions for ComboBoxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2516 diff changeset	4419
2521 5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4420 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	4421 {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4422 var retval: Int = -1
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4423
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4424 waitOnUiThread {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4425 if(window is DWListBox) {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4426 val listbox = window
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4427 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	4428
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4429 // 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	4430 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	4431 retval = checked.keyAt(0)
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4432 } else {
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4433 // 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	4434 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	4435 // Item position in adapter
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4436 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	4437 // 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	4438 // 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	4439 // 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	4440 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	4441 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	4442 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4443 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4444 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4445 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4446 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4447 return retval
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4448 }
5f92284e2b08 Android: Implement bitmap buttons, implement dw_listbox_selected_multi(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2520 diff changeset	4449
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4450 fun calendarNew(cid: Int): CalendarView?
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4451 {
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4452 var calendar: CalendarView? = null
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4453
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4454 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4455 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	4456
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4457 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	4458 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	4459 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	4460 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	4461 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	4462 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	4463 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	4464 }
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4465 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4466
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4467 return calendar
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4468 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4469
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4470 fun calendarSetDate(calendar: CalendarView, date: Long)
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4471 {
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4472 waitOnUiThread {
2524 d5c3c573c74e Android: Calendar fixes, need to be in milliseconds not seconds... also... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2523 diff changeset	4473 // 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	4474 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	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
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4478 fun calendarGetDate(calendar: CalendarView): Long
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4479 {
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4480 var date: Long = 0
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4481
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4482 waitOnUiThread {
2524 d5c3c573c74e Android: Calendar fixes, need to be in milliseconds not seconds... also... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2523 diff changeset	4483 // 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	4484 date = calendar.date / 1000
2523 82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4485 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4486 return date
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4487 }
82cdb3ad7c25 Android: Implement the calendar widget using CalendarView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2522 diff changeset	4488
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	4489 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	4490 {
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	4491 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	4492
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	4493 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4494 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	4495
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 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	4497 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	4498 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	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
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	4501 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	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
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4504 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	4505 {
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 waitOnUiThread {
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4507 var filename: String? = file
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4508
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4509 if(resID > 0 && resID < 65536) {
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4510 filename = resID.toString()
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4511 } else if(resID != 0) {
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4512 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	4513 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	4514
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	4515 button.setImageResource(resID)
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4516 } 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	4517 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	4518
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	4519 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	4520 }
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4521 }
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4522 if(filename != null) {
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	4523 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	4524 // 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	4525 try {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4526 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	4527 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	4528
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4529 if(b != null) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4530 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	4531 val button = window
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4532
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4533 button.setImageBitmap(b)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4534 } 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	4535 val imageview = window
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4536
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4537 imageview.setImageBitmap(b)
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4538 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4539 break
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4540 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4541 } 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	4542 }
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	4543 }
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	4544 }
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	4545 }
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	4546 }
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	4547
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	4548 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	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 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	4551 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	4552 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	4553 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	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 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	4556 } 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	4557 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	4558
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 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	4560 }
2655 5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4561 }
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4562 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	4563 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	4564
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 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	4566 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	4567
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	4568 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	4569 } 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	4570 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	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 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	4573 }
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 }
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 }
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
2652 42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4578 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	4579 {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4580 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	4581
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4582 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	4583 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	4584
42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4585 // 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	4586 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	4587 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	4588 // 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	4589 } 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	4590 try {
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4591 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	4592 } 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	4593 }
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4594 // 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	4595 } 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	4596 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	4597 } else {
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4598 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	4599 }
42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4600 // 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	4601 // 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	4602 if(filename != null) {
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	4603 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	4604 // 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	4605 try {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4606 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	4607 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	4608 } catch (e: IOException) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4609 }
2652 42151fd096d4 Android: Switch to loading resource images like we do on iOS. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2651 diff changeset	4610 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	4611 break
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4612 }
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4613 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4614 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4615 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4616 return icon
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4617 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4618
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4619 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	4620 {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4621 var pixmap: Bitmap? = null
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4622
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4623 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	4624 var filename: String? = null
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4625
2529 060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4626 if(width > 0 && height > 0) {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4627 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	4628 } 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	4629 filename = resID.toString()
2529 060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4630 } 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	4631 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	4632 } 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	4633 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	4634 } else {
5b63a3ed8e10 Android: Code path cleanup, basically only try one image load... the only bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2654 diff changeset	4635 filename = file
2654 fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4636 }
fe186c9318cc Android: More resource changes, for windowSetBitmap and pixmapNew. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2653 diff changeset	4637 if(filename != null) {
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	4638 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	4639 // 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	4640 try {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4641 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	4642 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	4643 } catch (e: IOException) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4644 }
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4645 if(pixmap != null) {
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4646 break
607acfe2c504 Android: The _from_file() functions now check the assets folder. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 2563 diff changeset	4647 }
2529 060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4648 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4649 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4650 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4651 return pixmap
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4652 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4653
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4654 fun pixmapGetDimensions(pixmap: Bitmap): Long
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 var dimensions: Long = 0
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 waitOnUiThread {
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4659 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	4660 }
060fdb2d807d Android: Initial pixmap implmentation using Android Bitmap. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2528 diff changeset	4661 return dimensions
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
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	4664 fun screenGetDimensions(): Long
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	4665 {
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	4666 val dm = resources.displayMetrics
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	4667 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	4668 }
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	4669
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4670 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	4671 {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4672 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	4673
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4674 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4675 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	4676
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4677 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	4678 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	4679 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	4680 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	4681 @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	4682 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	4683 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	4684 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	4685 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	4686 render!!.evy = event.y
2611 ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	4687 // 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	4688 // 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	4689 }
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 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	4691 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	4692 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	4693 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	4694 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	4695 }
ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	4696 MotionEvent.ACTION_MOVE -> {
ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	4697 render!!.evx = event.x
ed2c4a503666 Android: Implement button release and motion notify events. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2608 diff changeset	4698 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	4699 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	4700 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	4701 }
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4702 }
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4703 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	4704 }
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4705 })
a11522c30345 Android: Add initial code to handle button presses and long clicks on DWRender. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2607 diff changeset	4706 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	4707 // 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	4708 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	4709 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	4710 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	4711 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	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!!.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	4714 // 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	4715 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	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(), 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	4718 }
2596 60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	4719 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	4720 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	4721 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	4722 }
60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	4723 false
60ec91d23746 Android: Add initial keyboard support for Android. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2595 diff changeset	4724 })
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4725 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4726 return render
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4727 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4728
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	4729 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	4730 {
2539 822f814a54f4 Android: Fix memory corruption issue due to incorrectly allocating HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2538 diff changeset	4731 runOnUiThread {
822f814a54f4 Android: Fix memory corruption issue due to incorrectly allocating HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2538 diff changeset	4732 render.invalidate()
822f814a54f4 Android: Fix memory corruption issue due to incorrectly allocating HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2538 diff changeset	4733 }
2530 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
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4736 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	4737 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	4738 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4739 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	4740 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	4741 var retval = 1
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4742
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4743 if(srcw == -1) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4744 src.right = srcx + dstw
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 if(srch == -1) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4747 src.bottom = srcy + dsth
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4748 }
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 waitOnUiThread {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4751 var canvas: Canvas? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4752 var bitmap: Bitmap? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4753
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4754 if(dstr != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4755 canvas = dstr.cachedCanvas
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4756 } else if(dstp != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4757 canvas = Canvas(dstp)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4758 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4759
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4760 if(srcp != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4761 bitmap = srcp
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4762 } else if(srcr != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4763 bitmap = Bitmap.createBitmap(srcr.layoutParams.width,
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4764 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	4765 val c = Canvas(bitmap)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4766 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	4767 srcr.draw(c)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4768 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4769
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4770 if(canvas != null && bitmap != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4771 canvas.drawBitmap(bitmap, src, dst, null)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4772 retval = 0
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4773 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4774 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4775 return retval
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
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	4778 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	4779 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4780 waitOnUiThread {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4781 var canvas: Canvas? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4782
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4783 if(render != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4784 canvas = render.cachedCanvas
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4785 } else if(bitmap != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4786 canvas = Canvas(bitmap)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4787 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4788
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4789 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	4790 colorsSet(fgColor, bgColor)
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4791 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	4792 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4793 }
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
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	4796 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	4797 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4798 waitOnUiThread {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4799 var canvas: Canvas? = null
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 if(render != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4802 canvas = render.cachedCanvas
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4803 } else if(bitmap != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4804 canvas = Canvas(bitmap)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4805 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4806
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4807 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	4808 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	4809 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	4810 paint.style = Paint.Style.STROKE
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4811 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	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 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4815
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4816 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	4817 {
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4818 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	4819
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4820 waitOnUiThread {
2578 a36448beb7f7 Android: Implement dw_window_set_style() for static text widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2576 diff changeset	4821 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	4822
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4823 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	4824 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	4825 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	4826 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	4827 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	4828 }
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 } 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	4831 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	4832 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	4833 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	4834 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	4835 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4836 } 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	4837 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	4838
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4839 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	4840 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	4841 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	4842 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	4843 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4844 }
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 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4847 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	4848 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	4849 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	4850 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	4851 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4852 return dimensions
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
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	4855 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	4856 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	4857 {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4858 waitOnUiThread {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4859 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	4860
2547 dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4861 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	4862 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	4863 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	4864 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	4865 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	4866 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	4867 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4868 }
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4869 } 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	4870 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	4871 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	4872 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	4873 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	4874 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	4875 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4876 } 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	4877 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	4878
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4879 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	4880 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	4881 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	4882 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	4883 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4884 }
dbd15c13f5bb Android: Implement most of the font functions and control/widget color. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2546 diff changeset	4885 }
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4886 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4887
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4888 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	4889 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	4890 // 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	4891 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	4892 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	4893 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	4894 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	4895 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	4896 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	4897 if(bgcolor != null) {
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4898 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	4899 // 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	4900 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	4901 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	4902 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	4903 rect.left += x
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4904 rect.right += x
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4905 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	4906 // 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	4907 paint.color = oldcolor
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	4908 }
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4909 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	4910 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	4911 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4912 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4913 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4914
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	4915 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	4916 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4917 waitOnUiThread {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4918 var canvas: Canvas? = null
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4919
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4920 if(render != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4921 canvas = render.cachedCanvas
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4922 } else if(bitmap != null) {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4923 canvas = Canvas(bitmap)
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4924 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4925
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4926 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	4927 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	4928 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	4929 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	4930 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	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 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	4934
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	4935 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	4936 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	4937 {
2537 cd9d2ba251d5 Android: Reimplement drawPolygon() using drawPath() instead of drawLines/Points(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2536 diff changeset	4938 // 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	4939 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	4940
2537 cd9d2ba251d5 Android: Reimplement drawPolygon() using drawPath() instead of drawLines/Points(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2536 diff changeset	4941 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	4942 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	4943 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	4944 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4945
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4946 waitOnUiThread {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4947 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	4948
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4949 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	4950 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	4951 } 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	4952 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	4953 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4954
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4955 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	4956 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	4957 // 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	4958 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	4959 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	4960 } else {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4961 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	4962 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4963 // 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	4964 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	4965 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	4966 } else {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4967 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	4968 }
2537 cd9d2ba251d5 Android: Reimplement drawPolygon() using drawPath() instead of drawLines/Points(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2536 diff changeset	4969 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	4970 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4971 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4972 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4973
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4974 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	4975 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	4976 {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4977 waitOnUiThread {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4978 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	4979
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4980 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	4981 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	4982 } 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	4983 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	4984 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4985
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4986 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	4987 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	4988
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4989 // 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	4990 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	4991 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	4992 } else {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4993 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	4994 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4995 // 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	4996 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	4997 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	4998 } else {
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	4999 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	5000 }
2536 d172ab2eddb6 Android: Implement DW_DRAW_FULL flag for dw_draw_arc(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2535 diff changeset	5001 // 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	5002 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	5003 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	5004 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	5005 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	5006 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	5007
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5008 if(x2 < x1) {
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5009 left = x2.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5010 right = x1.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5011 }
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5012 if(y2 < y1) {
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5013 top = y2.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5014 bottom = y1.toFloat()
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5015 }
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5016
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5017 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	5018 } else {
2576 db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5019 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	5020 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	5021 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	5022 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	5023 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	5024 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	5025 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	5026 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	5027
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5028 // Convert to degrees
db097ec28c90 Android: Fix drawArc() FULL option and refactor to reduce calculations. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2575 diff changeset	5029 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	5030 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	5031 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	5032
2536 d172ab2eddb6 Android: Implement DW_DRAW_FULL flag for dw_draw_arc(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2535 diff changeset	5033 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	5034 }
2535 d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	5035 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	5036 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	5037 }
d862d9e4069b Android: Implement most of the rest of drawing except for fonts... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2531 diff changeset	5038
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	5039 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	5040 {
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	5041 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	5042 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	5043 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	5044
473eb9ff3f04 Android: Implement dw_container_set_stripe() and center the images in the rows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2579 diff changeset	5045 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	5046 }
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 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	5049 {
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	5050 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	5051 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	5052 if(bgColor != -1L) {
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	5053 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	5054 } else {
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	5055 this.bgcolor = null
22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	5056 }
2531 f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	5057 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	5058 }
f45ebd96ebe5 Android: First attempts at implementing drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2530 diff changeset	5059
2490 62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5060 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	5061 {
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5062 // creating timer task, timer
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5063 val t = Timer()
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5064 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	5065 override fun run() {
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5066 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	5067 t.cancel()
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 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5070 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5071 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	5072 return t
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5073 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5074
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5075 fun timerDisconnect(timer: Timer)
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 timer.cancel()
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5078 }
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5079
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5080 fun doBeep(duration: Int)
62e124eecd82 Android: Implement timers and beep. Some general code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2489 diff changeset	5081 {
2491 bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	5082 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	5083 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	5084 val handler = Handler(Looper.getMainLooper())
bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	5085 handler.postDelayed({
bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	5086 toneGen.release()
bf4fe6bb512b Android: Fix the permission error on the beep... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2490 diff changeset	5087 }, (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	5088 }
666af45f33b5 Android: Implment a bunch of window functions: enable/disable/data/id bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2487 diff changeset	5089
2482 4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	5090 fun debugMessage(text: String)
4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	5091 {
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	5092 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	5093 }
4888503c3e3e Android: Implement dw_debug() using the Android Log class. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2481 diff changeset	5094
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	5095 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	5096 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	5097 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	5098 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	5099 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	5100 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	5101 } 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	5102 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	5103 }
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 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	5105 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	5106 }
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	5107 }
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	5108
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	5109 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	5110 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	5111 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	5112 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	5113
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5114 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	5115 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	5116 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	5117 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 )
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 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	5120 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	5121 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	5122 }
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 } 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	5124 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	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 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	5127 }
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
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 // 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	5130 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	5131 {
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	5132 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	5133
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	5134 // 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	5135 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	5136 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	5137
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	5138 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	5139 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	5140 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	5141 // 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	5142 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	5143 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	5144 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	5145 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	5146 } 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	5147 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	5148 }
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	5149 }
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
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 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	5152 // 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	5153 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	5154 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	5155
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5156 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	5157 // 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	5158 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	5159 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	5160 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	5161 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	5162 } 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	5163 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	5164 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	5165 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	5166 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	5167 )
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 = 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	5169 } 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	5170 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	5171 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	5172 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	5173 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	5174 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	5175 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	5176 } 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	5177 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	5178 } 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	5179 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	5180 }
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 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	5182 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	5183 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	5184 )
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 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	5186 }
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 } 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	5188 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	5189 }
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 // 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	5191 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	5192 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	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
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 // 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	5196 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	5197 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	5198 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	5199
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 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	5201 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	5202 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	5203
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 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	5205 }
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 } 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	5208 // 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	5209 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	5210 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	5211 }
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	5212 }
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	5213 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	5214 }
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	5215
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5216 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	5217 {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5218 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	5219
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5220 waitOnUiThread {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5221 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	5222 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	5223 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	5224 // 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	5225 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	5226 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	5227 }
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	5228 })
2526 d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5229 if(ext != null) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5230 fc.setExtension(ext)
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5231 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5232 fc.showDialog()
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5233 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5234
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5235 // 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	5236 try {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5237 Looper.loop()
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5238 } catch (e2: RuntimeException) {
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5239 }
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 return retval
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5242 }
d3f09b3f3703 Android: Initial dw_file_browse() implementation, still needs some work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2524 diff changeset	5243
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	5244 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	5245 {
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	5246 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	5247
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5248 // 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	5249 if(Looper.getMainLooper() != Looper.myLooper()) {
e9ad53d2271b Android: Fix Intent based file chooser and switch to using it by default. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2714 diff changeset	5250 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	5251 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	5252 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	5253
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 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	5255 colorWheel.rgb = Color.rgb(red, green, blue)
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 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	5257 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	5258 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	5259 )
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 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	5261 retval = colorWheel.rgb
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 }
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	5263 }
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	5264 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	5265 }
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	5266
2486 cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	5267 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	5268 {
2579 68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5269 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	5270
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5271 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5272 // 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	5273 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	5274
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5275 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	5276 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	5277 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	5278 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	5279 )
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5280 //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	5281 { _: DialogInterface, _: Int ->
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5282 retval = 1
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5283 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	5284 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5285 }
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5286 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	5287 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	5288 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	5289 ) { _: DialogInterface, _: Int ->
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5290 retval = 0
68ee9a89e0f0 Android: Code cleanup, fix all warnings except for unused function/parameters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2578 diff changeset	5291 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	5292 }
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5293 }
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) 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	5295 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	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.no,
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 = 0
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 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	5304 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	5305 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	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 = 2
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 }
2573 ea75e295025b Android: Make message boxes modal (not cancelable). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2572 diff changeset	5311 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	5312 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	5313
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5314 // 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	5315 try {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5316 Looper.loop()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5317 } 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	5318 }
2486 cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	5319 }
cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	5320 return retval
cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	5321 }
cec43818bd3e Android: Implement dw_messagebox() ... seems we can't just cleanly exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2484 diff changeset	5322
2530 b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	5323 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	5324 {
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	5325 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	5326 return true
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	5327 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	5328 return false
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	5329 }
b9923432cb1f Android: Implement View based render widget and icon support with Drawable. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2529 diff changeset	5330
2514 5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5331 fun mainSleep(milliseconds: Int)
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5332 {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5333 // 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	5334 // 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	5335 // 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	5336 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	5337 val starttime = System.currentTimeMillis()
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5338
2637 22105f99dd6a Android: Add support for transparent background color for text drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2620 diff changeset	5339 // 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	5340 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	5341 var thrown: Boolean = false
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5342
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5343 override fun queueIdle(): Boolean {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5344 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	5345 if (thrown == false) {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5346 thrown = true
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5347 throw java.lang.RuntimeException()
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5348 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5349 return false
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5350 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5351 return true
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5352 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5353 })
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5354
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5355 // 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	5356 try {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5357 Looper.loop()
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5358 } catch (e2: RuntimeException) {
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 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5361 else
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5362 {
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5363 // 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	5364 Thread.sleep(milliseconds.toLong())
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 }
5f711e86a211 Android: Implement dw_main_sleep() and dw_main_iteration(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2510 diff changeset	5367
2487 83f8f4f58a98 Android: Implement dw_exit() using Activity.finishActivity() instead of exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2486 diff changeset	5368 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	5369 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5370 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5371 this.finishAffinity()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5372 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	5373 }
2494 b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	5374 }
b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	5375
b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	5376 fun dwindowsShutdown()
b3e28eed0e50 Android: Fix the basics of notebook control... return actual page IDs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2493 diff changeset	5377 {
2502 b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5378 waitOnUiThread {
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5379 this.finishAffinity()
b6319aed3298 Android: Massive thread safety overhaul. Not quite back to fully functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2501 diff changeset	5380 }
2487 83f8f4f58a98 Android: Implement dw_exit() using Activity.finishActivity() instead of exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2486 diff changeset	5381 }
83f8f4f58a98 Android: Implement dw_exit() using Activity.finishActivity() instead of exit(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2486 diff changeset	5382
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5383 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	5384 {
2690 755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	5385 appID = appid
755d9ad07aaf Android: Fix state exception by calling notifyDataSetChanged() on DWListBox. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2689 diff changeset	5386
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5387 waitOnUiThread {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5388 // 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	5389 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	5390 // Create the NotificationChannel
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5391 val importance = NotificationManager.IMPORTANCE_DEFAULT
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5392 val mChannel = NotificationChannel(appid, appname, importance)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5393 // 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	5394 // or other notification behaviors after this
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5395 val notificationManager =
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5396 getSystemService(NOTIFICATION_SERVICE) as NotificationManager
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5397 notificationManager.createNotificationChannel(mChannel)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5398 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5399 }
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5400 return Build.VERSION.SDK_INT
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5401 }
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5402
2543 f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5403 fun dwMain()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5404 {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5405 runOnUiThread {
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5406 // 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	5407 invalidateOptionsMenu()
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5408 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5409 }
f9367eb9a6e7 Android: Initial menu support, incomplete but basics functional. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2542 diff changeset	5410
2542 bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5411 fun androidGetRelease(): String
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5412 {
bb75e64e6138 Android: Implement dw_screen_* and dw_environment_query(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2539 diff changeset	5413 return Build.VERSION.RELEASE
2522 66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5414 }
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 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	5417 {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5418 var builder: NotificationCompat.Builder? = null
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5419
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5420 waitOnUiThread {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5421 builder = NotificationCompat.Builder(this, appid)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5422 .setContentTitle(title)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5423 .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	5424 .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	5425 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5426 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5427 return builder
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5428 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5429
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5430 fun notificationSend(builder: NotificationCompat.Builder)
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 waitOnUiThread {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5433 notificationID += 1
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5434 with(NotificationManagerCompat.from(this)) {
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5435 // 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	5436 notify(notificationID, builder.build())
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5437 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5438 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5439 }
66c490aa719d Android: Implement notifications, images on notifications incomplete. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2521 diff changeset	5440
2475 16d195d46f2a Android: Implement dw_window_new(), dw_box_new() and dw_box_pack(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2474 diff changeset	5441 /*
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	5442 * 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	5443 * 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	5444 */
2658 ad6fc7f1a9af Android: Asset/Resource refactoring for compatibility with other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2656 diff changeset	5445 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	5446 external fun eventHandler(
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5447 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	5448 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	5449 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	5450 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	5451 str2: String?,
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5452 inta: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5453 intb: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5454 intc: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5455 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	5456 ): Int
2499 ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5457 external fun eventHandlerInt(
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5458 obj1: View,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5459 message: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5460 inta: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5461 intb: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5462 intc: Int,
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5463 intd: Int
ff3310fa6d72 Android: Implment DW_SIGNA_CONFIGURE on orientation change. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2498 diff changeset	5464 )
2483 9f7af6d8c6a4 Android: Fix signal handlers so they actually work. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2482 diff changeset	5465 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	5466 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	5467 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	5468 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	5469 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	5470 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	5471
2474 a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	5472 companion object
a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	5473 {
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5474 // 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	5475 init
a13e6db064f4 Android: Implement thread, semaphore, shared memory API functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2473 diff changeset	5476 {
2473 aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5477 System.loadLibrary("dwindows")
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5478 }
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5479 }
aa420e366b2b Android: Initial skeletal commit for Android support, almost nothing implemented... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5480 }

Mercurial > dwindows

annotate android/DWindows.kt @ 2721:c0be28906839