fix: migrate IDEColorSchemeProvider to Kotlin coroutines

Author: itsaky

app/src/main/java/com/itsaky/androidide/actions/etc/ReloadColorSchemesAction.kt

@@ -19,14 +19,18 @@ package com.itsaky.androidide.actions.etc
 
 import android.content.Context
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import com.blankj.utilcode.util.ThreadUtils
 import com.itsaky.androidide.R
 import com.itsaky.androidide.actions.ActionData
 import com.itsaky.androidide.actions.EditorActivityAction
 import com.itsaky.androidide.editor.schemes.IDEColorSchemeProvider
 import com.itsaky.androidide.tasks.executeAsyncProvideError
 import com.itsaky.androidide.tasks.executeWithProgress
+import com.itsaky.androidide.tasks.launchAsyncWithProgress
 import com.itsaky.androidide.utils.ILogger
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 /**
  * Action which reloads the editor color schemes.
@@ -51,14 +55,14 @@ class ReloadColorSchemesAction(context: Context, override val order: Int) : Edit
 
   override suspend fun execAction(data: ActionData): Boolean {
     val context = data.requireActivity()
-    context.executeWithProgress { dialog ->
-      executeAsyncProvideError(IDEColorSchemeProvider::reload) { _, error ->
-        if (error != null) {
-          log.error("Failed to load the color schemes", error)
-          return@executeAsyncProvideError
-        }
-
-        ThreadUtils.runOnUiThread(dialog::dismiss)
+    context.lifecycleScope.launchAsyncWithProgress(
+      context = Dispatchers.Default,
+      configureFlashbar = { builder, _ ->
+        builder.message(R.string.please_wait)
+      }) { flashbar, _ ->
+      IDEColorSchemeProvider.reload()
+      withContext(Dispatchers.Main) {
+        flashbar.dismiss()
       }
     }
     return true

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

@@ -109,9 +109,9 @@ abstract class BaseEditorActivity :
   protected val log: ILogger = ILogger.newInstance("EditorActivity")
 
   /**
-   * [CoroutineScope] for executing tasks in the background.
+   * Editor activity's [CoroutineScope] for executing tasks in the background.
    */
-  protected val activityBackgroundScope = CoroutineScope(Dispatchers.Default)
+  protected val editorActivityScope = CoroutineScope(Dispatchers.Default)
 
   internal var installationCallback: ApkInstallationSessionCallback? = null
 
@@ -168,7 +168,7 @@ abstract class BaseEditorActivity :
     installationCallback = null
 
     if (isDestroying) {
-      activityBackgroundScope.cancelIfActive("Activity is being destroyed")
+      editorActivityScope.cancelIfActive("Activity is being destroyed")
     }
   }
 

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

@@ -378,7 +378,7 @@ open class EditorHandlerActivity : ProjectHandlerActivity(), IEditorHandler {
     progressConsumer: ((Int, Int) -> Unit)?,
     runAfter: (() -> Unit)?
   ) {
-    activityBackgroundScope.launch {
+    editorActivityScope.launch {
       saveAll(notify, requestSync, processResources, progressConsumer)
       runAfter?.invoke()
     }

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

@@ -463,7 +463,7 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
     }
 
     manager.cachedInitResult = result
-    activityBackgroundScope.launch(Dispatchers.IO) {
+    editorActivityScope.launch(Dispatchers.IO) {
       manager.setupProject()
       manager.notifyProjectUpdate()
       updateBuildVariants(manager.androidBuildVariants)

app/src/main/java/com/itsaky/androidide/fragments/output/LogViewFragment.kt

@@ -238,7 +238,11 @@ abstract class LogViewFragment :
       }
     }
 
-    IDEColorSchemeProvider.readScheme(requireContext(), LogLanguage.TS_TYPE) { scheme ->
+    IDEColorSchemeProvider.readSchemeAsync(
+      context = requireContext(),
+      type = LogLanguage.TS_TYPE,
+      coroutineScope = editor.editorScope
+    ) { scheme ->
       editor.applyTreeSitterLang(LogLanguage(requireContext()), LogLanguage.TS_TYPE, scheme)
     }
   }

common/src/main/java/com/itsaky/androidide/app/BaseIDEActivity.kt

@@ -25,8 +25,11 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import com.itsaky.androidide.common.R
+import com.itsaky.androidide.tasks.cancelIfActive
 import com.itsaky.androidide.utils.ILogger
 import com.itsaky.androidide.utils.resolveAttr
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 
 abstract class BaseIDEActivity : AppCompatActivity() {
 
@@ -36,11 +39,17 @@ abstract class BaseIDEActivity : AppCompatActivity() {
   open val statusBarColor: Int
     get() = resolveAttr(R.attr.colorSurface)
 
-  fun loadFragment(fragment: Fragment, id: Int) {
-    val transaction = supportFragmentManager.beginTransaction()
-    transaction.replace(id, fragment)
-    transaction.commit()
-  }
+  /**
+   * [CoroutineScope] for executing tasks with the [Default][Dispatchers.Default] dispatcher.
+   */
+  protected val activityScope = CoroutineScope(Dispatchers.Default)
+
+  val isStoragePermissionGranted: Boolean
+    get() =
+      (ContextCompat.checkSelfPermission(this, permission.READ_EXTERNAL_STORAGE) ==
+          PackageManager.PERMISSION_GRANTED &&
+          ContextCompat.checkSelfPermission(this, permission.WRITE_EXTERNAL_STORAGE) ==
+          PackageManager.PERMISSION_GRANTED)
 
   override fun onCreate(savedInstanceState: Bundle?) {
     window?.apply {
@@ -61,12 +70,16 @@ abstract class BaseIDEActivity : AppCompatActivity() {
     }
   }
 
-  val isStoragePermissionGranted: Boolean
-    get() =
-      (ContextCompat.checkSelfPermission(this, permission.READ_EXTERNAL_STORAGE) ==
-        PackageManager.PERMISSION_GRANTED &&
-        ContextCompat.checkSelfPermission(this, permission.WRITE_EXTERNAL_STORAGE) ==
-          PackageManager.PERMISSION_GRANTED)
+  override fun onDestroy() {
+    super.onDestroy()
+    activityScope.cancelIfActive("Activity is being destroyed")
+  }
+
+  fun loadFragment(fragment: Fragment, id: Int) {
+    val transaction = supportFragmentManager.beginTransaction()
+    transaction.replace(id, fragment)
+    transaction.commit()
+  }
 
   protected fun requestStorage() {
     if (isStoragePermissionGranted) {
@@ -80,7 +93,6 @@ abstract class BaseIDEActivity : AppCompatActivity() {
     )
   }
 
-  protected open fun onStorageGranted() {}
   override fun onRequestPermissionsResult(
     requestCode: Int,
     permissions: Array<String>,
@@ -94,13 +106,16 @@ abstract class BaseIDEActivity : AppCompatActivity() {
     }
   }
 
+  protected open fun onStorageGranted() {}
+
   protected open fun onStorageAlreadyGranted() {}
   protected open fun onStorageDenied() {}
   protected open fun preSetContentLayout() {}
 
   protected abstract fun bindLayout(): View
 
   companion object {
+
     const val REQCODE_STORAGE = 1009
     protected var LOG = ILogger.newInstance("StudioActivity")
   }

editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguage.kt

@@ -22,7 +22,6 @@ import com.itsaky.androidide.editor.language.IDELanguage
 import com.itsaky.androidide.editor.language.newline.TSBracketsHandler
 import com.itsaky.androidide.editor.language.utils.CommonSymbolPairs
 import com.itsaky.androidide.editor.schemes.IDEColorScheme
-import com.itsaky.androidide.editor.schemes.IDEColorSchemeProvider
 import com.itsaky.androidide.editor.schemes.LanguageScheme
 import com.itsaky.androidide.editor.schemes.LanguageSpecProvider.getLanguageSpec
 import com.itsaky.androidide.editor.schemes.LocalCaptureSpecProvider.newLocalCaptureSpec
@@ -44,8 +43,11 @@ import io.github.rosemoe.sora.widget.SymbolPairMatch
  *
  * @author Akash Yadav
  */
-abstract class TreeSitterLanguage(context: Context, lang: TSLanguage, type: String) :
-  IDELanguage() {
+abstract class TreeSitterLanguage(
+  context: Context,
+  lang: TSLanguage,
+  private val langType: String
+) : IDELanguage() {
 
   private lateinit var tsTheme: TsTheme
   private lateinit var languageSpec: TreeSitterLanguageSpec
@@ -57,25 +59,15 @@ abstract class TreeSitterLanguage(context: Context, lang: TSLanguage, type: Stri
   private val log = ILogger.newInstance("TreeSitterLanguage")
 
   init {
-    this.languageSpec = getLanguageSpec(context, type, lang, newLocalCaptureSpec(type))
+    this.languageSpec = getLanguageSpec(context, langType, lang, newLocalCaptureSpec(langType))
     this.tsTheme = TsTheme(languageSpec.spec.tsQuery)
-    IDEColorSchemeProvider.readScheme(context, type) { scheme ->
-      if (scheme == null) {
-        log.error("Failed to read color scheme")
-        return@readScheme
-      }
-
-      if (scheme !is IDEColorScheme) {
-        log.error("Invalid color scheme returned by color scheme provider", scheme)
-        return@readScheme
-      }
-
-      val langScheme = scheme.languages[type] ?: return@readScheme
-      this.languageScheme = langScheme
-      langScheme.styles.forEach { tsTheme.putStyleRule(it.key, it.value.makeStyle()) }
+  }
 
-      analyzer.langScheme = languageScheme
-    }
+  fun setupWith(scheme: IDEColorScheme?) {
+    val langScheme = scheme?.languages?.get(langType)
+    this.languageScheme = langScheme
+    this.analyzer.langScheme = languageScheme
+    langScheme?.styles?.forEach { tsTheme.putStyleRule(it.key, it.value.makeStyle()) }
   }
 
   open fun finalizeIndent(indent: Int): Int {

editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/XMLLanguage.kt

@@ -32,7 +32,7 @@ import io.github.rosemoe.sora.util.MyCharacter
  * @author Akash Yadav
  */
 class XMLLanguage(context: Context) :
-  TreeSitterLanguage(context, lang = TSLanguageXml.getInstance(), type = TS_TYPE) {
+  TreeSitterLanguage(context, lang = TSLanguageXml.getInstance(), langType = TS_TYPE) {
 
   override val languageServer: ILanguageServer?
     get() = ILanguageServerRegistry.getDefault().getServer(XMLLanguageServer.SERVER_ID)