From d3c4a0bb986d226b4d779f54332eb083f7056f1b Mon Sep 17 00:00:00 2001 From: Francesco <100066266+cranci1@users.noreply.github.com> Date: Sat, 31 May 2025 17:51:40 +0200 Subject: [PATCH] fixes idk --- Sora/Utils/TabBar/TabBar.swift | 4 ++-- Sora/Views/DownloadView.swift | 1 + Sora/Views/SearchView/SearchViewComponents.swift | 1 + .../SettingsSubViews/SettingsViewAbout.swift | 9 +++------ 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Sora/Utils/TabBar/TabBar.swift b/Sora/Utils/TabBar/TabBar.swift index b009a20..4a52e5f 100644 --- a/Sora/Utils/TabBar/TabBar.swift +++ b/Sora/Utils/TabBar/TabBar.swift @@ -76,9 +76,9 @@ struct TabBar: View { } }) { Image(systemName: "x.circle") - .font(.system(size: 30)) + .font(.system(size: 25)) .foregroundStyle(.gray) - .frame(width: 24, height: 24) + .frame(width: 20, height: 20) .matchedGeometryEffect(id: "x.circle", in: animation) .padding(16) .background( diff --git a/Sora/Views/DownloadView.swift b/Sora/Views/DownloadView.swift index 05eb9d5..aa38615 100644 --- a/Sora/Views/DownloadView.swift +++ b/Sora/Views/DownloadView.swift @@ -71,6 +71,7 @@ struct DownloadView: View { } } .deviceScaled() + .navigationViewStyle(StackNavigationViewStyle()) } private var activeDownloadsView: some View { diff --git a/Sora/Views/SearchView/SearchViewComponents.swift b/Sora/Views/SearchView/SearchViewComponents.swift index 98333cd..148e394 100644 --- a/Sora/Views/SearchView/SearchViewComponents.swift +++ b/Sora/Views/SearchView/SearchViewComponents.swift @@ -188,5 +188,6 @@ struct SearchContent: View { } } } + .navigationViewStyle(StackNavigationViewStyle()) } } diff --git a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewAbout.swift b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewAbout.swift index 4395c5b..dc5de32 100644 --- a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewAbout.swift +++ b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewAbout.swift @@ -82,9 +82,6 @@ struct SettingsViewAbout: View { Text("AKA Sulfur") .font(.caption) .foregroundColor(.secondary) - Text("Version \(version)") - .font(.subheadline) - .foregroundColor(.secondary) } Spacer() } @@ -249,11 +246,11 @@ extension Color { Scanner(string: hexTwo).scanHexInt64(&int) let a, r, g, b: UInt64 switch hexTwo.count { - case 3: // RGB (12-bit) + case 3: (a, r, g, b) = (255, (int >> 8) * 17, (int >> 4 & 0xF) * 17, (int & 0xF) * 17) - case 6: // RGB (24-bit) + case 6: (a, r, g, b) = (255, int >> 16, int >> 8 & 0xFF, int & 0xFF) - case 8: // ARGB (32-bit) + case 8: (a, r, g, b) = (int >> 24, int >> 16 & 0xFF, int >> 8 & 0xFF, int & 0xFF) default: (a, r, g, b) = (1, 1, 1, 0)