mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 01:20:12 +00:00
Replace plain SF Symbols with Compound counterparts
This commit is contained in:
@@ -6,6 +6,7 @@
|
|||||||
// Please see LICENSE files in the repository root for full details.
|
// Please see LICENSE files in the repository root for full details.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
import Compound
|
||||||
import CoreLocation
|
import CoreLocation
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
@@ -92,7 +93,7 @@ struct MapLibreStaticMapView<PinAnnotation: View>: View {
|
|||||||
placeholderImage
|
placeholderImage
|
||||||
.overlay {
|
.overlay {
|
||||||
VStack(spacing: 0) {
|
VStack(spacing: 0) {
|
||||||
Image(systemName: "arrow.clockwise")
|
CompoundIcon(\.restart)
|
||||||
Text(L10n.actionStaticMapLoad)
|
Text(L10n.actionStaticMapLoad)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
// Please see LICENSE files in the repository root for full details.
|
// Please see LICENSE files in the repository root for full details.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
import Compound
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct RoomListFiltersView: View {
|
struct RoomListFiltersView: View {
|
||||||
@@ -63,9 +64,9 @@ struct RoomListFiltersView: View {
|
|||||||
scrollViewProxy.scrollTo(leadingID, anchor: .leading)
|
scrollViewProxy.scrollTo(leadingID, anchor: .leading)
|
||||||
}
|
}
|
||||||
}, label: {
|
}, label: {
|
||||||
Image(systemName: "xmark.circle.fill")
|
CompoundIcon(\.close, size: .small, relativeTo: .compound.bodyLG)
|
||||||
.font(.system(size: 24))
|
.foregroundColor(.compound.iconOnSolidPrimary)
|
||||||
.foregroundColor(.compound.bgActionPrimaryRest)
|
.background(Circle().fill(Color.compound.bgActionPrimaryRest))
|
||||||
})
|
})
|
||||||
.accessibilityLabel(L10n.screenRoomlistClearFilters)
|
.accessibilityLabel(L10n.screenRoomlistClearFilters)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,9 +32,8 @@ struct HomeScreenNewSoundBanner: View {
|
|||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
|
||||||
Button(action: dismissAction) {
|
Button(action: dismissAction) {
|
||||||
Image(systemName: "xmark")
|
CompoundIcon(\.close, size: .small, relativeTo: .compound.bodyMD)
|
||||||
.foregroundColor(.compound.iconSecondary)
|
.foregroundColor(.compound.iconSecondary)
|
||||||
.frame(width: 12, height: 12)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -66,9 +66,8 @@ struct HomeScreenRecoveryKeyConfirmationBanner: View {
|
|||||||
Button {
|
Button {
|
||||||
context.send(viewAction: .skipRecoveryKeyConfirmation)
|
context.send(viewAction: .skipRecoveryKeyConfirmation)
|
||||||
} label: {
|
} label: {
|
||||||
Image(systemName: "xmark")
|
CompoundIcon(\.close, size: .small, relativeTo: .compound.bodyMD)
|
||||||
.foregroundColor(.compound.iconSecondary)
|
.foregroundColor(.compound.iconSecondary)
|
||||||
.frame(width: 12, height: 12)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-5
@@ -6,6 +6,7 @@
|
|||||||
// Please see LICENSE files in the repository root for full details.
|
// Please see LICENSE files in the repository root for full details.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
import Compound
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct RoomChangeRolesScreenSelectedItem: View {
|
struct RoomChangeRolesScreenSelectedItem: View {
|
||||||
@@ -48,11 +49,9 @@ struct RoomChangeRolesScreenSelectedItem: View {
|
|||||||
.overlay(alignment: .topTrailing) {
|
.overlay(alignment: .topTrailing) {
|
||||||
if let dismissAction {
|
if let dismissAction {
|
||||||
Button(action: dismissAction) {
|
Button(action: dismissAction) {
|
||||||
Image(systemName: "xmark.circle.fill")
|
CompoundIcon(\.close, size: .xSmall, relativeTo: .compound.bodyMD)
|
||||||
.resizable()
|
.foregroundColor(.compound.iconOnSolidPrimary)
|
||||||
.scaledFrame(size: 20)
|
.background(Circle().fill(Color.compound.iconPrimary))
|
||||||
.symbolRenderingMode(.palette)
|
|
||||||
.foregroundStyle(Color.compound.iconOnSolidPrimary, Color.compound.iconPrimary)
|
|
||||||
}
|
}
|
||||||
// We will use the accessibility action
|
// We will use the accessibility action
|
||||||
.accessibilityHidden(true)
|
.accessibilityHidden(true)
|
||||||
|
|||||||
+3
-2
@@ -6,6 +6,7 @@
|
|||||||
// Please see LICENSE files in the repository root for full details.
|
// Please see LICENSE files in the repository root for full details.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
import Compound
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct CollapsibleRoomTimelineView: View {
|
struct CollapsibleRoomTimelineView: View {
|
||||||
@@ -38,12 +39,12 @@ struct CollapsibleRoomTimelineView: View {
|
|||||||
} label: {
|
} label: {
|
||||||
HStack(alignment: .center, spacing: 8) {
|
HStack(alignment: .center, spacing: 8) {
|
||||||
Text(L10n.screenRoomTimelineStateChanges(timelineItem.items.count))
|
Text(L10n.screenRoomTimelineStateChanges(timelineItem.items.count))
|
||||||
Text(Image(systemName: "chevron.forward"))
|
.font(.compound.bodySM)
|
||||||
|
CompoundIcon(\.chevronRight, size: .small, relativeTo: .compound.bodySM)
|
||||||
.accessibilityLabel(isExpanded ? L10n.screenRoomGroupedStateEventsReduce : L10n.screenRoomGroupedStateEventsExpand)
|
.accessibilityLabel(isExpanded ? L10n.screenRoomGroupedStateEventsReduce : L10n.screenRoomGroupedStateEventsExpand)
|
||||||
.rotationEffect(.degrees(isExpanded ? 90 : 0))
|
.rotationEffect(.degrees(isExpanded ? 90 : 0))
|
||||||
.animation(.elementDefault, value: isExpanded)
|
.animation(.elementDefault, value: isExpanded)
|
||||||
}
|
}
|
||||||
.font(.compound.bodySM)
|
|
||||||
.foregroundColor(.compound.textSecondary)
|
.foregroundColor(.compound.textSecondary)
|
||||||
.padding(.horizontal, 36.0)
|
.padding(.horizontal, 36.0)
|
||||||
.padding(.vertical, 12.0)
|
.padding(.vertical, 12.0)
|
||||||
|
|||||||
+1
-3
@@ -63,9 +63,7 @@ struct VideoRoomTimelineView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var playIcon: some View {
|
var playIcon: some View {
|
||||||
Image(systemName: "play.circle.fill")
|
CompoundIcon(\.playSolid, size: .custom(50), relativeTo: .compound.headingLG)
|
||||||
.resizable()
|
|
||||||
.frame(width: 50, height: 50)
|
|
||||||
.background(.ultraThinMaterial, in: Circle())
|
.background(.ultraThinMaterial, in: Circle())
|
||||||
.foregroundColor(.white)
|
.foregroundColor(.white)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user