neon443/ShhShell
1
0
Fork 0
mirror of https://github.com/neon443/ShhShell.git synced 2026-03-11 13:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve ios 16 ux:

Browse Source 
fix missing symbol in onboarding
fix settings empty headers
This commit is contained in:
neon443
2025-09-01 12:01:29 +01:00
parent 76a6d9d2f2
commit bcd52143cb
6 changed files with 157 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Resources/Assets.xcassets/apple.terminal.on.rectangle.fill.symbolset/Contents.json Normal file
View File

@@ -0,0 +1,12 @@
{
"info" : {
"author" : "xcode",
"version" : 1
},
"symbols" : [
{
"filename" : "apple.terminal.on.rectangle.fill.svg",
"idiom" : "universal"
}
]
}

95
Resources/Assets.xcassets/apple.terminal.on.rectangle.fill.symbolset/apple.terminal.on.rectangle.fill.svg Normal file
View File

@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--Generator: Apple Native CoreSVG 341-->
<!DOCTYPE svg
PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 3300 2200">
<!--glyph: "101E5C", point size: 100.0, font version: "20.0d10e1", template writer version: "138.0.0"-->
<style>.SFSymbolsPreviewWireframe {fill:none;opacity:1.0;stroke:black;stroke-width:0.5}
</style>
<g id="Notes">
<rect height="2200" id="artboard" style="fill:white;opacity:1" width="3300" x="0" y="0"/>
<line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="292" y2="292"/>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 322)">Weight/Scale Variations</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 559.711 322)">Ultralight</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 856.422 322)">Thin</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1153.13 322)">Light</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1449.84 322)">Regular</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 1746.56 322)">Medium</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2043.27 322)">Semibold</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2339.98 322)">Bold</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2636.69 322)">Heavy</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:middle;" transform="matrix(1 0 0 1 2933.4 322)">Black</text>
<line style="fill:none;stroke:black;opacity:1;stroke-width:0.5;" x1="263" x2="3036" y1="1903" y2="1903"/>
<g transform="matrix(0.2 0 0 0.2 263 1933)">
<path d="m46.2402 4.15039c21.7773 0 39.4531-17.627 39.4531-39.4043s-17.6758-39.4043-39.4531-39.4043c-21.7285 0-39.4043 17.627-39.4043 39.4043s17.6758 39.4043 39.4043 39.4043Zm0-7.42188c-17.6758 0-31.9336-14.3066-31.9336-31.9824s14.2578-31.9824 31.9336-31.9824 31.9824 14.3066 31.9824 31.9824-14.3066 31.9824-31.9824 31.9824Zm-17.9688-31.9824c0 2.14844 1.51367 3.61328 3.75977 3.61328h10.498v10.5957c0 2.19727 1.46484 3.71094 3.61328 3.71094 2.24609 0 3.71094-1.51367 3.71094-3.71094v-10.5957h10.5957c2.19727 0 3.71094-1.46484 3.71094-3.61328 0-2.19727-1.51367-3.71094-3.71094-3.71094h-10.5957v-10.5469c0-2.24609-1.46484-3.75977-3.71094-3.75977-2.14844 0-3.61328 1.51367-3.61328 3.75977v10.5469h-10.498c-2.24609 0-3.75977 1.51367-3.75977 3.71094Z"/>
</g>
<g transform="matrix(0.2 0 0 0.2 281.506 1933)">
<path d="m58.5449 14.5508c27.4902 0 49.8047-22.3145 49.8047-49.8047s-22.3145-49.8047-49.8047-49.8047-49.8047 22.3145-49.8047 49.8047 22.3145 49.8047 49.8047 49.8047Zm0-8.30078c-22.9492 0-41.5039-18.5547-41.5039-41.5039s18.5547-41.5039 41.5039-41.5039 41.5039 18.5547 41.5039 41.5039-18.5547 41.5039-41.5039 41.5039Zm-22.6562-41.5039c0 2.39258 1.66016 4.00391 4.15039 4.00391h14.3555v14.4043c0 2.44141 1.66016 4.15039 4.05273 4.15039 2.44141 0 4.15039-1.66016 4.15039-4.15039v-14.4043h14.4043c2.44141 0 4.15039-1.61133 4.15039-4.00391 0-2.44141-1.70898-4.15039-4.15039-4.15039h-14.4043v-14.3555c0-2.49023-1.70898-4.19922-4.15039-4.19922-2.39258 0-4.05273 1.70898-4.05273 4.19922v14.3555h-14.3555c-2.49023 0-4.15039 1.70898-4.15039 4.15039Z"/>
</g>
<g transform="matrix(0.2 0 0 0.2 304.924 1933)">
<path d="m74.8535 28.3203c35.1074 0 63.623-28.4668 63.623-63.5742s-28.5156-63.623-63.623-63.623-63.5742 28.5156-63.5742 63.623 28.4668 63.5742 63.5742 63.5742Zm0-9.08203c-30.127 0-54.4922-24.3652-54.4922-54.4922s24.3652-54.4922 54.4922-54.4922 54.4922 24.3652 54.4922 54.4922-24.3652 54.4922-54.4922 54.4922Zm-28.8574-54.4922c0 2.58789 1.85547 4.39453 4.58984 4.39453h19.7266v19.7754c0 2.68555 1.85547 4.58984 4.44336 4.58984 2.68555 0 4.54102-1.85547 4.54102-4.58984v-19.7754h19.7754c2.68555 0 4.58984-1.80664 4.58984-4.39453 0-2.73438-1.85547-4.58984-4.58984-4.58984h-19.7754v-19.7266c0-2.73438-1.85547-4.63867-4.54102-4.63867-2.58789 0-4.44336 1.9043-4.44336 4.63867v19.7266h-19.7266c-2.73438 0-4.58984 1.85547-4.58984 4.58984Z"/>
</g>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 263 1953)">Design Variations</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1971)">Symbols are supported in up to nine weights and three scales.</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1989)">For optimal layout with text and other symbols, vertically align</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 2007)">symbols with the adjacent text.</text>
<line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="776" x2="776" y1="1919" y2="1933"/>
<g transform="matrix(0.2 0 0 0.2 776 1933)">
<path d="m16.5527 0.78125c2.58789 0 3.85742-0.976562 4.78516-3.71094l6.29883-17.2363h28.8086l6.29883 17.2363c0.927734 2.73438 2.19727 3.71094 4.73633 3.71094 2.58789 0 4.24805-1.5625 4.24805-4.00391 0-0.830078-0.146484-1.61133-0.537109-2.63672l-22.9004-60.9863c-1.12305-2.97852-3.125-4.49219-6.25-4.49219-3.02734 0-5.07812 1.46484-6.15234 4.44336l-22.9004 61.084c-0.390625 1.02539-0.537109 1.80664-0.537109 2.63672 0 2.44141 1.5625 3.95508 4.10156 3.95508Zm13.4766-28.3691 11.8652-32.8613h0.244141l11.8652 32.8613Z"/>
</g>
<line style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="792.836" x2="792.836" y1="1919" y2="1933"/>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 776 1953)">Margins</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1971)">Leading and trailing margins on the left and right side of each symbol</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 1989)">can be adjusted by modifying the x-location of the margin guidelines.</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2007)">Modifications are automatically applied proportionally to all</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 776 2025)">scales and weights.</text>
<g transform="matrix(0.2 0 0 0.2 1289 1933)">
<path d="m14.209 9.32617 8.49609 8.54492c4.29688 4.3457 9.22852 4.05273 13.8672-1.07422l53.4668-58.9355-4.83398-4.88281-53.0762 58.3984c-1.75781 2.00195-3.41797 2.49023-5.76172 0.146484l-5.85938-5.81055c-2.34375-2.29492-1.80664-4.00391 0.195312-5.81055l57.373-54.0039-4.88281-4.83398-57.959 54.4434c-4.93164 4.58984-5.32227 9.47266-1.02539 13.8184Zm32.0801-90.9668c-2.09961 2.05078-2.24609 4.93164-1.07422 6.88477 1.17188 1.80664 3.4668 2.97852 6.68945 2.14844 7.32422-1.70898 14.9414-2.00195 22.0703 2.68555l-2.92969 7.27539c-1.70898 4.15039-0.830078 7.08008 1.85547 9.81445l11.4746 11.5723c2.44141 2.44141 4.49219 2.53906 7.32422 2.05078l5.32227-0.976562 3.32031 3.36914-0.195312 2.7832c-0.195312 2.49023 0.439453 4.39453 2.88086 6.78711l3.80859 3.71094c2.39258 2.39258 5.46875 2.53906 7.8125 0.195312l14.5508-14.5996c2.34375-2.34375 2.24609-5.32227-0.146484-7.71484l-3.85742-3.80859c-2.39258-2.39258-4.24805-3.17383-6.64062-2.97852l-2.88086 0.244141-3.22266-3.17383 1.2207-5.61523c0.634766-2.83203-0.146484-5.0293-3.07617-7.95898l-10.9863-10.9375c-16.6992-16.6016-38.8672-16.2109-53.3203-1.75781Zm7.4707 1.85547c12.1582-8.88672 28.6133-7.37305 39.7461 3.75977l12.1582 12.0605c1.17188 1.17188 1.36719 2.09961 1.02539 3.80859l-1.61133 7.42188 7.51953 7.42188 4.93164-0.292969c1.26953-0.0488281 1.66016 0.0488281 2.63672 1.02539l2.88086 2.88086-12.207 12.207-2.88086-2.88086c-0.976562-0.976562-1.12305-1.36719-1.07422-2.68555l0.341797-4.88281-7.4707-7.42188-7.61719 1.26953c-1.61133 0.341797-2.34375 0.195312-3.56445-0.976562l-10.0098-10.0098c-1.26953-1.17188-1.41602-2.00195-0.634766-3.85742l4.39453-10.4492c-7.8125-7.27539-17.9688-10.4004-28.125-7.42188-0.78125 0.195312-1.07422-0.439453-0.439453-0.976562Z"/>
</g>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;font-weight:bold;" transform="matrix(1 0 0 1 1289 1953)">Exporting</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1971)">Symbols should be outlined when exporting to ensure the</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 1289 1989)">design is preserved when submitting to Xcode.</text>
<text id="template-version" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1933)">Template v.6.0</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1951)">Requires Xcode 16 or greater</text>
<text id="descriptive-name" style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1969)">Generated from apple.terminal.on.rectangle.fill</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;text-anchor:end;" transform="matrix(1 0 0 1 3036 1987)">Typeset at 100.0 points</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 726)">Small</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1156)">Medium</text>
<text style="stroke:none;fill:black;font-family:sans-serif;font-size:13;" transform="matrix(1 0 0 1 263 1586)">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"/>
</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="H-reference" 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"/>
</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="H-reference" 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"/>
</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="right-margin-Black-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="2995.17" x2="2995.17" 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="2871.63" x2="2871.63" 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="1507.61" x2="1507.61" 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="1392.08" x2="1392.08" 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="615.159" x2="615.159" y1="600.785" y2="720.121"/>
<line id="left-margin-Ultralight-S" style="fill:none;stroke:#00AEEF;stroke-width:0.5;opacity:1.0;" x1="504.263" x2="504.263" y1="600.785" y2="720.121"/>
</g>
<g id="Symbols">
<g id="Black-S" transform="matrix(1 0 0 1 2871.63 696)">
<path class="SFSymbolsPreviewWireframe" d="M49.4629-29.1504L54.9316-32.5195L49.4141-35.8398C44.8242-38.5742 48.8281-45.6543 53.8086-42.5293L63.2324-36.6211C66.2109-34.7656 66.2598-30.2734 63.2324-28.418L53.8086-22.4121C48.8281-19.2871 44.8242-26.3184 49.4629-29.1504ZM64.502-23.584C64.502-25.7812 66.3086-27.4902 68.457-27.4902L81.1035-27.4902C83.3008-27.4902 85.0098-25.7812 85.0098-23.584C85.0098-21.4355 83.3008-19.6289 81.1035-19.6289L68.457-19.6289C66.2598-19.6289 64.502-21.4355 64.502-23.584ZM46.4844 9.08203L98.5352 9.08203C108.105 9.08203 113.77 3.41797 113.77-6.15234L113.77-43.8477C113.77-53.418 108.105-59.082 98.5352-59.082L46.4844-59.082C36.9141-59.082 31.25-53.418 31.25-43.8477L31.25-6.15234C31.25 3.41797 36.9141 9.08203 46.4844 9.08203ZM46.4844-66.4062L92.1875-66.4062L92.1875-66.4062C91.4062-74.707 85.9375-79.5898 77.0508-79.5898L25-79.5898C15.4297-79.5898 9.76562-73.9258 9.76562-64.3555L9.76562-26.6602C9.76562-17.4316 14.9902-11.8652 23.9258-11.4746L23.9258-11.4746L23.9258-43.8477C23.9258-57.4707 32.8613-66.4062 46.4844-66.4062Z"/>
</g>
<g id="Regular-S" transform="matrix(1 0 0 1 1392.08 696)">
<path class="SFSymbolsPreviewWireframe" d="M42.627-30.6152L50.3418-35.3027L42.627-39.9902C39.5996-41.7969 42.1875-46.3379 45.459-44.2383L55.0781-38.2324C57.0801-36.9141 57.1777-33.6914 55.0781-32.373L45.459-26.3184C42.1875-24.2188 39.6484-28.8086 42.627-30.6152ZM57.1289-26.6602C57.1289-27.9785 58.1543-29.1016 59.5703-29.1016L72.4121-29.1016C73.8281-29.1016 74.9023-27.9785 74.9023-26.6602C74.9023-25.2441 73.8281-24.1211 72.4121-24.1211L59.5703-24.1211C58.1543-24.1211 57.1289-25.2441 57.1289-26.6602ZM41.6016 4.15039L93.3105 4.15039C101.611 4.15039 105.762 0.0488281 105.762-8.10547L105.762-44.043C105.762-52.2461 101.611-56.2988 93.3105-56.2988L41.6016-56.2988C33.252-56.2988 29.1504-52.2461 29.1504-44.043L29.1504-8.10547C29.1504 0.0976562 33.252 4.15039 41.6016 4.15039ZM41.6016-62.0117L86.4258-62.0117L86.4258-62.3535C86.4258-70.5566 82.2266-74.6582 73.9746-74.6582L22.2168-74.6582C13.8672-74.6582 9.76562-70.5566 9.76562-62.3535L9.76562-26.4648C9.76562-18.2617 13.8672-14.209 22.2168-14.209L23.4375-14.209L23.4375-44.043C23.4375-55.4199 30.127-62.0117 41.6016-62.0117Z"/>
</g>
<g id="Ultralight-S" transform="matrix(1 0 0 1 504.263 696)">
<path class="SFSymbolsPreviewWireframe" d="M38.9033-32.9765L48.0713-38.4814L38.9033-43.9863C37.4653-44.7939 38.7364-46.7466 40.1006-45.9184L49.9014-39.7764C50.7227-39.23 50.9112-37.8237 49.9014-37.1411L40.1006-31.041C38.7364-30.2128 37.5596-32.1235 38.9033-32.9765ZM51.3619-30.2021C51.3619-30.7485 51.8423-31.2358 52.4864-31.2358L64.7379-31.2358C65.3819-31.2358 65.775-30.7485 65.775-30.2021C65.775-29.6035 65.3819-29.1162 64.7379-29.1162L52.4864-29.1162C51.8423-29.1162 51.3619-29.6035 51.3619-30.2021ZM36.5157 0.653836L91.1309 0.653836C97.6607 0.653836 101.13-2.8574 101.13-9.33153L101.13-46.2226C101.13-52.6548 97.6607-56.208 91.1309-56.208L36.5157-56.208C29.937-56.208 26.5166-52.7456 26.5166-46.2226L26.5166-9.33153C26.5166-2.76316 29.937 0.653836 36.5157 0.653836ZM36.5157-59.2871L84.3823-59.2871L84.3823-61.0366C84.3823-67.5142 80.9097-71.0254 74.3833-71.0254L19.7647-71.0254C13.2315-71.0254 9.76562-67.605 9.76562-61.0366L9.76562-24.1489C9.76562-17.626 13.2315-14.1636 19.7647-14.1636L23.4375-14.1636L23.4375-46.2226C23.4375-54.4663 28.2652-59.2871 36.5157-59.2871Z"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

2
ShhShell/Host/HostsManager.swift
View File

@@ -16,7 +16,7 @@ class HostsManager: ObservableObject, @unchecked Sendable {
@Published var themes: [Theme] = [] @Published var themes: [Theme] = []
@Published var selectedTheme: Theme = Theme.decodeLocalTheme(fileName: "xcodeDarkHC") ?? Theme.defaultTheme @Published var selectedTheme: Theme = Theme.decodeLocalTheme(fileName: "xcodeDarkHC") ?? Theme.defaultTheme
@Published var selectedAnsi: Int = 1 @Published var selectedAnsi: Int = 4
@Published var fonts: [UIFont] = [] @Published var fonts: [UIFont] = []
@Published var selectedFont: String = "SF Mono" @Published var selectedFont: String = "SF Mono"

17
ShhShell/Views/Onboarding/WelcomeChunk.swift
View File

@@ -8,19 +8,30 @@
import SwiftUI import SwiftUI
struct WelcomeChunk: View { struct WelcomeChunk: View {
@State var symbol: String @State var systemImage: String?
@State var image: String?
@State var title: String @State var title: String
@State var para: String @State var para: String
@State var delay: TimeInterval = 0 @State var delay: TimeInterval = 0
@State private var spawnDate: Date = .now @State private var spawnDate: Date = .now
var imageUnwrapped: Image {
if let systemImage {
return Image(systemName: systemImage)
} else if let image {
return Image(image)
} else {
return Image(systemName: "questionmark")
}
}
var body: some View { var body: some View {
TimelineView(.animation) { tl in TimelineView(.animation) { tl in
let time = tl.date.timeIntervalSince(spawnDate) let time = tl.date.timeIntervalSince(spawnDate)
HStack(spacing: 25) { HStack(spacing: 25) {
if time > delay { if time > delay {
Image(systemName: symbol) imageUnwrapped
.resizable().scaledToFit() .resizable().scaledToFit()
.symbolRenderingMode(.hierarchical) .symbolRenderingMode(.hierarchical)
.frame(width: 50, height: 50) .frame(width: 50, height: 50)
@@ -56,7 +67,7 @@ struct WelcomeChunk: View {
#Preview { #Preview {
WelcomeChunk( WelcomeChunk(
symbol: "trash", systemImage: "trash",
title: "The Trash", title: "The Trash",
para: "Here's to the crazy ones." para: "Here's to the crazy ones."
) )

10
ShhShell/Views/Onboarding/WelcomeView.swift
View File

@@ -40,31 +40,31 @@ struct WelcomeView: View {
} }
WelcomeChunk( WelcomeChunk(
symbol: "bolt.fill", systemImage: "bolt.fill",
title: "Blazing Fast", title: "Blazing Fast",
para: "", para: "",
delay: 4 delay: 4
) )
WelcomeChunk( WelcomeChunk(
symbol: "apple.terminal.on.rectangle.fill", image: "apple.terminal.on.rectangle.fill",
title: "Multiple Sessions", title: "Multiple Sessions",
para: "Connect to the same host again and again, or different ones", para: "Connect to the same host again and again, or different ones",
delay: 5 delay: 5
) )
WelcomeChunk( WelcomeChunk(
symbol: "swatchpalette.fill", systemImage: "swatchpalette.fill",
title: "Themes", title: "Themes",
para: "Customise ShhShell by importing themes, or make your own!", para: "Customise ShhShell by importing themes, or make your own!",
delay: 6 delay: 6
) )
WelcomeChunk( WelcomeChunk(
symbol: "lock.shield.fill", systemImage: "lock.shield.fill",
title: "Secure", title: "Secure",
para: "ShhShell uses secure Elliptic Curve keys, and keeps you safe by verifying hostkeys haven't changed", para: "ShhShell uses secure Elliptic Curve keys, and keeps you safe by verifying hostkeys haven't changed",
delay: 7 delay: 7
) )
WelcomeChunk( WelcomeChunk(
symbol: "ellipsis.circle", systemImage: "ellipsis.circle",
title: "And more...", title: "And more...",
para: "Snippets, iCloud Sync, Fonts, Terminal Filters, Connection History", para: "Snippets, iCloud Sync, Fonts, Terminal Filters, Connection History",
delay: 8 delay: 8

51
ShhShell/Views/Settings/SettingsView.swift
View File

@@ -101,7 +101,7 @@ struct SettingsView: View {
} }
.pickerStyle(.segmented) .pickerStyle(.segmented)
Picker("", selection: $hostsManager.settings.cursorType.cursorShape) { Picker("Shape", selection: $hostsManager.settings.cursorType.cursorShape) {
ForEach(CursorShape.allCases, id: \.self) { type in ForEach(CursorShape.allCases, id: \.self) { type in
Text(type.description).tag(type) Text(type.description).tag(type)
} }
@@ -110,28 +110,37 @@ struct SettingsView: View {
.labelsHidden() .labelsHidden()
} }
Toggle("location persistence", systemImage: "location.fill", isOn: $hostsManager.settings.locationPersist) Section("Keepalive") {
.onChange(of: hostsManager.settings.locationPersist) { _ in Toggle("location persistence", systemImage: "location.fill", isOn: $hostsManager.settings.locationPersist)
if hostsManager.settings.locationPersist && !Backgrounder.shared.checkPermsStatus() { .onChange(of: hostsManager.settings.locationPersist) { _ in
Backgrounder.shared.requestPerms() if hostsManager.settings.locationPersist && !Backgrounder.shared.checkPermsStatus() {
Backgrounder.shared.requestPerms()
}
}
Toggle("keep screen awake", systemImage: "cup.and.saucer.fill", isOn: $hostsManager.settings.caffeinate)
}
Section("Bell") {
Toggle("bell sound", systemImage: "bell.and.waves.left.and.right", isOn: $hostsManager.settings.bellSound)
Toggle("bell haptic",systemImage: "iphone.radiowaves.left.and.right", isOn: $hostsManager.settings.bellHaptic)
}
Section("Terminal Filter") {
if #unavailable(iOS 17), hostsManager.settings.filter == .crt {
Label("iOS 17 Required", systemImage: "exclamationmark.triangle.fill")
.foregroundStyle(.yellow)
.transition(.opacity)
}
Picker("", selection: $hostsManager.settings.filter) {
ForEach(TerminalFilter.allCases, id: \.self) { filter in
Text(filter.description).tag(filter)
} }
} }
.pickerStyle(.inline)
Toggle("bell sound", systemImage: "bell.and.waves.left.and.right", isOn: $hostsManager.settings.bellSound) .labelsHidden()
Toggle("bell haptic",systemImage: "iphone.radiowaves.left.and.right", isOn: $hostsManager.settings.bellHaptic)
Toggle("keep screen awake", systemImage: "cup.and.saucer.fill", isOn: $hostsManager.settings.caffeinate)
if #unavailable(iOS 17), hostsManager.settings.filter == .crt {
Label("iOS 17 Required", systemImage: "exclamationmark.triangle.fill")
.foregroundStyle(.yellow)
} }
Picker("terminal filter", selection: $hostsManager.settings.filter) { .animation(.spring, value: hostsManager.settings.filter)
ForEach(TerminalFilter.allCases, id: \.self) { filter in
Text(filter.description).tag(filter)
}
}
.pickerStyle(.inline)
Section("App Icon") { Section("App Icon") {
ScrollView(.horizontal) { ScrollView(.horizontal) {
@@ -166,7 +175,7 @@ struct SettingsView: View {
} }
} }
} }
.listStyle(.sidebar) .listStyle(.insetGrouped)
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)
.onChange(of: hostsManager.settings) { _ in .onChange(of: hostsManager.settings) { _ in
hostsManager.saveSettings() hostsManager.saveSettings()