diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index 34c85d664..2261704fc 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -633,7 +633,7 @@ final class HomeVC: BaseVC, UITableViewDataSource, UITableViewDelegate, SeedRemi title: ((hasUnread) ? "mark_read_button_text".localized() : "mark_unread_button_text".localized()), icon: ((hasUnread) ? UIImage(systemName: "envelope.open") : UIImage(systemName: "envelope.badge")), iconHeight: Values.smallFontSize, - themeTintColor: .textPrimary, + themeTintColor: .white, themeBackgroundColor: .conversationButton_swipeDestructive, side: .trailing, actionIndex: 0, @@ -693,7 +693,7 @@ final class HomeVC: BaseVC, UITableViewDataSource, UITableViewDelegate, SeedRemi title: (threadViewModel.threadIsPinned ? "UNPIN_BUTTON_TEXT".localized() : "PIN_BUTTON_TEXT".localized()), icon: UIImage(systemName: "pin"), iconHeight: Values.mediumFontSize, - themeTintColor: .textPrimary, + themeTintColor: .white, themeBackgroundColor: .conversationButton_swipeDestructive, side: .trailing, actionIndex: 0, @@ -720,7 +720,7 @@ final class HomeVC: BaseVC, UITableViewDataSource, UITableViewDelegate, SeedRemi title: ((threadViewModel.threadMutedUntilTimestamp != nil) ? "unmute_button_text".localized() : "mute_button_text".localized()), icon: UIImage(systemName: "speaker.slash"), iconHeight: Values.mediumFontSize, - themeTintColor: .textPrimary, + themeTintColor: .white, themeBackgroundColor: .conversationButton_swipeDestructive, side: .trailing, actionIndex: 1, @@ -763,20 +763,32 @@ final class HomeVC: BaseVC, UITableViewDataSource, UITableViewDelegate, SeedRemi title: "TXT_DELETE_TITLE".localized(), icon: UIImage(named: "icon_bin")?.resizedImage(to: CGSize(width: Values.mediumFontSize, height: Values.mediumFontSize)), iconHeight: Values.mediumFontSize, - themeTintColor: .textPrimary, + themeTintColor: .white, themeBackgroundColor: .conversationButton_swipeDestructive, side: .trailing, actionIndex: 2, indexPath: indexPath, tableView: tableView ) { [weak self] _, _, completionHandler in + let confirmationModalExplanation: NSAttributedString = { + let mutableAttributedString = NSMutableAttributedString( + string: String( + format: "delete_conversation_confirmation_alert_message".localized(), + threadViewModel.displayName + ) + ) + mutableAttributedString.addAttribute( + .font, + value: UIFont.boldSystemFont(ofSize: Values.smallFontSize), + range: (mutableAttributedString.string as NSString).range(of: threadViewModel.displayName) + ) + return mutableAttributedString + }() + let confirmationModal: ConfirmationModal = ConfirmationModal( info: ConfirmationModal.Info( - title: "CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE".localized(), - explanation: (threadViewModel.currentUserIsClosedGroupAdmin == true ? - "admin_group_leave_warning".localized() : - "CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE".localized() - ), + title: "delete_conversation_confirmation_alert_title".localized(), + attributedExplanation: confirmationModalExplanation, confirmTitle: "TXT_DELETE_TITLE".localized(), confirmStyle: .danger, cancelStyle: .alert_text, @@ -805,7 +817,7 @@ final class HomeVC: BaseVC, UITableViewDataSource, UITableViewDelegate, SeedRemi title: "LEAVE_BUTTON_TITLE".localized(), icon: UIImage(systemName: "rectangle.portrait.and.arrow.right"), iconHeight: Values.mediumFontSize, - themeTintColor: .textPrimary, + themeTintColor: .white, themeBackgroundColor: .conversationButton_swipeDestructive, side: .trailing, actionIndex: 2, diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings index 4329dadc7..f5007fbe3 100644 --- a/Session/Meta/Translations/de.lproj/Localizable.strings +++ b/Session/Meta/Translations/de.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Fertig"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Auswählen"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Du wirst in dieser Gruppe keine Nachrichten mehr versenden oder empfangen können."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Wollen Sie die Gruppe wirklich verlassen?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Dies kann nicht rückgängig gemacht werden."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Unterhaltung löschen?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index 3b4ec22ee..da74d3933 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Done"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Select"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "You will no longer be able to send or receive messages in this group."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Do you really want to leave?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "This cannot be undone."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/es.lproj/Localizable.strings b/Session/Meta/Translations/es.lproj/Localizable.strings index 4bf349817..46107d2bc 100644 --- a/Session/Meta/Translations/es.lproj/Localizable.strings +++ b/Session/Meta/Translations/es.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Hecho"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Seleccionar"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "No podrás enviar o recibir más mensajes en este grupo."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "¿De verdad quieres abandonar el grupo?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Este paso no se puede deshacer."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "¿Eliminar conversación?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings index db8d61359..b5cc4f0f8 100644 --- a/Session/Meta/Translations/fa.lproj/Localizable.strings +++ b/Session/Meta/Translations/fa.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "انجام شد"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "انتخاب"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "شما دیگر قادر به ارسال یا دریافت پیام از این گروه نخواهید بود"; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "آیا واقعا قصد ترک کردن دارید؟"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "این نمیتواند انجام نشود."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "گفتگو حذف شود؟"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "درحال جستجو..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings index d8b4a14b1..666585405 100644 --- a/Session/Meta/Translations/fi.lproj/Localizable.strings +++ b/Session/Meta/Translations/fi.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Valmis"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Valitse"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Et pysty enään lähettämään tai vastaanottamaan viestejä tässä ryhmässä."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Haluatko varmasti poistua ryhmästä?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Tätä ei voida perua."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Poistetaanko keskustelu?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings index 485829208..6625f503b 100644 --- a/Session/Meta/Translations/fr.lproj/Localizable.strings +++ b/Session/Meta/Translations/fr.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Terminé"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Sélectionner"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Vous ne pourrez plus recevoir ni envoyer de messages dans ce groupe."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Voulez-vous vraiment quitter ce groupe ?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Cette action est irréversible."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Supprimer la conversation ?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings index 954e74054..e1cdaac55 100644 --- a/Session/Meta/Translations/hi.lproj/Localizable.strings +++ b/Session/Meta/Translations/hi.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "पूरा हुआ"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "चुनें"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "अब आप इस समूह में संदेश भेजने या प्राप्त करने में सक्षम नहीं होंगे।"; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "क्या आप वाकई छोड़ना चाहते हैं?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "This cannot be undone."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings index 59fe0f037..77cafa902 100644 --- a/Session/Meta/Translations/hr.lproj/Localizable.strings +++ b/Session/Meta/Translations/hr.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Gotovo"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Odaberi"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Više nećete moći slati niti primati poruke u ovoj grupi."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Da li zaista želite izaći?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Ovaj je postupak nepovratan."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Obriši razgovor?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/id-ID.lproj/Localizable.strings b/Session/Meta/Translations/id-ID.lproj/Localizable.strings index d82fd6014..1f23902a3 100644 --- a/Session/Meta/Translations/id-ID.lproj/Localizable.strings +++ b/Session/Meta/Translations/id-ID.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Selesai"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Pilih"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Anda tidak dapat lagi mengirim atau menerima pesan dari grup ini."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Apakah Anda benar-benar ingin keluar?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Tindakan ini tidak dapat dibatalkan."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Hapus Percakapan?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings index 32b1bfc72..c824b802c 100644 --- a/Session/Meta/Translations/it.lproj/Localizable.strings +++ b/Session/Meta/Translations/it.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Fatto"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Seleziona"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Non sarei più in grado di inviare o ricevere messaggi in questo gruppo."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Vuoi davvero lasciare?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Non potrà essere annullato."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Elimina conversazione?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings index b2d5cf714..75cb1e6bf 100644 --- a/Session/Meta/Translations/ja.lproj/Localizable.strings +++ b/Session/Meta/Translations/ja.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "完了"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "選択"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "このグループとの会話が出来なくなりますがよろしいでしょうか。"; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "離脱してよろしいですか?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "消去すると元に戻せません"; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "消去しますか?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings index 36a4ecf8d..4c9b31f6e 100644 --- a/Session/Meta/Translations/nl.lproj/Localizable.strings +++ b/Session/Meta/Translations/nl.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Ok"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Selecteer"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Je kunt geen berichten meer versturen of ontvangen in deze groep."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Wilt u echt deze groep verlaten?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Dit kan niet ongedaan worden gemaakt."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Gesprek verwijderen?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings index 9505b5df1..35d1f7a04 100644 --- a/Session/Meta/Translations/pl.lproj/Localizable.strings +++ b/Session/Meta/Translations/pl.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Gotowe"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Zaznacz"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Nie będziesz już móc odbierać lub wysyłać wiadomości w tej grupie."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Czy na pewno chcesz wyjść?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Tego nie można cofnąć."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Usunąć konwersację?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings index 2977aad75..c351ad411 100644 --- a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Pronto"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Selecionar"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Você não poderá mais enviar nem receber mensagens neste grupo."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Você tem certeza que deseja sair?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Isso não pode ser desfeito."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Excluir conversa?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings index 1f8cca0be..26a64e4a4 100644 --- a/Session/Meta/Translations/ru.lproj/Localizable.strings +++ b/Session/Meta/Translations/ru.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Готово"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Выбор"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Вы больше не сможете отправлять и получать сообщения в этой группе."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Вы хотите покинуть группу?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Это не может быть отменено."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Удалить разговор?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/si.lproj/Localizable.strings b/Session/Meta/Translations/si.lproj/Localizable.strings index 76c4e66a8..349867b2c 100644 --- a/Session/Meta/Translations/si.lproj/Localizable.strings +++ b/Session/Meta/Translations/si.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Done"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Select"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "You will no longer be able to send or receive messages in this group."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Do you really want to leave?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "This cannot be undone."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Delete Conversation?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings index 582dd4281..71cbe0cd5 100644 --- a/Session/Meta/Translations/sk.lproj/Localizable.strings +++ b/Session/Meta/Translations/sk.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Hotovo"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Vybrať"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Už nebudete môcť posielať a prijímať správy v tejto skupine."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Ste si istý/á, že chcete odísť?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Táto akcia sa nedá vrátiť."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Zmazať konverzáciu?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/sv.lproj/Localizable.strings b/Session/Meta/Translations/sv.lproj/Localizable.strings index e94364dcc..f0a1f421a 100644 --- a/Session/Meta/Translations/sv.lproj/Localizable.strings +++ b/Session/Meta/Translations/sv.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Klart"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Välj"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Du kommer inte längre att kunna skicka eller ta emot meddelanden i denna grupp."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Vill du verkligen lämna?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Detta kan inte ångras."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Radera konversation?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings index 1df1f2254..e32ffabad 100644 --- a/Session/Meta/Translations/th.lproj/Localizable.strings +++ b/Session/Meta/Translations/th.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "เสร็จ"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "เลือก"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "คุณจะไม่สามารถส่งและรับข้อความในกลุ่มนี้ได้อีกต่อไป"; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "แน่ใจออกจากไหม"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "การกระทำนี้ไม่สามารถยกเลิกได้"; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "ลบการสนทนาไหม"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings index 47c54b0bd..049e0782d 100644 --- a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings +++ b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "Xong"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "Chọn"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "Bạn sẽ không thể gửi hoặc nhận tin nhắn trong nhóm này nữa."; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "Bạn thực sự muốn rời khỏi nhóm?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "Tác vụ này không thể hoàn tất."; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "Xóa cuộc hội thoại?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings index 43063bfee..2eb03bd1a 100644 --- a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "完成"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "選擇"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "您已經無法再於此群組傳送或接收訊息。"; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "確定要離開嗎?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "此操作無法復原。"; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "刪除對話?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings index 815f05f54..9e1b96ac2 100644 --- a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings @@ -60,14 +60,6 @@ "BUTTON_DONE" = "完成"; /* Button text to enable batch selection mode */ "BUTTON_SELECT" = "选择"; -/* Alert body */ -"CONFIRM_LEAVE_GROUP_DESCRIPTION" = "您将无法在此群组中继续发送或接收消息。"; -/* Alert title */ -"CONFIRM_LEAVE_GROUP_TITLE" = "确定离开群聊?"; -/* Message for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE" = "该操作无法撤销。"; -/* Title for the 'conversation delete confirmation' alert. */ -"CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE" = "删除会话?"; /* keyboard toolbar label when starting to search with no current results */ "CONVERSATION_SEARCH_SEARCHING" = "Searching..."; /* keyboard toolbar label when no messages match the search string */ @@ -619,3 +611,5 @@ "group_you_leaving" = "Leaving..."; "group_leave_error" = "Failed to leave Group!"; "group_unable_to_leave" = "Unable to leave the Group, please try again"; +"delete_conversation_confirmation_alert_message" = "Are you sure you want to delete your conversation with %@?"; +"delete_conversation_confirmation_alert_title" = "Delete Conversation"; diff --git a/SessionUIKit/Utilities/UIContextualAction+Theming.swift b/SessionUIKit/Utilities/UIContextualAction+Theming.swift index d16fdd9da..4e4396c1e 100644 --- a/SessionUIKit/Utilities/UIContextualAction+Theming.swift +++ b/SessionUIKit/Utilities/UIContextualAction+Theming.swift @@ -28,7 +28,7 @@ public extension UIContextualAction { title: String? = nil, icon: UIImage? = nil, iconHeight: CGFloat = Values.mediumFontSize, - themeTintColor: ThemeValue = .textPrimary, + themeTintColor: ThemeValue = .white, themeBackgroundColor: ThemeValue, side: Side, actionIndex: Int,