Skip to content

Commit fec92f3

Browse files
ByteAuroraByteAurora
authored
Merge pull request #10 from ByteAurora/develop
Release CodeXP v2.0.0
2 parents a392954 + 28ce888 commit fec92f3

25 files changed

+934
-325
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,19 @@
55
## [Unreleased]
66

77
### Added
8+
- Organize CodeXP configuration options by type for easier readability.
9+
- Add a new notification type: CodeXP notification
10+
- Add configuration for notification type (IntelliJ notification or CodeXP notification)
811

912
### Changed
1013

1114
### Removed
1215

16+
### Fixed
17+
- Fix plugin compatibility issue after IntelliJ IDEA version 2023.2
18+
19+
## [1.2.1] - 2023-07-19
20+
1321
### Fixed
1422
- Fix plugin initialization issue of CodeXP plugin at IDE startup
1523

@@ -41,7 +49,9 @@
4149
- Define events to detect and add challenges for each event
4250
- Implement notification alert feature for leveling up or completing challenges
4351

44-
[Unreleased]: https://github.com/ILoveGameCoding/intellij-codexp/compare/v1.2.0...HEAD
52+
[Unreleased]: https://github.com/ILoveGameCoding/intellij-codexp/compare/v1.2.1...HEAD
53+
54+
[1.2.1]: https://github.com/ILoveGameCoding/intellij-codexp/compare/v1.2.0...v1.2.1
4555

4656
[1.2.0]: https://github.com/ILoveGameCoding/intellij-codexp/compare/v1.1.0...v1.2.0
4757

‎README.md‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,20 @@ Completed challenges are added under the "Completed Challenges" section. Also, m
6969

7070
![Completed Challenges](https://github.com/ILoveGameCoding/intellij-codexp/blob/main/images/completed_challenges.png)
7171

72+
You can toggle the visibility of completed challenges in the CodeXP tool window.
73+
74+
![Toggle Completed Challenges](https://github.com/ILoveGameCoding/intellij-codexp/blob/main/images/toggle_completed_challenges.gif)
75+
7276
<br>
7377

7478
## Notification
75-
Whenever a challenge is completed or a level up occurs, a notification is provided to inform you of the details.
79+
Whenever a challenge is completed or a level up occurs, a notification is provided to inform you of the details. You can choose to display the notification as an IntelliJ notification or a CodeXP notification.
80+
81+
#### IntelliJ Notification
82+
![IntelliJ Notification](https://github.com/ILoveGameCoding/intellij-codexp/blob/main/images/intellij_notification.jpg)
7683

77-
![Notification](https://github.com/ILoveGameCoding/intellij-codexp/blob/main/images/notification.jpg)
84+
#### CodeXP Notification
85+
![CodeXP Notification](https://github.com/ILoveGameCoding/intellij-codexp/blob/main/images/codexp_notification.png)
7886

7987
---
8088
Plugin based on the [IntelliJ Platform Plugin Template][template].

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ pluginGroup = com.github.ilovegamecoding.intellijcodexp
44
pluginName = intellij-codexp
55
pluginRepositoryUrl = https://github.com/ILoveGameCoding/intellij-codexp
66
# SemVer format -> https://semver.org
7-
pluginVersion=1.2.1
7+
pluginVersion=2.0.0
88

99
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
10-
pluginSinceBuild = 221
11-
pluginUntilBuild = 231.*
10+
pluginSinceBuild = 232
11+
pluginUntilBuild = 232.*
1212

1313
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
1414
platformType = IC
15-
platformVersion = 2022.1.4
15+
platformVersion = 2023.2
1616

1717
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1818
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

‎images/codexp_notification.png‎

17.6 KB
Loading

‎images/notification.jpg‎ renamed to ‎images/intellij_notification.jpg‎

File renamed without changes.

‎images/toggle_completed_challenges.gif‎

675 KB
Loading

‎src/main/java/com/github/ilovegamecoding/intellijcodexp/form/CodeXPConfigurationForm.form‎

Lines changed: 136 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,179 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.github.ilovegamecoding.intellijcodexp.form.CodeXPConfigurationForm">
3-
<grid id="27dc6" binding="pMain" layout-manager="GridLayoutManager" row-count="7" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
3+
<grid id="27dc6" binding="pMain" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
44
<margin top="0" left="0" bottom="0" right="0"/>
55
<constraints>
6-
<xy x="20" y="20" width="621" height="400"/>
6+
<xy x="20" y="20" width="640" height="400"/>
77
</constraints>
88
<properties/>
99
<border type="none"/>
1010
<children>
11-
<component id="b610" class="javax.swing.JLabel">
12-
<constraints>
13-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
14-
</constraints>
15-
<properties>
16-
<font/>
17-
<text resource-bundle="messages/CodeXPBundle" key="TEXT_NOTIFICATION"/>
18-
</properties>
19-
</component>
20-
<component id="9ae23" class="javax.swing.JCheckBox" binding="cbShowLevelUpNotification">
21-
<constraints>
22-
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
23-
</constraints>
24-
<properties>
25-
<text resource-bundle="messages/CodeXPBundle" key="TEXT_SHOW_LEVEL_UP_NOTIFICATION"/>
26-
</properties>
27-
</component>
28-
<component id="629a5" class="javax.swing.JCheckBox" binding="cbShowCompleteChallengeNotification">
29-
<constraints>
30-
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
31-
</constraints>
32-
<properties>
33-
<text resource-bundle="messages/CodeXPBundle" key="TEXT_SHOW_COMPLETE_CHALLENGE_NOTIFICATION"/>
34-
</properties>
35-
</component>
3611
<vspacer id="43cd9">
3712
<constraints>
38-
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
13+
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
3914
</constraints>
4015
</vspacer>
41-
<component id="a4d9f" class="javax.swing.JCheckBox" binding="cbShowGainedXP">
42-
<constraints>
43-
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
44-
</constraints>
45-
<properties>
46-
<text resource-bundle="messages/CodeXPBundle" key="TEXT_SHOW_GAINED_XP"/>
47-
</properties>
48-
</component>
49-
<grid id="1c92c" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
50-
<margin top="0" left="22" bottom="0" right="0"/>
16+
<grid id="2b0a2" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
17+
<margin top="0" left="0" bottom="0" right="0"/>
5118
<constraints>
52-
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
19+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
5320
</constraints>
5421
<properties/>
5522
<border type="none"/>
5623
<children>
57-
<component id="9ca3" class="javax.swing.JComboBox" binding="cbPositionToDisplayGainedXP">
24+
<component id="b610" class="javax.swing.JLabel">
5825
<constraints>
59-
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
26+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
6027
</constraints>
61-
<properties/>
28+
<properties>
29+
<font style="1"/>
30+
<text resource-bundle="messages/CodeXPBundle" key="TEXT_NOTIFICATION"/>
31+
</properties>
6232
</component>
63-
<hspacer id="3944">
33+
<component id="9ae23" class="javax.swing.JCheckBox" binding="cbShowLevelUpNotification">
6434
<constraints>
65-
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
35+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
6636
</constraints>
67-
</hspacer>
68-
<component id="d236" class="javax.swing.JLabel">
37+
<properties>
38+
<text resource-bundle="messages/CodeXPBundle" key="TEXT_SHOW_LEVEL_UP_NOTIFICATION"/>
39+
</properties>
40+
</component>
41+
<component id="629a5" class="javax.swing.JCheckBox" binding="cbShowCompleteChallengeNotification">
6942
<constraints>
70-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
43+
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
7144
</constraints>
7245
<properties>
73-
<text resource-bundle="messages/CodeXPBundle" key="TEXT_CARETS"/>
46+
<text resource-bundle="messages/CodeXPBundle" key="TEXT_SHOW_COMPLETE_CHALLENGE_NOTIFICATION"/>
7447
</properties>
7548
</component>
49+
<grid id="58d24" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
50+
<margin top="0" left="0" bottom="0" right="0"/>
51+
<constraints>
52+
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
53+
</constraints>
54+
<properties/>
55+
<border type="none"/>
56+
<children>
57+
<component id="56816" class="javax.swing.JLabel">
58+
<constraints>
59+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
60+
</constraints>
61+
<properties>
62+
<text resource-bundle="messages/CodeXPBundle" key="TEXT_TYPE"/>
63+
</properties>
64+
</component>
65+
<hspacer id="15805">
66+
<constraints>
67+
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
68+
</constraints>
69+
</hspacer>
70+
<component id="67b68" class="javax.swing.JComboBox" binding="cbNotificationType">
71+
<constraints>
72+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
73+
</constraints>
74+
<properties>
75+
<model/>
76+
</properties>
77+
</component>
78+
<grid id="5212a" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
79+
<margin top="0" left="0" bottom="0" right="0"/>
80+
<constraints>
81+
<grid row="1" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
82+
</constraints>
83+
<properties/>
84+
<border type="none"/>
85+
<children>
86+
<component id="41dc4" class="javax.swing.JLabel" binding="lblTypeDescription">
87+
<constraints>
88+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
89+
</constraints>
90+
<properties>
91+
<text value="Label"/>
92+
</properties>
93+
</component>
94+
<hspacer id="90b24">
95+
<constraints>
96+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
97+
</constraints>
98+
</hspacer>
99+
</children>
100+
</grid>
101+
</children>
102+
</grid>
76103
</children>
77104
</grid>
78-
<grid id="9e7ee" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
79-
<margin top="0" left="22" bottom="0" right="0"/>
105+
<grid id="be17d" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
106+
<margin top="16" left="0" bottom="0" right="0"/>
80107
<constraints>
81-
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
108+
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
82109
</constraints>
83110
<properties/>
84111
<border type="none"/>
85112
<children>
86-
<component id="57ce1" class="javax.swing.JLabel">
113+
<component id="e5851" class="javax.swing.JLabel">
87114
<constraints>
88115
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
89116
</constraints>
90117
<properties>
91-
<text resource-bundle="messages/CodeXPBundle" key="TEXT_SHOW_GAINED_XP_DESCRIPTION"/>
118+
<font style="1"/>
119+
<text resource-bundle="messages/CodeXPBundle" key="TEXT_EFFECT"/>
92120
</properties>
93121
</component>
122+
<component id="a4d9f" class="javax.swing.JCheckBox" binding="cbShowGainedXP">
123+
<constraints>
124+
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
125+
</constraints>
126+
<properties>
127+
<text resource-bundle="messages/CodeXPBundle" key="TEXT_SHOW_GAINED_XP"/>
128+
</properties>
129+
</component>
130+
<grid id="9e7ee" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
131+
<margin top="0" left="22" bottom="0" right="0"/>
132+
<constraints>
133+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
134+
</constraints>
135+
<properties/>
136+
<border type="none"/>
137+
<children>
138+
<component id="57ce1" class="javax.swing.JLabel">
139+
<constraints>
140+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
141+
</constraints>
142+
<properties>
143+
<text resource-bundle="messages/CodeXPBundle" key="TEXT_SHOW_GAINED_XP_DESCRIPTION"/>
144+
</properties>
145+
</component>
146+
</children>
147+
</grid>
148+
<grid id="1c92c" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
149+
<margin top="0" left="22" bottom="0" right="0"/>
150+
<constraints>
151+
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
152+
</constraints>
153+
<properties/>
154+
<border type="none"/>
155+
<children>
156+
<component id="9ca3" class="javax.swing.JComboBox" binding="cbPositionToDisplayGainedXP">
157+
<constraints>
158+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
159+
</constraints>
160+
<properties/>
161+
</component>
162+
<hspacer id="3944">
163+
<constraints>
164+
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
165+
</constraints>
166+
</hspacer>
167+
<component id="d236" class="javax.swing.JLabel">
168+
<constraints>
169+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
170+
</constraints>
171+
<properties>
172+
<text resource-bundle="messages/CodeXPBundle" key="TEXT_CARETS"/>
173+
</properties>
174+
</component>
175+
</children>
176+
</grid>
94177
</children>
95178
</grid>
96179
</children>

‎src/main/java/com/github/ilovegamecoding/intellijcodexp/form/CodeXPConfigurationForm.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ public class CodeXPConfigurationForm {
99
public JPanel pMain;
1010
public JCheckBox cbShowGainedXP;
1111
public JComboBox cbPositionToDisplayGainedXP;
12+
public JComboBox cbNotificationType;
13+
public JLabel lblTypeDescription;
1214
}

‎src/main/kotlin/com/github/ilovegamecoding/intellijcodexp/activities/CodeXPStartupActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.github.ilovegamecoding.intellijcodexp.activities
22

3+
import com.github.ilovegamecoding.intellijcodexp.managers.CodeXPUIManager
34
import com.github.ilovegamecoding.intellijcodexp.services.CodeXPService
45
import com.intellij.openapi.application.ApplicationManager
5-
import com.intellij.openapi.diagnostic.thisLogger
66
import com.intellij.openapi.project.Project
77
import com.intellij.openapi.startup.StartupActivity
88

99
class CodeXPStartupActivity : StartupActivity {
1010
override fun runActivity(project: Project) {
11-
thisLogger().warn("CodeXPStartupActivity.runActivity")
12-
val codeXPService = ApplicationManager.getApplication().getService(CodeXPService::class.java)
11+
ApplicationManager.getApplication().getService(CodeXPService::class.java)
12+
CodeXPUIManager.createDialogArea()
1313
}
1414
}

0 commit comments

Comments
 (0)