Merge pull request #96 from Grigory-Rylov/fix_support_giraffe

Fix support giraffe

Author: Grigory-Rylov

README.md

@@ -121,6 +121,17 @@ Execute `./gradlew clean :app:fatJar` , release will be placed at `app/build/lib
 ## Plugin
 Execute `./gradlew clean :plugin:buildPlugin` , plugin will be placed at `plugin/build/distributions`
 
+# Support me if you like YAMP =)
+**ETH ERC20 tokens** : `0x25Ca16AD3c4e9BD1e6e5FDD77eDB019386B68591`
+
+**BNB BEP20 tokens** : `0x25Ca16AD3c4e9BD1e6e5FDD77eDB019386B68591`
+
+**USDT TRC20** : `TSo3X6K54nYq3S64wML4M4xFgTNiENkHwC`
+
+**BTC** : `bc1qmm5lp389scuk2hghgyzdztddwgjnxqa2awrrue`
+
+https://www.tinkoff.ru/cf/4KNjR2SMOAj
+
 # License
 
 YAMP is released under the [Apache License, Version 2.0](LICENSE.txt).

app/src/main/java/com/github/grishberg/profiler/common/settings/JsonSettings.kt

@@ -342,6 +342,7 @@ class JsonSettings(
     override fun filesDir() = filesDirName
 
     override var shouldShowToolbar: Boolean = false
+    override var lastVersion: String = ""
 
     private fun initWithDefaults() {
         initWithDefaultStringValue(SETTINGS_FONT_NAME, "Arial")

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.0'
 
     repositories {
         mavenCentral()
@@ -15,7 +15,7 @@ plugins {
 }
 
 
-idea.project.jdkName = '11'
+idea.project.jdkName = '17'
 
 allprojects {
     apply plugin: "kotlin"

core/src/main/java/com/github/grishberg/profiler/ui/Main.java

@@ -433,7 +433,7 @@ private void addToolbarButtons(JToolBar toolBar,
                 appIconDelegate);
         toolBar.add(button);
 
-        button = makeToolbarButton("New", " newFile",
+        button = makeToolbarButton("New", "newFile",
                 Actions.RECORD_NEW_TRACE,
                 "Record new method trace from device",
                 appIconDelegate);
@@ -447,13 +447,13 @@ private JButton makeToolbarButton(
             String toolTipText,
             AppIconDelegate appIconDelegate) {
 
-        String imageLocation = "images/" + iconName + ".svg";
+        String imageLocation = "images/" + iconName.strip() + ".svg";
 
         JButton button = new JButton();
         button.setActionCommand(actionCommand.name());
-        button.setToolTipText(toolTipText);
+        button.setToolTipText(toolTipText.strip());
         button.addActionListener(this);
-        button.setIcon(appIconDelegate.loadIcon(imageLocation, altText));
+        button.setIcon(appIconDelegate.loadIcon(imageLocation, altText.strip()));
         return button;
     }
 

gradle.properties

@@ -8,23 +8,23 @@ studioCompilePath=/Applications/Android Studio.app/Contents
 
 pluginGroup = com.github.grishberg
 pluginName = android-methods-profiler
-yampVersion = 23.01.17
+yampVersion = 23.08.25
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 221
-pluginUntilBuild = 222.*
+pluginSinceBuild = 223
+pluginUntilBuild = 231.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
-platformType = IU
-platformVersion = 222.4459.24
+platformType = AI
+platformVersion = 2023.1.1.16
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins = android
 
 # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
-javaVersion = 11
+javaVersion = 17
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion = 7.4

plugin/build.gradle.kts

@@ -1,14 +1,10 @@
-import org.jetbrains.changelog.markdownToHTML
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-
 plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") //version "1.6.10"
+    id("org.jetbrains.kotlin.jvm")
     // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.12.0"
+    id("org.jetbrains.intellij") version "1.13.3"
     // Gradle Changelog Plugin
     id("org.jetbrains.changelog") version "1.3.1"
 }
@@ -34,25 +30,25 @@ intellij {
 
 dependencies {
     implementation(project(":core"))
-    implementation ("com.github.Grigory-Rylov:adb-facade-core:0.1.8")
-    implementation ("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation ("com.github.Grigory-Rylov:andoid_method_trace_recorder:2.1.0")
+    implementation("com.github.Grigory-Rylov:adb-facade-core:0.1.8")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("com.github.Grigory-Rylov:andoid_method_trace_recorder:2.1.0")
 
     implementation(platform("io.projectreactor:reactor-bom:2020.0.20"))
     implementation("io.rsocket:rsocket-core:1.1.2")
     implementation("io.rsocket:rsocket-transport-netty:1.1.2")
     implementation("io.rsocket.broker:rsocket-broker-frames:0.3.0")
 
 
-    implementation ("org.jooq:joor-java-8:0.9.7")
-    implementation ("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation ("com.google.code.gson:gson:2.8.6")
+    implementation("org.jooq:joor-java-8:0.9.7")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("com.google.code.gson:gson:2.8.6")
 
-    implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.3.2")
-    implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.3.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2")
 
 
-    testImplementation ("junit:junit:4.12")
+    testImplementation("junit:junit:4.12")
 }
 
 
@@ -63,8 +59,9 @@ tasks {
         sinceBuild.set(properties("pluginSinceBuild"))
         untilBuild.set(properties("pluginUntilBuild"))
 
-        changeNotes.set( """
-            Fixed Android Studio Eel support.<br>
+        changeNotes.set(
+            """
+            Fixed Android Studio Giraffe support.<br>
           """
         )
     }

plugin/src/main/kotlin/com/github/grishberg/profiler/androidstudio/PluginProjectInfo.kt

@@ -1,7 +1,7 @@
 package com.github.grishberg.profiler.androidstudio
 
 import com.android.ddmlib.IDevice
-import com.android.tools.idea.gradle.project.model.AndroidModuleModel
+import com.android.tools.idea.model.AndroidModel
 import com.android.tools.idea.run.activity.ActivityLocator
 import com.android.tools.idea.run.activity.DefaultActivityLocator
 import com.github.grishberg.profiler.common.AppLogger
@@ -37,7 +37,7 @@ class PluginProjectInfo(
             val facet = facets.firstOrNull()
             if (facet != null) {
                 try {
-                    val applicationId = AndroidModuleModel.get(facet)?.applicationId
+                    val applicationId = AndroidModel.get(facet)?.applicationId
                     logger.d("selected applicationId =$applicationId")
                     return applicationId
                 } catch (e: Throwable) {

plugin/src/main/kotlin/com/github/grishberg/profiler/androidstudio/PluginState.kt

@@ -51,4 +51,5 @@ class PluginState : SettingsFacade {
     override var hierarchicalStagesMode: Boolean = true
     override var shouldShowToolbar: Boolean = true
     override var caseSensitive: Boolean = false
+    var lastVersion: String = ""
 }

plugin/src/main/kotlin/com/github/grishberg/profiler/androidstudio/ShowProfilerAction.kt

@@ -4,14 +4,17 @@ import com.github.grishberg.profiler.chart.highlighting.ColorInfoAdapter
 import com.github.grishberg.profiler.chart.highlighting.PluginMethodsColorRepository
 import com.github.grishberg.profiler.ui.FramesManager
 import com.github.grishberg.profiler.ui.Main
+import com.github.grishberg.profiler.ui.NotificationHelperImpl
 import com.github.grishberg.profiler.ui.PluginDialogFactory
 import com.github.grishberg.profiler.ui.PluginFramesManager
 import com.github.grishberg.profiler.ui.PluginThemeController
 import com.github.grishberg.profiler.ui.ViewFactory
 import com.github.grishberg.profiler.ui.dialogs.recorder.ProjectInfoProvider
+import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.PlatformDataKeys
+import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.project.Project
 
 class ShowProfilerAction : AnAction() {
@@ -37,5 +40,23 @@ class ShowProfilerAction : AnAction() {
             methodsColorRepository
         )
         framesManager.createMainFrame(Main.StartMode.DEFAULT)
+
+        showSupportBannerIfNeeded(settings, NotificationHelperImpl(project))
+    }
+
+    private fun showSupportBannerIfNeeded(settings: PluginState, notificationHelper: NotificationHelperImpl) {
+        val plugin =
+            PluginManagerCore.getPlugin(PluginId.getId("com.github.grishberg.android.android-layout-inspector-plugin"))
+                ?: return
+        if (plugin.version != settings.lastVersion) {
+            settings.lastVersion = plugin.version
+            notificationHelper.supportInfo(
+                "Support me if you like YAMP =)",
+                "BNB,ETH tokens : 0x25Ca16AD3c4e9BD1e6e5FDD77eDB019386B68591\n\n" +
+                    "USDT TRC20 : TSo3X6K54nYq3S64wML4M4xFgTNiENkHwC\n\n" +
+                    "BTC : bc1qmm5lp389scuk2hghgyzdztddwgjnxqa2awrrue\n\n" +
+                    "https://www.tinkoff.ru/cf/4KNjR2SMOAj"
+            )
+        }
     }
 }

plugin/src/main/kotlin/com/github/grishberg/profiler/ui/NotificationHelperImpl.kt

@@ -0,0 +1,15 @@
+package com.github.grishberg.profiler.ui
+
+import com.intellij.notification.NotificationGroupManager
+import com.intellij.notification.NotificationType
+import com.intellij.openapi.project.Project
+
+class NotificationHelperImpl(private val project: Project) {
+
+    fun supportInfo(title: String, message: String) {
+        NotificationGroupManager.getInstance().getNotificationGroup("Support YAMP Notification")
+            .createNotification(title, escapeString(message), NotificationType.INFORMATION).notify(project)
+    }
+
+    private fun escapeString(string: String) = string.replace("\n".toRegex(), "\n<br />")
+}