telegram ui style

Luma.xcodeproj/project.pbxproj

@@ -435,12 +435,12 @@
 		D8C81B9255E9886FB86E0785 /* InlineVideoPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlineVideoPlayer.swift; sourceTree = "<group>"; };
 		D9BBE412EAF54DFE968B2E54 /* ArchiveSyncCheckpoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchiveSyncCheckpoint.swift; sourceTree = "<group>"; };
 		D9FCE089ABBF05EF9F55D451 /* VideoNoteRecordingLifecycleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoNoteRecordingLifecycleTests.swift; sourceTree = "<group>"; };
-		DF8C531E464C9C4EDE2648C6 /* Luma.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Luma.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		DF8C531E464C9C4EDE2648C6 /* Luma.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Luma.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E619B2C85B0DD2E80653D6D3 /* VideoNoteRecordingCompletionPolicy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoNoteRecordingCompletionPolicy.swift; sourceTree = "<group>"; };
 		E6A5C32B4DACD56DA733A0DB /* ServerInformation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerInformation.swift; sourceTree = "<group>"; };
 		E9F226A1F8D82B39630F9CEB /* LumaRoomStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LumaRoomStore.swift; sourceTree = "<group>"; };
 		EA1D94FE541121DAE9DCE3B0 /* LegacyArchiveImporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegacyArchiveImporter.swift; sourceTree = "<group>"; };
-		EA54340DD785335237158BEF /* LumaMac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LumaMac.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		EA54340DD785335237158BEF /* LumaMac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = LumaMac.app; path = Luma.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F0A35C9A7B52458996513382 /* WatchVoiceRecorder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchVoiceRecorder.swift; sourceTree = "<group>"; };
 		F207C1B20DE3780F1754F81D /* ConnectionBanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionBanner.swift; sourceTree = "<group>"; };
 		F26F91180E43DE9C135B68C1 /* EmojiCatalog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiCatalog.swift; sourceTree = "<group>"; };
@@ -1295,7 +1295,7 @@
 				DEVELOPMENT_TEAM = K3AS449A74;
 				INFOPLIST_FILE = "Config/Luma-Info.plist";
 				INFOPLIST_KEY_CFBundleIconName = AppIcon;
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 26.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1554,7 +1554,7 @@
 				DEVELOPMENT_TEAM = K3AS449A74;
 				INFOPLIST_FILE = "Config/Luma-Info.plist";
 				INFOPLIST_KEY_CFBundleIconName = AppIcon;
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 26.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

Sources/Shared/UI/Components/ConnectionBanner.swift

@@ -2,53 +2,60 @@ import SwiftUI
 
 struct ConnectionBanner: View {
     @ObservedObject var model: AppModel
+    var text: String
 
     var body: some View {
         switch model.connectionStatus {
         case .connected:
             if model.isArchiveSyncing || !model.isOMEMOReady {
                 banner(
-                    icon: model.isArchiveSyncing ? "arrow.triangle.2.circlepath" : "lock.rotation",
-                    text: model.isArchiveSyncing ? "Синхронизация истории…" : "Публикация ключей OMEMO…",
-                    color: .blue,
+//                    text: model.isArchiveSyncing ? "Синхронизация истории…" : "Публикация ключей OMEMO…",
+                    text: "Обновление",
+                    color: .clear,
                     progress: true
                 )
+            } else {
+                Text(text)
+                    .font(.headline)
             }
         case .connecting:
-            banner(icon: "antenna.radiowaves.left.and.right", text: "Подключение…", color: .orange, progress: true)
-        case .disconnected(let reason):
-            HStack(spacing: 8) {
-                Image(systemName: "wifi.exclamationmark")
-                Text(reason ?? "Нет соединения")
-                    .lineLimit(1)
-                Spacer()
-                Button("Повторить") { Task { await model.reconnect() } }
-                    .buttonStyle(.borderless)
-                    .fontWeight(.semibold)
-            }
-            .font(.caption)
-            .foregroundStyle(.white)
-            .padding(.horizontal, 12)
-            .padding(.vertical, 8)
-            .background(Color.red.opacity(0.88))
+//            banner(icon: "antenna.radiowaves.left.and.right", text: "Подключение…", color: .clear, progress: true)
+            banner(text: "Подключение", color: .clear, progress: true)
+        case .disconnected:
+            banner(text: "Ожидание сети", color: .clear, progress: true)
+//            HStack(spacing: 8) {
+//                Image(systemName: "wifi.exclamationmark")
+//                Text(reason ?? "Нет соединения")
+//                    .lineLimit(1)
+//                Spacer()
+//                Button { Task { await model.reconnect() } } label: {
+//                    Label("Обновить", systemImage: "arrow.clockwise")
+//                }
+//                    .buttonStyle(.borderless)
+//                    .fontWeight(.semibold)
+//            }
+//            .font(.caption)
+//            .foregroundStyle(.white)
+//            .padding(.horizontal, 12)
+//            .padding(.vertical, 8)
+////            .background(Color.red.opacity(0.88))
+//            .background(Color.clear)
         }
     }
 
-    private func banner(icon: String, text: String, color: Color, progress: Bool) -> some View {
+    private func banner(text: String, color: Color, progress: Bool) -> some View {
         HStack(spacing: 8) {
             if progress {
                 ProgressView().controlSize(.mini).tint(.white)
-            } else {
-                Image(systemName: icon)
             }
             Text(text)
-            Spacer()
+//            Spacer()
         }
         .font(.caption)
         .foregroundStyle(.white)
-        .padding(.horizontal, 12)
-        .padding(.vertical, 8)
-        .background(color.opacity(0.88))
+//        .padding(.horizontal, 12)
+//        .padding(.vertical, 8)
+//        .background(color.opacity(0.88))
     }
 }
 

Sources/Shared/UI/NewChatView.swift

@@ -13,6 +13,9 @@ struct NewChatView: View {
                 Section("Контакт") {
                     TextField("user@example.org", text: $jid)
                         .disableAutocorrection(true)
+                    #if os(iOS)
+                        .keyboardType(.emailAddress)
+                    #endif
                     TextField("Имя (необязательно)", text: $name)
                 }
                 Section {

Sources/Shared/UI/NewGroupView.swift

@@ -19,6 +19,9 @@ struct NewGroupView: View {
                     VStack(alignment: .leading, spacing: 12) {
                         TextField("room@conference.example.org", text: $roomJID)
                             .disableAutocorrection(true)
+                        #if os(iOS)
+                            .keyboardType(.emailAddress)
+                        #endif
                         TextField("Название (необязательно)", text: $name)
                         TextField("Ваш псевдоним", text: $nickname)
                     }
@@ -31,6 +34,9 @@ struct NewGroupView: View {
                     VStack(alignment: .leading, spacing: 8) {
                         TextField("alice@example.org, bob@example.org", text: $invitees, axis: .vertical)
                             .lineLimit(2...5)
+                        #if os(iOS)
+                            .keyboardType(.emailAddress)
+                        #endif
                         Text("Укажите JID через запятую или с новой строки. Если комнаты ещё нет, Prosody создаст её с настройками по умолчанию.")
                             .font(.footnote)
                             .foregroundStyle(.secondary)

Sources/Shared/UI/ServerInfoView.swift

@@ -120,7 +120,7 @@ struct ServerInfoView: View {
             .font(.caption)
         }
         .frame(maxWidth: .infinity, alignment: .leading)
-        .listRowBackground(Color.clear)
+        .listRowBackground(Color.gray.opacity(0.16))
     }
 
     private func connectionRows() -> some View {
@@ -271,7 +271,7 @@ private extension ServerInformation.CapabilityStatus {
     var color: Color {
         switch self {
         case .success: return Color.green.opacity(0.16)
-        case .normal: return Color.clear
+        case .normal: return Color.gray.opacity(0.16)
         case .warning: return Color.orange.opacity(0.16)
         case .error: return Color.red.opacity(0.16)
         }

Sources/Shared/UI/SettingsView.swift

@@ -153,8 +153,13 @@ struct SettingsView: View {
                     }
                 }
             }
-            .navigationTitle("Настройки")
+            .navigationTitle("")
+            .navigationBarTitleDisplayMode(.inline)
             .toolbar {
+                ToolbarItem(placement: .principal) {
+                    Text("Настройки")
+                        .font(.headline)
+                }
                 if !presentedAsTab {
                     ToolbarItem(placement: .confirmationAction) {
                         Button("Готово") { dismiss() }

Sources/Shared/XMPP/LumaOMEMO2Module.swift

@@ -388,7 +388,7 @@ final class LumaOMEMO2Module: AbstractPEPModule, XmppModule {
 
     public func decode(message: Message, from: BareJID, serverMsgId: String? = nil) -> DecryptionResult<Message, SignalError> {
         guard context != nil else { return .failure(.unknown) }
-        guard let encryptedEl = message.findChild(name: "encrypted", xmlns: Self.XMLNS),
+        guard let encryptedEl = message.firstChild(name: "encrypted", xmlns: Self.XMLNS),
             let headerEl = encryptedEl.findChild(name: "header"),
             let sid = UInt32(headerEl.getAttribute("sid") ?? "")
         else {

Sources/Shared/XMPP/LumaSaslFailureModule.swift

@@ -29,7 +29,7 @@ final class LumaSaslFailureModule: XmppModuleBase, XmppModule {
 
     func process(stanza: Stanza) throws {
         let condition = stanza.findChild()?.name
-        let text = stanza.findChild(name: "text")?.value
+        let text = stanza.firstChild(name: "text")?.value
         lock.lock()
         stored = Failure(condition: condition, text: text)
         lock.unlock()