diff --git a/ElementX/Resources/Assets.xcassets/images/letro-icon-new.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/letro-icon-new.imageset/Contents.json new file mode 100644 index 000000000..018926ba7 --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/letro-icon-new.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "letro-icon-new.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ElementX/Resources/Assets.xcassets/images/letro-icon-new.imageset/letro-icon-new.svg b/ElementX/Resources/Assets.xcassets/images/letro-icon-new.imageset/letro-icon-new.svg new file mode 100644 index 000000000..1951f3b4f --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/letro-icon-new.imageset/letro-icon-new.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/ElementX/Sources/Generated/Assets.swift b/ElementX/Sources/Generated/Assets.swift index e7539ec9e..e49568753 100644 --- a/ElementX/Sources/Generated/Assets.swift +++ b/ElementX/Sources/Generated/Assets.swift @@ -37,6 +37,7 @@ internal enum Asset { internal static let letroHeader2 = ImageAsset(name: "images/letro-header-2") internal static let letroIconChat = ImageAsset(name: "images/letro-icon-chat") internal static let letroIconChatSolid = ImageAsset(name: "images/letro-icon-chatSolid") + internal static let letroIconNew = ImageAsset(name: "images/letro-icon-new") internal static let letroIconSpace = ImageAsset(name: "images/letro-icon-space") internal static let letroIconSpaceSolid = ImageAsset(name: "images/letro-icon-spaceSolid") internal static let letroLogoType = ImageAsset(name: "images/letro-logo-type") diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift index 2a52b9504..6732c20e4 100644 --- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift +++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift @@ -57,12 +57,15 @@ struct HomeScreen: View { .buttonStyle(.borderless) } - ToolbarItem(placement: .primaryAction) { - if #available(iOS 26, *) { + // Letro: custom new button + if #available(iOS 26, *) { + ToolbarItem(placement: .primaryAction) { newRoomButton - } else { + } + .sharedBackgroundVisibility(.hidden) + } else { + ToolbarItem(placement: .primaryAction) { newRoomButton - .buttonStyle(.compound(.super, size: .toolbarIcon)) } } @@ -105,7 +108,10 @@ struct HomeScreen: View { Button { context.send(viewAction: .startChat) } label: { - CompoundIcon(\.plus) + // Letro: custom new button + Image(asset: Asset.Images.letroIconNew) + .resizable() + .frame(width: 32, height: 32) } .accessibilityLabel(L10n.actionStartChat) .accessibilityIdentifier(A11yIdentifiers.homeScreen.startChat) diff --git a/ElementX/Sources/Screens/Spaces/SpacesScreen/View/SpacesScreen.swift b/ElementX/Sources/Screens/Spaces/SpacesScreen/View/SpacesScreen.swift index 6db2229d2..a35a2f8bd 100644 --- a/ElementX/Sources/Screens/Spaces/SpacesScreen/View/SpacesScreen.swift +++ b/ElementX/Sources/Screens/Spaces/SpacesScreen/View/SpacesScreen.swift @@ -118,14 +118,30 @@ struct SpacesScreen: View { } .backportSharedBackgroundVisibility(.hidden) - ToolbarItem(placement: .navigationBarTrailing) { - Button { - context.send(viewAction: .createSpace) - } label: { - CompoundIcon(\.plus) - .accessibilityHidden(true) + // Letro: custom new button + if #available(iOS 26, *) { + ToolbarItem(placement: .navigationBarTrailing) { + Button { + context.send(viewAction: .createSpace) + } label: { + Image(asset: Asset.Images.letroIconNew) + .resizable() + .frame(width: 32, height: 32) + .accessibilityHidden(true) + } + .accessibilityLabel(L10n.actionCreateSpace) + } + .sharedBackgroundVisibility(.hidden) + } else { + ToolbarItem(placement: .navigationBarTrailing) { + Button { + context.send(viewAction: .createSpace) + } label: { + Image(asset: Asset.Images.letroIconNew) + .accessibilityHidden(true) + } + .accessibilityLabel(L10n.actionCreateSpace) } - .accessibilityLabel(L10n.actionCreateSpace) } } }