diff --git a/Swiftgram/SGSettingsUI/Sources/SGSettingsController.swift b/Swiftgram/SGSettingsUI/Sources/SGSettingsController.swift index da487fa1c9..ae69457ab1 100644 --- a/Swiftgram/SGSettingsUI/Sources/SGSettingsController.swift +++ b/Swiftgram/SGSettingsUI/Sources/SGSettingsController.swift @@ -40,6 +40,7 @@ private enum SGControllerSection: Int32, SGItemListSection { case photo case stickers case videoNotes + case messageSelection case contextMenu case accountColors case other @@ -68,7 +69,9 @@ private enum SGBoolSetting: String { case showRepostToStory case contextShowSelectFromUser case contextShowSaveToCloud + case selectionShowSaveToCloudButton case contextShowHideForwardName + case selectionShowHideForwardNameButton case contextShowRestrict case contextShowReport case contextShowReply @@ -258,6 +261,10 @@ private func SGControllerEntries(presentationData: PresentationData, callListSet entries.append(.header(id: id.count, section: .videoNotes, text: i18n("Settings.VideoNotes.Header", lang), badge: nil)) entries.append(.toggle(id: id.count, section: .videoNotes, settingName: .startTelescopeWithRearCam, value: SGSimpleSettings.shared.startTelescopeWithRearCam, text: i18n("Settings.VideoNotes.StartWithRearCam", lang), enabled: true)) + + entries.append(.header(id: id.count, section: .messageSelection, text: i18n("Settings.MessageSelection.Header", lang), badge: nil)) + entries.append(.toggle(id: id.count, section: .messageSelection, settingName: .selectionShowSaveToCloudButton, value: SGSimpleSettings.shared.selectionShowSaveToCloudButton, text: i18n("Settings.Selection.SaveToCloudButton", lang), enabled: true)) + entries.append(.toggle(id: id.count, section: .messageSelection, settingName: .selectionShowHideForwardNameButton, value: SGSimpleSettings.shared.selectionShowHideForwardNameButton, text: i18n("Settings.Selection.HideSenderNamesButton", lang), enabled: true)) entries.append(.header(id: id.count, section: .contextMenu, text: i18n("Settings.ContextMenu", lang), badge: nil)) entries.append(.notice(id: id.count, section: .contextMenu, text: i18n("Settings.ContextMenu.Notice", lang))) @@ -426,10 +433,14 @@ public func sgSettingsController(context: AccountContext/*, focusOnItemTag: Int? SGSimpleSettings.shared.contextShowSelectFromUser = value case .contextShowSaveToCloud: SGSimpleSettings.shared.contextShowSaveToCloud = value + case .selectionShowSaveToCloudButton: + SGSimpleSettings.shared.selectionShowSaveToCloudButton = value case .contextShowRestrict: SGSimpleSettings.shared.contextShowRestrict = value case .contextShowHideForwardName: SGSimpleSettings.shared.contextShowHideForwardName = value + case .selectionShowHideForwardNameButton: + SGSimpleSettings.shared.selectionShowHideForwardNameButton = value case .disableScrollToNextChannel: SGSimpleSettings.shared.disableScrollToNextChannel = !value case .disableScrollToNextTopic: diff --git a/Swiftgram/SGSimpleSettings/Sources/SimpleSettings.swift b/Swiftgram/SGSimpleSettings/Sources/SimpleSettings.swift index 2db47deb51..95a890a47b 100644 --- a/Swiftgram/SGSimpleSettings/Sources/SimpleSettings.swift +++ b/Swiftgram/SGSimpleSettings/Sources/SimpleSettings.swift @@ -74,7 +74,9 @@ public class SGSimpleSettings { { let _ = self.hideRecordingButton }, { let _ = self.inputToolbar }, { let _ = self.dismissedSGSuggestions }, - { let _ = self.customAppBadge } + { let _ = self.customAppBadge }, + { let _ = self.selectionShowSaveToCloudButton }, + { let _ = self.selectionShowHideForwardNameButton }, ] tasks.forEach { task in @@ -117,7 +119,9 @@ public class SGSimpleSettings { case contextShowSaveToCloud case contextShowRestrict // case contextShowBan + case selectionShowSaveToCloudButton case contextShowHideForwardName + case selectionShowHideForwardNameButton case contextShowReport case contextShowReply case contextShowPin @@ -275,7 +279,9 @@ public class SGSimpleSettings { Keys.contextShowSaveToCloud.rawValue: true, Keys.contextShowRestrict.rawValue: true, // Keys.contextShowBan.rawValue: true, + Keys.selectionShowSaveToCloudButton.rawValue: true, Keys.contextShowHideForwardName.rawValue: true, + Keys.selectionShowHideForwardNameButton.rawValue: true, Keys.contextShowReport.rawValue: true, Keys.contextShowReply.rawValue: true, Keys.contextShowPin.rawValue: true, @@ -422,9 +428,15 @@ public class SGSimpleSettings { @UserDefault(key: Keys.contextShowSaveToCloud.rawValue) public var contextShowSaveToCloud: Bool + @UserDefault(key: Keys.selectionShowSaveToCloudButton.rawValue) + public var selectionShowSaveToCloudButton: Bool + @UserDefault(key: Keys.contextShowHideForwardName.rawValue) public var contextShowHideForwardName: Bool + @UserDefault(key: Keys.selectionShowHideForwardNameButton.rawValue) + public var selectionShowHideForwardNameButton: Bool + @UserDefault(key: Keys.contextShowReport.rawValue) public var contextShowReport: Bool diff --git a/Swiftgram/SGStrings/Strings/af.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/af.lproj/SGLocalizable.strings index 5acfe970d5..002e4f648a 100644 --- a/Swiftgram/SGStrings/Strings/af.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/af.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Stoor na Wolk"; "ContextMenu.SelectFromUser" = "Kies vanaf Outeur"; +"Settings.MessageSelection.Header" = "BOODSKAPKEUSE"; +"Settings.Selection.SaveToCloudButton" = "Stoor na Wolk-knoppie"; +"Settings.Selection.HideSenderNamesButton" = "Knoppie om senders se name te versteek"; "Settings.ContextMenu" = "KONTEKSMENU"; "Settings.ContextMenu.Notice" = "Gedeaktiveerde inskrywings sal beskikbaar wees in die \"Swiftgram\" sub-menu."; diff --git a/Swiftgram/SGStrings/Strings/ar.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/ar.lproj/SGLocalizable.strings index 41f1168454..fd9c5bf91f 100644 --- a/Swiftgram/SGStrings/Strings/ar.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/ar.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "الحفظ في السحابة"; "ContextMenu.SelectFromUser" = "حدد من المؤلف"; +"Settings.MessageSelection.Header" = "تحديد الرسائل"; +"Settings.Selection.SaveToCloudButton" = "زر الحفظ في السحابة"; +"Settings.Selection.HideSenderNamesButton" = "زر إخفاء أسماء المرسلين"; "Settings.ContextMenu" = "قائمة السياق"; "Settings.ContextMenu.Notice" = "المدخلات المعطلة ستكون متوفرة في القائمة الفرعية \"Swiftgram\"."; diff --git a/Swiftgram/SGStrings/Strings/ca.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/ca.lproj/SGLocalizable.strings index a48c45fa92..bb2ea20139 100644 --- a/Swiftgram/SGStrings/Strings/ca.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/ca.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Desar al Núvol"; "ContextMenu.SelectFromUser" = "Seleccionar de l'Autor"; +"Settings.MessageSelection.Header" = "SELECCIÓ DE MISSATGES"; +"Settings.Selection.SaveToCloudButton" = "Botó de Desar al Núvol"; +"Settings.Selection.HideSenderNamesButton" = "Botó d'Amagar els Noms dels Remitents"; "Settings.ContextMenu" = "MENÚ CONTEXTUAL"; "Settings.ContextMenu.Notice" = "Les entrades desactivades estaran disponibles al submenú \"Swiftgram\"."; diff --git a/Swiftgram/SGStrings/Strings/cs.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/cs.lproj/SGLocalizable.strings index 05cf6ed482..41d798b9e1 100644 --- a/Swiftgram/SGStrings/Strings/cs.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/cs.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Uložit do cloudu"; "ContextMenu.SelectFromUser" = "Vybrat od autora"; +"Settings.MessageSelection.Header" = "VÝBĚR ZPRÁV"; +"Settings.Selection.SaveToCloudButton" = "Tlačítko Uložit do cloudu"; +"Settings.Selection.HideSenderNamesButton" = "Tlačítko Skrýt jména odesílatelů"; "Settings.ContextMenu" = "KONTEXTOVÉ MENU"; "Settings.ContextMenu.Notice" = "Zakázané položky budou dostupné v podmenu \"Swiftgram\"."; diff --git a/Swiftgram/SGStrings/Strings/da.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/da.lproj/SGLocalizable.strings index cb0c4174db..fed47b8063 100644 --- a/Swiftgram/SGStrings/Strings/da.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/da.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "In Cloud speichern"; "ContextMenu.SelectFromUser" = "Vælg fra Forfatter"; +"Settings.MessageSelection.Header" = "VALG AF BESKEDER"; +"Settings.Selection.SaveToCloudButton" = "Knap til at gemme i skyen"; +"Settings.Selection.HideSenderNamesButton" = "Knap til at skjule afsendernavne"; "Settings.ContextMenu" = "KONTEKSTMENU"; "Settings.ContextMenu.Notice" = "Deaktiverede indgange vil være tilgængelige i \"Swiftgram\" undermenuen."; diff --git a/Swiftgram/SGStrings/Strings/de.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/de.lproj/SGLocalizable.strings index 726e485dcf..9aac82750b 100644 --- a/Swiftgram/SGStrings/Strings/de.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/de.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "In Cloud speichern"; "ContextMenu.SelectFromUser" = "Vom Autor auswählen"; +"Settings.MessageSelection.Header" = "NACHRICHTENAUSWAHL"; +"Settings.Selection.SaveToCloudButton" = "Schaltfläche In Cloud speichern"; +"Settings.Selection.HideSenderNamesButton" = "Schaltfläche Absendernamen verbergen"; "Settings.ContextMenu" = "KONTEXTMENÜ"; "Settings.ContextMenu.Notice" = "Deaktivierte Einträge sind im 'Swiftgram'-Untermenü verfügbar."; diff --git a/Swiftgram/SGStrings/Strings/el.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/el.lproj/SGLocalizable.strings index 010c2fd7ed..333d716c7f 100644 --- a/Swiftgram/SGStrings/Strings/el.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/el.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Αποθήκευση στο σύννεφο"; "ContextMenu.SelectFromUser" = "Επιλέξτε από τον Συγγραφέα"; +"Settings.MessageSelection.Header" = "ΕΠΙΛΟΓΗ ΜΗΝΥΜΑΤΩΝ"; +"Settings.Selection.SaveToCloudButton" = "Κουμπί Αποθήκευση στο σύννεφο"; +"Settings.Selection.HideSenderNamesButton" = "Κουμπί Απόκρυψη ονομάτων αποστολέων"; "Settings.ContextMenu" = "KONTEXTMENÜ"; "Settings.ContextMenu.Notice" = "Deaktivierte Einträge sind im 'Swiftgram'-Untermenü verfügbar."; diff --git a/Swiftgram/SGStrings/Strings/en.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/en.lproj/SGLocalizable.strings index 0383460b65..116fdf94d1 100644 --- a/Swiftgram/SGStrings/Strings/en.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/en.lproj/SGLocalizable.strings @@ -120,6 +120,9 @@ "ContextMenu.SaveToCloud" = "Save to Cloud"; "ContextMenu.SelectFromUser" = "Select from Author"; +"Settings.MessageSelection.Header" = "MESSAGE SELECTION"; +"Settings.Selection.SaveToCloudButton" = "Save to Cloud Button"; +"Settings.Selection.HideSenderNamesButton" = "Hide Senders' Names Button"; "Settings.ContextMenu" = "CONTEXT MENU"; "Settings.ContextMenu.Notice" = "Disabled entries will be available in \"Swiftgram\" sub-menu."; diff --git a/Swiftgram/SGStrings/Strings/es.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/es.lproj/SGLocalizable.strings index 4fcb6aee08..4bf79cf572 100644 --- a/Swiftgram/SGStrings/Strings/es.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/es.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Guardar en la nube"; "ContextMenu.SelectFromUser" = "Seleccionar del autor"; +"Settings.MessageSelection.Header" = "SELECCIÓN DE MENSAJES"; +"Settings.Selection.SaveToCloudButton" = "Botón Guardar en la nube"; +"Settings.Selection.HideSenderNamesButton" = "Botón Ocultar nombres de remitentes"; "Settings.ContextMenu" = "MENÚ CONTEXTUAL"; "Settings.ContextMenu.Notice" = "Las entradas desactivadas estarán disponibles en el submenú \"Swiftgram\"."; diff --git a/Swiftgram/SGStrings/Strings/fa.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/fa.lproj/SGLocalizable.strings index 1581d63536..3f4a7b09fb 100644 --- a/Swiftgram/SGStrings/Strings/fa.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/fa.lproj/SGLocalizable.strings @@ -7,3 +7,6 @@ "Settings.ShowProfileID" = "نمایش ایدی پروفایل"; "Settings.Translation.QuickTranslateButton" = "دکمه ترجمه سریع"; "ContextMenu.SaveToCloud" = "ذخیره در فضای ابری"; +"Settings.MessageSelection.Header" = "انتخاب پیام‌ها"; +"Settings.Selection.SaveToCloudButton" = "دکمه ذخیره در فضای ابری"; +"Settings.Selection.HideSenderNamesButton" = "دکمه پنهان کردن نام فرستندگان"; diff --git a/Swiftgram/SGStrings/Strings/fi.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/fi.lproj/SGLocalizable.strings index 3e7ea96fbf..74404a91a8 100644 --- a/Swiftgram/SGStrings/Strings/fi.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/fi.lproj/SGLocalizable.strings @@ -96,6 +96,9 @@ "ContextMenu.SaveToCloud" = "Tallenna Pilveen"; "ContextMenu.SelectFromUser" = "Valitse Tekijältä"; +"Settings.MessageSelection.Header" = "VIESTIEN VALINTA"; +"Settings.Selection.SaveToCloudButton" = "Tallenna pilveen -painike"; +"Settings.Selection.HideSenderNamesButton" = "Piilota lähettäjien nimet -painike"; "Settings.ContextMenu" = "KONTEKSTIVALIKKO"; "Settings.ContextMenu.Notice" = "Poistetut kohteet ovat saatavilla 'Swiftgram'-alavalikossa."; diff --git a/Swiftgram/SGStrings/Strings/fr.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/fr.lproj/SGLocalizable.strings index adc9a1b3d3..847f671eb5 100644 --- a/Swiftgram/SGStrings/Strings/fr.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/fr.lproj/SGLocalizable.strings @@ -94,6 +94,9 @@ "ContextMenu.SaveToCloud" = "Sauvegarder dans le cloud"; "ContextMenu.SelectFromUser" = "Sélectionner de l'Auteur"; +"Settings.MessageSelection.Header" = "SÉLECTION DE MESSAGES"; +"Settings.Selection.SaveToCloudButton" = "Bouton Sauvegarder dans le cloud"; +"Settings.Selection.HideSenderNamesButton" = "Bouton Masquer les noms des expéditeurs"; "Settings.ContextMenu" = "MENU CONTEXTUEL"; "Settings.ContextMenu.Notice" = "Les entrées désactivées seront disponibles dans le sous-menu 'Swiftgram'."; diff --git a/Swiftgram/SGStrings/Strings/he.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/he.lproj/SGLocalizable.strings index eb4562b7c8..91f5930dd2 100644 --- a/Swiftgram/SGStrings/Strings/he.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/he.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "שמור בענן"; "ContextMenu.SelectFromUser" = "בחר מהמשתמש"; +"Settings.MessageSelection.Header" = "בחירת הודעות"; +"Settings.Selection.SaveToCloudButton" = "כפתור שמירה בענן"; +"Settings.Selection.HideSenderNamesButton" = "כפתור הסתרת שמות השולחים"; "Settings.ContextMenu" = "תפריט הקשר"; "Settings.ContextMenu.Notice" = "פריטים מבוטלים יהיו זמינים בתת-תפריט 'Swiftgram'."; diff --git a/Swiftgram/SGStrings/Strings/hi.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/hi.lproj/SGLocalizable.strings index 6adc148a1d..e1019287d9 100644 --- a/Swiftgram/SGStrings/Strings/hi.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/hi.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "क्लाउड में सहेजें"; "ContextMenu.SelectFromUser" = "लेखक में से चुनें"; +"Settings.MessageSelection.Header" = "संदेश चयन"; +"Settings.Selection.SaveToCloudButton" = "क्लाउड में सहेजें बटन"; +"Settings.Selection.HideSenderNamesButton" = "प्रेषकों के नाम छिपाने का बटन"; "Settings.ContextMenu" = "संदर्भ मेनू"; "Settings.ContextMenu.Notice" = "अक्षम प्रविष्टियाँ \"स्विफ्टग्राम\" उप-मेनू में उपलब्ध होंगी।"; diff --git a/Swiftgram/SGStrings/Strings/hu.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/hu.lproj/SGLocalizable.strings index d357bb69b6..ad5d9e21b0 100644 --- a/Swiftgram/SGStrings/Strings/hu.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/hu.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Mentés a Felhőbe"; "ContextMenu.SelectFromUser" = "Kiválasztás a Szerzőtől"; +"Settings.MessageSelection.Header" = "ÜZENETEK KIJELÖLÉSE"; +"Settings.Selection.SaveToCloudButton" = "Mentés a Felhőbe gomb"; +"Settings.Selection.HideSenderNamesButton" = "Feladónevek elrejtése gomb"; "Settings.ContextMenu" = "KONTEXTUS MENÜ"; "Settings.ContextMenu.Notice" = "A kikapcsolt bejegyzések elérhetők lesznek a 'Swiftgram' almenüjében."; diff --git a/Swiftgram/SGStrings/Strings/id.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/id.lproj/SGLocalizable.strings index 44ba7a11a2..4d4387d03c 100644 --- a/Swiftgram/SGStrings/Strings/id.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/id.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Simpan ke Cloud"; "ContextMenu.SelectFromUser" = "Pilih dari Penulis"; +"Settings.MessageSelection.Header" = "PILIHAN PESAN"; +"Settings.Selection.SaveToCloudButton" = "Tombol Simpan ke Cloud"; +"Settings.Selection.HideSenderNamesButton" = "Tombol Sembunyikan Nama Pengirim"; "Settings.ContextMenu" = "MENU KONTEKS"; "Settings.ContextMenu.Notice" = "Entri yang dinonaktifkan akan tersedia di sub-menu \"Swiftgram\"."; diff --git a/Swiftgram/SGStrings/Strings/it.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/it.lproj/SGLocalizable.strings index ca32eafb8c..be79e4ad8a 100644 --- a/Swiftgram/SGStrings/Strings/it.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/it.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Salva sul cloud"; "ContextMenu.SelectFromUser" = "Seleziona dall'autore"; +"Settings.MessageSelection.Header" = "SELEZIONE MESSAGGI"; +"Settings.Selection.SaveToCloudButton" = "Pulsante Salva sul cloud"; +"Settings.Selection.HideSenderNamesButton" = "Pulsante Nascondi nomi dei mittenti"; "Settings.ContextMenu" = "MENU CONTESTUALE"; "Settings.ContextMenu.Notice" = "Le voci disabilitate saranno disponibili nel sottomenu \"Swiftgram\"."; diff --git a/Swiftgram/SGStrings/Strings/ja.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/ja.lproj/SGLocalizable.strings index afe45d6566..5e57e511a6 100644 --- a/Swiftgram/SGStrings/Strings/ja.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/ja.lproj/SGLocalizable.strings @@ -97,6 +97,9 @@ "ContextMenu.SaveToCloud" = "メッセージを保存"; "ContextMenu.SelectFromUser" = "全て選択"; +"Settings.MessageSelection.Header" = "メッセージ選択"; +"Settings.Selection.SaveToCloudButton" = "「メッセージを保存」ボタン"; +"Settings.Selection.HideSenderNamesButton" = "「送信者名を隠す」ボタン"; "Settings.ContextMenu" = "コンテキスト メニュー"; "Settings.ContextMenu.Notice" = "無効化されたエントリは、「Swiftgram」サブメニューから利用できます。"; diff --git a/Swiftgram/SGStrings/Strings/km.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/km.lproj/SGLocalizable.strings index 928cf393a6..83ae5ec48f 100644 --- a/Swiftgram/SGStrings/Strings/km.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/km.lproj/SGLocalizable.strings @@ -6,3 +6,6 @@ "Settings.HidePhoneInSettingsUI" = "លាក់លេខទូរសព្ទក្នុងការកំណត់"; "Settings.Folders.BottomTab" = "ថតឯបាត"; "ContextMenu.SaveToCloud" = "រក្សាទុកទៅពពក"; +"Settings.MessageSelection.Header" = "ការជ្រើសរើសសារ"; +"Settings.Selection.SaveToCloudButton" = "ប៊ូតុងរក្សាទុកទៅពពក"; +"Settings.Selection.HideSenderNamesButton" = "ប៊ូតុងលាក់ឈ្មោះអ្នកផ្ញើ"; diff --git a/Swiftgram/SGStrings/Strings/ko.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/ko.lproj/SGLocalizable.strings index 501a5f64b4..363102f3d6 100644 --- a/Swiftgram/SGStrings/Strings/ko.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/ko.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "클라우드에 저장"; "ContextMenu.SelectFromUser" = "사용자에서 선택"; +"Settings.MessageSelection.Header" = "메시지 선택"; +"Settings.Selection.SaveToCloudButton" = "클라우드에 저장 버튼"; +"Settings.Selection.HideSenderNamesButton" = "보낸 사람 이름 숨기기 버튼"; "Settings.ContextMenu" = "컨텍스트 메뉴"; "Settings.ContextMenu.Notice" = "'Swiftgram' 하위 메뉴에서 비활성화된 항목을 사용할 수 있습니다."; diff --git a/Swiftgram/SGStrings/Strings/ku.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/ku.lproj/SGLocalizable.strings index 62ac20a89c..7dee25bbed 100644 --- a/Swiftgram/SGStrings/Strings/ku.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/ku.lproj/SGLocalizable.strings @@ -8,3 +8,6 @@ "Settings.Translation.QuickTranslateButton" = "دوگمەی وەرگێڕانی خێرا"; "Settings.Folders.BottomTab" = "بوخچەکان لە خوارەوە"; "ContextMenu.SaveToCloud" = "هەڵگرتن لە کڵاود"; +"Settings.MessageSelection.Header" = "هەڵبژاردنی پەیامەکان"; +"Settings.Selection.SaveToCloudButton" = "دوگمەی هەڵگرتن لە کڵاود"; +"Settings.Selection.HideSenderNamesButton" = "دوگمەی شاردنەوەی ناوی نێرەرەکان"; diff --git a/Swiftgram/SGStrings/Strings/nl.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/nl.lproj/SGLocalizable.strings index d80e6ca49e..58a615050d 100644 --- a/Swiftgram/SGStrings/Strings/nl.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/nl.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Opslaan in de Cloud"; "ContextMenu.SelectFromUser" = "Selecteer van Auteur"; +"Settings.MessageSelection.Header" = "BERICHTSELECTIE"; +"Settings.Selection.SaveToCloudButton" = "Knop Opslaan in de cloud"; +"Settings.Selection.HideSenderNamesButton" = "Knop Namen van afzenders verbergen"; "Settings.ContextMenu" = "CONTEXTMENU"; "Settings.ContextMenu.Notice" = "Uitgeschakelde items zijn beschikbaar in het 'Swiftgram'-submenu."; diff --git a/Swiftgram/SGStrings/Strings/no.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/no.lproj/SGLocalizable.strings index 5fd16d5c62..b257aacc2a 100644 --- a/Swiftgram/SGStrings/Strings/no.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/no.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Lagre til skyen"; "ContextMenu.SelectFromUser" = "Velg fra forfatter"; +"Settings.MessageSelection.Header" = "MELDINGSVALG"; +"Settings.Selection.SaveToCloudButton" = "Lagre til skyen-knapp"; +"Settings.Selection.HideSenderNamesButton" = "Skjul avsendernavn-knapp"; "Settings.ContextMenu" = "KONTEKSTMENY"; "Settings.ContextMenu.Notice" = "Deaktiverte oppføringer vil være tilgjengelige i 'Swiftgram'-undermenyen."; diff --git a/Swiftgram/SGStrings/Strings/pl.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/pl.lproj/SGLocalizable.strings index 9efb5c2247..6075eb24d5 100644 --- a/Swiftgram/SGStrings/Strings/pl.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/pl.lproj/SGLocalizable.strings @@ -96,6 +96,9 @@ "ContextMenu.SaveToCloud" = "Zapisz w chmurze"; "ContextMenu.SelectFromUser" = "Zaznacz od autora"; +"Settings.MessageSelection.Header" = "WYBÓR WIADOMOŚCI"; +"Settings.Selection.SaveToCloudButton" = "Przycisk Zapisz w chmurze"; +"Settings.Selection.HideSenderNamesButton" = "Przycisk Ukryj nazwy nadawców"; "Settings.ContextMenu" = "MENU KONTEKSTOWE"; "Settings.ContextMenu.Notice" = "Wyłączone wpisy będą dostępne w podmenu „Swiftgram”."; diff --git a/Swiftgram/SGStrings/Strings/pt.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/pt.lproj/SGLocalizable.strings index a45973f988..a4d54ecd42 100644 --- a/Swiftgram/SGStrings/Strings/pt.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/pt.lproj/SGLocalizable.strings @@ -115,6 +115,9 @@ "ContextMenu.SaveToCloud" = "Salvar na Nuvem"; "ContextMenu.SelectFromUser" = "Selecionar do Autor"; +"Settings.MessageSelection.Header" = "SELEÇÃO DE MENSAGENS"; +"Settings.Selection.SaveToCloudButton" = "Botão Salvar na Nuvem"; +"Settings.Selection.HideSenderNamesButton" = "Botão Ocultar nomes dos remetentes"; "Settings.ContextMenu" = "MENU DE CONTEXTO"; "Settings.ContextMenu.Notice" = "Entradas desativadas estarão disponíveis no sub-menu 'Swiftgram'."; diff --git a/Swiftgram/SGStrings/Strings/ro.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/ro.lproj/SGLocalizable.strings index ccb2ad1e46..d2b38f424b 100644 --- a/Swiftgram/SGStrings/Strings/ro.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/ro.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Salvează în Cloud"; "ContextMenu.SelectFromUser" = "Selectați din autor"; +"Settings.MessageSelection.Header" = "SELECTAREA MESAJELOR"; +"Settings.Selection.SaveToCloudButton" = "Buton Salvează în Cloud"; +"Settings.Selection.HideSenderNamesButton" = "Buton Ascunde numele expeditorilor"; "Settings.ContextMenu" = "MENIU CONTEXTUAL"; "Settings.ContextMenu.Notice" = "Intrările dezactivate vor fi disponibile în submeniul 'Swiftgram'."; diff --git a/Swiftgram/SGStrings/Strings/ru.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/ru.lproj/SGLocalizable.strings index 0488ecf5f3..d3619158b2 100644 --- a/Swiftgram/SGStrings/Strings/ru.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/ru.lproj/SGLocalizable.strings @@ -115,6 +115,9 @@ "ContextMenu.SaveToCloud" = "Сохранить в Избранное"; "ContextMenu.SelectFromUser" = "Выбрать от Автора"; +"Settings.MessageSelection.Header" = "ВЫБОР СООБЩЕНИЙ"; +"Settings.Selection.SaveToCloudButton" = "Кнопка «Сохранить в Избранное»"; +"Settings.Selection.HideSenderNamesButton" = "Кнопка «Скрыть имена отправителей»"; "Settings.ContextMenu" = "КОНТЕКСТНОЕ МЕНЮ"; "Settings.ContextMenu.Notice" = "Выключенные пункты будут доступны в подменю «Swiftgram»."; diff --git a/Swiftgram/SGStrings/Strings/si.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/si.lproj/SGLocalizable.strings index 869c70ba7e..bc92ffb668 100644 --- a/Swiftgram/SGStrings/Strings/si.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/si.lproj/SGLocalizable.strings @@ -1,2 +1,5 @@ "Settings.Tabs.Header" = "පටිති"; "ContextMenu.SaveToCloud" = "මේඝයට සුරකින්න"; +"Settings.MessageSelection.Header" = "පණිවිඩ තේරීම"; +"Settings.Selection.SaveToCloudButton" = "මේඝයට සුරකින්න බොත්තම"; +"Settings.Selection.HideSenderNamesButton" = "යවන්නන්ගේ නම් සඟවන්න බොත්තම"; diff --git a/Swiftgram/SGStrings/Strings/sk.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/sk.lproj/SGLocalizable.strings index 77376339e3..83444bbf78 100644 --- a/Swiftgram/SGStrings/Strings/sk.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/sk.lproj/SGLocalizable.strings @@ -2,3 +2,6 @@ "Settings.Tabs.ShowContacts" = "Zobraziť kontakty"; "Settings.Tabs.ShowNames" = "Zobraziť názvy záložiek"; "ContextMenu.SaveToCloud" = "Uložiť na Cloud"; +"Settings.MessageSelection.Header" = "VÝBER SPRÁV"; +"Settings.Selection.SaveToCloudButton" = "Tlačidlo Uložiť na Cloud"; +"Settings.Selection.HideSenderNamesButton" = "Tlačidlo Skryť mená odosielateľov"; diff --git a/Swiftgram/SGStrings/Strings/sr.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/sr.lproj/SGLocalizable.strings index c71efa9f16..bd443d5be8 100644 --- a/Swiftgram/SGStrings/Strings/sr.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/sr.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Сачувај у облак"; "ContextMenu.SelectFromUser" = "Изабери од аутора"; +"Settings.MessageSelection.Header" = "ИЗБОР ПОРУКА"; +"Settings.Selection.SaveToCloudButton" = "Дугме Сачувај у облак"; +"Settings.Selection.HideSenderNamesButton" = "Дугме Сакриј имена пошиљалаца"; "Settings.ContextMenu" = "КОНТЕКСТ МЕНИ"; "Settings.ContextMenu.Notice" = "Онемогућени уноси ће бити доступни у 'Swiftgram' подменују."; diff --git a/Swiftgram/SGStrings/Strings/sv.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/sv.lproj/SGLocalizable.strings index de9ed08295..88ce18d8e1 100644 --- a/Swiftgram/SGStrings/Strings/sv.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/sv.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Spara till Molnet"; "ContextMenu.SelectFromUser" = "Välj från Författaren"; +"Settings.MessageSelection.Header" = "MEDDELANDEVAL"; +"Settings.Selection.SaveToCloudButton" = "Knappen Spara till Molnet"; +"Settings.Selection.HideSenderNamesButton" = "Knappen Dölj avsändarnamn"; "Settings.ContextMenu" = "KONTEXTMENY"; "Settings.ContextMenu.Notice" = "Inaktiverade poster kommer att vara tillgängliga i 'Swiftgram'-undermenyn."; diff --git a/Swiftgram/SGStrings/Strings/tr.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/tr.lproj/SGLocalizable.strings index 7f1b643ec7..c0041594d8 100644 --- a/Swiftgram/SGStrings/Strings/tr.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/tr.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Buluta Kaydet"; "ContextMenu.SelectFromUser" = "Yazardan Seç"; +"Settings.MessageSelection.Header" = "MESAJ SEÇİMİ"; +"Settings.Selection.SaveToCloudButton" = "Buluta Kaydet düğmesi"; +"Settings.Selection.HideSenderNamesButton" = "Gönderen adlarını gizle düğmesi"; "Settings.ContextMenu" = "BAĞLAM MENÜSÜ"; "Settings.ContextMenu.Notice" = "Devre dışı bırakılmış girişler \"Swiftgram\" alt menüsünde mevcut olacaktır."; diff --git a/Swiftgram/SGStrings/Strings/uk.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/uk.lproj/SGLocalizable.strings index 405fcfb869..9f5bcb227c 100644 --- a/Swiftgram/SGStrings/Strings/uk.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/uk.lproj/SGLocalizable.strings @@ -96,6 +96,9 @@ "ContextMenu.SaveToCloud" = "Переслати в Збережене"; "ContextMenu.SelectFromUser" = "Вибрати від автора"; +"Settings.MessageSelection.Header" = "ВИБІР ПОВІДОМЛЕНЬ"; +"Settings.Selection.SaveToCloudButton" = "Кнопка Переслати в Збережене"; +"Settings.Selection.HideSenderNamesButton" = "Кнопка Приховати імена відправників"; "Settings.ContextMenu" = "КОНТЕКСТНЕ МЕНЮ"; "Settings.ContextMenu.Notice" = "Вимкнені елементи будуть доступні в підменю \"Swiftgram\"."; diff --git a/Swiftgram/SGStrings/Strings/uz.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/uz.lproj/SGLocalizable.strings index cfab47bc31..ebbc84d2be 100644 --- a/Swiftgram/SGStrings/Strings/uz.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/uz.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Bulutga saqlash"; "ContextMenu.SelectFromUser" = "Avtordan tanlash"; +"Settings.MessageSelection.Header" = "XABARLARNI TANLASH"; +"Settings.Selection.SaveToCloudButton" = "Bulutga saqlash tugmasi"; +"Settings.Selection.HideSenderNamesButton" = "Yuboruvchilar nomini yashirish tugmasi"; "Settings.ContextMenu" = "KONTEKS MENYU"; "Settings.ContextMenu.Notice" = "O'chirilgan kirishlar \"Swiftgram\" pastki menudasiga o'tkaziladi."; diff --git a/Swiftgram/SGStrings/Strings/vi.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/vi.lproj/SGLocalizable.strings index 8878463be8..ed9183e528 100644 --- a/Swiftgram/SGStrings/Strings/vi.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/vi.lproj/SGLocalizable.strings @@ -95,6 +95,9 @@ "ContextMenu.SaveToCloud" = "Lưu vào Đám mây"; "ContextMenu.SelectFromUser" = "Chọn từ Tác giả"; +"Settings.MessageSelection.Header" = "CHỌN TIN NHẮN"; +"Settings.Selection.SaveToCloudButton" = "Nút Lưu vào Đám mây"; +"Settings.Selection.HideSenderNamesButton" = "Nút Ẩn tên người gửi"; "Settings.ContextMenu" = "MENU NGỮ CẢNH"; "Settings.ContextMenu.Notice" = "Mục nhập đã vô hiệu hóa sẽ có sẵn trong menu phụ 'Swiftgram'."; diff --git a/Swiftgram/SGStrings/Strings/zh-hans.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/zh-hans.lproj/SGLocalizable.strings index 460aabbfaa..997197f4a2 100644 --- a/Swiftgram/SGStrings/Strings/zh-hans.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/zh-hans.lproj/SGLocalizable.strings @@ -100,6 +100,9 @@ "ContextMenu.SaveToCloud" = "保存到收藏夹"; "ContextMenu.SelectFromUser" = "选择此人所有消息"; +"Settings.MessageSelection.Header" = "消息选择"; +"Settings.Selection.SaveToCloudButton" = "保存到收藏夹按钮"; +"Settings.Selection.HideSenderNamesButton" = "隐藏发送者姓名按钮"; "Settings.ContextMenu" = "消息菜单"; "Settings.ContextMenu.Notice" = "已禁用的项目可在 Swiftgram 子菜单中找到"; diff --git a/Swiftgram/SGStrings/Strings/zh-hant.lproj/SGLocalizable.strings b/Swiftgram/SGStrings/Strings/zh-hant.lproj/SGLocalizable.strings index cc3963ac1f..8cc69f76df 100644 --- a/Swiftgram/SGStrings/Strings/zh-hant.lproj/SGLocalizable.strings +++ b/Swiftgram/SGStrings/Strings/zh-hant.lproj/SGLocalizable.strings @@ -100,6 +100,9 @@ "ContextMenu.SaveToCloud" = "轉傳到儲存的訊息"; "ContextMenu.SelectFromUser" = "選取此人的所有訊息"; +"Settings.MessageSelection.Header" = "訊息選擇"; +"Settings.Selection.SaveToCloudButton" = "轉傳到儲存的訊息按鈕"; +"Settings.Selection.HideSenderNamesButton" = "隱藏寄件者名稱按鈕"; "Settings.ContextMenu" = "內容選單"; "Settings.ContextMenu.Notice" = "停用的選項可在 Swiftgram 選單中使用"; diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageSelectionInputPanelNode/BUILD b/submodules/TelegramUI/Components/Chat/ChatMessageSelectionInputPanelNode/BUILD index f05b8b8b4e..344c4ccc1f 100644 --- a/submodules/TelegramUI/Components/Chat/ChatMessageSelectionInputPanelNode/BUILD +++ b/submodules/TelegramUI/Components/Chat/ChatMessageSelectionInputPanelNode/BUILD @@ -1,5 +1,9 @@ load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library") +sgdeps = [ + "//Swiftgram/SGSimpleSettings:SGSimpleSettings", +] + swift_library( name = "ChatMessageSelectionInputPanelNode", module_name = "ChatMessageSelectionInputPanelNode", @@ -9,7 +13,7 @@ swift_library( copts = [ "-warnings-as-errors", ], - deps = [ + deps = sgdeps + [ "//submodules/AsyncDisplayKit", "//submodules/Display", "//submodules/TelegramCore", diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageSelectionInputPanelNode/Sources/ChatMessageSelectionInputPanelNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageSelectionInputPanelNode/Sources/ChatMessageSelectionInputPanelNode.swift index 2caedb188a..2e4b163b09 100644 --- a/submodules/TelegramUI/Components/Chat/ChatMessageSelectionInputPanelNode/Sources/ChatMessageSelectionInputPanelNode.swift +++ b/submodules/TelegramUI/Components/Chat/ChatMessageSelectionInputPanelNode/Sources/ChatMessageSelectionInputPanelNode.swift @@ -15,6 +15,7 @@ import TopMessageReactions import GlassBackgroundComponent import ComponentFlow import ComponentDisplayAdapters +import SGSimpleSettings private final class ChatMessageSelectionInputPanelNodeViewForOverlayContent: UIView, ChatInputPanelViewForOverlayContent { var reactionContextNode: ReactionContextNode? @@ -245,11 +246,13 @@ public final class ChatMessageSelectionInputPanelNode: ChatInputPanelNode { self.cloudButton.icon = "SaveToCloud" self.cloudButton.isAccessibilityElement = true self.cloudButton.accessibilityLabel = "Save To Cloud" + self.cloudButton.isHidden = !SGSimpleSettings.shared.selectionShowSaveToCloudButton self.forwardHideNamesButton = GlassButtonView() self.forwardHideNamesButton.image = generateTintedImage(image: UIImage(bundleImageName: "Avatar/AnonymousSenderIcon"), color: theme.chat.inputPanel.panelControlAccentColor, customSize: CGSize(width: 28.0, height: 28.0)) self.forwardHideNamesButton.isAccessibilityElement = true - self.forwardHideNamesButton.accessibilityLabel = "Hide Sender Name" + self.forwardHideNamesButton.accessibilityLabel = strings.Conversation_ForwardOptions_HideSendersNames + self.forwardHideNamesButton.isHidden = !SGSimpleSettings.shared.selectionShowHideForwardNameButton // self.shareButton = GlassButtonView()