ADFA-2443 | Move file I/O operations off the main thread

app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt

@@ -72,6 +72,7 @@ import com.itsaky.androidide.utils.IntentUtils.openImage
 import com.itsaky.androidide.utils.UniqueNameBuilder
 import com.itsaky.androidide.utils.flashSuccess
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
@@ -537,9 +538,13 @@ open class EditorHandlerActivity :
  progressConsumer: ((Int, Int) -> Unit)?,
  runAfter: (() -> Unit)?,
 	) {
- lifecycleScope.launch {
- saveAll(notify, requestSync, processResources, progressConsumer)
- runAfter?.invoke()
+ lifecycleScope.launch(Dispatchers.IO) {
+ withContext(NonCancellable) {
+ saveAll(notify, requestSync, processResources, progressConsumer)
+ }
+ withContext(Dispatchers.Main) {
+ runAfter?.invoke()
+ }
  }
 	}
 

layouteditor/src/main/java/org/appdevforall/codeonthego/layouteditor/activities/EditorActivity.kt

@@ -7,6 +7,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -50,6 +51,7 @@ import org.appdevforall.codeonthego.layouteditor.editor.DeviceSize
 import org.appdevforall.codeonthego.layouteditor.editor.convert.ConvertImportedXml
 import org.appdevforall.codeonthego.layouteditor.managers.DrawableManager
 import org.appdevforall.codeonthego.layouteditor.managers.IdManager.clear
+import org.appdevforall.codeonthego.layouteditor.managers.PreferencesManager
 import org.appdevforall.codeonthego.layouteditor.managers.ProjectManager
 import org.appdevforall.codeonthego.layouteditor.managers.UndoRedoManager
 import org.appdevforall.codeonthego.layouteditor.tools.XmlLayoutGenerator
@@ -147,31 +149,38 @@ class EditorActivity : BaseActivity() {
  val createdAt = getCreatedTime(filePath).toString()
  val modifiedAt = getLastModifiedTime(filePath).toString()
 
- projectManager.openProject(
- ProjectFile(
- filePath,
- createdAt,
- modifiedAt,
- this@EditorActivity,
- mainLayoutName = fileName
+ try {
+ projectManager.openProject(
+ ProjectFile(
+ filePath,
+ createdAt,
+ modifiedAt,
+ this@EditorActivity,
+ mainLayoutName = fileName
+ )
+ )
+ project = projectManager.openedProject!!
+ invalidateOptionsMenu()
+ androidToDesignConversion(
+ Uri.fromFile(File(projectManager.openedProject?.mainLayout?.path ?: "")),
  )
- )
- project = projectManager.openedProject!!
- invalidateOptionsMenu()
- androidToDesignConversion(
- Uri.fromFile(File(projectManager.openedProject?.mainLayout?.path ?: "")),
- )
 
- supportActionBar?.title = project.name
- layoutAdapter = LayoutListAdapter(project)
+ supportActionBar?.title = project.name
+ layoutAdapter = LayoutListAdapter(project)
+ binding.editorLayout.setBackgroundColor(
+ Utils.getSurfaceColor(this@EditorActivity)
+ )
+ } catch (e: Exception) {
+ Log.e("EditorActivity", "Error loading project", e)
+ Toast.makeText(
+ this@EditorActivity,
+ getString(string.msg_error_opening_project),
+ Toast.LENGTH_SHORT
+ ).show()
+ finish()
+ }
  }
  } ?: showNothingDialog()
-
- binding.editorLayout.setBackgroundColor(
- Utils.getSurfaceColor(
- this,
- ),
- )
 	}
 
 	private fun defineXmlPicker() {
@@ -724,23 +733,30 @@ class EditorActivity : BaseActivity() {
  }
 	}
 
- private fun openLayout(layoutFile: LayoutFile) {
- originalProductionXml = layoutFile.readLayoutFile()
- originalDesignXml = layoutFile.readDesignFile()
+ private suspend fun openLayout(layoutFile: LayoutFile) {
+ val (production, design, layoutName) = withContext(Dispatchers.IO) {
+ val production = layoutFile.readLayoutFile()
+ var design = layoutFile.readDesignFile()
 
- var contentToParse = layoutFile.readDesignFile()
+ if (design.isNullOrBlank() && !production.isNullOrBlank()) {
+ val converted = withContext(Dispatchers.Default) {
+ ConvertImportedXml(production).getXmlConverted(this@EditorActivity)
+ }
+ if (!converted.isNullOrBlank()) {
+ layoutFile.saveDesignFile(converted)
+ design = converted
+ }
+ }
+ Triple(production, design, layoutFile.name)
+ }
+ originalProductionXml = production
+ originalDesignXml = design
 
- if (contentToParse.isNullOrBlank()) {
- val productionContent = layoutFile.readLayoutFile()
- if (!productionContent.isNullOrBlank()) {
- contentToParse = ConvertImportedXml(productionContent).getXmlConverted(this)
- contentToParse?.let { layoutFile.saveDesignFile(it) }
- }
- }
+ binding.editorLayout.loadLayoutFromParser(design)
 
- binding.editorLayout.loadLayoutFromParser(contentToParse)
  project.currentLayout = layoutFile
- supportActionBar!!.subtitle = layoutFile.name
+ supportActionBar?.subtitle = layoutName
+
  if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
  drawerLayout.closeDrawer(GravityCompat.START)
  }

layouteditor/src/main/java/org/appdevforall/codeonthego/layouteditor/activities/ResourceManagerActivity.kt

@@ -17,9 +17,11 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia.Companion.isPhotoPickerAvailable
 import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia.ImageOnly
 import androidx.annotation.RequiresApi
+import androidx.lifecycle.lifecycleScope
 import androidx.viewpager2.widget.ViewPager2
 import com.blankj.utilcode.util.ToastUtils
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.launch
 import org.appdevforall.codeonthego.layouteditor.BaseActivity
 import org.appdevforall.codeonthego.layouteditor.R
 import org.appdevforall.codeonthego.layouteditor.adapters.PagerAdapter
@@ -46,7 +48,6 @@ class ResourceManagerActivity : BaseActivity() {
  private var pickMedia: ActivityResultLauncher<PickVisualMediaRequest>? = null
  private var requestPermission: ActivityResultLauncher<String>? = null
 
- @SuppressLint("UseCompatLoadingForDrawables")
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)
  binding = ActivityResourceManagerBinding.inflate(
@@ -56,38 +57,23 @@ class ResourceManagerActivity : BaseActivity() {
  setSupportActionBar(binding!!.topAppBar)
  supportActionBar!!.setTitle(R.string.res_manager)
  binding!!.topAppBar.setNavigationOnClickListener { onBackPressedDispatcher.onBackPressed() }
- if (ProjectManager.instance.openedProject == null) {
- val extras = intent.extras
- if (extras != null && extras.containsKey(Constants.EXTRA_KEY_PROJECT)) {
- ProjectManager.instance
- .openProject(extras.getParcelable(Constants.EXTRA_KEY_PROJECT))
+ lifecycleScope.launch {
+ try {
+ if (ProjectManager.instance.openedProject == null) {
+ val extras = intent.extras
+ if (extras != null && extras.containsKey(Constants.EXTRA_KEY_PROJECT)) {
+ ProjectManager.instance
+ .openProject(extras.getParcelable(Constants.EXTRA_KEY_PROJECT))
+ }
+ }
+ if (ProjectManager.instance.openedProject == null) return@launch
+ setupViewPager()
+ } catch (e: Exception) {
+ ToastUtils.showShort(R.string.msg_error_opening_project)
+ Log.e("ResourcesManagerActivity", "Error loading project", e)
+ finish()
  }
  }
- // loadDrawables()
- val adapter = PagerAdapter(supportFragmentManager, lifecycle)
- adapter.setup(binding!!.pager, binding!!.tabLayout)
- adapter.addFragmentToAdapter(
- DrawableFragment(drawableList.toMutableList()),
- getString(R.string.drawable),
- getDrawable(R.drawable.image_outline)!!
- )
- adapter.addFragmentToAdapter(
- ColorFragment(),
- getString(R.string.color),
- getDrawable(R.drawable.palette_outline)!!
- )
- adapter.addFragmentToAdapter(
- StringFragment(),
- getString(R.string.string),
- getDrawable(R.drawable.format_letter_case)!!
- )
- adapter.addFragmentToAdapter(
- FontFragment(),
- getString(R.string.font),
- getDrawable(R.drawable.format_font)!!
- )
- adapter.setupPager(ViewPager2.ORIENTATION_HORIZONTAL)
- adapter.setupMediatorWithIcon()
  requestPermission = registerForActivityResult(
  ActivityResultContracts.RequestPermission()
  ) { onRequestPermission(it) }
@@ -112,6 +98,34 @@ class ResourceManagerActivity : BaseActivity() {
  }
  }
 
+ @SuppressLint("UseCompatLoadingForDrawables")
+	private fun setupViewPager() {
+ val adapter = PagerAdapter(supportFragmentManager, lifecycle)
+ adapter.setup(binding!!.pager, binding!!.tabLayout)
+ adapter.addFragmentToAdapter(
+ DrawableFragment(drawableList.toMutableList()),
+ getString(R.string.drawable),
+ getDrawable(R.drawable.image_outline)!!
+ )
+ adapter.addFragmentToAdapter(
+ ColorFragment(),
+ getString(R.string.color),
+ getDrawable(R.drawable.palette_outline)!!
+ )
+ adapter.addFragmentToAdapter(
+ StringFragment(),
+ getString(R.string.string),
+ getDrawable(R.drawable.format_letter_case)!!
+ )
+ adapter.addFragmentToAdapter(
+ FontFragment(),
+ getString(R.string.font),
+ getDrawable(R.drawable.format_font)!!
+ )
+ adapter.setupPager(ViewPager2.ORIENTATION_HORIZONTAL)
+ adapter.setupMediatorWithIcon()
+	}
+
  override fun onCreateOptionsMenu(menu: Menu): Boolean {
  menuInflater.inflate(R.menu.menu_resource_manager, menu)
  return super.onCreateOptionsMenu(menu)

layouteditor/src/main/java/org/appdevforall/codeonthego/layouteditor/adapters/ProjectListAdapter.kt

@@ -1,10 +1,12 @@
 package org.appdevforall.codeonthego.layouteditor.adapters
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.text.Editable
 import android.text.TextWatcher
+import android.util.Log
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.MenuItem
@@ -14,12 +16,18 @@ import android.view.WindowManager
 import android.view.animation.AnimationUtils
 import android.view.inputmethod.InputMethodManager
 import android.widget.ArrayAdapter
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.PopupMenu
 import androidx.appcompat.widget.TooltipCompat
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputLayout
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.appdevforall.codeonthego.layouteditor.LayoutEditor.Companion.instance
 import org.appdevforall.codeonthego.layouteditor.ProjectFile
 import org.appdevforall.codeonthego.layouteditor.R
@@ -34,10 +42,11 @@ import org.appdevforall.codeonthego.layouteditor.utils.Constants
 import org.appdevforall.codeonthego.layouteditor.utils.FileUtil
 import org.appdevforall.codeonthego.layouteditor.utils.SBUtils.Companion.make
 import java.io.File
+import androidx.core.content.edit
+import androidx.lifecycle.LifecycleOwner
 
 class ProjectListAdapter(private val projects: MutableList<ProjectFile>) :
  RecyclerView.Adapter<ProjectListAdapter.ViewHolder>() {
- private lateinit var preferencesManager:PreferencesManager
 
  var onDeleteCallback: ((Int) -> Unit)? = null
 
@@ -223,23 +232,40 @@ class ProjectListAdapter(private val projects: MutableList<ProjectFile>) :
  }
 
  private fun openProject(v: View, position: Int) {
- val intent = Intent(v.context, EditorActivity::class.java)
- preferencesManager = PreferencesManager(v.context)
- ProjectManager.instance.openProject(projects[position])
-
- val projectDir =
- "${FileUtil.getPackageDataDir(instance!!.context)}/projects/${projects[position].name}"
-
- if (!preferencesManager.prefs.getBoolean("copyAssets", false)
- && !(File("$projectDir/values/colors.xml").exists())
- ) {
- FileUtil.makeDir("$projectDir/values/")
- // FileUtil.makeDir(projectDir + "/drawable/");
- // FileUtil.copyFileFromAsset("default_image.png", projectDir + "/drawable");
- FileUtil.copyFileFromAsset("colors.xml", "$projectDir/values")
- preferencesManager.prefs.edit().putBoolean("copyAssets", true).apply()
+ val lifecycleOwner = v.findViewTreeLifecycleOwner() ?: (v.context as? LifecycleOwner)
+ val scope = lifecycleOwner?.lifecycleScope ?: return
+
+ v.isEnabled = false
+
+ scope.launch {
+ try {
+ withContext(Dispatchers.IO) {
+ ProjectManager.instance.openProject(projects[position])
+ val prefsManager = PreferencesManager(v.context)
+
+ val projectDir =
+ "${FileUtil.getPackageDataDir(instance!!.context)}/projects/${projects[position].name}"
+ val checkFile = File("$projectDir/values/colors.xml")
+
+ if (!prefsManager.prefs.getBoolean("copyAssets", false) && !checkFile.exists()) {
+ FileUtil.makeDir("$projectDir/values/")
+ FileUtil.copyFileFromAsset("colors.xml", "$projectDir/values")
+ prefsManager.prefs.edit { putBoolean("copyAssets", true) }
+ }
+ }
+ val intent = Intent(v.context, EditorActivity::class.java)
+ v.context.startActivity(intent)
+ } catch (e: Exception) {
+ withContext(Dispatchers.Main) {
+ Toast.makeText(v.context, v.context.getString(R.string.msg_error_opening_project), Toast.LENGTH_SHORT).show()
+ }
+ Log.e("ProjectListAdapter", "Error opening project", e)
+ } finally {
+ if (v.context is Activity && !(v.context as Activity).isFinishing) {
+ v.isEnabled = true
+ }
+ }
  }
- v.context.startActivity(intent)
  }
 
  private fun previewLayout(v: View, position: Int) {

layouteditor/src/main/java/org/appdevforall/codeonthego/layouteditor/managers/PreferencesManager.kt

@@ -5,7 +5,26 @@ import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.PreferenceManager
 
-class PreferencesManager(val context: Context) {
+class PreferencesManager private constructor(context: Context) {
+	private val appContext = context.applicationContext
+
+ val prefs: SharedPreferences by lazy {
+ PreferenceManager.getDefaultSharedPreferences(appContext)
+	}
+
+	companion object {
+ @Volatile
+ private var INSTANCE: PreferencesManager? = null
+ fun getInstance(context: Context): PreferencesManager {
+ return INSTANCE ?: synchronized(this) {
+ INSTANCE ?: PreferencesManager(context).also { INSTANCE = it }
+ }
+ }
+
+ operator fun invoke(context: Context): PreferencesManager {
+ return getInstance(context)
+ }
+	}
 
  val isEnableVibration: Boolean
  get() = prefs.getBoolean(SharedPreferencesKeys.KEY_VIBRATION, false)
@@ -22,7 +41,4 @@ class PreferencesManager(val context: Context) {
  "Dark" -> AppCompatDelegate.MODE_NIGHT_YES
  else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
  }
-
- val prefs: SharedPreferences
- get() = PreferenceManager.getDefaultSharedPreferences(context)
 }