From 66430d7fbd082f79fc9e6588041d0cbae030ff7b Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Thu, 31 Oct 2024 20:39:31 +0400 Subject: [PATCH] large titles --- apps/ios/Shared/Model/ChatModel.swift | 2 +- .../Views/Onboarding/ChooseServerOperators.swift | 6 ++---- apps/ios/SimpleXChat/APITypes.swift | 12 ++++++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/apps/ios/Shared/Model/ChatModel.swift b/apps/ios/Shared/Model/ChatModel.swift index 928b9b25e8..7362da8032 100644 --- a/apps/ios/Shared/Model/ChatModel.swift +++ b/apps/ios/Shared/Model/ChatModel.swift @@ -199,7 +199,7 @@ final class ChatModel: ObservableObject { @Published var draftChatId: String? @Published var networkInfo = UserNetworkInfo(networkType: .other, online: true) // server operators - @Published var serverOperators: [ServerOperator] = [ServerOperator.sampleData1, ServerOperator.sampleData2, ServerOperator.sampleData3] + @Published var serverOperators: [ServerOperator] = [ServerOperator.sampleData1, ServerOperator.sampleData2] // ServerOperator.sampleData3 var messageDelivery: Dictionary Void> = [:] diff --git a/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift b/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift index b83711713f..0c3106eaeb 100644 --- a/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift +++ b/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift @@ -93,12 +93,10 @@ struct ChooseServerOperators: View { let icon = checked ? "checkmark.circle.fill" : "circle" let iconColor = checked ? theme.colors.primary : Color(uiColor: .tertiaryLabel).asAnotherColorFromSecondary(theme) HStack(spacing: 10) { - Image(serverOperator.info.logo) + Image(serverOperator.info.largeLogo) .resizable() .scaledToFit() - .frame(width: 30, height: 30) - Text(serverOperator.name) - .font(.title2) + .frame(height: 48) Spacer() Image(systemName: icon) .resizable() diff --git a/apps/ios/SimpleXChat/APITypes.swift b/apps/ios/SimpleXChat/APITypes.swift index 42e8326f80..fec8a15e0b 100644 --- a/apps/ios/SimpleXChat/APITypes.swift +++ b/apps/ios/SimpleXChat/APITypes.swift @@ -1204,23 +1204,27 @@ public struct ServerOperatorInfo: Decodable { public var description: String public var website: String public var logo: String + public var largeLogo: String // TODO light/dark } public let operatorsInfo: Dictionary = [ .simplex: ServerOperatorInfo( description: "SimpleX Chat preset servers", website: "https://simplex.chat", - logo: "icon-transparent" + logo: "icon-transparent", + largeLogo: "logo" ), .xyz: ServerOperatorInfo( description: "XYZ servers", website: "XYZ website", - logo: "shield" + logo: "shield", + largeLogo: "logo" ), .demo: ServerOperatorInfo( description: "Demo operator", website: "Demo website", - logo: "icon-transparent" + logo: "icon-transparent", + largeLogo: "logo" ) ] @@ -1257,7 +1261,7 @@ public struct ServerOperator: Identifiable, Decodable { public var id: Int64 { operatorId } public var info: ServerOperatorInfo { - operatorsInfo[tag] ?? ServerOperatorInfo(description: "Default", website: "Default", logo: "icon-transparent") + operatorsInfo[tag] ?? ServerOperatorInfo(description: "Default", website: "Default", logo: "icon-transparent", largeLogo: "logo") } public static var sampleData1 = ServerOperator(