dwindows: android/DWindows.kt comparison

comparison android/DWindows.kt @ 2658:ad6fc7f1a9af

Android: Asset/Resource refactoring for compatibility with other platforms. Other platforms are able to access the bundled assets via the filesystem. Android keeps the assets in the Zipped APK archive, so during initialization we now extract the non-resource (numeric images) into the app cache dir. dw_app_dir() now returns the path to the application cache. dw_user_dir() returns either the HOME directory or the path to the application root directory (usually the parent of the cache).

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 24 Sep 2021 13:57:16 +0000
parents	2bdbd5e83654
children	3a14d7fd4b99

comparison

equal deleted inserted replaced

-:9535f533a230
+:ad6fc7f1a9af
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
 import com.google.android.material.tabs.TabLayoutMediator
+import java.io.BufferedInputStream
 import java.io.File
+import java.io.FileOutputStream
 import java.io.IOException
 import java.util.*
 import java.util.concurrent.locks.ReentrantLock
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
 object DWEvent {
 const val TIMER = 0
 const val CONFIGURE = 1
 const val KEY_PRESS = 2
 const val COLUMN_CLICK = 17
 const val HTML_RESULT = 18
 const val HTML_CHANGED = 19
 }
+val DWImageExts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
 class DWTabViewPagerAdapter : RecyclerView.Adapter<DWTabViewPagerAdapter.DWEventViewHolder>() {
 val viewList = mutableListOf<LinearLayout>()
 val pageList = mutableListOf<Long>()
 var currentPageID = 0L
 threadCond.await()
 threadLock.unlock()
 }
 }
+// Returns true if the filename is a resource ID (non-zero number)
+// with a image file extension in our DWImageExts list
+private fun isDWResource(filename: String): Boolean {
+val length = filename.length
+for (ext in DWImageExts) {
+if (ext.isNotEmpty() && filename.endsWith(ext)) {
+val filebody: String = filename.substring(7, length - ext.length)
+if (filebody.toInt() > 0) {
+return true
+}
+}
+}
+return false
+}
+/**
+* extracts assets/ in the APK to the application cache directory
+*/
+private fun extractAssets() {
+var zipFile: ZipFile? = null
+val targetDir = cacheDir
+try {
+zipFile = ZipFile(this.applicationInfo.sourceDir)
+val e: Enumeration<out ZipEntry?> = zipFile.entries()
+while (e.hasMoreElements()) {
+val entry: ZipEntry? = e.nextElement()
+if (entry == null || entry.isDirectory || !entry.name.startsWith("assets/") ||
+isDWResource(entry.name)) {
+continue
+}
+val targetFile = File(targetDir, entry.name.substring("assets/".length))
+targetFile.parentFile!!.mkdirs()
+val tempBuffer = ByteArray(entry.size.toInt())
+var ais: BufferedInputStream? = null
+var aos: FileOutputStream? = null
+try {
+ais = BufferedInputStream(zipFile.getInputStream(entry))
+aos = FileOutputStream(targetFile)
+ais.read(tempBuffer)
+aos.write(tempBuffer)
+} catch (e: IOException) {
+} finally {
+ais?.close()
+aos?.close()
+}
+}
+} catch (e: IOException) {
+} finally {
+zipFile?.close()
+}
+}
 // We only want to call this once when the app starts up
 // By default Android will call onCreate for rotation and other
 // changes.  This is incompatible with Dynamic Windows...
 // Make sure the following is in your AndroidManifest.xml
 // android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 // Get the Android app path
 val m = packageManager
 var s = packageName
 val p = m.getPackageInfo(s!!, 0)
 s = p.applicationInfo.dataDir
+val c = cacheDir.path
+// Extract any non-resource assets to the cache directory
+// So that our C code can access them as files, like on
+// other Dynamic Windows platforms
+extractAssets()
 // Initialize the Dynamic Windows code...
 // This will start a new thread that calls the app's dwmain()
-dwindowsInit(s, this.getPackageName())
+dwindowsInit(s, c, this.getPackageName())
 }
 override fun onConfigurationChanged(newConfig: Configuration) {
 super.onConfigurationChanged(newConfig)
 fun bitmapButtonNew(text: String, resid: Int): ImageButton? {
 var button: ImageButton? = null
 waitOnUiThread {
 button = ImageButton(this)
 val dataArrayMap = SimpleArrayMap<String, Long>()
-val exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
 var filename: String? = null
 button!!.tag = dataArrayMap
 button!!.id = resid
 button!!.setImageResource(resid)
 if(resid > 0 && resid < 65536) {
 filename = resid.toString()
 }
 if(filename != null) {
-for (ext in exts) {
+for (ext in DWImageExts) {
 // Try to load the image, and protect against exceptions
 try {
 val f = this.assets.open(filename + ext)
 val b = BitmapFactory.decodeStream(f)
 fun bitmapButtonNewFromFile(text: String, cid: Int, filename: String): ImageButton? {
 var button: ImageButton? = null
 waitOnUiThread {
 button = ImageButton(this)
 val dataArrayMap = SimpleArrayMap<String, Long>()
-val exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
 button!!.tag = dataArrayMap
 button!!.id = cid
 button!!.setOnClickListener {
 lastClickView = button!!
 eventHandlerSimple(button!!, DWEvent.CLICKED)
 }
-for (ext in exts) {
+for (ext in DWImageExts) {
 // Try to load the image, and protect against exceptions
 try {
 val f = this.assets.open(filename + ext)
 val b = BitmapFactory.decodeStream(f)
 imageview.setImageResource(resID)
 }
 }
 if(filename != null) {
-val exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
+for (ext in DWImageExts) {
-for (ext in exts) {
 // Try to load the image, and protect against exceptions
 try {
 val f = this.assets.open(filename + ext)
 val b = BitmapFactory.decodeStream(f)
 filename = file
 }
 // Handle filename or DW resource IDs
 // these will be located in the assets folder
 if(filename != null) {
-val exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
+for (ext in DWImageExts) {
-for (ext in exts) {
 // 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) {
 pixmap = BitmapFactory.decodeByteArray(data, 0, length)
 } else {
 filename = file
 }
 if(filename != null) {
-val exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
+for (ext in DWImageExts) {
-for (ext in exts) {
 // Try to load the image, and protect against exceptions
 try {
 val f = this.assets.open(filename + ext)
 pixmap = BitmapFactory.decodeStream(f)
 } catch (e: IOException) {
 /*
 * Native methods that are implemented by the 'dwindows' native library,
 * which is packaged with this application.
 */
-external fun dwindowsInit(dataDir: String, appid: String)
+external fun dwindowsInit(dataDir: String, cacheDir: String, appid: String)
 external fun eventHandler(
 obj1: View?,
 obj2: View?,
 message: Int,
 str1: String?,

Mercurial > dwindows

comparison android/DWindows.kt @ 2658:ad6fc7f1a9af