Skip to content

Commit 14625cd

Browse files
shai-almogshai-almog
committed
Revert "Dark mode in initializr and fixing build to update to latest version of plugin"
This reverts commit d626593.
1 parent d626593 commit 14625cd

10 files changed

Lines changed: 16 additions & 271 deletions

File tree

‎.github/workflows/initializr-cn1-version-pr.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ name: Initializr CN1 Version PR
33
on:
44
push:
55
tags:
6-
- "*"
7-
release:
8-
types:
9-
- published
6+
- "v*"
7+
- "[0-9]*"
108

119
permissions:
1210
contents: write
@@ -20,22 +18,21 @@ jobs:
2018
uses: actions/checkout@v4
2119

2220
- name: Update Initializr Codename One versions
23-
run: ./scripts/initializr/update-cn1-version.sh "${{ github.event.release.tag_name || github.ref_name }}"
21+
run: ./scripts/initializr/update-cn1-version.sh "${GITHUB_REF_NAME}"
2422

2523
- name: Create pull request
2624
uses: peter-evans/create-pull-request@v6
2725
with:
28-
commit-message: "scripts/initializr: bump Codename One versions to ${{ github.event.release.tag_name || github.ref_name }}"
29-
title: "scripts/initializr: bump Codename One versions to ${{ github.event.release.tag_name || github.ref_name }}"
26+
commit-message: "scripts/initializr: bump Codename One versions to ${{ github.ref_name }}"
27+
title: "scripts/initializr: bump Codename One versions to ${{ github.ref_name }}"
3028
body: |
31-
Automated update of Codename One versions in `scripts/initializr` after release `${{ github.event.release.tag_name || github.ref_name }}`.
29+
Automated update of Codename One versions in `scripts/initializr` after release `${{ github.ref_name }}`.
3230
3331
Updated:
3432
- All `scripts/initializr/**/pom.xml` files containing `cn1.plugin.version`
3533
- `scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java`
3634
- `scripts/initializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java`
37-
- Embedded root `pom.xml` in `scripts/initializr/common/src/main/resources/common.zip`
38-
branch: automation/initializr-cn1-version-${{ github.event.release.tag_name || github.ref_name }}
35+
branch: automation/initializr-cn1-version-${{ github.ref_name }}
3936
delete-branch: true
4037
labels: |
4138
automation

‎scripts/initializr/common/src/main/css/theme.css‎

Lines changed: 0 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -57,96 +57,49 @@ InitializrForm {
5757
background-color: #f3f6fb;
5858
}
5959

60-
InitializrFormDark {
61-
background-color: #0f172a;
62-
}
63-
6460
InitializrRoot {
6561
padding: 2.2mm;
6662
}
6763

68-
InitializrRootDark {
69-
padding: 2.2mm;
70-
}
71-
7264
InitializrHeaderCard {
7365
background-color: #eaf2ff;
7466
padding: 2.5mm;
7567
margin: 1.2mm;
7668
}
7769

78-
InitializrHeaderCardDark {
79-
background-color: #1e293b;
80-
padding: 2.5mm;
81-
margin: 1.2mm;
82-
}
83-
8470
InitializrCard {
8571
background-color: #ffffff;
8672
padding: 2.5mm;
8773
margin: 1.2mm;
8874
}
8975

90-
InitializrCardDark {
91-
background-color: #111827;
92-
padding: 2.5mm;
93-
margin: 1.2mm;
94-
}
95-
9676
InitializrHeroTitle {
9777
color: #0d1b2a;
9878
font-family: "native:MainBold";
9979
font-size: 4.5mm;
10080
padding: 0 0 1mm 0;
10181
}
10282

103-
InitializrHeroTitleDark {
104-
color: #e2e8f0;
105-
font-family: "native:MainBold";
106-
font-size: 4.5mm;
107-
padding: 0 0 1mm 0;
108-
}
109-
11083
InitializrHeroSubtitle {
11184
color: #4a5568;
11285
font-family: "native:MainRegular";
11386
font-size: 2.8mm;
11487
}
11588

116-
InitializrHeroSubtitleDark {
117-
color: #94a3b8;
118-
font-family: "native:MainRegular";
119-
font-size: 2.8mm;
120-
}
121-
12289
InitializrSectionTitle {
12390
color: #1f2937;
12491
font-family: "native:MainBold";
12592
font-size: 3.4mm;
12693
padding: 0 0 1.2mm 0;
12794
}
12895

129-
InitializrSectionTitleDark {
130-
color: #e2e8f0;
131-
font-family: "native:MainBold";
132-
font-size: 3.4mm;
133-
padding: 0 0 1.2mm 0;
134-
}
135-
13696
InitializrFieldLabel {
13797
color: #475569;
13898
font-family: "native:MainRegular";
13999
font-size: 2.4mm;
140100
padding: 0.4mm 0;
141101
}
142102

143-
InitializrFieldLabelDark {
144-
color: #cbd5e1;
145-
font-family: "native:MainRegular";
146-
font-size: 2.4mm;
147-
padding: 0.4mm 0;
148-
}
149-
150103
InitializrField, InitializrFieldHint {
151104
color: #1f2937;
152105
font-family: "native:MainRegular";
@@ -157,16 +110,6 @@ InitializrField, InitializrFieldHint {
157110
margin: 0 0 1.4mm 0;
158111
}
159112

160-
InitializrFieldDark, InitializrFieldHintDark {
161-
color: #e2e8f0;
162-
font-family: "native:MainRegular";
163-
font-size: 2.8mm;
164-
background-color: #0f172a;
165-
border: 1px solid #334155;
166-
padding: 1.1mm;
167-
margin: 0 0 1.4mm 0;
168-
}
169-
170113
InitializrChoicesGrid {
171114
margin: 0 0 1.2mm 0;
172115
}
@@ -189,24 +132,6 @@ InitializrChoice.pressed {
189132
text-align: center;
190133
}
191134

192-
InitializrChoiceDark {
193-
color: #e2e8f0;
194-
background-color: #1f2937;
195-
font-family: "native:MainRegular";
196-
font-size: 2.6mm;
197-
border: 1px solid #334155;
198-
margin: 0.7mm;
199-
padding: 1.1mm;
200-
text-align: center;
201-
}
202-
203-
InitializrChoiceDark.pressed {
204-
color: #ffffff;
205-
background-color: #0f766e;
206-
border: 1px solid #0f766e;
207-
text-align: center;
208-
}
209-
210135
InitializrSummary {
211136
color: #1f2937;
212137
font-family: "native:MainRegular";
@@ -217,44 +142,20 @@ InitializrSummary {
217142
margin: 0 0 1.4mm 0;
218143
}
219144

220-
InitializrSummaryDark {
221-
color: #e2e8f0;
222-
font-family: "native:MainRegular";
223-
font-size: 2.7mm;
224-
background-color: #0f172a;
225-
border: 1px solid #334155;
226-
padding: 1.4mm;
227-
margin: 0 0 1.4mm 0;
228-
}
229-
230145
InitializrTip {
231146
color: #5f6b7a;
232147
font-family: "native:MainRegular";
233148
font-size: 2.4mm;
234149
padding: 0 0 1.2mm 0;
235150
}
236151

237-
InitializrTipDark {
238-
color: #94a3b8;
239-
font-family: "native:MainRegular";
240-
font-size: 2.4mm;
241-
padding: 0 0 1.2mm 0;
242-
}
243-
244152
InitializrValidationError {
245153
color: #b42318;
246154
font-family: "native:MainRegular";
247155
font-size: 2.2mm;
248156
padding: 0 0 0.8mm 0;
249157
}
250158

251-
InitializrValidationErrorDark {
252-
color: #f87171;
253-
font-family: "native:MainRegular";
254-
font-size: 2.2mm;
255-
padding: 0 0 0.8mm 0;
256-
}
257-
258159
InitializrHelpButton {
259160
cn1-derive: Button;
260161
color: #64748b;
@@ -264,15 +165,6 @@ InitializrHelpButton {
264165
padding: 0.2mm;
265166
}
266167

267-
InitializrHelpButtonDark {
268-
cn1-derive: Button;
269-
color: #94a3b8;
270-
background-color: transparent;
271-
border: none;
272-
margin: 0;
273-
padding: 0.2mm;
274-
}
275-
276168
Images {
277169
background-image: url(images/grub.png),
278170
url(images/tweet.png);

‎scripts/initializr/common/src/main/java/com/codename1/initializr/Initializr.java‎

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.codename1.initializr.model.Template;
1212
import com.codename1.initializr.ui.TemplatePreviewPanel;
1313
import com.codename1.system.Lifecycle;
14-
import com.codename1.system.NativeLookup;
1514
import com.codename1.ui.Button;
1615
import com.codename1.ui.ButtonGroup;
1716
import com.codename1.ui.CheckBox;
@@ -26,12 +25,9 @@
2625
import com.codename1.ui.layouts.BorderLayout;
2726
import com.codename1.ui.layouts.BoxLayout;
2827
import com.codename1.ui.layouts.GridLayout;
29-
import com.codename1.ui.util.UITimer;
3028
import com.codename1.util.StringUtil;
3129

3230
public class Initializr extends Lifecycle {
33-
private boolean websiteDarkMode;
34-
3531
@Override
3632
public void runApp() {
3733
final Form form = new Form("", new BorderLayout());
@@ -136,7 +132,6 @@ public void run() {
136132
appNameField.addDataChangedListener((type, index) -> refresh.run());
137133
packageField.addDataChangedListener((type, index) -> refresh.run());
138134
refresh.run();
139-
initWebsiteThemeSync(form);
140135
form.show();
141136
}
142137

@@ -329,92 +324,6 @@ private boolean supportsLivePreview(Template template) {
329324
return template == Template.BAREBONES || template == Template.KOTLIN;
330325
}
331326

332-
private void initWebsiteThemeSync(Form form) {
333-
WebsiteThemeNative websiteThemeNative = NativeLookup.create(WebsiteThemeNative.class);
334-
if (websiteThemeNative == null || !websiteThemeNative.isSupported()) {
335-
return;
336-
}
337-
websiteDarkMode = websiteThemeNative.isDarkMode();
338-
applyWebsiteTheme(form, websiteDarkMode);
339-
UITimer.timer(900, true, form, () -> {
340-
boolean dark = websiteThemeNative.isDarkMode();
341-
if (dark != websiteDarkMode) {
342-
websiteDarkMode = dark;
343-
applyWebsiteTheme(form, dark);
344-
form.revalidate();
345-
}
346-
});
347-
}
348-
349-
private void applyWebsiteTheme(Component component, boolean dark) {
350-
String uiid = component.getUIID();
351-
String themed = themedUiid(uiid, dark);
352-
if (!uiid.equals(themed)) {
353-
component.setUIID(themed);
354-
}
355-
if (component instanceof Container) {
356-
Container cnt = (Container) component;
357-
for (int i = 0; i < cnt.getComponentCount(); i++) {
358-
applyWebsiteTheme(cnt.getComponentAt(i), dark);
359-
}
360-
}
361-
}
362-
363-
private String themedUiid(String uiid, boolean dark) {
364-
if (uiid == null || uiid.length() == 0) {
365-
return uiid;
366-
}
367-
if (dark) {
368-
if (uiid.endsWith("Dark")) {
369-
return uiid;
370-
}
371-
switch (uiid) {
372-
case "InitializrForm":
373-
case "InitializrRoot":
374-
case "InitializrHeaderCard":
375-
case "InitializrCard":
376-
case "InitializrHeroTitle":
377-
case "InitializrHeroSubtitle":
378-
case "InitializrSectionTitle":
379-
case "InitializrFieldLabel":
380-
case "InitializrField":
381-
case "InitializrFieldHint":
382-
case "InitializrChoice":
383-
case "InitializrSummary":
384-
case "InitializrTip":
385-
case "InitializrValidationError":
386-
case "InitializrHelpButton":
387-
return uiid + "Dark";
388-
default:
389-
return uiid;
390-
}
391-
}
392-
if (!uiid.endsWith("Dark")) {
393-
return uiid;
394-
}
395-
String base = uiid.substring(0, uiid.length() - "Dark".length());
396-
switch (base) {
397-
case "InitializrForm":
398-
case "InitializrRoot":
399-
case "InitializrHeaderCard":
400-
case "InitializrCard":
401-
case "InitializrHeroTitle":
402-
case "InitializrHeroSubtitle":
403-
case "InitializrSectionTitle":
404-
case "InitializrFieldLabel":
405-
case "InitializrField":
406-
case "InitializrFieldHint":
407-
case "InitializrChoice":
408-
case "InitializrSummary":
409-
case "InitializrTip":
410-
case "InitializrValidationError":
411-
case "InitializrHelpButton":
412-
return base;
413-
default:
414-
return uiid;
415-
}
416-
}
417-
418327
private void setEnabledRecursive(Component component, boolean enabled) {
419328
component.setEnabled(enabled);
420329
if (component instanceof Container) {

‎scripts/initializr/common/src/main/java/com/codename1/initializr/WebsiteThemeNative.java‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static com.codename1.ui.CN.*;
1919

2020
public class GeneratorModel {
21-
private static final String CN1_PLUGIN_VERSION = "7.0.250";
21+
private static final String CN1_PLUGIN_VERSION = "7.0.224";
2222
private static final String GENERATED_GITIGNORE =
2323
"**/target/\n" +
2424
".idea/\n" +

‎scripts/initializr/common/src/main/resources/common.zip‎

2.94 KB
Binary file not shown.

‎scripts/initializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private void assertRootPom(Map<String, byte[]> entries, String packageName, Stri
9191
String pom = getText(entries, "pom.xml");
9292
assertContains(pom, packageName, "Root pom should include package as groupId");
9393
assertContains(pom, mainClassName.toLowerCase(), "Root pom should include app artifact/name");
94-
assertContains(pom, "<cn1.plugin.version>7.0.250</cn1.plugin.version>", "Root pom should use current CN1 plugin version");
94+
assertContains(pom, "<cn1.plugin.version>7.0.224</cn1.plugin.version>", "Root pom should use current CN1 plugin version");
9595
assertFalse(pom.indexOf("com.example.myapp") >= 0, "Root pom still contains placeholder package");
9696
assertFalse(pom.indexOf("myappname") >= 0, "Root pom still contains placeholder app name");
9797
}

0 commit comments

Comments
 (0)