mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-05-19 00:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change arrows icon to rocket for boosts (#1099)

Browse source 
* Change arrows icon to rocket for boosts

* Fixing case (part 1)

* Fixing Case (part 2)

* Clean up after merge

* Fix for disabled boost

* Fixes

---------

Co-authored-by: Thomas Ricouard <ricouard77@gmail.com>
This commit is contained in:
Gareth Simpson 2023-02-28 13:53:31 +00:00 committed by GitHub
parent adf8d004f7
commit 9ebe0b314c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 867 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
IceCubesApp/App/Tabs/Settings/PushNotificationsView.swift
View file

@ -66,7 +66,7 @@ struct PushNotificationsView: View {
subscription.isReblogNotificationEnabled = newValue
updateSubscription()
})) {
Label("settings.push.boosts", systemImage: "arrow.left.arrow.right.circle")
Label("settings.push.boosts", image: "Rocket")
}
Toggle(isOn: .init(get: {
subscription.isPollNotificationEnabled

1
IceCubesApp/App/Tabs/Tabs.swift
View file

@ -3,6 +3,7 @@ import Explore
import Foundation
import Status
import SwiftUI
import DesignSystem
enum Tab: Int, Identifiable, Hashable {
case timeline, notifications, mentions, explore, messages, settings, other

15
IceCubesApp/Assets.xcassets/Rocket.Fill.symbolset/Contents.json Normal file
View file

@ -0,0 +1,15 @@
{
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"symbol-rendering-intent" : "template"
},
"symbols" : [
{
"filename" : "rocket.fill.svg",
"idiom" : "universal"
}
]
}

387
IceCubesApp/Assets.xcassets/Rocket.Fill.symbolset/rocket.fill.svg Normal file
View file

@ -0,0 +1,387 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--Generator: Apple Native CoreSVG 175.5-->
<svg
version="1.1"
width="3300"
height="2200"
id="svg122"
sodipodi:docname="rocket.fill.svg"
inkscape:version="1.2.2 (b0a84865, 2022-12-01)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs126" />
<sodipodi:namedview
id="namedview124"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="0.29853095"
inkscape:cx="2478.805"
inkscape:cy="1162.3585"
inkscape:window-width="1728"
inkscape:window-height="998"
inkscape:window-x="0"
inkscape:window-y="38"
inkscape:window-maximized="0"
inkscape:current-layer="Symbols"
showguides="true" />
<!--glyph: "uni100000.medium", point size: 100.0, font version: "18.0d12e2", template writer version: "101"-->
<g
id="Notes"
transform="translate(2.4003264,84.328484)">
<rect
height="2200"
id="artboard"
style="opacity:1;fill:#ffffff"
width="3300"
x="0"
y="0" />
<line
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.5"
x1="263"
x2="3036"
y1="292"
y2="292"
id="line3" />
<text
style="font-weight:bold;font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,322)"
id="text5">Weight/Scale Variations</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(559.711,322)"
id="text7">Ultralight</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(856.422,322)"
id="text9">Thin</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(1153.13,322)"
id="text11">Light</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(1449.84,322)"
id="text13">Regular</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(1746.56,322)"
id="text15">Medium</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(2043.27,322)"
id="text17">Semibold</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(2339.98,322)"
id="text19">Bold</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(2636.69,322)"
id="text21">Heavy</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(2933.4,322)"
id="text23">Black</text>
<line
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.5"
x1="263"
x2="3036"
y1="1903"
y2="1903"
id="line25" />
<g
transform="translate(263,1933)"
id="g29">
<path
d="m 9.24805,0.830078 c 4.30665,0 7.89065,-3.574218 7.89065,-7.880858 0,-4.30662 -3.5938,-7.88082 -7.90042,-7.88082 -4.29687,0 -7.87109,3.5742 -7.87109,7.88082 0,4.30664 3.58398,7.880858 7.88086,7.880858 z m 0,-1.484375 c -3.54493,0 -6.37696,-2.841793 -6.37696,-6.396483 0,-3.55472 2.82227,-6.39652 6.36719,-6.39652 3.55472,0 6.40622,2.8418 6.40622,6.39652 0,3.55469 -2.8418,6.396483 -6.39645,6.396483 z M 5.6543,-7.05078 c 0,0.42969 0.30273,0.72266 0.75195,0.72266 h 2.09961 v 2.11914 c 0,0.43945 0.29297,0.74218 0.72266,0.74218 0.44921,0 0.74218,-0.30273 0.74218,-0.74218 v -2.11914 h 2.1191 c 0.4395,0 0.7422,-0.29297 0.7422,-0.72266 0,-0.43945 -0.3027,-0.74219 -0.7422,-0.74219 H 9.9707 v -2.10937 c 0,-0.44926 -0.29297,-0.75196 -0.74218,-0.75196 -0.42969,0 -0.72266,0.3027 -0.72266,0.75196 v 2.10937 H 6.40625 c -0.44922,0 -0.75195,0.30274 -0.75195,0.74219 z"
id="path27" />
</g>
<g
transform="translate(281.867,1933)"
id="g33">
<path
d="m 11.709,2.91016 c 5.4492,0 9.9609,-4.52149 9.9609,-9.96094 0,-5.44922 -4.5215,-9.96092 -9.9707,-9.96092 -5.43943,0 -9.95115,4.5117 -9.95115,9.96092 0,5.43945 4.52148,9.96094 9.96095,9.96094 z m 0,-1.66016 c -4.60939,0 -8.29103,-3.69141 -8.29103,-8.30078 0,-4.60942 3.67187,-8.30082 8.28123,-8.30082 4.6094,0 8.3106,3.6914 8.3106,8.30082 0,4.60937 -3.6914,8.30078 -8.3008,8.30078 z M 7.17773,-7.05078 c 0,0.47851 0.33204,0.80078 0.83008,0.80078 h 2.87109 v 2.88086 c 0,0.48828 0.332,0.83008 0.8106,0.83008 0.4882,0 0.83,-0.33203 0.83,-0.83008 V -6.25 h 2.8809 c 0.4883,0 0.8301,-0.32227 0.8301,-0.80078 0,-0.48828 -0.3418,-0.83008 -0.8301,-0.83008 H 12.5195 V -10.752 c 0,-0.498 -0.3418,-0.8398 -0.83,-0.8398 -0.4786,0 -0.8106,0.3418 -0.8106,0.8398 v 2.87114 H 8.00781 c -0.49804,0 -0.83008,0.3418 -0.83008,0.83008 z"
id="path31" />
</g>
<g
transform="translate(305.646,1933)"
id="g37">
<path
d="m 14.9707,5.66406 c 6.9629,0 12.7246,-5.7617162 12.7246,-12.71484 0,-6.96292 -5.7715,-12.72462 -12.7344,-12.72462 -6.95309,0 -12.70504,5.7617 -12.70504,12.72462 0,6.9531238 5.76172,12.71484 12.71484,12.71484 z m 0,-1.8164 c -6.03515,0 -10.88867,-4.86328 -10.88867,-10.89844 0,-6.04492 4.84375,-10.89842 10.87887,-10.89842 6.045,0 10.9082,4.8535 10.9082,10.89842 0,6.03516 -4.8535,10.89844 -10.8984,10.89844 z M 9.19922,-7.05078 c 0,0.51758 0.37109,0.8789 0.91798,0.8789 h 3.9453 v 3.95508 c 0,0.53711 0.3711,0.91797 0.8887,0.91797 0.5371,0 0.9082,-0.37109 0.9082,-0.91797 v -3.95508 h 3.9551 c 0.5371,0 0.9179,-0.36132 0.9179,-0.8789 0,-0.54688 -0.3711,-0.91797 -0.9179,-0.91797 h -3.9551 v -3.94535 c 0,-0.5468 -0.3711,-0.9277 -0.9082,-0.9277 -0.5176,0 -0.8887,0.3809 -0.8887,0.9277 v 3.94535 h -3.9453 c -0.54689,0 -0.91798,0.37109 -0.91798,0.91797 z"
id="path35" />
</g>
<text
style="font-weight:bold;font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,1953)"
id="text39">Design Variations</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,1971)"
id="text41">Symbols are supported in up to nine weights and three scales.</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,1989)"
id="text43">For optimal layout with text and other symbols, vertically align</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,2007)"
id="text45">symbols with the adjacent text.</text>
<line
style="opacity:1;fill:none;stroke:#00aeef;stroke-width:0.5"
x1="776"
x2="776"
y1="1919"
y2="1933"
id="line47" />
<g
transform="translate(776,1933)"
id="g51">
<path
d="m 3.31055,0.15625 c 0.51757,0 0.77148,-0.1953125 0.95703,-0.742188 L 5.52734,-4.0332 h 5.76176 l 1.2597,3.447262 c 0.1856,0.5468755 0.4395,0.742188 0.9473,0.742188 0.5176,0 0.8496,-0.3125 0.8496,-0.800781 0,-0.166016 -0.0293,-0.322266 -0.1074,-0.527349 L 9.6582,-13.3691 c -0.22461,-0.5957 -0.625,-0.8985 -1.25,-0.8985 -0.60547,0 -1.01562,0.293 -1.23047,0.8887 L 2.59766,-1.16211 c -0.07813,0.205079 -0.10743,0.361329 -0.10743,0.527344 0,0.488282 0.3125,0.791016 0.82032,0.791016 z m 2.69531,-5.67383 2.37305,-6.57222 h 0.04882 l 2.37307,6.57222 z"
id="path49" />
</g>
<line
style="opacity:1;fill:none;stroke:#00aeef;stroke-width:0.5"
x1="793.19702"
x2="793.19702"
y1="1919"
y2="1933"
id="line53" />
<text
style="font-weight:bold;font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(776,1953)"
id="text55">Margins</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(776,1971)"
id="text57">Leading and trailing margins on the left and right side of each symbol</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(776,1989)"
id="text59">can be adjusted by modifying the x-location of the margin guidelines.</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(776,2007)"
id="text61">Modifications are automatically applied proportionally to all</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(776,2025)"
id="text63">scales and weights.</text>
<g
transform="translate(1289,1933)"
id="g67">
<path
d="M 2.8418,1.86523 4.54102,3.57422 C 5.40039,4.44336 6.38672,4.38477 7.31445,3.35938 L 18.0078,-8.42773 17.041,-9.4043 6.42578,2.27539 C 6.07422,2.67578 5.74219,2.77344 5.27344,2.30469 L 4.10156,1.14258 C 3.63281,0.683594 3.74023,0.341797 4.14062,-0.0195312 L 15.6152,-10.8203 14.6387,-11.7871 3.04688,-0.898438 C 2.06055,0.0195312 1.98242,0.996094 2.8418,1.86523 Z M 9.25781,-16.3281 c -0.41992,0.4101 -0.44922,0.9863 -0.21484,1.3769 0.23437,0.3614 0.69336,0.5957 1.33793,0.4297 1.4648,-0.3418 2.9882,-0.4004 4.414,0.5371 l -0.5859,1.4551 c -0.3418,0.8301 -0.166,1.416 0.3711,1.9629 l 2.2949,2.31445 c 0.4883,0.48828 0.8984,0.50781 1.4648,0.41015 l 1.0645,-0.19531 0.6641,0.67383 -0.0391,0.55664 c -0.0391,0.49805 0.0879,0.87891 0.5762,1.35742 l 0.7617,0.74219 c 0.4785,0.47851 1.0937,0.50781 1.5625,0.03906 l 2.9101,-2.91992 c 0.4688,-0.46875 0.4493,-1.06445 -0.0293,-1.54297 l -0.7714,-0.76172 c -0.4786,-0.47852 -0.8496,-0.63472 -1.3282,-0.59572 l -0.5761,0.0488 -0.6446,-0.6347 0.2442,-1.1231 c 0.1269,-0.5664 -0.0293,-1.0058 -0.6153,-1.5918 l -2.1972,-2.1875 c -3.3399,-3.3203 -7.7735,-3.2422 -10.66409,-0.3515 z m 1.49419,0.3711 c 2.4316,-1.7774 5.7226,-1.4746 7.9492,0.7519 l 2.4316,2.4121 c 0.2344,0.2344 0.2734,0.42 0.2051,0.7618 l -0.3223,1.4843 1.5039,1.4844 0.9864,-0.05859 c 0.2539,-0.00977 0.332,0.00976 0.5273,0.20507 l 0.5762,0.57618 -2.4414,2.4414 -0.5762,-0.57617 C 21.3965,-6.66992 21.3672,-6.74805 21.377,-7.01172 l 0.0683,-0.97656 -1.4941,-1.48438 -1.5235,0.25391 c -0.3222,0.06836 -0.4687,0.03906 -0.7129,-0.19531 L 15.7129,-11.416 c -0.2539,-0.2344 -0.2832,-0.4004 -0.127,-0.7715 l 0.8789,-2.0898 c -1.5625,-1.4551 -3.5937,-2.0801 -5.625,-1.4844 -0.1562,0.039 -0.2148,-0.0879 -0.0878,-0.1953 z"
id="path65" />
</g>
<text
style="font-weight:bold;font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(1289,1953)"
id="text69">Exporting</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(1289,1971)"
id="text71">Symbols should be outlined when exporting to ensure the</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(1289,1989)"
id="text73">design is preserved when submitting to Xcode.</text>
<text
id="template-version"
style="font-size:13px;font-family:sans-serif;text-anchor:end;fill:#000000;stroke:none"
transform="translate(3036,1933)">Template v.4.0</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:end;fill:#000000;stroke:none"
transform="translate(3036,1951)"
id="text76">Requires Xcode 14 or greater</text>
<text
id="descriptive-name"
style="font-size:13px;font-family:sans-serif;text-anchor:end;fill:#000000;stroke:none"
transform="translate(3036,1969)">Generated from circle</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:end;fill:#000000;stroke:none"
transform="translate(3036,1987)"
id="text79">Typeset at 100 points</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,726)"
id="text81">Small</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,1156)"
id="text83">Medium</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,1586)"
id="text85">Large</text>
</g>
<g
id="Guides">
<g
id="H-reference"
style="fill:#27AAE1;stroke:none;"
transform="matrix(1 0 0 1 339 696)">
<path
d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"
id="path88" />
</g>
<line
id="Baseline-S"
style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;"
x1="263"
x2="3036"
y1="696"
y2="696" />
<line
id="Capline-S"
style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;"
x1="263"
x2="3036"
y1="625.541"
y2="625.541" />
<g
id="g95"
style="fill:#27AAE1;stroke:none;"
transform="matrix(1 0 0 1 339 1126)">
<path
d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"
id="path93" />
</g>
<line
id="Baseline-M"
style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;"
x1="263"
x2="3036"
y1="1126"
y2="1126" />
<line
id="Capline-M"
style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;"
x1="263"
x2="3036"
y1="1055.54"
y2="1055.54" />
<g
id="g101"
style="fill:#27AAE1;stroke:none;"
transform="matrix(1 0 0 1 339 1556)">
<path
d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"
id="path99" />
</g>
<line
id="Baseline-L"
style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;"
x1="263"
x2="3036"
y1="1556"
y2="1556" />
<line
id="Capline-L"
style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;"
x1="263"
x2="3036"
y1="1485.54"
y2="1485.54" />
<line
id="left-margin-Ultralight-S"
style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;"
x1="515.649"
x2="515.649"
y1="600.785"
y2="720.121" />
<line
id="right-margin-Ultralight-S"
style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;"
x1="603.773"
x2="603.773"
y1="600.785"
y2="720.121" />
<line
id="left-margin-Regular-S"
style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;"
x1="1403.58"
x2="1403.58"
y1="600.785"
y2="720.121" />
<line
id="right-margin-Regular-S"
style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;"
x1="1496.11"
x2="1496.11"
y1="600.785"
y2="720.121" />
<line
id="left-margin-Black-S"
style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;"
x1="2884.57"
x2="2884.57"
y1="600.785"
y2="720.121" />
<line
id="right-margin-Black-S"
style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;"
x1="2982.23"
x2="2982.23"
y1="600.785"
y2="720.121" />
</g>
<g
id="Symbols">
<g
id="Regular-S">
<path
id="path193"
style="stroke-width:0.144866"
d="m 1482.002,621.44922 c -6.7571,-0.18345 -23.7507,2.53122 -36.0293,13.08789 l -3.4727,-1.33594 c -5.4442,-2.08536 -11.5198,-0.33347 -15.3066,4.25391 l -7.4942,9.34375 c -0.868,1.08457 -1.1825,2.50203 -0.8672,3.91992 0.158,0.75059 0.5521,1.41951 1.0254,1.91992 0.3946,0.41719 0.9455,0.83359 1.4981,1 l 8.6797,3.33594 c -1.5778,3.5034 -2.6024,6.58959 -3.3125,8.92578 -0.7892,2.58569 -0.081,5.33777 1.7343,7.33984 l 9.627,10.17774 c 1.8937,2.00209 4.4975,2.66842 6.9433,1.83398 2.2091,-0.75059 5.1272,-1.91693 8.4415,-3.50195 l 3.1562,9.17578 c 0.2367,0.58418 0.5533,1.16674 0.9473,1.58399 0.4734,0.5004 1.1044,0.91895 1.8144,1.08593 1.2625,0.3334 2.6813,0.0816 3.7071,-0.83593 l 8.8378,-7.92383 c 4.3396,-3.92046 5.996,-10.42607 4.0235,-16.18164 l -1.1856,-3.67188 c 10.7303,-13.93014 12.8612,-33.36528 12.3086,-39.37109 -0.1579,-2.16861 -1.8927,-3.92091 -3.8652,-4.08789 -0.3551,-0.0365 -0.7605,-0.062 -1.2109,-0.0742 z m -22.0645,17.05273 c 6.5592,3.5e-4 11.8767,5.31774 11.877,11.87696 10e-4,6.56013 -5.3169,11.87855 -11.877,11.8789 -6.5611,9e-4 -11.8799,-5.31788 -11.8789,-11.8789 3e-4,-6.5601 5.3188,-11.87786 11.8789,-11.87696 z m 0,4.84961 c -3.8812,-1.8e-4 -7.0275,3.14619 -7.0273,7.02735 -2e-4,3.88115 3.1461,7.02752 7.0273,7.02734 3.8812,2.4e-4 7.0275,-3.14615 7.0273,-7.02734 2e-4,-3.8812 -3.1461,-7.02759 -7.0273,-7.02735 z" />
<path
d="m 1433.7539,683.70217 c -2.9941,0.18104 -5.731,-2.71313 -5.5596,-5.87776 0,-0.5425 -0.1713,-1.08499 -0.5131,-1.53727 -0.4279,-0.45229 -0.8557,-0.63333 -1.4541,-0.54249 -2.395,0.18104 -4.7047,1.26601 -6.5865,3.16544 -0.3625,0.35762 -0.3542,0.34634 -0.6844,0.72354 -5.9881,6.1484 -7.3568,15.19162 -7.6986,18.80824 -0.086,0.81375 0.1713,1.71837 0.7697,2.26081 0.599,0.63333 1.3687,0.90458 2.2238,0.81374 3.4212,-0.36145 11.8893,-1.80879 17.7917,-8.04845 l 0.5991,-0.63333 c 1.7965,-2.07977 2.9081,-4.5216 2.994,-7.0537 0,-0.5425 -0.1712,-1.08499 -0.5131,-1.53727 -0.4191,-0.37784 -0.7532,-0.63156 -1.3689,-0.5415 z"
id="path195"
style="stroke-width:0.144866"
sodipodi:nodetypes="cccccccccscccc" />
</g>
<g
id="Ultralight-S"
transform="matrix(1.013151,0,0,0.9833796,-908.17089,10.472384)">
<path
id="path193-0"
style="stroke-width:0.144866"
d="m 1482.002,621.44922 c -6.7571,-0.18345 -23.7507,2.53122 -36.0293,13.08789 l -3.4727,-1.33594 c -5.4442,-2.08536 -11.5198,-0.33347 -15.3066,4.25391 l -7.4942,9.34375 c -0.868,1.08457 -1.1825,2.50203 -0.8672,3.91992 0.158,0.75059 0.5521,1.41951 1.0254,1.91992 0.3946,0.41719 0.9455,0.83359 1.4981,1 l 8.6797,3.33594 c -1.5778,3.5034 -2.6024,6.58959 -3.3125,8.92578 -0.7892,2.58569 -0.081,5.33777 1.7343,7.33984 l 9.627,10.17774 c 1.8937,2.00209 4.4975,2.66842 6.9433,1.83398 2.2091,-0.75059 5.1272,-1.91693 8.4415,-3.50195 l 3.1562,9.17578 c 0.2367,0.58418 0.5533,1.16674 0.9473,1.58399 0.4734,0.5004 1.1044,0.91895 1.8144,1.08593 1.2625,0.3334 2.6813,0.0816 3.7071,-0.83593 l 8.8378,-7.92383 c 4.3396,-3.92046 5.996,-10.42607 4.0235,-16.18164 l -1.1856,-3.67188 c 10.7303,-13.93014 12.8612,-33.36528 12.3086,-39.37109 -0.1579,-2.16861 -1.8927,-3.92091 -3.8652,-4.08789 -0.3551,-0.0365 -0.7605,-0.062 -1.2109,-0.0742 z m -22.0645,17.05273 c 6.5592,3.5e-4 11.8767,5.31774 11.877,11.87696 10e-4,6.56013 -5.3169,11.87855 -11.877,11.8789 -6.5611,9e-4 -11.8799,-5.31788 -11.8789,-11.8789 3e-4,-6.5601 5.3188,-11.87786 11.8789,-11.87696 z m 0,4.84961 c -3.8812,-1.8e-4 -7.0275,3.14619 -7.0273,7.02735 -2e-4,3.88115 3.1461,7.02752 7.0273,7.02734 3.8812,2.4e-4 7.0275,-3.14615 7.0273,-7.02734 2e-4,-3.8812 -3.1461,-7.02759 -7.0273,-7.02735 z" />
<path
d="m 1433.7539,683.70217 c -2.9941,0.18104 -5.731,-2.71313 -5.5596,-5.87776 0,-0.5425 -0.1713,-1.08499 -0.5131,-1.53727 -0.4279,-0.45229 -0.8557,-0.63333 -1.4541,-0.54249 -2.395,0.18104 -4.7047,1.26601 -6.5865,3.16544 -0.3625,0.35762 -0.3542,0.34634 -0.6844,0.72354 -5.9881,6.1484 -7.3568,15.19162 -7.6986,18.80824 -0.086,0.81375 0.1713,1.71837 0.7697,2.26081 0.599,0.63333 1.3687,0.90458 2.2238,0.81374 3.4212,-0.36145 11.8893,-1.80879 17.7917,-8.04845 l 0.5991,-0.63333 c 1.7965,-2.07977 2.9081,-4.5216 2.994,-7.0537 0,-0.5425 -0.1712,-1.08499 -0.5131,-1.53727 -0.4191,-0.37784 -0.7532,-0.63156 -1.3689,-0.5415 z"
id="path195-2"
style="stroke-width:0.144866"
sodipodi:nodetypes="cccccccccscccc" />
</g>
<g
id="Black-S"
transform="matrix(1.0350695,0,0,1.0290857,1433.0548,-18.800246)">
<path
id="path193-9"
style="stroke-width:0.144866"
d="m 1482.002,621.44922 c -6.7571,-0.18345 -23.7507,2.53122 -36.0293,13.08789 l -3.4727,-1.33594 c -5.4442,-2.08536 -11.5198,-0.33347 -15.3066,4.25391 l -7.4942,9.34375 c -0.868,1.08457 -1.1825,2.50203 -0.8672,3.91992 0.158,0.75059 0.5521,1.41951 1.0254,1.91992 0.3946,0.41719 0.9455,0.83359 1.4981,1 l 8.6797,3.33594 c -1.5778,3.5034 -2.6024,6.58959 -3.3125,8.92578 -0.7892,2.58569 -0.081,5.33777 1.7343,7.33984 l 9.627,10.17774 c 1.8937,2.00209 4.4975,2.66842 6.9433,1.83398 2.2091,-0.75059 5.1272,-1.91693 8.4415,-3.50195 l 3.1562,9.17578 c 0.2367,0.58418 0.5533,1.16674 0.9473,1.58399 0.4734,0.5004 1.1044,0.91895 1.8144,1.08593 1.2625,0.3334 2.6813,0.0816 3.7071,-0.83593 l 8.8378,-7.92383 c 4.3396,-3.92046 5.996,-10.42607 4.0235,-16.18164 l -1.1856,-3.67188 c 10.7303,-13.93014 12.8612,-33.36528 12.3086,-39.37109 -0.1579,-2.16861 -1.8927,-3.92091 -3.8652,-4.08789 -0.3551,-0.0365 -0.7605,-0.062 -1.2109,-0.0742 z m -22.0645,17.05273 c 6.5592,3.5e-4 11.8767,5.31774 11.877,11.87696 10e-4,6.56013 -5.3169,11.87855 -11.877,11.8789 -6.5611,9e-4 -11.8799,-5.31788 -11.8789,-11.8789 3e-4,-6.5601 5.3188,-11.87786 11.8789,-11.87696 z m 0,4.84961 c -3.8812,-1.8e-4 -7.0275,3.14619 -7.0273,7.02735 -2e-4,3.88115 3.1461,7.02752 7.0273,7.02734 3.8812,2.4e-4 7.0275,-3.14615 7.0273,-7.02734 2e-4,-3.8812 -3.1461,-7.02759 -7.0273,-7.02735 z" />
<path
d="m 1433.7539,683.70217 c -2.9941,0.18104 -5.731,-2.71313 -5.5596,-5.87776 0,-0.5425 -0.1713,-1.08499 -0.5131,-1.53727 -0.4279,-0.45229 -0.8557,-0.63333 -1.4541,-0.54249 -2.395,0.18104 -4.7047,1.26601 -6.5865,3.16544 -0.3625,0.35762 -0.3542,0.34634 -0.6844,0.72354 -5.9881,6.1484 -7.3568,15.19162 -7.6986,18.80824 -0.086,0.81375 0.1713,1.71837 0.7697,2.26081 0.599,0.63333 1.3687,0.90458 2.2238,0.81374 3.4212,-0.36145 11.8893,-1.80879 17.7917,-8.04845 l 0.5991,-0.63333 c 1.7965,-2.07977 2.9081,-4.5216 2.994,-7.0537 0,-0.5425 -0.1712,-1.08499 -0.5131,-1.53727 -0.4191,-0.37784 -0.7532,-0.63156 -1.3689,-0.5415 z"
id="path195-0"
style="stroke-width:0.144866"
sodipodi:nodetypes="cccccccccscccc" />
</g>
</g>
<ellipse
style="fill:#000000"
id="path635"
cx="1384.8197"
cy="650.08722"
rx="1.7392863"
ry="0.057976209" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

15
IceCubesApp/Assets.xcassets/Rocket.symbolset/Contents.json Normal file
View file

@ -0,0 +1,15 @@
{
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"symbol-rendering-intent" : "template"
},
"symbols" : [
{
"filename" : "rocket.svg",
"idiom" : "universal"
}
]
}

402
IceCubesApp/Assets.xcassets/Rocket.symbolset/rocket.svg Normal file
View file

@ -0,0 +1,402 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--Generator: Apple Native CoreSVG 175.5-->
<svg
version="1.1"
width="3300"
height="2200"
id="svg122"
sodipodi:docname="rocket.svg"
inkscape:version="1.2.2 (b0a84865, 2022-12-01)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs126" />
<sodipodi:namedview
id="namedview124"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="0.57242113"
inkscape:cx="40.180208"
inkscape:cy="978.30071"
inkscape:window-width="1728"
inkscape:window-height="998"
inkscape:window-x="0"
inkscape:window-y="38"
inkscape:window-maximized="0"
inkscape:current-layer="Ultralight-S"
showguides="false" />
<!--glyph: "uni100000.medium", point size: 100.0, font version: "18.0d12e2", template writer version: "101"-->
<g
id="Notes"
transform="translate(-19.730454,75.010261)">
<rect
height="2200"
id="artboard"
style="opacity:1;fill:#ffffff"
width="3300"
x="0"
y="0" />
<line
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.5"
x1="263"
x2="3036"
y1="292"
y2="292"
id="line3" />
<text
style="font-weight:bold;font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,322)"
id="text5">Weight/Scale Variations</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(559.711,322)"
id="text7">Ultralight</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(856.422,322)"
id="text9">Thin</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(1153.13,322)"
id="text11">Light</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(1449.84,322)"
id="text13">Regular</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(1746.56,322)"
id="text15">Medium</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(2043.27,322)"
id="text17">Semibold</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(2339.98,322)"
id="text19">Bold</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(2636.69,322)"
id="text21">Heavy</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:middle;fill:#000000;stroke:none"
transform="translate(2933.4,322)"
id="text23">Black</text>
<line
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.5"
x1="263"
x2="3036"
y1="1903"
y2="1903"
id="line25" />
<g
transform="translate(263,1933)"
id="g29">
<path
d="m 9.24805,0.830078 c 4.30665,0 7.89065,-3.574218 7.89065,-7.880858 0,-4.30662 -3.5938,-7.88082 -7.90042,-7.88082 -4.29687,0 -7.87109,3.5742 -7.87109,7.88082 0,4.30664 3.58398,7.880858 7.88086,7.880858 z m 0,-1.484375 c -3.54493,0 -6.37696,-2.841793 -6.37696,-6.396483 0,-3.55472 2.82227,-6.39652 6.36719,-6.39652 3.55472,0 6.40622,2.8418 6.40622,6.39652 0,3.55469 -2.8418,6.396483 -6.39645,6.396483 z M 5.6543,-7.05078 c 0,0.42969 0.30273,0.72266 0.75195,0.72266 h 2.09961 v 2.11914 c 0,0.43945 0.29297,0.74218 0.72266,0.74218 0.44921,0 0.74218,-0.30273 0.74218,-0.74218 v -2.11914 h 2.1191 c 0.4395,0 0.7422,-0.29297 0.7422,-0.72266 0,-0.43945 -0.3027,-0.74219 -0.7422,-0.74219 H 9.9707 v -2.10937 c 0,-0.44926 -0.29297,-0.75196 -0.74218,-0.75196 -0.42969,0 -0.72266,0.3027 -0.72266,0.75196 v 2.10937 H 6.40625 c -0.44922,0 -0.75195,0.30274 -0.75195,0.74219 z"
id="path27" />
</g>
<g
transform="translate(281.867,1933)"
id="g33">
<path
d="m 11.709,2.91016 c 5.4492,0 9.9609,-4.52149 9.9609,-9.96094 0,-5.44922 -4.5215,-9.96092 -9.9707,-9.96092 -5.43943,0 -9.95115,4.5117 -9.95115,9.96092 0,5.43945 4.52148,9.96094 9.96095,9.96094 z m 0,-1.66016 c -4.60939,0 -8.29103,-3.69141 -8.29103,-8.30078 0,-4.60942 3.67187,-8.30082 8.28123,-8.30082 4.6094,0 8.3106,3.6914 8.3106,8.30082 0,4.60937 -3.6914,8.30078 -8.3008,8.30078 z M 7.17773,-7.05078 c 0,0.47851 0.33204,0.80078 0.83008,0.80078 h 2.87109 v 2.88086 c 0,0.48828 0.332,0.83008 0.8106,0.83008 0.4882,0 0.83,-0.33203 0.83,-0.83008 V -6.25 h 2.8809 c 0.4883,0 0.8301,-0.32227 0.8301,-0.80078 0,-0.48828 -0.3418,-0.83008 -0.8301,-0.83008 H 12.5195 V -10.752 c 0,-0.498 -0.3418,-0.8398 -0.83,-0.8398 -0.4786,0 -0.8106,0.3418 -0.8106,0.8398 v 2.87114 H 8.00781 c -0.49804,0 -0.83008,0.3418 -0.83008,0.83008 z"
id="path31" />
</g>
<g
transform="translate(305.646,1933)"
id="g37">
<path
d="m 14.9707,5.66406 c 6.9629,0 12.7246,-5.7617162 12.7246,-12.71484 0,-6.96292 -5.7715,-12.72462 -12.7344,-12.72462 -6.95309,0 -12.70504,5.7617 -12.70504,12.72462 0,6.9531238 5.76172,12.71484 12.71484,12.71484 z m 0,-1.8164 c -6.03515,0 -10.88867,-4.86328 -10.88867,-10.89844 0,-6.04492 4.84375,-10.89842 10.87887,-10.89842 6.045,0 10.9082,4.8535 10.9082,10.89842 0,6.03516 -4.8535,10.89844 -10.8984,10.89844 z M 9.19922,-7.05078 c 0,0.51758 0.37109,0.8789 0.91798,0.8789 h 3.9453 v 3.95508 c 0,0.53711 0.3711,0.91797 0.8887,0.91797 0.5371,0 0.9082,-0.37109 0.9082,-0.91797 v -3.95508 h 3.9551 c 0.5371,0 0.9179,-0.36132 0.9179,-0.8789 0,-0.54688 -0.3711,-0.91797 -0.9179,-0.91797 h -3.9551 v -3.94535 c 0,-0.5468 -0.3711,-0.9277 -0.9082,-0.9277 -0.5176,0 -0.8887,0.3809 -0.8887,0.9277 v 3.94535 h -3.9453 c -0.54689,0 -0.91798,0.37109 -0.91798,0.91797 z"
id="path35" />
</g>
<text
style="font-weight:bold;font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,1953)"
id="text39">Design Variations</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,1971)"
id="text41">Symbols are supported in up to nine weights and three scales.</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,1989)"
id="text43">For optimal layout with text and other symbols, vertically align</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,2007)"
id="text45">symbols with the adjacent text.</text>
<line
style="opacity:1;fill:none;stroke:#00aeef;stroke-width:0.5"
x1="776"
x2="776"
y1="1919"
y2="1933"
id="line47" />
<g
transform="translate(776,1933)"
id="g51">
<path
d="m 3.31055,0.15625 c 0.51757,0 0.77148,-0.1953125 0.95703,-0.742188 L 5.52734,-4.0332 h 5.76176 l 1.2597,3.447262 c 0.1856,0.5468755 0.4395,0.742188 0.9473,0.742188 0.5176,0 0.8496,-0.3125 0.8496,-0.800781 0,-0.166016 -0.0293,-0.322266 -0.1074,-0.527349 L 9.6582,-13.3691 c -0.22461,-0.5957 -0.625,-0.8985 -1.25,-0.8985 -0.60547,0 -1.01562,0.293 -1.23047,0.8887 L 2.59766,-1.16211 c -0.07813,0.205079 -0.10743,0.361329 -0.10743,0.527344 0,0.488282 0.3125,0.791016 0.82032,0.791016 z m 2.69531,-5.67383 2.37305,-6.57222 h 0.04882 l 2.37307,6.57222 z"
id="path49" />
</g>
<line
style="opacity:1;fill:none;stroke:#00aeef;stroke-width:0.5"
x1="793.19702"
x2="793.19702"
y1="1919"
y2="1933"
id="line53" />
<text
style="font-weight:bold;font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(776,1953)"
id="text55">Margins</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(776,1971)"
id="text57">Leading and trailing margins on the left and right side of each symbol</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(776,1989)"
id="text59">can be adjusted by modifying the x-location of the margin guidelines.</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(776,2007)"
id="text61">Modifications are automatically applied proportionally to all</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(776,2025)"
id="text63">scales and weights.</text>
<g
transform="translate(1289,1933)"
id="g67">
<path
d="M 2.8418,1.86523 4.54102,3.57422 C 5.40039,4.44336 6.38672,4.38477 7.31445,3.35938 L 18.0078,-8.42773 17.041,-9.4043 6.42578,2.27539 C 6.07422,2.67578 5.74219,2.77344 5.27344,2.30469 L 4.10156,1.14258 C 3.63281,0.683594 3.74023,0.341797 4.14062,-0.0195312 L 15.6152,-10.8203 14.6387,-11.7871 3.04688,-0.898438 C 2.06055,0.0195312 1.98242,0.996094 2.8418,1.86523 Z M 9.25781,-16.3281 c -0.41992,0.4101 -0.44922,0.9863 -0.21484,1.3769 0.23437,0.3614 0.69336,0.5957 1.33793,0.4297 1.4648,-0.3418 2.9882,-0.4004 4.414,0.5371 l -0.5859,1.4551 c -0.3418,0.8301 -0.166,1.416 0.3711,1.9629 l 2.2949,2.31445 c 0.4883,0.48828 0.8984,0.50781 1.4648,0.41015 l 1.0645,-0.19531 0.6641,0.67383 -0.0391,0.55664 c -0.0391,0.49805 0.0879,0.87891 0.5762,1.35742 l 0.7617,0.74219 c 0.4785,0.47851 1.0937,0.50781 1.5625,0.03906 l 2.9101,-2.91992 c 0.4688,-0.46875 0.4493,-1.06445 -0.0293,-1.54297 l -0.7714,-0.76172 c -0.4786,-0.47852 -0.8496,-0.63472 -1.3282,-0.59572 l -0.5761,0.0488 -0.6446,-0.6347 0.2442,-1.1231 c 0.1269,-0.5664 -0.0293,-1.0058 -0.6153,-1.5918 l -2.1972,-2.1875 c -3.3399,-3.3203 -7.7735,-3.2422 -10.66409,-0.3515 z m 1.49419,0.3711 c 2.4316,-1.7774 5.7226,-1.4746 7.9492,0.7519 l 2.4316,2.4121 c 0.2344,0.2344 0.2734,0.42 0.2051,0.7618 l -0.3223,1.4843 1.5039,1.4844 0.9864,-0.05859 c 0.2539,-0.00977 0.332,0.00976 0.5273,0.20507 l 0.5762,0.57618 -2.4414,2.4414 -0.5762,-0.57617 C 21.3965,-6.66992 21.3672,-6.74805 21.377,-7.01172 l 0.0683,-0.97656 -1.4941,-1.48438 -1.5235,0.25391 c -0.3222,0.06836 -0.4687,0.03906 -0.7129,-0.19531 L 15.7129,-11.416 c -0.2539,-0.2344 -0.2832,-0.4004 -0.127,-0.7715 l 0.8789,-2.0898 c -1.5625,-1.4551 -3.5937,-2.0801 -5.625,-1.4844 -0.1562,0.039 -0.2148,-0.0879 -0.0878,-0.1953 z"
id="path65" />
</g>
<text
style="font-weight:bold;font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(1289,1953)"
id="text69">Exporting</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(1289,1971)"
id="text71">Symbols should be outlined when exporting to ensure the</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(1289,1989)"
id="text73">design is preserved when submitting to Xcode.</text>
<text
id="template-version"
style="font-size:13px;font-family:sans-serif;text-anchor:end;fill:#000000;stroke:none"
transform="translate(3036,1933)">Template v.4.0</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:end;fill:#000000;stroke:none"
transform="translate(3036,1951)"
id="text76">Requires Xcode 14 or greater</text>
<text
id="descriptive-name"
style="font-size:13px;font-family:sans-serif;text-anchor:end;fill:#000000;stroke:none"
transform="translate(3036,1969)">Generated from circle</text>
<text
style="font-size:13px;font-family:sans-serif;text-anchor:end;fill:#000000;stroke:none"
transform="translate(3036,1987)"
id="text79">Typeset at 100 points</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,726)"
id="text81">Small</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,1156)"
id="text83">Medium</text>
<text
style="font-size:13px;font-family:sans-serif;fill:#000000;stroke:none"
transform="translate(263,1586)"
id="text85">Large</text>
</g>
<g
id="Guides">
<g
id="H-reference"
style="fill:#27AAE1;stroke:none;"
transform="matrix(1 0 0 1 339 696)">
<path
d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"
id="path88" />
</g>
<line
id="Baseline-S"
style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;"
x1="263"
x2="3036"
y1="696"
y2="696" />
<line
id="Capline-S"
style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;"
x1="263"
x2="3036"
y1="625.541"
y2="625.541" />
<g
id="g95"
style="fill:#27AAE1;stroke:none;"
transform="matrix(1 0 0 1 339 1126)">
<path
d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"
id="path93" />
</g>
<line
id="Baseline-M"
style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;"
x1="263"
x2="3036"
y1="1126"
y2="1126" />
<line
id="Capline-M"
style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;"
x1="263"
x2="3036"
y1="1055.54"
y2="1055.54" />
<g
id="g101"
style="fill:#27AAE1;stroke:none;"
transform="matrix(1 0 0 1 339 1556)">
<path
d="M0.993654 0L3.63775 0L29.3281-67.1323L30.0303-67.1323L30.0303-70.459L28.1226-70.459ZM11.6885-24.4799L46.9815-24.4799L46.2315-26.7285L12.4385-26.7285ZM55.1196 0L57.7637 0L30.6382-70.459L29.4326-70.459L29.4326-67.1323Z"
id="path99" />
</g>
<line
id="Baseline-L"
style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;"
x1="263"
x2="3036"
y1="1556"
y2="1556" />
<line
id="Capline-L"
style="fill:none;stroke:#27AAE1;opacity:1;stroke-width:0.5;"
x1="263"
x2="3036"
y1="1485.54"
y2="1485.54" />
<line
id="left-margin-Ultralight-S"
style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;"
x1="515.649"
x2="515.649"
y1="600.785"
y2="720.121" />
<line
id="right-margin-Ultralight-S"
style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;"
x1="603.773"
x2="603.773"
y1="600.785"
y2="720.121" />
<line
id="left-margin-Regular-S"
style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;"
x1="1403.58"
x2="1403.58"
y1="600.785"
y2="720.121" />
<line
id="right-margin-Regular-S"
style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;"
x1="1496.11"
x2="1496.11"
y1="600.785"
y2="720.121" />
<line
id="left-margin-Black-S"
style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;"
x1="2884.57"
x2="2884.57"
y1="600.785"
y2="720.121" />
<line
id="right-margin-Black-S"
style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;"
x1="2982.23"
x2="2982.23"
y1="600.785"
y2="720.121" />
</g>
<g
id="Symbols">
<g
id="Ultralight-S"
transform="translate(-690.5199,-5.473488)">
<path
d="m 1274.497,670.01519 c 10.7303,-13.93016 12.8607,-33.36565 12.3081,-39.37147 -0.1579,-2.16861 -1.8937,-3.92046 -3.8662,-4.08744 -5.6807,-0.58418 -24.1431,1.752 -37.2403,13.01246 l -3.4717,-1.33476 c -5.4442,-2.08536 -11.5196,-0.33341 -15.3064,4.25397 l -7.4947,9.34342 c -0.868,1.08457 -1.1833,2.50258 -0.868,3.92047 0.158,0.75059 0.5526,1.41796 1.0259,1.91837 0.3946,0.41719 0.9466,0.83438 1.4992,1.00079 l 8.6792,3.33627 c -1.5778,3.5034 -2.6037,6.58942 -3.3138,8.92561 -0.7892,2.58569 -0.079,5.33851 1.7358,7.34059 l 9.6257,10.17653 c 1.8937,2.00209 4.4975,2.66955 6.9433,1.83511 2.2091,-0.75059 5.1281,-1.91838 8.4424,-3.5034 l 3.1557,9.17586 c 0.2367,0.58418 0.5526,1.16776 0.9466,1.58501 0.4734,0.5004 1.1046,0.91759 1.8146,1.08457 1.2625,0.3334 2.6824,0.0832 3.7082,-0.83438 l 8.8366,-7.9242 c 4.3396,-3.92046 5.9962,-10.42676 4.0237,-16.18234 z m -52.1523,-14.76385 c -0.2366,-0.0832 -0.3946,-0.3334 -0.3946,-0.41719 0,-0.16699 -0.079,-0.3334 0.158,-0.58418 l 7.4953,-9.34224 c 2.8403,-3.50339 7.4166,-4.7549 11.4402,-3.25315 l 1.6571,0.66739 c -0.079,0.0832 -0.1579,0.16699 -0.2366,0.2502 -4.8922,5.08826 -8.5217,10.9271 -11.1249,16.09892 z m 47.1028,31.69737 -8.8366,7.92419 c -0.2366,0.16699 -0.4733,0.16699 -0.5525,0.16699 -0.158,-0.0832 -0.3154,-0.16699 -0.3946,-0.41719 l -3.3138,-9.50921 c 4.8922,-2.75222 10.415,-6.58942 15.3064,-11.8448 0.079,-0.0832 0.158,-0.167 0.2367,-0.2502 l 0.6312,1.75199 c 1.4199,4.42095 0.2367,9.25897 -3.0776,12.17817 z m -0.2367,-16.18234 c -8.9151,9.42535 -19.8036,14.09654 -25.4844,16.01551 -1.1832,0.41719 -2.525,0 -3.4717,-1.00079 l -9.6257,-10.17712 c -0.9466,-1.00079 -1.2625,-2.41871 -0.9466,-3.67037 1.8937,-5.92211 6.3121,-17.43355 15.2275,-26.85935 12.1508,-12.84607 32.1909,-15.51503 37.7138,-15.01454 0.2367,0 0.3946,0.0832 0.5526,0.25019 0.1579,0.167 0.2366,0.33341 0.2366,0.58419 0.4728,5.83884 -2.0516,27.02617 -14.2018,39.87195 z"
id="path193-8"
style="stroke-width:0.144866" />
<path
d="m 1232.6805,689.11703 c -2.7617,0.16699 -5.2862,-2.50258 -5.1281,-5.42162 0,-0.5004 -0.158,-1.00079 -0.4733,-1.41797 -0.3947,-0.41719 -0.7893,-0.58418 -1.3413,-0.50039 -2.2091,0.16699 -4.3396,1.16776 -6.0753,2.91979 -0.2367,0.16699 -0.4733,0.41719 -0.6313,0.66739 -5.5234,5.67126 -6.7859,14.01268 -7.1012,17.34864 -0.079,0.7506 0.158,1.58502 0.71,2.08536 0.5525,0.58418 1.2625,0.83438 2.0512,0.75059 3.1557,-0.3334 10.967,-1.66813 16.411,-7.42386 l 0.5526,-0.58418 c 1.6571,-1.91837 2.6824,-4.1707 2.7617,-6.5063 0,-0.5004 -0.1579,-1.00079 -0.4733,-1.41797 -0.2372,-0.24961 -0.7892,-0.49981 -1.2625,-0.49981 z m -3.4717,6.00581 -0.5525,0.58419 c -4.1024,4.33708 -10.0198,5.67186 -13.1762,6.17234 0.4733,-3.42012 1.8145,-9.67618 5.9174,-14.01327 0.158,-0.16699 0.2367,-0.2502 0.4734,-0.5004 0.7892,-0.75059 1.5778,-1.25097 2.3671,-1.58501 0.6312,3.33626 3.3137,6.08908 6.47,6.84025 -0.3159,0.83322 -0.7892,1.66754 -1.4993,2.50198 z"
id="path195-0"
style="stroke-width:0.144866" />
<path
d="m 1253.8255,647.32655 c -3.6297,3.83735 -3.6297,10.17652 0,14.01327 3.6296,3.83735 9.6257,3.83735 13.2547,0 3.6297,-3.83734 3.6297,-10.17652 0,-14.01327 -3.629,-3.92046 -9.5465,-3.92046 -13.2547,0 z m 10.809,11.42818 c -2.2878,2.41871 -6.0754,2.41871 -8.3632,0 -2.2877,-2.41871 -2.2877,-6.42304 0,-8.84175 2.2878,-2.41871 6.0754,-2.41871 8.3632,0 2.3671,2.41871 2.3671,6.42244 0,8.84175 z"
id="path197-2"
style="stroke-width:0.144866" />
</g>
<g
id="Regular-S">
<path
d="m 1474.7705,664.98279 c 10.7303,-13.93016 12.8607,-33.36565 12.3081,-39.37147 -0.1579,-2.16861 -1.8937,-3.92046 -3.8662,-4.08744 -5.6807,-0.58418 -24.1431,1.752 -37.2403,13.01246 l -3.4717,-1.33476 c -5.4442,-2.08536 -11.5196,-0.33341 -15.3064,4.25397 l -7.4947,9.34342 c -0.868,1.08457 -1.1833,2.50258 -0.868,3.92047 0.158,0.75059 0.5526,1.41796 1.0259,1.91837 0.3946,0.41719 0.9466,0.83438 1.4992,1.00079 l 8.6792,3.33627 c -1.5778,3.5034 -2.6037,6.58942 -3.3138,8.92561 -0.7892,2.58569 -0.079,5.33851 1.7358,7.34059 l 9.6257,10.17653 c 1.8937,2.00209 4.4975,2.66955 6.9433,1.83511 2.2091,-0.75059 5.1281,-1.91838 8.4424,-3.5034 l 3.1557,9.17586 c 0.2367,0.58418 0.5526,1.16776 0.9466,1.58501 0.4734,0.5004 1.1046,0.91759 1.8146,1.08457 1.2625,0.3334 2.6824,0.0832 3.7082,-0.83438 l 8.8366,-7.9242 c 4.3396,-3.92046 5.9962,-10.42676 4.0237,-16.18234 z m -51.1903,-15.25429 c -0.2138,-0.0752 -0.3566,-0.30127 -0.3566,-0.37698 0,-0.1509 -0.071,-0.30127 0.1428,-0.52788 l 6.7729,-8.44181 c 2.5665,-3.16572 6.7377,-4.38942 10.3375,-2.9396 l 1.4974,0.60306 c 0.096,0.0387 -0.142,0.15148 -0.2138,0.22609 -4.42,4.59842 -7.7004,9.87392 -10.0526,14.54726 z m 45.6858,31.92266 -8.0341,7.20451 c -0.2151,0.15182 -0.4303,0.15182 -0.5023,0.15182 -0.1437,-0.0756 -0.2868,-0.15182 -0.3588,-0.3793 l -3.0128,-8.64558 c 4.4479,-2.50226 9.4691,-5.99096 13.9162,-10.76904 0.072,-0.0756 0.1437,-0.15184 0.2152,-0.22748 l 0.5739,1.59287 c 1.4079,4.23569 0.01,8.76082 -2.7973,11.0722 z m -0.2282,-16.35249 c -8.4193,9.26126 -19.1053,13.5995 -24.5858,15.45081 -1.1415,0.40248 -2.436,0 -3.3493,-0.9655 l -9.2863,-9.81828 c -0.9132,-0.96553 -1.218,-2.33343 -0.9132,-3.54096 1.8269,-5.71329 6.0895,-16.81885 14.6905,-25.9123 11.7224,-12.39312 31.0559,-14.96797 36.3841,-14.48513 0.2283,0 0.3807,0.0803 0.5331,0.24137 0.1523,0.16111 0.2282,0.32165 0.2282,0.56359 -1.5777,15.15025 -1.7462,22.77596 -13.7013,38.4664 z"
id="path193"
style="stroke-width:0.144866"
sodipodi:nodetypes="ccccccccsccccsccccccccccsccsssccccccccccccccscscscc" />
<path
d="m 1433.7539,683.70217 c -2.9941,0.18104 -5.731,-2.71313 -5.5596,-5.87776 0,-0.5425 -0.1713,-1.08499 -0.5131,-1.53727 -0.4279,-0.45229 -0.8557,-0.63333 -1.4541,-0.54249 -2.395,0.18104 -4.7047,1.26601 -6.5865,3.16544 -0.3625,0.35762 -0.3542,0.34634 -0.6844,0.72354 -5.9881,6.1484 -7.3568,15.19162 -7.6986,18.80824 -0.086,0.81375 0.1713,1.71837 0.7697,2.26081 0.599,0.63333 1.3687,0.90458 2.2238,0.81374 3.4212,-0.36145 11.8893,-1.80879 17.7917,-8.04845 l 0.5991,-0.63333 c 1.7965,-2.07977 2.9081,-4.5216 2.994,-7.0537 0,-0.5425 -0.1712,-1.08499 -0.5131,-1.53727 -0.4191,-0.37784 -0.7532,-0.63156 -1.3689,-0.5415 z m -5.0313,6.22766 -0.4838,0.51161 c -3.5925,3.79853 -8.775,4.96723 -11.5393,5.40553 0.4145,-2.99523 1.5891,-8.47407 5.1823,-12.27235 0.1383,-0.14624 0.2073,-0.21912 0.4146,-0.43823 0.6911,-0.65734 1.3817,-1.09556 2.073,-1.3881 0.5528,2.92178 2.902,5.33261 5.6662,5.99046 -0.3837,0.84054 -0.8288,1.6149 -1.313,2.19108 z"
id="path195"
style="stroke-width:0.144866"
sodipodi:nodetypes="cccccccccscccccscscccc" />
<path
id="path1047"
style="fill:#000000"
d="m 1459.938,638.50142 c -6.5601,-9e-4 -11.8788,5.31665 -11.8791,11.87675 -10e-4,6.56103 5.318,11.88001 11.8791,11.87911 6.5601,-3.5e-4 11.8778,-5.31897 11.8768,-11.87911 -3e-4,-6.55922 -5.3176,-11.8764 -11.8768,-11.87675 z m -2e-4,4.84961 c 3.8812,-2.4e-4 7.0276,3.14614 7.0274,7.02734 2e-4,3.8812 -3.1462,7.02758 -7.0274,7.02734 -3.8812,1.8e-4 -7.0275,-3.14618 -7.0273,-7.02734 -2e-4,-3.88116 3.1461,-7.02752 7.0273,-7.02734 z"
sodipodi:nodetypes="cccccccccc" />
</g>
<g
id="Black-S"
transform="translate(1483.1603,1.018132)">
<path
d="m 1475.9813,665.3948 c 11.3258,-14.7033 13.5745,-35.21747 12.9912,-41.55662 -0.1667,-2.28897 -1.9988,-4.13805 -4.0808,-4.3143 -5.996,-0.6166 -25.483,1.84924 -39.3072,13.73466 l -3.6643,-1.40884 c -5.7464,-2.2011 -12.159,-0.35191 -16.156,4.49007 l -7.9106,9.86199 c -0.9162,1.14477 -1.249,2.64148 -0.9162,4.13806 0.1668,0.79225 0.5833,1.49666 1.0828,2.02484 0.4165,0.44035 0.9992,0.88069 1.5825,1.05634 l 9.1609,3.52143 c -1.6654,3.69784 -2.7483,6.95514 -3.4978,9.42099 -0.833,2.7292 -0.083,5.6348 1.8322,7.748 l 10.1599,10.74134 c 1.9988,2.1132 4.7471,2.81771 7.3287,1.93696 2.3317,-0.79225 5.4127,-2.02485 8.9109,-3.69784 l 3.3309,9.68513 c 0.2498,0.6166 0.5832,1.23257 0.9991,1.67298 0.4997,0.52817 1.1659,0.96851 1.9153,1.14476 1.3326,0.3519 2.8313,0.0878 3.914,-0.88069 l 9.3271,-8.364 c 4.5804,-4.13805 6.329,-11.00545 4.247,-17.08047 z m -52.4011,-15.6663 c -0.2138,-0.0752 -0.3566,-0.30127 -0.3566,-0.37698 0,-0.1509 -0.071,-0.30127 0.1428,-0.52788 l 6.7729,-8.44181 c 2.5665,-3.16572 6.7377,-4.38942 10.3375,-2.9396 l 1.4974,0.60306 c 0.096,0.0387 -0.142,0.15148 -0.2138,0.22609 -4.42,4.59842 -7.7004,9.87392 -10.0526,14.54726 z m 45.6858,31.92266 -8.0341,7.20451 c -0.2151,0.15182 -0.4303,0.15182 -0.5023,0.15182 -0.1437,-0.0756 -0.2868,-0.15182 -0.3588,-0.3793 l -3.0128,-8.64558 c 4.4479,-2.50226 9.4691,-5.99096 13.9162,-10.76904 0.072,-0.0756 0.1437,-0.15184 0.2152,-0.22748 l 0.5739,1.59287 c 1.4079,4.23569 0.01,8.76082 -2.7973,11.0722 z m -0.2282,-16.35249 c -8.4193,9.26126 -19.1053,13.5995 -24.5858,15.45081 -1.1415,0.40248 -2.436,0 -3.3493,-0.9655 l -9.2863,-9.81828 c -0.9132,-0.96553 -1.218,-2.33343 -0.9132,-3.54096 1.8269,-5.71329 6.0895,-16.81885 14.6905,-25.9123 11.7224,-12.39312 31.0559,-14.96797 36.3841,-14.48513 0.2283,0 0.3807,0.0803 0.5331,0.24137 0.1523,0.16111 0.2282,0.32165 0.2282,0.56359 -1.5777,15.15025 -1.7462,22.77596 -13.7013,38.4664 z"
id="path193-87"
style="stroke-width:0.144866"
sodipodi:nodetypes="ccccccccsccccsccccccccccsccsssccccccccccccccscscscc" />
<path
d="m 1433.7539,683.70217 c -2.9941,0.18104 -5.731,-2.71313 -5.5596,-5.87776 0,-0.5425 -0.1713,-1.08499 -0.5131,-1.53727 -0.4279,-0.45229 -0.8557,-0.63333 -1.4541,-0.54249 -2.395,0.18104 -4.7047,1.26601 -6.5865,3.16544 -0.3625,0.35762 -0.3542,0.34634 -0.6844,0.72354 -5.9881,6.1484 -7.3568,15.19162 -7.6986,18.80824 -0.086,0.81375 0.1713,1.71837 0.7697,2.26081 0.599,0.63333 1.3687,0.90458 2.2238,0.81374 3.4212,-0.36145 11.8893,-1.80879 17.7917,-8.04845 l 0.5991,-0.63333 c 1.7965,-2.07977 2.9081,-4.5216 2.994,-7.0537 0,-0.5425 -0.1712,-1.08499 -0.5131,-1.53727 -0.4191,-0.37784 -0.7532,-0.63156 -1.3689,-0.5415 z m -5.791,6.06705 -0.4151,0.43903 c -3.0827,3.25988 -7.5302,4.2626 -9.9024,4.63872 0.3557,-2.57033 1.3637,-7.27196 4.4472,-10.53143 0.1186,-0.12549 0.1779,-0.18803 0.3558,-0.37606 0.593,-0.56409 1.1856,-0.94015 1.7789,-1.19119 0.4744,2.5073 2.4903,4.57614 4.8624,5.14067 -0.3293,0.7213 -0.7112,1.38581 -1.1268,1.88026 z"
id="path195-3"
style="stroke-width:0.144866"
sodipodi:nodetypes="cccccccccscccccscscccc" />
<path
id="path1047-8"
style="fill:#000000"
d="m 1459.9381,637.50142 c -7.1124,-9.7e-4 -12.8789,5.76426 -12.8792,12.87665 0,7.1134 5.7657,12.88018 12.8792,12.87921 7.1124,-3.8e-4 12.8778,-5.76677 12.8767,-12.87921 -3e-4,-7.11144 -5.7653,-12.87627 -12.8767,-12.87665 z m -3e-4,5.84961 c 3.8812,-2.4e-4 7.0276,3.14614 7.0274,7.02734 2e-4,3.8812 -3.1462,7.02758 -7.0274,7.02734 -3.8812,2e-4 -7.0275,-3.14618 -7.0273,-7.02734 -2e-4,-3.88116 3.1461,-7.02754 7.0273,-7.02734 z"
sodipodi:nodetypes="cccccccccc" />
</g>
</g>
<ellipse
style="fill:#000000"
id="path635"
cx="1384.8197"
cy="650.08722"
rx="1.7392863"
ry="0.057976209" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

4
Packages/Account/Sources/Account/AccountDetailContextMenu.swift
View file

@ -128,7 +128,7 @@ public struct AccountDetailContextMenu: View {
}
}
} label: {
Label("account.action.reboosts-hide", systemImage: "arrow.left.arrow.right.circle.fill")
Label("account.action.reboosts-hide", image: "Rocket.Fill")
}
} else {
Button {
@ -142,7 +142,7 @@ public struct AccountDetailContextMenu: View {
}
}
} label: {
Label("account.action.reboosts-show", systemImage: "arrow.left.arrow.right.circle")
Label("account.action.reboosts-show", image: "Rocket")
}
}
}

2
Packages/Account/Sources/Account/Follow/FollowButton.swift
View file

@ -115,7 +115,7 @@ public struct FollowButton: View {
await viewModel.toggleReboosts()
}
} label: {
Image(systemName: viewModel.relationship.showingReblogs ? "arrow.left.arrow.right.circle.fill" : "arrow.left.arrow.right.circle")
Image(viewModel.relationship.showingReblogs ? "Rocket.Fill" : "Rocket")
}
}
}

21
Packages/DesignSystem/Sources/DesignSystem/SFSymbols.swift Normal file
View file

@ -0,0 +1,21 @@
import Foundation
import SwiftUI
// Functions to cope with extending SF symbols
// images named in lower case are Apple's symbols
// images inamed in CamelCase are custom
extension Label where Title == Text, Icon == Image {
public init (_ title: LocalizedStringKey, imageNamed: String) {
if imageNamed.lowercased() == imageNamed {
self.init(title, systemImage: imageNamed)
}
else {
self.init(title, image: imageNamed)
}
}
}

4
Packages/Env/Sources/Env/StatusAction.swift
View file

@ -38,10 +38,10 @@ public enum StatusAction: String, CaseIterable, Identifiable {
return "quote.bubble"
case .boost:
if privateBoost {
return isReblogged ? "arrow.left.arrow.right.circle.fill" : "lock.rotation"
return isReblogged ? "Rocket.Fill" : "lock.rotation"
}
return isReblogged ? "arrow.left.arrow.right.circle.fill" : "arrow.left.arrow.right.circle"
return isReblogged ? "Rocket.Fill" : "Rocket"
case .favorite:
return isFavorited ? "star.fill" : "star"
case .bookmark:

2
Packages/Notifications/Sources/Notifications/NotificationTypeExt.swift
View file

@ -55,7 +55,7 @@ extension Models.Notification.NotificationType {
case .mention:
return "at"
case .reblog:
return "arrow.left.arrow.right.circle.fill"
return "Rocket.Fill"
case .follow, .follow_request:
return "person.fill.badge.plus"
case .favourite:

24
Packages/Status/Sources/Status/Row/Subviews/StatusRowActionsView.swift
View file

@ -28,22 +28,25 @@ struct StatusRowActionsView: View {
[.respond, .boost, .favorite, .bookmark, .share]
}
func iconName(dataController: StatusDataController, privateBoost: Bool = false) -> String {
func image(dataController: StatusDataController, privateBoost: Bool = false) -> Image {
switch self {
case .respond:
return "arrowshape.turn.up.left"
return Image(systemName: "arrowshape.turn.up.left")
case .boost:
if privateBoost {
return dataController.isReblogged ? "arrow.left.arrow.right.circle.fill" : "lock.rotation"
if dataController.isReblogged {
return Image("Rocket.Fill")
} else {
return Image(systemName: "lock.rotation")
}
}
return dataController.isReblogged ? "arrow.left.arrow.right.circle.fill" : "arrow.left.arrow.right.circle"
return Image(dataController.isReblogged ? "Rocket.Fill" : "Rocket")
case .favorite:
return dataController.isFavorited ? "star.fill" : "star"
return Image(systemName: dataController.isFavorited ? "star.fill" : "star")
case .bookmark:
return dataController.isBookmarked ? "bookmark.fill" : "bookmark"
return Image(systemName: dataController.isBookmarked ? "bookmark.fill" : "bookmark")
case .share:
return "square.and.arrow.up"
return Image(systemName: "square.and.arrow.up")
}
}
@ -97,7 +100,7 @@ struct StatusRowActionsView: View {
ShareLink(item: url,
subject: Text(viewModel.status.reblog?.account.safeDisplayName ?? viewModel.status.account.safeDisplayName),
message: Text(viewModel.status.reblog?.content.asRawText ?? viewModel.status.content.asRawText)) {
Image(systemName: action.iconName(dataController: statusDataController))
action.image(dataController: statusDataController)
}
.buttonStyle(.statusAction())
}
@ -118,7 +121,7 @@ struct StatusRowActionsView: View {
Button {
handleAction(action: action)
} label: {
Image(systemName: action.iconName(dataController: statusDataController, privateBoost: privateBoost()))
action.image(dataController: statusDataController, privateBoost: privateBoost())
}
.buttonStyle(
.statusAction(
@ -138,6 +141,7 @@ struct StatusRowActionsView: View {
}
}
}
private func handleAction(action: Action) {
Task {

4
Packages/Status/Sources/Status/Row/Subviews/StatusRowContextMenu.swift
View file

@ -24,9 +24,9 @@ struct StatusRowContextMenu: View {
}
if self.statusDataController.isReblogged {
return Label("status.action.unboost", systemImage: "arrow.left.arrow.right.circle")
return Label("status.action.unboost", image: "Rocket")
}
return Label("status.action.boost", systemImage: "arrow.left.arrow.right.circle")
return Label("status.action.boost", image: "Rocket")
}
var body: some View {

2
Packages/Status/Sources/Status/Row/Subviews/StatusRowReblogView.swift
View file

@ -7,7 +7,7 @@ struct StatusRowReblogView: View {
var body: some View {
if viewModel.status.reblog != nil {
HStack(spacing: 2) {
Image(systemName: "arrow.left.arrow.right.circle.fill")
Image("Rocket.Fill")
AvatarView(url: viewModel.status.account.avatar, size: .boost)
EmojiTextApp(.init(stringValue: viewModel.status.account.safeDisplayName), emojis: viewModel.status.account.emojis)
Text("status.row.was-boosted")

4
Packages/Status/Sources/Status/Row/Subviews/StatusRowSwipeView.swift
View file

@ -108,7 +108,7 @@ struct StatusRowSwipeView: View {
isFavorited: statusDataController.isFavorited,
isBookmarked: statusDataController.isBookmarked,
privateBoost: privateBoost),
systemImage: action.iconName(isReblogged: statusDataController.isReblogged,
imageNamed: action.iconName(isReblogged: statusDataController.isReblogged,
isFavorited: statusDataController.isFavorited,
isBookmarked: statusDataController.isBookmarked,
privateBoost: privateBoost))
@ -119,7 +119,7 @@ struct StatusRowSwipeView: View {
isFavorited: statusDataController.isFavorited,
isBookmarked: statusDataController.isBookmarked,
privateBoost: privateBoost),
systemImage: action.iconName(isReblogged: statusDataController.isReblogged,
imageNamed: action.iconName(isReblogged: statusDataController.isReblogged,
isFavorited: statusDataController.isFavorited,
isBookmarked: statusDataController.isBookmarked,
privateBoost: privateBoost))