Skip to content

Commit c70c990

Browse files
committed
Theme updates
1 parent ef81299 commit c70c990

File tree

3 files changed

+62
-7
lines changed

3 files changed

+62
-7
lines changed

Sobretium.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
355355
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
356356
CODE_SIGN_STYLE = Automatic;
357-
CURRENT_PROJECT_VERSION = 65;
357+
CURRENT_PROJECT_VERSION = 71;
358358
DEVELOPMENT_ASSET_PATHS = "\"Sobretium/Preview Content\"";
359359
DEVELOPMENT_TEAM = W8C8UQ95CG;
360360
ENABLE_PREVIEWS = YES;
@@ -370,7 +370,7 @@
370370
"$(inherited)",
371371
"@executable_path/Frameworks",
372372
);
373-
MARKETING_VERSION = 0.4;
373+
MARKETING_VERSION = 0.4.1;
374374
PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium;
375375
PRODUCT_NAME = "$(TARGET_NAME)";
376376
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -388,7 +388,7 @@
388388
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
389389
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
390390
CODE_SIGN_STYLE = Automatic;
391-
CURRENT_PROJECT_VERSION = 65;
391+
CURRENT_PROJECT_VERSION = 71;
392392
DEVELOPMENT_ASSET_PATHS = "\"Sobretium/Preview Content\"";
393393
DEVELOPMENT_TEAM = W8C8UQ95CG;
394394
ENABLE_PREVIEWS = YES;
@@ -404,7 +404,7 @@
404404
"$(inherited)",
405405
"@executable_path/Frameworks",
406406
);
407-
MARKETING_VERSION = 0.4;
407+
MARKETING_VERSION = 0.4.1;
408408
PRODUCT_BUNDLE_IDENTIFIER = com.alyxferrari.Sobretium;
409409
PRODUCT_NAME = "$(TARGET_NAME)";
410410
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

Sobretium/Settings/AboutView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ struct AboutView: View {
1818
Text("by Alyx Ferrari")
1919
.font(.subheadline)
2020
Text("")
21-
Text("Version 0.4 build 65")
21+
Text("Version 0.4.1 build 71")
2222
Spacer()
2323
}
2424
.toolbar {

Sobretium/Theme.swift

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,71 @@ class Theme: Identifiable, Equatable {
1414
Color.white, Color.white, Color.white, Color.white, Color.white,
1515
"Sobretium"
1616
),
17+
Theme(
18+
Color(0xf0c22c), Color(0xee9e20), Color(0xe65104), Color(0xae3204), Color(0x751a01),
19+
Color.black, Color.black, Color.white, Color.white, Color.white,
20+
"Autumn"
21+
),
1722
Theme(
1823
Color(0xfffeed), Color(0xcdd873), Color(0xd03b3b), Color(0x901a1a), Color(0x28543c),
19-
Color.black, Color.black, Color.black, Color.white, Color.white,
24+
Color.black, Color.black, Color.white, Color.white, Color.white,
2025
"Christmas"
2126
),
2227
Theme(
23-
Color.teal, Color.pink, Color.white, Color.pink, Color.teal,
28+
Color(0xcdad75), Color(0x965336), Color(0x7e2c2e), Color(0x78021f), Color(0x450019),
29+
Color.black, Color.white, Color.white, Color.white, Color.white,
30+
"Ruby"
31+
),
32+
Theme(
33+
Color(0x2796ff), Color(0x29589f), Color(0x292c59), Color(0x17151d), Color.black,
34+
Color.black, Color.white, Color.white, Color.white, Color.white,
35+
"Starry Night"
36+
),
37+
Theme(
38+
Color(0xffe558), Color(0xffae2f), Color(0xff5a00), Color(0x832e01), Color.black,
39+
Color.black, Color.black, Color.white, Color.white, Color.white,
40+
"Halloween"
41+
),
42+
Theme(
43+
Color(0x6272a4), Color(0x50fa7b), Color(0xff79c6), Color(0xbd93f9), Color(0x44475a),
44+
Color.white, Color.black, Color.black, Color.white, Color.white,
45+
"Dracula"
46+
),
47+
Theme( // TODO: is 2nd color okay as white?
48+
Color(0xe40303), Color(0xff8c00), Color(0x008026), Color(0x004dff), Color(0x750787),
49+
Color.white, Color.black, Color.white, Color.white, Color.white,
50+
"Rainbow"
51+
),
52+
Theme(
53+
Color(0xd52d00), Color(0xff9a56), Color.white, Color(0xd362a4), Color(0xa30262),
54+
Color.white, Color.white, Color.black, Color.white, Color.white,
55+
"Lesbian Pride"
56+
),
57+
Theme(
58+
Color(0x26ceaa), Color(0x98e8c1), Color.white, Color(0x7bade2), Color(0x5049cc),
2459
Color.black, Color.black, Color.black, Color.white, Color.white,
60+
"Gay Pride"
61+
),
62+
Theme(
63+
Color(0xd60270), Color(0x9b4f96), Color(0x9b4f96), Color(0x9b4f96), Color(0x0038a8),
64+
Color.white, Color.white, Color.white, Color.white, Color.white,
65+
"Bisexual Pride"
66+
),
67+
Theme(
68+
Color.teal, Color(0xf5a9b8), Color.white, Color(0xf5a9b8), Color.teal,
69+
Color.black, Color.black, Color.black, Color.black, Color.black,
2570
"Trans Pride"
2671
),
72+
Theme(
73+
Color(0xff218c), Color(0xff218c), Color(0xffd800), Color(0x21b1ff), Color(0x21b1ff),
74+
Color.white, Color.white, Color.black, Color.black, Color.black,
75+
"Pansexual Pride"
76+
),
77+
Theme(
78+
Color(0xffd800), Color(0x7902aa), Color(0xffd800), Color(0x7902aa), Color(0xffd800),
79+
Color.black, Color.white, Color.black, Color.white, Color.black,
80+
"Intersex Pride"
81+
),
2782
]
2883

2984
static func == (lhs: Theme, rhs: Theme) -> Bool {

0 commit comments

Comments
 (0)