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

solarium complete

Browse Source 
idr most of ts
cleaned up stuff
remove glassbutton
This commit is contained in:
neon443
2025-09-10 21:09:28 +01:00
parent 0b83009b39
commit 7b127127e7
5 changed files with 34 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ShhShell.xcodeproj/project.pbxproj
View File

@@ -96,7 +96,6 @@
A9C897EF2DF1A9A400EF9A5F /* SSHHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C897EE2DF1A9A400EF9A5F /* SSHHandler.swift */; };
A9CC786B2E4E681400FAEE58 /* RecentsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9CC786A2E4E681400FAEE58 /* RecentsView.swift */; };
A9CC786D2E4F534600FAEE58 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9CC786C2E4F534600FAEE58 /* History.swift */; };
A9D45DD92E7204FF00BA9E4A /* GlassButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9D45DD82E7204FF00BA9E4A /* GlassButton.swift */; };
A9D819292E0E904200442D38 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9D819282E0E904200442D38 /* Theme.swift */; };
A9D8192D2E0E9EB500442D38 /* ThemeManagerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9D8192C2E0E9EB500442D38 /* ThemeManagerView.swift */; };
A9D8192F2E0F1BEE00442D38 /* ThemeButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9D8192E2E0F1BEE00442D38 /* ThemeButton.swift */; };
@@ -239,7 +238,6 @@
A9C897EE2DF1A9A400EF9A5F /* SSHHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSHHandler.swift; sourceTree = "<group>"; };
A9CC786A2E4E681400FAEE58 /* RecentsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentsView.swift; sourceTree = "<group>"; };
A9CC786C2E4F534600FAEE58 /* History.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = History.swift; sourceTree = "<group>"; };
A9D45DD82E7204FF00BA9E4A /* GlassButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlassButton.swift; sourceTree = "<group>"; };
A9D819282E0E904200442D38 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
A9D8192C2E0E9EB500442D38 /* ThemeManagerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeManagerView.swift; sourceTree = "<group>"; };
A9D8192E2E0F1BEE00442D38 /* ThemeButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeButton.swift; sourceTree = "<group>"; };
@@ -548,7 +546,6 @@
A93143C52DF61FE300FCD5DB /* ViewModifiers.swift */,
A96C90A02E12B87900724253 /* TextBox.swift */,
A9835C3B2E17CCA500969508 /* TrafficLights.swift */,
A9D45DD82E7204FF00BA9E4A /* GlassButton.swift */,
);
path = Misc;
sourceTree = "<group>";
@@ -911,7 +908,6 @@
A9FD37552E143D23005319A8 /* SecKeyConvertible.swift in Sources */,
A94B832F2E5B929C00EBA09C /* Backgrounder.swift in Sources */,
A96C6AFE2E0C43B600F377FE /* Keypair.swift in Sources */,
A9D45DD92E7204FF00BA9E4A /* GlassButton.swift in Sources */,
A90B38322E3E8FC9002B56FC /* AboutView.swift in Sources */,
A9C4140C2E096DB7005E3047 /* SSHError.swift in Sources */,
A96BE6AA2E116EC000C0FEE9 /* TerminalViewContainer.swift in Sources */,

13
ShhShell/Views/Keys/KeyImporterView.swift
View File

@@ -59,17 +59,7 @@ struct KeyImporterView: View {
}
.preferredColorScheme(.dark)
.overlay(alignment: .bottom) {
if #available(iOS 26, *) {
Button {
} label: {
Text("Import")
.font(.title)
.bold()
}
.modifier(glassButton(prominent: true))
} else {
Button() {
keyManager.importKey(type: keyType, priv: privkeyStr, name: keyName)
UINotificationFeedbackGenerator().notificationOccurred(.success)
dismiss()
@@ -78,12 +68,11 @@ struct KeyImporterView: View {
.font(.title)
.bold()
}
.buttonStyle(.borderedProminent)
.modifier(glassButton(prominent: true))
.padding(.bottom, 15)
}
}
}
}
#Preview {
KeyImporterView(keyManager: KeyManager())

49
ShhShell/Views/Misc/GlassButton.swift
View File

@@ -1,49 +0,0 @@
//
// GlassButton.swift
// ShhShell
//
// Created by neon443 on 10/09/2025.
//
import SwiftUI
struct GlassButton<Label: View>: View {
var action: (() -> Void)
var prominent: Bool = false
@ViewBuilder var label: Label
@ViewBuilder var fallbackLabel: Label
var body: some View {
if #available(iOS 26, *) {
Button {
action()
} label: {
label
}
.buttonStyle(.glassProminent)
} else {
Button {
action()
} label: {
fallbackLabel
}
}
}
}
#Preview {
GlassButton(
action: {
},
prominent: true,
label: {
Text("iOS 26+")
.padding(5)
},
fallbackLabel: {
Text("iOS 26+")
.padding(5)
}
)
}

4
ShhShell/Views/Misc/ViewModifiers.swift
View File

@@ -22,11 +22,15 @@ struct glassButton: ViewModifier {
} else {
content.buttonStyle(.glass)
}
} else {
if prominent {
content.buttonStyle(.borderedProminent)
} else {
content
}
}
}
}
struct foregroundColorStyle: ViewModifier {
var color: Color

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

@@ -74,15 +74,15 @@ struct WelcomeView: View {
Spacer()
}
if time > 9 {
#if swift(>=6.2)
Button("Continue") {
hostsManager.setOnboarding(to: true)
}
.modifier(glassButton(prominent: true))
#else
Button {
hostsManager.setOnboarding(to: true)
} label: {
if #available(iOS 19, *) {
Text("Continue")
.monospaced()
.font(.title)
.foregroundStyle(.black)
} else {
ZStack {
Color.terminalGreen
Text("Continue")
@@ -92,10 +92,9 @@ struct WelcomeView: View {
}
.clipShape(RoundedRectangle(cornerRadius: 50))
}
.buttonStyle(.plain)
.frame(width: 300, height: 50)
.padding(.horizontal, 75)
#endif
}
.tint(.terminalGreen)
.modifier(glassButton(prominent: true))
}
}
.animation(.spring, value: time)