Chores - Deprecated APIs and dart highlighting fixes.

dinbtechit · Dec 17, 2023 · 8c739fa · 8c739fa
1 parent d6dff47
commit 8c739fa
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 38 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/src/main/kotlin/com/github/dinbtechit/vscodetheme/VSCodeThemeManager.kt b/src/main/kotlin/com/github/dinbtechit/vscodetheme/VSCodeThemeManager.kt
@@ -1,26 +1,15 @@
 package com.github.dinbtechit.vscodetheme
 
 import com.github.dinbtechit.vscodetheme.settings.VSCodeThemeSettingsStore
-import com.intellij.ide.DataManager
-import com.intellij.ide.actions.SettingsEntryPointAction
 import com.intellij.ide.plugins.IdeaPluginDescriptor
 import com.intellij.ide.plugins.PluginManagerCore
-import com.intellij.ide.ui.*
-import com.intellij.ide.ui.laf.UIThemeLookAndFeelInfoImpl
-import com.intellij.ide.ui.laf.UiThemeProviderListManager
-import com.intellij.openapi.actionSystem.ActionManager
-import com.intellij.openapi.actionSystem.ActionPlaces
-import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.ide.ui.LafManager
+import com.intellij.ide.ui.LafManagerListener
+import com.intellij.ide.ui.ThemeListProvider
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.extensions.PluginId
-import com.intellij.openapi.options.Configurable
-import com.intellij.openapi.options.SearchableConfigurable
-import com.intellij.openapi.options.ShowSettingsUtil
-import com.intellij.openapi.project.ProjectManager
-import java.util.*
-import javax.swing.UIDefaults
-
-import javax.swing.UIManager
+import com.intellij.util.ui.JBUI
+import com.jetbrains.rd.util.string.printToString
 
 /*enum class VSCodeTheme(val theme: String) {
     UNKNOWN("UNKNOWN"),
@@ -51,7 +40,7 @@ class VSCodeThemeManager {
         try {
             if (getPlugin()?.isEnabled != null) {
                 val vscodeTheme =
-                    LafManager.getInstance().installedThemes.firstOrNull { (it as UIThemeLookAndFeelInfoImpl).theme.name == VSCodeTheme.DARK }
+                    LafManager.getInstance().installedThemes.firstOrNull { it.toString().contains(VSCodeTheme.DARK) }
                 return vscodeTheme != null
             }
             return false
@@ -60,13 +49,12 @@ class VSCodeThemeManager {
         }
     }
 
-
     fun switchToVSCodeTheme(always: Boolean = false, selectedVSCodeTheme: String = VSCodeTheme.DARK) {
         try {
             if (isVSCodeThemeReady()) {
                 val convertedSelectedVSCodeTheme = convertOldToNewTheme(selectedVSCodeTheme)
                 val vscodeTheme =
-                    LafManager.getInstance().installedThemes.firstOrNull { it.name == convertedSelectedVSCodeTheme }
+                    LafManager.getInstance().installedThemes.firstOrNull { it.toString().contains(convertedSelectedVSCodeTheme) }
 
                 if (vscodeTheme != null) {
                     LafManager.getInstance().currentUIThemeLookAndFeel = vscodeTheme
@@ -82,6 +70,19 @@ class VSCodeThemeManager {
         }
     }
 
+    fun isVSCodeThemeSelected(): Boolean {
+        val theme = LafManager.getInstance().currentUIThemeLookAndFeel
+        if (theme != null) {
+            return theme.toString().contains(VSCodeTheme.DARK) && !theme.toString().contains("Modern")
+        }
+        return false
+    }
+
+    fun isVSCodeDarkModernThemeSelected(): Boolean {
+        val theme = LafManager.getInstance().currentUIThemeLookAndFeel
+        return theme?.toString()?.contains(VSCodeTheme.DARK_MODERN) ?: false
+    }
+
     private fun convertOldToNewTheme(theme: String): String {
         return when (theme) {
             "DARK_MODERN" -> "VSCode Dark Modern"

diff --git a/src/main/kotlin/com/github/dinbtechit/vscodetheme/startup/VSCodeStartupNotifyActivity.kt b/src/main/kotlin/com/github/dinbtechit/vscodetheme/startup/VSCodeStartupNotifyActivity.kt
@@ -10,16 +10,13 @@ import com.github.dinbtechit.vscodetheme.icons.VSCodeIcons
 import com.github.dinbtechit.vscodetheme.settings.VSCodeThemeSettingsStore
 import com.intellij.ide.plugins.IdeaPluginDescriptor
 import com.intellij.ide.plugins.PluginManagerCore
-import com.intellij.ide.ui.LafManager
-import com.intellij.ide.ui.laf.UIThemeLookAndFeelInfoImpl
 import com.intellij.notification.Notification
 import com.intellij.notification.NotificationGroupManager
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.actionSystem.DefaultActionGroup
 import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupActivity
-import com.intellij.openapi.application.ApplicationInfo
 
 /*enum class DisplayActionType {
     DONATION_ONLY,
@@ -98,20 +95,6 @@ class VSCodeStartupNotifyActivity : StartupActivity {
         }
     }
 
-    private fun isVSCodeThemeSelected(): Boolean {
-        val currentIDEVersion = ApplicationInfo.getInstance().build
-        val targetIDEVersion = com.intellij.openapi.util.BuildNumber.fromString("2023.3")
-        print(currentIDEVersion)
-        print(targetIDEVersion)
-        /* if (currentIDEVersion.compareTo(targetIDEVersion) <= 0) {
-             return LafManager.getInstance().currentUIThemeLookAndFeel.name == VSCodeTheme.DARK
-         }*/
-        return (LafManager.getInstance().currentUIThemeLookAndFeel as UIThemeLookAndFeelInfoImpl).theme.name == VSCodeTheme.DARK
-    }
-
-    private fun isVSCodeDarkModernThemeSelected() =
-        (LafManager.getInstance().currentUIThemeLookAndFeel as UIThemeLookAndFeelInfoImpl).theme.name == VSCodeTheme.DARK_MODERN
-
     private fun showNotificationPopup(project: Project) {
         Util.notification = createNotification(
             updateMsg(),
@@ -122,10 +105,12 @@ class VSCodeStartupNotifyActivity : StartupActivity {
     }
 
     private fun notificationContent(): String {
-        if (!isVSCodeThemeSelected() && !isVSCodeDarkModernThemeSelected()) {
+        if (!VSCodeThemeManager.getInstance().isVSCodeThemeSelected() && !VSCodeThemeManager.getInstance()
+                .isVSCodeDarkModernThemeSelected()
+        ) {
             Util.displayActionType = DisplayActionType.SHOW_ALL_THEMES_FOR_DEFAULT
             return switchThemeQuestion
-        } else if (isVSCodeThemeSelected()) {
+        } else if (VSCodeThemeManager.getInstance().isVSCodeThemeSelected()) {
             Util.displayActionType = DisplayActionType.SHOW_NEW_DARK_MODERN_THEME
             return tryNewDarkModernThemeQuestion
         }