Merge branch 'stage' into fix/ADFA-3318-setup-K2-LSP-infra

Author: itsaky-adfa

.gitignore

@@ -105,7 +105,7 @@ sentry.properties
 
 # Generated files for tooling API
 tests/test-home
-/tests/**/.androidide/init/model.jar
+/tests/**/.cg/init/model.jar
 
 /composite-builds/build-deps-common/constants/build/
 /composite-builds/build-deps/build/

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

@@ -209,7 +209,10 @@ interface ActionItem {
     EDITOR_FILE_TREE("ide.editor.fileTree"),
 
     /** Location marker for action items shown in UI Designer activity's toolbar. */
-    UI_DESIGNER_TOOLBAR("ide.uidesigner.toolbar");
+    UI_DESIGNER_TOOLBAR("ide.uidesigner.toolbar"),
+
+    /** Location marker for action items shown on the main screen. */
+    MAIN_SCREEN("ide.main.screen");
 
     override fun toString(): String {
       return id

apk-viewer-plugin/build.gradle.kts

@@ -35,6 +35,8 @@ android {
         jvmTarget = "17"
     }
 
+
+
     packaging {
         resources {
             excludes += setOf(

apk-viewer-plugin/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
 
     <application
         android:label="APK Viewer"
-        android:theme="@style/Theme.AppCompat">
+        android:theme="@style/PluginTheme">
 
         <!-- Plugin metadata -->
         <meta-data
@@ -16,7 +16,7 @@
 
         <meta-data
             android:name="plugin.version"
-            android:value="1.0.2" />
+            android:value="${pluginVersion}" />
 
         <meta-data
             android:name="plugin.description"

apk-viewer-plugin/src/main/kotlin/com/example/sampleplugin/ApkViewer.kt

@@ -12,6 +12,7 @@ import com.itsaky.androidide.plugins.extensions.NavigationItem
 import com.itsaky.androidide.plugins.extensions.FileOpenExtension
 import com.itsaky.androidide.plugins.extensions.FileTabMenuItem
 import com.itsaky.androidide.plugins.services.IdeEditorTabService
+import com.example.sampleplugin.R
 import com.example.sampleplugin.fragments.ApkAnalyzerFragment
 import java.io.File
 
@@ -94,7 +95,7 @@ class ApkViewer : IPlugin, UIExtension, EditorTabExtension, FileOpenExtension {
             NavigationItem(
                 id = "apk_analyzer_sidebar",
                 title = "APK Analyzer",
-                icon = android.R.drawable.ic_menu_info_details,
+                icon = R.drawable.ic_apk_analyzer,
                 isEnabled = true,
                 isVisible = true,
                 group = "tools",
@@ -111,7 +112,7 @@ class ApkViewer : IPlugin, UIExtension, EditorTabExtension, FileOpenExtension {
             EditorTabItem(
                 id = TAB_ID,
                 title = "APK Analyzer",
-                icon = android.R.drawable.ic_menu_info_details,
+                icon = R.drawable.ic_apk_analyzer,
                 fragmentFactory = {
                     context.logger.debug("Creating ApkAnalyzerFragment")
                     ApkAnalyzerFragment()