Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/Extensions/Font+Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
2 changes: 1 addition & 1 deletion iOSClient/GUI/Lucid Banner/ErrorBannerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/GUI/Lucid Banner/InfoBannerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/GUI/Lucid Banner/ShowBanner.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions iOSClient/GUI/Lucid Banner/UploadBannerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion iOSClient/GUI/Lucid Banner/WarningBannerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -171,7 +171,7 @@ struct NCCollectionViewCommonSelectTabBarView: View {
tabBarSelect.delegate?.delete()
} label: {
Image(systemName: "trash")
.font(.icon())
.font(.icon(23))
}
.tint(.red)
.frame(maxWidth: .infinity)
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions iOSClient/Media/NCMediaSelectTabBar.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -114,7 +114,7 @@ struct MediaTabBarSelectView: View {
tabBarSelect.delegate?.delete()
} label: {
Image(systemName: "trash")
.font(.icon())
.font(.icon(23))
}
.tint(.red)
.frame(maxWidth: .infinity)
Expand Down
Loading