Skip to content

Commit 43ab052

Browse files
ACTCDACTCD
authored
Merge pull request #829 from quoid/new-app-icon
feat: new app icon for liquid glass
2 parents dad2e68 + dd947fc commit 43ab052

8 files changed

Lines changed: 132 additions & 19 deletions

File tree

‎.github/workflows/deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
matrix: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
1111
platform: [mac, ios]
12-
runs-on: macos-latest # https://github.com/actions/runner-images
12+
runs-on: macos-15 # https://github.com/actions/runner-images
1313
steps:
1414
- uses: actions/checkout@v4 # https://github.com/actions/checkout
1515
with:
@@ -38,7 +38,7 @@ jobs:
3838
- run: npm run build:${{ matrix.platform }}-safari-15
3939
if: ${{ ! github.event.release.prerelease }}
4040
- name: Set xcode version
41-
run: sudo xcode-select -s "/Applications/Xcode_16.2.app" # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md#xcode
41+
run: sudo xcode-select -s "/Applications/Xcode_26.0.app" # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md#xcode
4242
- name: Run fastlane
4343
id: fastlane
4444
working-directory: ./fastlane

‎src/app/App.svelte‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<svelte:options runes={true} />
22

33
<script>
4-
import logoIcon from "@shared/img/logo-icon.png";
4+
import LogoIcon from "@shared/Components/LogoIcon.svelte";
55
import LogoText from "@shared/Components/LogoText.svelte";
66
import IconDebug from "@shared/img/icon-bug.svg?raw";
77
import Dropdown from "@shared/Components/Dropdown.svelte";
@@ -147,15 +147,8 @@
147147
</div>
148148
{/if}
149149
<div class="section app">
150-
<img
151-
alt="Userscripts App Icon"
152-
class="icon"
153-
draggable="false"
154-
src={logoIcon}
155-
/>
156-
<div class="logo">
157-
<LogoText />
158-
</div>
150+
<div class="logo-icon"><LogoIcon /></div>
151+
<div class="logo-text"><LogoText /></div>
159152
<div class="version">
160153
{#if import.meta.env.GIT_TAG && import.meta.env.GIT_COMMIT}
161154
<a href="{baseUrl}/releases/tag/{import.meta.env.GIT_TAG}">
@@ -307,12 +300,12 @@
307300
color: var(--color-blue);
308301
}
309302
310-
.section.app .icon {
311-
height: min(8rem, 256px);
312-
width: min(8rem, 256px);
303+
.section.app .logo-icon :global(svg) {
304+
height: min(7rem, 150px);
305+
padding: 0.7rem;
313306
}
314307
315-
.section.app .logo :global(svg) {
308+
.section.app .logo-text :global(svg) {
316309
display: flex;
317310
height: min(1.5rem, 32px);
318311
}

‎src/shared/Components/LogoIcon.svelte‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<svelte:options runes={true} />
2+
3+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 525 519">
4+
<path
5+
fill-rule="evenodd"
6+
d="M144.586 416.295c-6.418 0-12.835-2.407-17.647-7.221L6.618 280.693c-8.824-9.629-8.824-23.269 0-32.898l120.32-128.38c8.824-9.629 24.065-10.431 33.69-1.605 9.626 8.826 10.428 24.071 1.605 33.7l-.803.802L56.35 264.645 161.43 376.98c8.824 9.628 8.824 24.873-.802 33.7-4.812 4.012-10.427 6.419-16.042 6.419zm235.828 0c-13.636 0-24.064-10.43-24.064-24.071 0-6.42 2.407-12.036 6.417-16.048l105.08-112.333-105.08-112.333c-8.823-9.629-8.021-24.874 1.605-33.7 9.625-8.826 24.866-8.024 33.69.802l120.32 128.381c8.824 9.629 8.824 23.27 0 32.898l-120.32 128.38c-4.813 4.815-11.23 8.024-17.648 8.024M214.372 519c-1.605 0-3.209 0-4.813-.802-12.834-2.408-21.658-15.246-18.45-28.084l96.257-470.997C289.773 6.28 302.607-2.547 315.441.662s21.658 15.246 18.45 28.084l-96.257 470.997C236.029 510.976 225.602 519 214.372 519"
7+
/>
8+
</svg>
9+
10+
<style>
11+
path {
12+
fill: light-dark(var(--color-black), var(--color-white));
13+
}
14+
</style>

‎src/shared/Components/LogoText.svelte‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<svelte:options runes={true} />
22

3-
<script>
4-
</script>
5-
63
<svg viewBox="0 0 181 24">
74
<g fill="none">
85
<path

‎src/shared/img/logo-icon.png‎

-23.7 KB
Binary file not shown.

‎xcode/App-Shared/AppIcon.icon/Assets/icon.svg‎

Lines changed: 9 additions & 0 deletions
Loading

‎xcode/App-Shared/AppIcon.icon/icon.json‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
{
2+
"fill-specializations" : [
3+
{
4+
"value" : "automatic"
5+
},
6+
{
7+
"appearance" : "dark",
8+
"value" : "automatic"
9+
}
10+
],
11+
"groups" : [
12+
{
13+
"blend-mode-specializations" : [
14+
{
15+
"value" : "plus-darker"
16+
},
17+
{
18+
"appearance" : "dark",
19+
"value" : "plus-lighter"
20+
},
21+
{
22+
"appearance" : "tinted",
23+
"value" : "normal"
24+
}
25+
],
26+
"blur-material" : 0.5,
27+
"hidden" : false,
28+
"layers" : [
29+
{
30+
"blend-mode" : "normal",
31+
"fill-specializations" : [
32+
{
33+
"value" : "automatic"
34+
},
35+
{
36+
"appearance" : "dark",
37+
"value" : {
38+
"linear-gradient" : [
39+
"extended-gray:1.00000,0.80000",
40+
"extended-gray:1.00000,0.70000"
41+
]
42+
}
43+
},
44+
{
45+
"appearance" : "tinted",
46+
"value" : {
47+
"linear-gradient" : [
48+
"extended-gray:1.00000,0.80000",
49+
"extended-gray:1.00000,0.70000"
50+
]
51+
}
52+
}
53+
],
54+
"glass" : true,
55+
"hidden" : false,
56+
"image-name" : "icon.svg",
57+
"name" : "icon",
58+
"opacity" : 1
59+
}
60+
],
61+
"lighting" : "individual",
62+
"position" : {
63+
"scale" : 1,
64+
"translation-in-points" : [
65+
0,
66+
0
67+
]
68+
},
69+
"shadow-specializations" : [
70+
{
71+
"value" : {
72+
"kind" : "neutral",
73+
"opacity" : 0.5
74+
}
75+
},
76+
{
77+
"appearance" : "light",
78+
"value" : {
79+
"kind" : "layer-color",
80+
"opacity" : 0.5
81+
}
82+
}
83+
],
84+
"specular" : true,
85+
"translucency" : {
86+
"enabled" : true,
87+
"value" : 0.2
88+
}
89+
}
90+
],
91+
"supported-platforms" : {
92+
"squares" : "shared"
93+
}
94+
}

‎xcode/Userscripts.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
007596BF2E10B67F008F8C04 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 007596BE2E10B67F008F8C04 /* AppIcon.icon */; };
11+
007596C02E10B67F008F8C04 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 007596BE2E10B67F008F8C04 /* AppIcon.icon */; };
1012
030C64F62AC62CC900548FBD /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 030C64F52AC62CC900548FBD /* Settings.bundle */; };
1113
030C64FC2AD0B24C00548FBD /* Initialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 030C64FB2AD0B24C00548FBD /* Initialization.swift */; };
1214
030FCAD42B182008004D13CD /* UrlCodecTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 030FCAD32B182008004D13CD /* UrlCodecTests.swift */; };
@@ -112,6 +114,7 @@
112114
/* End PBXCopyFilesBuildPhase section */
113115

114116
/* Begin PBXFileReference section */
117+
007596BE2E10B67F008F8C04 /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIcon.icon; sourceTree = "<group>"; };
115118
030C64F52AC62CC900548FBD /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
116119
030C64FB2AD0B24C00548FBD /* Initialization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Initialization.swift; sourceTree = "<group>"; };
117120
030FCAD32B182008004D13CD /* UrlCodecTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UrlCodecTests.swift; sourceTree = "<group>"; };
@@ -204,6 +207,7 @@
204207
isa = PBXGroup;
205208
children = (
206209
039F59512AD95485002E9977 /* Resources */,
210+
007596BE2E10B67F008F8C04 /* AppIcon.icon */,
207211
03D405482CC66DC90091FE6F /* Shared.xcassets */,
208212
4A4CF6E9270A38BD00111584 /* ViewController.swift */,
209213
039F59552ADA2FE2002E9977 /* USchemeHandler.swift */,
@@ -501,6 +505,7 @@
501505
4A4CF6F0270A38BD00111584 /* Main.storyboard in Resources */,
502506
4A4CF6ED270A38BD00111584 /* LaunchScreen.storyboard in Resources */,
503507
03D4054B2CC66DC90091FE6F /* Shared.xcassets in Resources */,
508+
007596BF2E10B67F008F8C04 /* AppIcon.icon in Resources */,
504509
030C64F62AC62CC900548FBD /* Settings.bundle in Resources */,
505510
4A4CF710270A38BF00111584 /* Assets.xcassets in Resources */,
506511
039F59532AD9591C002E9977 /* dist in Resources */,
@@ -523,6 +528,7 @@
523528
files = (
524529
4A57B9F9227235CE008A9763 /* Assets.xcassets in Resources */,
525530
032CBD3C2CBCF19A00B31D5E /* dist in Resources */,
531+
007596C02E10B67F008F8C04 /* AppIcon.icon in Resources */,
526532
03D4054D2CC66DC90091FE6F /* Shared.xcassets in Resources */,
527533
4A57B9F5227235CD008A9763 /* Main.storyboard in Resources */,
528534
);

0 commit comments

Comments
 (0)