feat: allow to choose theme per project

Azn9 · Nov 30, 2023 · 34e8b58 · 34e8b58
1 parent 5f43b65
commit 34e8b58
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 12 deletions.
diff --git a/icons/src/main/kotlin/com/almightyalpaca/jetbrains/plugins/discord/icons/source/Theme.kt b/icons/src/main/kotlin/com/almightyalpaca/jetbrains/plugins/discord/icons/source/Theme.kt
@@ -18,6 +18,22 @@
 package com.almightyalpaca.jetbrains.plugins.discord.icons.source
 
 interface Theme {
+    object Default : Theme {
+        override val id: String
+            get() = "default"
+        override val name: String
+            get() = "Default"
+        override val description: String
+            get() = "The default theme"
+        override val applications: Map<String, Long>
+            get() = emptyMap()
+
+        override fun getIconSet(applicationName: String): IconSet? {
+            return null
+        }
+
+    }
+
     val id: String
     val name: String
     val description: String

diff --git a/...c/main/kotlin/com/almightyalpaca/jetbrains/plugins/discord/plugin/render/RenderContext.kt b/...c/main/kotlin/com/almightyalpaca/jetbrains/plugins/discord/plugin/render/RenderContext.kt
@@ -19,14 +19,20 @@ package com.almightyalpaca.jetbrains.plugins.discord.plugin.render
 
 import com.almightyalpaca.jetbrains.plugins.discord.icons.source.IconSet
 import com.almightyalpaca.jetbrains.plugins.discord.icons.source.Source
+import com.almightyalpaca.jetbrains.plugins.discord.icons.source.Theme
 import com.almightyalpaca.jetbrains.plugins.discord.plugin.data.Data
 import com.almightyalpaca.jetbrains.plugins.discord.plugin.settings.options.types.SimpleValue
 import com.almightyalpaca.jetbrains.plugins.discord.plugin.settings.settings
 
 class RenderContext(val source: Source, val data: Data, val mode: Renderer.Mode) {
     val icons: IconSet? by lazy {
+        var themeValue = projectData?.projectSettings?.theme ?: settings.theme
+        if (themeValue.getValue() == "default") {
+            themeValue = settings.theme
+        }
+
         source.getThemesOrNull()
-            ?.get(settings.theme.getValue())
+            ?.get(themeValue.getValue())
             ?.getIconSet(settings.applicationType.getValue().applicationName)
     }
 

diff --git a/...in/kotlin/com/almightyalpaca/jetbrains/plugins/discord/plugin/settings/ProjectSettings.kt b/...in/kotlin/com/almightyalpaca/jetbrains/plugins/discord/plugin/settings/ProjectSettings.kt
@@ -20,6 +20,7 @@ package com.almightyalpaca.jetbrains.plugins.discord.plugin.settings
 import com.almightyalpaca.jetbrains.plugins.discord.plugin.settings.options.OptionHolder
 import com.almightyalpaca.jetbrains.plugins.discord.plugin.settings.options.types.BooleanValue
 import com.almightyalpaca.jetbrains.plugins.discord.plugin.settings.options.types.StringValue
+import com.almightyalpaca.jetbrains.plugins.discord.plugin.settings.options.types.ThemeValue
 import com.almightyalpaca.jetbrains.plugins.discord.plugin.settings.values.ProjectShowValue
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.service
@@ -38,4 +39,6 @@ interface ProjectSettings : PersistentStateComponent<Element>, OptionHolder {
     val nameOverrideText: StringValue
 
     val description: StringValue
+
+    val theme: ThemeValue?
 }
diff --git a/...in/com/almightyalpaca/jetbrains/plugins/discord/plugin/settings/gui/themes/ThemeDialog.kt b/...in/com/almightyalpaca/jetbrains/plugins/discord/plugin/settings/gui/themes/ThemeDialog.kt
@@ -32,7 +32,7 @@ import javax.swing.JPanel
 import javax.swing.plaf.basic.BasicComboBoxRenderer
 import kotlin.coroutines.CoroutineContext
 
-class ThemeDialog(private val themes: ThemeMap, private val initialValue: String?) : DialogWrapper(null, true, IdeModalityType.IDE), CoroutineScope {
+class ThemeDialog(private val themes: ThemeMap, private val initialValue: String?, private val showDefault: Boolean = false) : DialogWrapper(null, true, IdeModalityType.IDE), CoroutineScope {
     private val parentJob: Job = SupervisorJob()
 
     override val coroutineContext: CoroutineContext
@@ -78,9 +78,15 @@ class ThemeDialog(private val themes: ThemeMap, private val initialValue: String
                 return this
             }
         }
-        field = JComboBox(themes.values.toTypedArray()).apply box@{
+
+        var themeValues = themes.values.toTypedArray()
+        if (showDefault) {
+            themeValues += Theme.Default
+        }
+
+        field = JComboBox(themeValues).apply box@{
             this@box.renderer = renderer
-            selectedItem = themes[initialValue]
+            selectedItem = themes[initialValue] ?: (if (showDefault) Theme.Default else themes.values.first())
         }
 
         add(field)

diff --git a/.../com/almightyalpaca/jetbrains/plugins/discord/plugin/settings/impl/ProjectSettingsImpl.kt b/.../com/almightyalpaca/jetbrains/plugins/discord/plugin/settings/impl/ProjectSettingsImpl.kt
@@ -39,4 +39,6 @@ class ProjectSettingsImpl(override val project: Project) : ProjectSettings, Pers
     override val nameOverrideText by nameOverrideToggle.option.text("", "")
 
     override val description by text("Project description", "")
+
+    override val theme by themeChooser("Project theme", "The theme to use for this project", true)
 }
diff --git a/...com/almightyalpaca/jetbrains/plugins/discord/plugin/settings/options/types/ThemeOption.kt b/...com/almightyalpaca/jetbrains/plugins/discord/plugin/settings/options/types/ThemeOption.kt
@@ -37,10 +37,10 @@ import javax.swing.JComponent
 import javax.swing.JPanel
 import kotlin.reflect.KProperty
 
-fun OptionCreator<in ThemeValue>.themeChooser(text: String, description: String? = null) =
-    OptionProviderImpl(this, ThemeOption(text, description))
+fun OptionCreator<in ThemeValue>.themeChooser(text: String, description: String? = null, showDefault: Boolean = false) =
+    OptionProviderImpl(this, ThemeOption(text, description, showDefault))
 
-class ThemeOption(text: String, val description: String?) : Option<ThemeValue>(text), ThemeValue.Provider {
+class ThemeOption(text: String, val description: String?, val showDefault: Boolean) : Option<ThemeValue>(text), ThemeValue.Provider {
     private val source: Source = sourceService.source
 
     private val listeners = mutableListOf<(ThemeValue) -> Unit>()
@@ -64,7 +64,7 @@ class ThemeOption(text: String, val description: String?) : Option<ThemeValue>(t
             val themes = this@ThemeOption.source.getThemesOrNull()
 
             if (themes != null) {
-                val dialog = ThemeDialog(themes, componentValue)
+                val dialog = ThemeDialog(themes, componentValue, showDefault)
                 val result = dialog.showAndGet()
 
                 if (result) {

diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
@@ -27,10 +27,6 @@
     <depends optional="true" config-file="git-extension.xml">Git4Idea</depends>
 
     <applicationListeners>
-        <listener
-                class="com.almightyalpaca.jetbrains.plugins.discord.plugin.time.TimeProjectManagerListener"
-                topic="com.intellij.openapi.project.ProjectManagerListener"/>
-
         <listener
                 class="com.almightyalpaca.jetbrains.plugins.discord.plugin.time.TimeFileEditorManagerListener"
                 topic="com.intellij.openapi.fileEditor.FileEditorManagerListener"/>