Release v2.3.0-beta

.github/FUNDING.yml

@@ -1,2 +1,3 @@
+github: AndroidIDEOfficial
 open_collective: androidide
 custom: ['https://androidide.com/donate.php']

.github/ISSUE_TEMPLATE/BUG.yml

@@ -40,7 +40,8 @@ body:
       label: What version of AndroidIDE you're using?
       multiple: false
       options:
-        - v2.1.4 (debug builds)
+        - v2.2.0 (debug builds)
+        - v2.2.0
         - v2.1.4
         - v2.1.3
         - v2.1.2

.github/ISSUE_TEMPLATE/FEATURE.yml

@@ -32,7 +32,8 @@ body:
       label: What version of AndroidIDE you're using?
       multiple: false
       options:
-        - v2.1.4 (debug builds)
+        - v2.2.0 (debug builds)
+        - v2.2.0
         - v2.1.4
         - v2.1.3
         - v2.1.2

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: Change Gradle wrapper permissions
         run: chmod +x ./gradlew
@@ -170,7 +170,7 @@ jobs:
     name: Publish release
     runs-on: ubuntu-latest
     needs: [build_apk, unit_test_debug, test_tooling_api]
-    if: ${{ always() && github.ref == 'refs/heads/main' && needs.build_apk.result == 'success' && needs.unit_test_debug.result == 'success' && needs.test_tooling_api.result == 'success' }}
+    if: ${{ always() && github.event_name != 'pull_request' && github.ref == 'refs/heads/main' && needs.build_apk.result == 'success' && needs.unit_test_debug.result == 'success' && needs.test_tooling_api.result == 'success' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -206,4 +206,4 @@ jobs:
         if: ${{ always() }}
         with:
           name: .nyx-state-${{ github.job }}.json
-          path: build/nyx-state.json
+          path: build/nyx-state.json

.nyx.yml

@@ -31,7 +31,6 @@ releaseTypes:
   items:
     mainline:
       description: "{{#file.content}}build/CHANGELOG.md{{/file.content}}"
-      collapseVersions: false
       gitPush: true
       gitTag: true
       publish: true

CROWDIN_CONTRIBUTORS.md

@@ -10,21 +10,21 @@ Thanks to all these people, AndroidIDE has been translated into multiple languag
         <br />
         <sub><b>Akash Yadav (itsaky)</b></sub></a>
       <br />
-      <sub><b>14055 words</b></sub>
+      <sub><b>49378 words</b></sub>
     </td>
     <td align="center" valign="top">
-      <a href="https://crowdin.com/profile/smith8h"><img alt="logo" style="width: 64px" src="https://crowdin-static.downloads.crowdin.com/avatar/15550455/medium/9c5a3d089c209487340abb35d74b5b7c.jpg" />
+      <a href="https://crowdin.com/profile/esalessandrx"><img alt="logo" style="width: 64px" src="https://crowdin-static.downloads.crowdin.com/avatar/15563911/medium/a2262fe354d51d9c991d06fcace20b7a.jpg" />
         <br />
-        <sub><b>Hussein Smith (smith8h)</b></sub></a>
+        <sub><b>Alessandro (esalessandrx)</b></sub></a>
       <br />
-      <sub><b>2110 words</b></sub>
+      <sub><b>2295 words</b></sub>
     </td>
     <td align="center" valign="top">
-      <a href="https://crowdin.com/profile/esalessandrx"><img alt="logo" style="width: 64px" src="https://crowdin-static.downloads.crowdin.com/avatar/15563911/medium/a2262fe354d51d9c991d06fcace20b7a.jpg" />
+      <a href="https://crowdin.com/profile/smith8h"><img alt="logo" style="width: 64px" src="https://crowdin-static.downloads.crowdin.com/avatar/15550455/medium/9c5a3d089c209487340abb35d74b5b7c.jpg" />
         <br />
-        <sub><b>Alessandro (esalessandrx)</b></sub></a>
+        <sub><b>Hussein Smith (smith8h)</b></sub></a>
       <br />
-      <sub><b>2032 words</b></sub>
+      <sub><b>2224 words</b></sub>
     </td>
     <td align="center" valign="top">
       <a href="https://crowdin.com/profile/adnroid"><img alt="logo" style="width: 64px" src="https://crowdin-static.downloads.crowdin.com/avatar/15503338/medium/c21cc0623c3ff71d53cb1f1a6e5d7757.png" />
@@ -38,7 +38,7 @@ Thanks to all these people, AndroidIDE has been translated into multiple languag
         <br />
         <sub><b>Andi Hasan A (andihasan97)</b></sub></a>
       <br />
-      <sub><b>977 words</b></sub>
+      <sub><b>1094 words</b></sub>
     </td>
     <td align="center" valign="top">
       <a href="https://crowdin.com/profile/friostd"><img alt="logo" style="width: 64px" src="https://crowdin-static.downloads.crowdin.com/avatar/15549279/medium/2d1718f34c949d5df55e346a0d6e5cb0.jpeg" />
@@ -59,7 +59,7 @@ Thanks to all these people, AndroidIDE has been translated into multiple languag
         <br />
         <sub><b>Deep Kr. Ghosh (deepkrg17)</b></sub></a>
       <br />
-      <sub><b>149 words</b></sub>
+      <sub><b>221 words</b></sub>
     </td>
   </tr>
   <tr>

actions/src/main/java/com/itsaky/androidide/actions/ActionItem.kt

@@ -23,6 +23,7 @@ import android.view.View
 /**
  * An action that can be registered using the [ActionsRegistry]
  * [com.itsaky.androidide.actions.ActionsRegistry]
+ *
  * @author Akash Yadav
  */
 interface ActionItem {
@@ -37,6 +38,7 @@ interface ActionItem {
 
   /**
    * Prepare the action. Subclasses can modify the visual properties of this action here.
+   *
    * @param data The data containing various information about the event.
    */
   fun prepare(data: ActionData)
@@ -57,6 +59,12 @@ interface ActionItem {
    */
   fun postExec(data: ActionData, result: Any) = Unit
 
+  /**
+   * Called when the action item is to be destroyed. Any resource references must be released if
+   * held.
+   */
+  fun destroy() = Unit
+
   /**
    * Return the show as action flags for the menu item.
    *

actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt

@@ -66,6 +66,7 @@ class DefaultActionsRegistry : ActionsRegistry() {
     val actions = getActions(action.location)
     val older = actions.remove(action.id)
     if (older != null) {
+      older.destroy()
       return true
     }
 
@@ -76,6 +77,7 @@ class DefaultActionsRegistry : ActionsRegistry() {
     for (locations in this.actions.values) {
       val older = locations.remove(id)
       if (older != null) {
+        older.destroy()
         return true
       }
     }
@@ -86,7 +88,13 @@ class DefaultActionsRegistry : ActionsRegistry() {
   override fun findAction(location: ActionItem.Location, id: String): ActionItem? =
     getActions(location)[id]
 
-  override fun clearActions(location: ActionItem.Location) = getActions(location).clear()
+  override fun clearActions(location: ActionItem.Location) {
+    val actions = getActions(location)
+    actions.forEach {
+      it.value.destroy()
+    }
+    actions.clear()
+  }
 
   override fun registerActionExecListener(listener: ActionExecListener) {
     listeners.add(listener)

annotation-ksp/build.gradle.kts

@@ -27,6 +27,7 @@ dependencies {
 
   implementation(projects.annotations)
 
+  implementation(libs.androidx.annotation)
   implementation(libs.common.javapoet)
   implementation(libs.common.ksp)
 }

annotation-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterIndexGenerator.kt

@@ -17,6 +17,7 @@
 
 package com.itsaky.androidide.annotations.ksp.inflater
 
+import androidx.annotation.RequiresApi
 import com.google.devtools.ksp.KspExperimental
 import com.google.devtools.ksp.getAnnotationsByType
 import com.google.devtools.ksp.isAnnotationPresent
@@ -187,6 +188,11 @@ class ViewAdapterIndexGenerator(private val logger: KSPLogger) {
           result
         }
       } else null
+
+    val requiresApi =
+      if (sym.isAnnotationPresent(RequiresApi::class))
+        sym.getAnnotationsByType(RequiresApi::class).iterator().next()
+      else null
 
     val viewName = getViewName(viewAdapter)
     val moduleNs = getModuleNs(viewAdapter)
@@ -195,6 +201,12 @@ class ViewAdapterIndexGenerator(private val logger: KSPLogger) {
     val viewTypeName =
       ClassName.get(viewName.substringBeforeLast('.'), viewName.substringAfterLast('.'))
 
+    requiresApi?.let { annotation ->
+      val api = if (annotation.value == 1) annotation.api else annotation.value
+      val androidBuild = ClassName.get("android.os", "Build")
+      block.beginControlFlow("if(\$T.VERSION.SDK_INT >= \$L)", androidBuild, api)
+    }
+
     block.addStatement(
       "final var adapter = new \$T()",
       ParameterizedTypeName.get(adapterTypeName, viewTypeName)
@@ -213,6 +225,8 @@ class ViewAdapterIndexGenerator(private val logger: KSPLogger) {
       )
     }
 
+    requiresApi?.let { block.endControlFlow() }
+
     indexAddStatements.add("{\n")
     indexAddStatements.indent()
     indexAddStatements.add(block.build())
@@ -238,7 +252,7 @@ class ViewAdapterIndexGenerator(private val logger: KSPLogger) {
     )
 
     indexClassBuilder.addStaticBlock(indexAddStatements.build())
-  
+
     OutputStreamWriter(out).use {
       val file = JavaFile.builder(INDEX_PACKAGE_NAME, indexClassBuilder.build())
       file.build().writeTo(it)
@@ -256,11 +270,11 @@ class ViewAdapterIndexGenerator(private val logger: KSPLogger) {
   }
 
   private fun getViewType(viewAdapter: KSAnnotation) =
-    (getViewAdapterArg(viewAdapter, "forView") as KSType)
+    (getAnnotationArg(viewAdapter, "forView") as KSType)
 
   private fun getModuleNs(viewAdapter: KSAnnotation) =
-    (getViewAdapterArg(viewAdapter, "moduleNamespace") as String)
+    (getAnnotationArg(viewAdapter, "moduleNamespace") as String)
 
-  private fun getViewAdapterArg(viewAdapter: KSAnnotation, arg: String) =
+  private fun getAnnotationArg(viewAdapter: KSAnnotation, arg: String) =
     viewAdapter.arguments.first { it.name!!.asString() == arg }.value
 }

app/build.gradle.kts

@@ -73,6 +73,8 @@ android {
 kapt { arguments { arg("eventBusIndex", "com.itsaky.androidide.events.AppEventsIndex") } }
 
 dependencies {
+
+  debugImplementation(libs.common.leakcanary)
 
   // Annotation processors
   kapt(libs.common.glide.ap)

app/proguard-rules.pro

@@ -5,9 +5,10 @@
 -dontobfuscate
 
 -keep class javax.** { *; }
+-keep class jdkx.** { *; }
 
 # keep javac classes
--keep class com.sun.** { *; }
+-keep class openjdk.** { *; }
 
 # Android builder model interfaces
 -keep class com.android.** { *; }
@@ -55,7 +56,7 @@
 -keep class * extends com.itsaky.androidide.lsp.java.providers.completion.IJavaCompletionProvider {
     <init>(...);
 }
--keep class com.itsaky.androidide.editor.IEditor { *; }
+-keep class com.itsaky.androidide.editor.api.IEditor { *; }
 -keep class * extends com.itsaky.androidide.inflater.IViewAdapter { *; }
 -keep class * extends com.itsaky.androidide.inflater.drawable.IDrawableParser {
     <init>(...);
@@ -83,4 +84,4 @@
 -keepclasseswithmembers class ** {
     native <methods>;
 }
--keep class com.itsaky.androidide.treesitter.** { *; }
+-keep class com.itsaky.androidide.treesitter.** { *; }

app/src/main/AndroidManifest.xml

@@ -61,7 +61,7 @@
       android:windowSoftInputMode="adjustResize" />
 
     <service
-      android:name=".services.GradleBuildService"
+      android:name=".services.builder.GradleBuildService"
       android:exported="false" />
 
     <provider

app/src/main/java/com/itsaky/androidide/actions/build/RunTasksAction.kt

@@ -49,4 +49,14 @@ class RunTasksAction() : BaseBuildAction() {
     val activity = getActivity(data)!!
     result.show(activity.supportFragmentManager, this.id)
   }
+
+  override fun destroy() {
+    super.destroy()
+    try {
+      dialog?.dismiss()
+    } catch (e: Exception) {
+      // ignored
+    }
+    dialog = null
+  }
 }