Skip to content

Shorten time that it takes to add pairing file (plus add a loading bar) #13

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 3 commits into from
Mar 28, 2025
Merged

Shorten time that it takes to add pairing file (plus add a loading bar) #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
858f3ff
add a timer for pairing file
neoarz Mar 28, 2025
7f09e61
Reduce time to minimum time
neoarz Mar 28, 2025
91a13ad
Merge pull request #4 from neoarz/pairingfile
neoarz 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
83 changes: 65 additions & 18 deletions StikJIT/Views/HomeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ struct HomeView: View {
@State private var pairingFileExists: Bool = false
@State private var showPairingFileMessage = false
@State private var pairingFileIsValid = false
@State private var isImportingFile = false
@State private var importProgress: Float = 0.0

var body: some View {
ZStack {
Expand Down Expand Up @@ -73,6 +75,37 @@ struct HomeView: View {

// Status message area - keeps layout consistent
ZStack {
// Progress bar for importing file
if isImportingFile {
VStack(spacing: 8) {
HStack {
Text("Processing pairing file...")
.font(.system(.caption, design: .rounded))
.foregroundColor(.secondaryText)
Spacer()
Text("\(Int(importProgress * 100))%")
.font(.system(.caption, design: .rounded))
.foregroundColor(.secondaryText)
}

GeometryReader { geometry in
ZStack(alignment: .leading) {
RoundedRectangle(cornerRadius: 4)
.fill(Color.black.opacity(0.2))
.frame(height: 8)

RoundedRectangle(cornerRadius: 4)
.fill(Color.green)
.frame(width: geometry.size.width * CGFloat(importProgress), height: 8)
.animation(.linear(duration: 0.3), value: importProgress)
}
}
.frame(height: 8)
}
.padding(.horizontal, 40)
}

// Success message
if showPairingFileMessage && pairingFileIsValid {
Text("✓ Pairing file successfully imported")
.font(.system(.callout, design: .rounded))
Expand All @@ -87,7 +120,7 @@ struct HomeView: View {
// Invisible text to reserve space - no layout jumps
Text(" ").opacity(0)
}
.frame(height: 30)
.frame(height: isImportingFile ? 60 : 30) // Adjust height based on what's showing

Spacer()
}
Expand Down Expand Up @@ -116,30 +149,44 @@ struct HomeView: View {
try fileManager.copyItem(at: url, to: URL.documentsDirectory.appendingPathComponent("pairingFile.plist"))
print("File copied successfully!")

// Show success message first
// Show progress bar and initialize progress
DispatchQueue.main.async {
// Set pairing file exists and show success message
isImportingFile = true
importProgress = 0.0
pairingFileExists = true
pairingFileIsValid = true

// Show success message with animation
withAnimation {
showPairingFileMessage = true
}

// Schedule hiding of message
DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
withAnimation {
showPairingFileMessage = false
}

// Start heartbeat in background
startHeartbeatInBackground()

// Create timer to update progress instead of sleeping
let progressTimer = Timer.scheduledTimer(withTimeInterval: 0.05, repeats: true) { timer in
DispatchQueue.main.async {
if importProgress < 1.0 {
importProgress += 0.25
} else {
timer.invalidate()
isImportingFile = false
pairingFileIsValid = true

// Show success message
withAnimation {
showPairingFileMessage = true
}

// Hide message after delay
DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
withAnimation {
showPairingFileMessage = false
}
}
}
}
}

// Start heartbeat and then sleep
startHeartbeatInBackground()
// Ensure timer keeps running
RunLoop.current.add(progressTimer, forMode: .common)

// Moving this after the UI updates
Thread.sleep(forTimeInterval: 5)
} catch {
print("Error copying file: \(error)")
}
Expand Down
86 changes: 85 additions & 1 deletion StikJIT/Views/SettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ struct SettingsView: View {

@State private var selectedBackgroundColor: Color = Color.primaryBackground
@State private var showIconPopover = false
@State private var showPairingFileMessage = false
@State private var pairingFileIsValid = false
@State private var isImportingFile = false
@State private var importProgress: Float = 0.0

var body: some View {
ZStack {
Expand Down Expand Up @@ -60,6 +64,58 @@ struct SettingsView: View {
Spacer()
}
.listRowBackground(Color.cardBackground)

if isImportingFile {
VStack(spacing: 8) {
HStack {
Text("Processing pairing file...")
.font(.system(.caption, design: .rounded))
.foregroundColor(.secondaryText)
Spacer()
Text("\(Int(importProgress * 100))%")
.font(.system(.caption, design: .rounded))
.foregroundColor(.secondaryText)
}

GeometryReader { geometry in
ZStack(alignment: .leading) {
RoundedRectangle(cornerRadius: 4)
.fill(Color.cardBackground)
.frame(height: 8)

RoundedRectangle(cornerRadius: 4)
.fill(Color.green)
.frame(width: geometry.size.width * CGFloat(importProgress), height: 8)
.animation(.linear(duration: 0.3), value: importProgress)
}
}
.frame(height: 8)
}
.padding(.vertical, 8)
.listRowBackground(Color.cardBackground)
}

if showPairingFileMessage && pairingFileIsValid {
HStack {
Spacer()
Text("✓ Pairing file successfully imported")
.font(.system(.callout, design: .rounded))
.foregroundColor(.green)
.padding(.vertical, 4)
.padding(.horizontal, 12)
.background(Color.green.opacity(0.1))
.cornerRadius(8)
Spacer()
}
.padding(.vertical, 4)
.listRowBackground(Color.cardBackground)
.transition(
.asymmetric(
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)) {
Expand Down Expand Up @@ -153,9 +209,37 @@ struct SettingsView: View {

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

DispatchQueue.main.async {
isImportingFile = true
importProgress = 0.0
}

let progressTimer = Timer.scheduledTimer(withTimeInterval: 0.05, repeats: true) { timer in
DispatchQueue.main.async {
if importProgress < 1.0 {
importProgress += 0.25
} else {
timer.invalidate()
isImportingFile = false
pairingFileIsValid = true

withAnimation {
showPairingFileMessage = true
}

DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
withAnimation {
showPairingFileMessage = false
}
}
}
}
}

startHeartbeatInBackground()

Thread.sleep(forTimeInterval: 5)
RunLoop.current.add(progressTimer, forMode: .common)
} catch {
print("Error copying file: \(error)")
}
Expand Down