Skip to content

My implemetation is better #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StephenDev0 merged 24 commits into from
Mar 28, 2025
+78 −27
Merged

My implemetation is better #16

Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ff8e51b
Update SettingsView.swift
se2crid Mar 28, 2025
02a9c3a
Update SettingsView.swift
se2crid Mar 28, 2025
352c349
Update SettingsView.swift
se2crid Mar 28, 2025
c61451a
Merge pull request #1 from se2crid/test
se2crid Mar 28, 2025
7c18992
Update SettingsView.swift
se2crid Mar 28, 2025
740ce6f
Update SettingsView.swift
se2crid Mar 28, 2025
51f4337
Update SettingsView.swift
se2crid Mar 28, 2025
61a13c3
Update SettingsView.swift
se2crid Mar 28, 2025
8f83603
Update SettingsView.swift
se2crid Mar 28, 2025
2e00f75
Merge branch '0-Blu:main' into main
se2crid Mar 28, 2025
9a405d2
Merge branch 'main' into main
se2crid Mar 28, 2025
7900c45
Update SettingsView.swift
se2crid Mar 28, 2025
b17686a
Update SettingsView.swift
se2crid Mar 28, 2025
1d03393
Update SettingsView.swift
se2crid Mar 28, 2025
d64970d
Update SettingsView.swift
se2crid Mar 28, 2025
3f621cb
Update SettingsView.swift
se2crid Mar 28, 2025
6761284
Update SettingsView.swift
se2crid Mar 28, 2025
3a2b221
Update SettingsView.swift
se2crid Mar 28, 2025
8d8d3d9
Update SettingsView.swift
se2crid Mar 28, 2025
f6f6380
Update SettingsView.swift
se2crid Mar 28, 2025
7c5051e
Update SettingsView.swift
se2crid Mar 28, 2025
e5bdd2c
Update SettingsView.swift
se2crid Mar 28, 2025
decf0cb
Update SettingsView.swift
se2crid Mar 28, 2025
cfb8d96
Update SettingsView.swift
se2crid Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 78 additions & 27 deletions StikJIT/Views/SettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
//
// SettingsView.swift
// StikJIT
//
// Created by Stephen on 3/27/25.
//

import SwiftUI
import UniformTypeIdentifiers
Expand All @@ -27,7 +25,9 @@ struct SettingsView: View {
.ignoresSafeArea()

Form {
Section(header: Text("General").font(.headline).foregroundColor(.primaryText)) {
Section(header: Text("General")
.font(.headline)
.foregroundColor(.primaryText)) {
HStack {
Label("", systemImage: "person.fill")
.foregroundColor(.primaryText)
Expand All @@ -45,7 +45,9 @@ struct SettingsView: View {
.listRowBackground(Color.cardBackground)
}

Section(header: Text("Appearance").font(.headline).foregroundColor(.primaryText)) {
Section(header: Text("Appearance")
.font(.headline)
.foregroundColor(.primaryText)) {
ColorPicker("Background Color", selection: $selectedBackgroundColor)
.onChange(of: selectedBackgroundColor) { newColor in
saveCustomBackgroundColor(newColor)
Expand All @@ -54,7 +56,9 @@ struct SettingsView: View {
.foregroundColor(.primaryText)
}

Section(header: Text("Pairing File").font(.headline).foregroundColor(.primaryText)) {
Section(header: Text("Pairing File")
.font(.headline)
.foregroundColor(.primaryText)) {
HStack {
Button {
isShowingPairingFilePicker = true
Expand Down Expand Up @@ -111,14 +115,18 @@ struct SettingsView: View {
.listRowBackground(Color.cardBackground)
.transition(
.asymmetric(
insertion: .scale(scale: 0.9).combined(with: .opacity).animation(.spring(response: 0.4, dampingFraction: 0.7)),
insertion: .scale(scale: 0.9)
.combined(with: .opacity)
.animation(.spring(response: 0.4, dampingFraction: 0.7)),
removal: .opacity.animation(.easeOut(duration: 0.25))
)
)
}
}

Section(header: Text("About").font(.headline).foregroundColor(.primaryText)) {
Section(header: Text("About")
.font(.headline)
.foregroundColor(.primaryText)) {
HStack {
Text("Version:")
.foregroundColor(.secondaryText)
Expand All @@ -132,7 +140,7 @@ struct SettingsView: View {
Text("App Creator:")
.foregroundColor(.secondaryText)
Spacer()
Text("Stephen")
Link("Stephen", destination: URL(string: "https://github.com/0-Blu")!)
.foregroundColor(.primaryText)
}
.listRowBackground(Color.cardBackground)
Expand All @@ -141,25 +149,66 @@ struct SettingsView: View {
Text("idevice & em_proxy Creator:")
.foregroundColor(.secondaryText)
Spacer()
Text("jkcoxson")
Link("jkcoxson", destination: URL(string: "https://github.com/jkcoxson")!)
.foregroundColor(.primaryText)
}

.listRowBackground(Color.cardBackground)
HStack {

VStack(alignment: .leading, spacing: 4) {
Text("Collaborators:")
.foregroundColor(.secondaryText)
Spacer()
Text("Stossy11")
.foregroundColor(.primaryText)
Text("Neo")
.foregroundColor(.primaryText)
Text("Se2crid")
.foregroundColor(.primaryText)
Text("HugeBlack")
.foregroundColor(.primaryText)
HStack(spacing: 8) {
Button(action: {
if let url = URL(string: "https://github.com/Stossy11") {
UIApplication.shared.open(url)
}
}) {
Text("Stossy11")
.padding(.vertical, 4)
.contentShape(Rectangle())
.foregroundColor(.primaryText)
}
.buttonStyle(PlainButtonStyle())

Button(action: {
if let url = URL(string: "https://github.com/neoarz") {
UIApplication.shared.open(url)
}
}) {
Text("Neo")
.padding(.vertical, 4)
.contentShape(Rectangle())
.foregroundColor(.primaryText)
}
.buttonStyle(PlainButtonStyle())

Button(action: {
if let url = URL(string: "https://github.com/Se2crid") {
UIApplication.shared.open(url)
}
}) {
Text("Se2crid")
.padding(.vertical, 4)
.contentShape(Rectangle())
.foregroundColor(.primaryText)
}
.buttonStyle(PlainButtonStyle())

Button(action: {
if let url = URL(string: "https://github.com/HugeBlack") {
UIApplication.shared.open(url)
}
}) {
Text("HugeBlack")
.padding(.vertical, 4)
.contentShape(Rectangle())
.foregroundColor(.primaryText)
}
.buttonStyle(PlainButtonStyle())
}
}
.listRowBackground(Color.cardBackground)

Button(action: {
if let url = URL(string: "https://github.com/0-Blu/StikJIT") {
UIApplication.shared.open(url)
Expand All @@ -174,6 +223,7 @@ struct SettingsView: View {
}
}
.listRowBackground(Color.cardBackground)

Button(action: {
if let url = URL(string: "https://apps.apple.com/us/app/stiknes/id6737158545") {
UIApplication.shared.open(url)
Expand All @@ -183,7 +233,7 @@ struct SettingsView: View {
Text("Like this app? Check out StikNES!")
.foregroundColor(.secondaryText)
Spacer()
Image(systemName: "arrow.up.right.square")
Image(systemName: "arrow.upright.square")
.foregroundColor(.primaryText)
}
}
Expand All @@ -196,20 +246,21 @@ struct SettingsView: View {
.font(.bodyFont)
.accentColor(.accentColor)
}
.fileImporter(isPresented: $isShowingPairingFilePicker, allowedContentTypes: [UTType(filenameExtension: "mobiledevicepairing", conformingTo: .data)!, .propertyList]) {result in
.fileImporter(isPresented: $isShowingPairingFilePicker,
allowedContentTypes: [UTType(filenameExtension: "mobiledevicepairing", conformingTo: .data)!, .propertyList]) { result in
switch result {

case .success(let url):
let fileManager = FileManager.default
let accessing = url.startAccessingSecurityScopedResource()

if fileManager.fileExists(atPath: url.path) {
do {
if fileManager.fileExists(atPath: URL.documentsDirectory.appendingPathComponent("pairingFile.plist").path) {
try fileManager.removeItem(at: URL.documentsDirectory.appendingPathComponent("pairingFile.plist"))
let destination = URL.documentsDirectory.appendingPathComponent("pairingFile.plist")
if fileManager.fileExists(atPath: destination.path) {
try fileManager.removeItem(at: destination)
}

try fileManager.copyItem(at: url, to: URL.documentsDirectory.appendingPathComponent("pairingFile.plist"))
try fileManager.copyItem(at: url, to: destination)
print("File copied successfully!")

DispatchQueue.main.async {
Expand Down Expand Up @@ -240,7 +291,6 @@ struct SettingsView: View {
}

startHeartbeatInBackground()

RunLoop.current.add(progressTimer, forMode: .common)
} catch {
print("Error copying file: \(error)")
Expand All @@ -261,6 +311,7 @@ struct SettingsView: View {
}
}


private func loadCustomBackgroundColor() {
selectedBackgroundColor = Color(hex: customBackgroundColorHex) ?? Color.primaryBackground
}
Expand Down