dwindows: android/DWindows.kt comparison

comparison android/DWindows.kt @ 2564:607acfe2c504

Android: The *_from_file() functions now check the assets folder. Also try all the loadable file extensions that I am aware of for images. Not sure if I should try absolute paths too or just leave it only assets. Create an "assets" folder under main and put file.png and folder.png in. Create a subfolder "image" and put test.png in. This will create an app with the required images.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 19 May 2021 08:13:13 +0000
parents	56183bef6793
children	5463801a888f

comparison

equal deleted inserted replaced

-:56183bef6793
+:607acfe2c504
 import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
 import com.google.android.material.tabs.TabLayoutMediator
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileNotFoundException
+import java.io.IOException
 import java.util.*
 import java.util.concurrent.locks.ReentrantLock
 class DWTabViewPagerAdapter : RecyclerView.Adapter<DWTabViewPagerAdapter.DWEventViewHolder>() {
 fun bitmapButtonNewFromFile(text: String, cid: Int, filename: String): ImageButton? {
 var button: ImageButton? = null
 waitOnUiThread {
 button = ImageButton(this)
 var dataArrayMap = SimpleArrayMap<String, Long>()
+var exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
 button!!.tag = dataArrayMap
 button!!.id = cid
 button!!.setOnClickListener {
 eventHandlerSimple(button!!, 8)
 }
-// Try to load the image, and protect against exceptions
-try {
+for (ext in exts) {
-val f = File(filename)
+// Try to load the image, and protect against exceptions
-val b = BitmapFactory.decodeStream(FileInputStream(f))
+try {
-button!!.setImageBitmap(b)
+val f = this.assets.open(filename + ext)
-}
+val b = BitmapFactory.decodeStream(f)
-catch (e: FileNotFoundException)
-{
+if(b != null) {
+button!!.setImageBitmap(b)
+break
+}
+} catch (e: IOException) {
+}
 }
 }
 return button
 }
 val imageview = window
 imageview.setImageResource(resID)
 }
 } else if(filename != null) {
-// Try to load the image, and protect against exceptions
+var exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
-try {
-val f = File(filename)
+for (ext in exts) {
-val b = BitmapFactory.decodeStream(FileInputStream(f))
+// Try to load the image, and protect against exceptions
-if(window is ImageButton) {
+try {
-val button = window
+val f = this.assets.open(filename + ext)
+val b = BitmapFactory.decodeStream(f)
-button.setImageBitmap(b)
-} else if(window is ImageView) {
+if(b != null) {
-val imageview = window
+if (window is ImageButton) {
+val button = window
-imageview.setImageBitmap(b)
-}
+button.setImageBitmap(b)
-} catch (e: FileNotFoundException) {
+} else if (window is ImageView) {
+val imageview = window
+imageview.setImageBitmap(b)
+}
+break
+}
+} catch (e: IOException) {
+}
 }
 }
 }
 }
 waitOnUiThread {
 if(resID != 0) {
 icon = ResourcesCompat.getDrawable(resources, resID, null);
 } else if(filename != null) {
-// Try to load the image, and protect against exceptions
+var exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
-try {
-icon = Drawable.createFromPath(filename)
+for (ext in exts) {
-} catch (e: FileNotFoundException) {
+// Try to load the image, and protect against exceptions
+try {
+val f = this.assets.open(filename + ext)
+icon = Drawable.createFromStream(f, null)
+} catch (e: IOException) {
+}
+if(icon != null) {
+break
+}
 }
 } else if(data != null) {
 icon = BitmapDrawable(resources, BitmapFactory.decodeByteArray(data, 0, length))
 }
 }
 if(width > 0 && height > 0) {
 pixmap = Bitmap.createBitmap(null, width, height, Bitmap.Config.ARGB_8888)
 } else if(resID != 0) {
 pixmap = BitmapFactory.decodeResource(resources, resID);
 } else if(filename != null) {
-// Try to load the image, and protect against exceptions
+var exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
-try {
-val f = File(filename)
+for (ext in exts) {
-pixmap = BitmapFactory.decodeStream(FileInputStream(f))
+// Try to load the image, and protect against exceptions
-} catch (e: FileNotFoundException) {
+try {
+val f = this.assets.open(filename + ext)
+pixmap = BitmapFactory.decodeStream(f)
+} catch (e: IOException) {
+}
+if(pixmap != null) {
+break
+}
 }
 } else if(data != null) {
 pixmap = BitmapFactory.decodeByteArray(data, 0, length)
 }
 }

Mercurial > dwindows

comparison android/DWindows.kt @ 2564:607acfe2c504