Skip to content

Commit b547879

Browse files
committed
Merge branch 'stage' into fix/ADFA-3365-allow-class-ref-desugaring
2 parents 6ba1055 + cb05a7d commit b547879

File tree

245 files changed

+8999
-2455
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+8999
-2455
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ interface ActionItem {
209209
EDITOR_FILE_TREE("ide.editor.fileTree"),
210210

211211
/** Location marker for action items shown in UI Designer activity's toolbar. */
212-
UI_DESIGNER_TOOLBAR("ide.uidesigner.toolbar");
212+
UI_DESIGNER_TOOLBAR("ide.uidesigner.toolbar"),
213+
214+
/** Location marker for action items shown on the main screen. */
215+
MAIN_SCREEN("ide.main.screen");
213216

214217
override fun toString(): String {
215218
return id

apk-viewer-plugin/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ android {
3535
jvmTarget = "17"
3636
}
3737

38+
39+
3840
packaging {
3941
resources {
4042
excludes += setOf(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<application
55
android:label="APK Viewer"
6-
android:theme="@style/Theme.AppCompat">
6+
android:theme="@style/PluginTheme">
77

88
<!-- Plugin metadata -->
99
<meta-data
@@ -16,7 +16,7 @@
1616

1717
<meta-data
1818
android:name="plugin.version"
19-
android:value="1.0.2" />
19+
android:value="${pluginVersion}" />
2020

2121
<meta-data
2222
android:name="plugin.description"

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.itsaky.androidide.plugins.extensions.NavigationItem
1212
import com.itsaky.androidide.plugins.extensions.FileOpenExtension
1313
import com.itsaky.androidide.plugins.extensions.FileTabMenuItem
1414
import com.itsaky.androidide.plugins.services.IdeEditorTabService
15+
import com.example.sampleplugin.R
1516
import com.example.sampleplugin.fragments.ApkAnalyzerFragment
1617
import java.io.File
1718

@@ -94,7 +95,7 @@ class ApkViewer : IPlugin, UIExtension, EditorTabExtension, FileOpenExtension {
9495
NavigationItem(
9596
id = "apk_analyzer_sidebar",
9697
title = "APK Analyzer",
97-
icon = android.R.drawable.ic_menu_info_details,
98+
icon = R.drawable.ic_apk_analyzer,
9899
isEnabled = true,
99100
isVisible = true,
100101
group = "tools",
@@ -111,7 +112,7 @@ class ApkViewer : IPlugin, UIExtension, EditorTabExtension, FileOpenExtension {
111112
EditorTabItem(
112113
id = TAB_ID,
113114
title = "APK Analyzer",
114-
icon = android.R.drawable.ic_menu_info_details,
115+
icon = R.drawable.ic_apk_analyzer,
115116
fragmentFactory = {
116117
context.logger.debug("Creating ApkAnalyzerFragment")
117118
ApkAnalyzerFragment()

0 commit comments

Comments
 (0)