diff --git a/iOSClient/Account/Account Settings/NCAccountSettingsView.swift b/iOSClient/Account/Account Settings/NCAccountSettingsView.swift index 6f374426f1..fed8b841fb 100644 --- a/iOSClient/Account/Account Settings/NCAccountSettingsView.swift +++ b/iOSClient/Account/Account Settings/NCAccountSettingsView.swift @@ -137,7 +137,7 @@ struct NCAccountSettingsView: View { if let account = model.tblAccount?.account { NavigationLink(destination: NCUserStatusView(account: account, controller: model.controller)) { HStack { - Image(systemName: "moon.fill") + Image(systemName: "moon") .font(.icon()) .foregroundStyle(Color(NCBrandColor.shared.iconImageColor)) .frame(width: 26) @@ -151,7 +151,7 @@ struct NCAccountSettingsView: View { if let account = model.tblAccount?.account { NavigationLink(destination: NCStatusMessageView(account: account, controller: model.controller)) { HStack { - Image(systemName: "message.fill") + Image(systemName: "message") .font(.icon()) .foregroundStyle(Color(NCBrandColor.shared.iconImageColor)) .frame(width: 26) diff --git a/iOSClient/Extensions/Font+Extension.swift b/iOSClient/Extensions/Font+Extension.swift index ecab746ad8..4c5c4a953d 100644 --- a/iOSClient/Extensions/Font+Extension.swift +++ b/iOSClient/Extensions/Font+Extension.swift @@ -34,7 +34,7 @@ extension Font { // // Returns: // A SwiftUI Font configured for symbol rendering. - static func icon(_ size: CGFloat = 26, weight: Weight = .regular) -> Font { + static func icon(_ size: CGFloat = 21, weight: Weight = .regular) -> Font { .system(size: size, weight: weight) } } diff --git a/iOSClient/GUI/Lucid Banner/ErrorBannerView.swift b/iOSClient/GUI/Lucid Banner/ErrorBannerView.swift index f1a52ddf28..5a67182fd2 100644 --- a/iOSClient/GUI/Lucid Banner/ErrorBannerView.swift +++ b/iOSClient/GUI/Lucid Banner/ErrorBannerView.swift @@ -85,7 +85,7 @@ struct ErrorBannerView: View { HStack(alignment: .top, spacing: 10) { Image(systemName: state.payload.systemImage ?? "info.circle") .applyBannerAnimation(state.payload.imageAnimation) - .font(.icon()) + .font(.icon(26)) .foregroundStyle(state.payload.imageColor) VStack(alignment: .leading, spacing: 7) { diff --git a/iOSClient/GUI/Lucid Banner/InfoBannerView.swift b/iOSClient/GUI/Lucid Banner/InfoBannerView.swift index 5566a49a90..8da14cf75f 100644 --- a/iOSClient/GUI/Lucid Banner/InfoBannerView.swift +++ b/iOSClient/GUI/Lucid Banner/InfoBannerView.swift @@ -73,7 +73,7 @@ struct InfoBannerView: View { HStack(alignment: .top, spacing: 10) { Image(systemName: state.payload.systemImage ?? "info.circle") .applyBannerAnimation(state.payload.imageAnimation) - .font(.icon()) + .font(.icon(26)) .foregroundStyle(state.payload.imageColor) VStack(alignment: .leading, spacing: 7) { diff --git a/iOSClient/GUI/Lucid Banner/ShowBanner.swift b/iOSClient/GUI/Lucid Banner/ShowBanner.swift index 8627cbc277..71b8cbb3c0 100644 --- a/iOSClient/GUI/Lucid Banner/ShowBanner.swift +++ b/iOSClient/GUI/Lucid Banner/ShowBanner.swift @@ -88,7 +88,7 @@ struct BannerView: View { HStack(alignment: .top, spacing: 10) { Image(systemName: state.payload.systemImage ?? "info.circle") .applyBannerAnimation(state.payload.imageAnimation) - .font(.icon()) + .font(.icon(26)) .foregroundStyle(state.payload.imageColor) VStack(alignment: .leading, spacing: 7) { diff --git a/iOSClient/GUI/Lucid Banner/UploadBannerView.swift b/iOSClient/GUI/Lucid Banner/UploadBannerView.swift index ac95cb749e..e9d9e8c109 100644 --- a/iOSClient/GUI/Lucid Banner/UploadBannerView.swift +++ b/iOSClient/GUI/Lucid Banner/UploadBannerView.swift @@ -80,7 +80,7 @@ struct UploadBannerView: View { HStack(spacing: 5) { Image(systemName: state.payload.systemImage ?? "arrow.up.circle") .applyBannerAnimation(state.payload.imageAnimation) - .font(.icon()) + .font(.icon(26)) .foregroundStyle(state.payload.imageColor) if let p = state.payload.progress { @@ -145,7 +145,7 @@ struct UploadBannerView: View { if let systemImage = state.payload.systemImage { Image(systemName: systemImage) .applyBannerAnimation(state.payload.imageAnimation) - .font(.icon()) + .font(.icon(26)) .foregroundStyle(state.payload.imageColor) } diff --git a/iOSClient/GUI/Lucid Banner/WarningBannerView.swift b/iOSClient/GUI/Lucid Banner/WarningBannerView.swift index f1ba8d00dc..613c528d87 100644 --- a/iOSClient/GUI/Lucid Banner/WarningBannerView.swift +++ b/iOSClient/GUI/Lucid Banner/WarningBannerView.swift @@ -75,7 +75,7 @@ struct WarningBannerView: View { HStack(alignment: .top, spacing: 10) { Image(systemName: state.payload.systemImage ?? "info.circle") .applyBannerAnimation(state.payload.imageAnimation) - .font(.icon()) + .font(.icon(26)) .foregroundStyle(state.payload.imageColor) VStack(alignment: .leading, spacing: 7) { diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommonSelectTabBar.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommonSelectTabBar.swift index 3471eba477..5ae9be568e 100644 --- a/iOSClient/Main/Collection Common/NCCollectionViewCommonSelectTabBar.swift +++ b/iOSClient/Main/Collection Common/NCCollectionViewCommonSelectTabBar.swift @@ -151,7 +151,7 @@ struct NCCollectionViewCommonSelectTabBarView: View { tabBarSelect.delegate?.share() } label: { Image(systemName: "square.and.arrow.up") - .font(.icon()) + .font(.icon(23)) } .tint(Color(NCBrandColor.shared.iconImageColor)) .frame(maxWidth: .infinity) @@ -161,7 +161,7 @@ struct NCCollectionViewCommonSelectTabBarView: View { tabBarSelect.delegate?.move() } label: { Image(systemName: "rectangle.portrait.and.arrow.right") - .font(.icon()) + .font(.icon(23)) } .tint(Color(NCBrandColor.shared.iconImageColor)) .frame(maxWidth: .infinity) @@ -171,7 +171,7 @@ struct NCCollectionViewCommonSelectTabBarView: View { tabBarSelect.delegate?.delete() } label: { Image(systemName: "trash") - .font(.icon()) + .font(.icon(23)) } .tint(.red) .frame(maxWidth: .infinity) @@ -210,7 +210,7 @@ struct NCCollectionViewCommonSelectTabBarView: View { }) } label: { Image(systemName: "ellipsis.circle") - .font(.icon()) + .font(.icon(23)) } .tint(Color(NCBrandColor.shared.iconImageColor)) .frame(maxWidth: .infinity) diff --git a/iOSClient/Media/NCMediaSelectTabBar.swift b/iOSClient/Media/NCMediaSelectTabBar.swift index 19c979eb9b..8d77ae06a1 100644 --- a/iOSClient/Media/NCMediaSelectTabBar.swift +++ b/iOSClient/Media/NCMediaSelectTabBar.swift @@ -94,7 +94,7 @@ struct MediaTabBarSelectView: View { tabBarSelect.delegate?.share() } label: { Image(systemName: "square.and.arrow.up") - .font(.icon()) + .font(.icon(23)) } .tint(Color(NCBrandColor.shared.iconImageColor)) .frame(maxWidth: .infinity) @@ -104,7 +104,7 @@ struct MediaTabBarSelectView: View { tabBarSelect.delegate?.move() } label: { Image(systemName: "rectangle.portrait.and.arrow.right") - .font(.icon()) + .font(.icon(23)) } .tint(Color(NCBrandColor.shared.iconImageColor)) .frame(maxWidth: .infinity) @@ -114,7 +114,7 @@ struct MediaTabBarSelectView: View { tabBarSelect.delegate?.delete() } label: { Image(systemName: "trash") - .font(.icon()) + .font(.icon(23)) } .tint(.red) .frame(maxWidth: .infinity)