From dbf6cf099189976020a9a5444f186194620d355f Mon Sep 17 00:00:00 2001 From: neoarz Date: Sat, 29 Mar 2025 02:32:04 -0400 Subject: [PATCH] fix ddi #2 --- StikJIT/Views/SettingsView.swift | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/StikJIT/Views/SettingsView.swift b/StikJIT/Views/SettingsView.swift index 3120d96..e39eb52 100644 --- a/StikJIT/Views/SettingsView.swift +++ b/StikJIT/Views/SettingsView.swift @@ -181,28 +181,29 @@ struct SettingsView: View { .foregroundColor(.primary) .padding(.bottom, 4) + // Status indicator with icon HStack(spacing: 12) { Image(systemName: mounted || (mountProg.mountProgress == 100) ? "checkmark.circle.fill" : "xmark.circle.fill") .font(.system(size: 24)) .foregroundColor(mounted || (mountProg.mountProgress == 100) ? .green : .red) - VStack(alignment: .leading, spacing: 4) { - Text(mounted || (mountProg.mountProgress == 100) ? "Successfully Mounted" : "Not Mounted") - .font(.system(.body, design: .rounded)) - .fontWeight(.medium) - - if !(mounted || (mountProg.mountProgress == 100)) { - Text("Import pairing file and restart the app to mount DDI") - .font(.system(.caption, design: .rounded)) - .foregroundColor(.secondary) - } - } + Text(mounted || (mountProg.mountProgress == 100) ? "Successfully Mounted" : "Not Mounted") + .font(.system(.body, design: .rounded)) + .fontWeight(.medium) } .padding() .frame(maxWidth: .infinity, alignment: .leading) .background(Color(UIColor.tertiarySystemBackground)) .cornerRadius(12) + // Helper text shown separately below the status indicator + if !(mounted || (mountProg.mountProgress == 100)) { + Text("Import pairing file and restart the app to mount DDI") + .font(.system(.caption, design: .rounded)) + .foregroundColor(.secondary) + .padding(.horizontal, 4) + } + // Only show progress if actively mounting if mountProg.mountProgress > 0 && mountProg.mountProgress < 100 && !mounted { VStack(spacing: 8) {