Browse Source

prefer action sheets where appropriate

B. Petersen 5 years ago
parent
commit
4970654d74

+ 4 - 4
deltachat-ios/Controller/ChatListController.swift

@@ -216,11 +216,11 @@ extension ChatListController: UITableViewDataSource, UITableViewDelegate {
 
     private func showDeleteChatConfirmationAlert(chatId: Int) {
         let alert = UIAlertController(
-            title: String.localized("ask_delete_chat_desktop"),
-            message: nil,
-            preferredStyle: .alert
+            title: nil,
+            message: String.localized("ask_delete_chat_desktop"),
+            preferredStyle: .actionSheet
         )
-        alert.addAction(UIAlertAction(title: String.localized("global_menu_edit_delete_desktop"), style: .default, handler: { _ in
+        alert.addAction(UIAlertAction(title: String.localized("menu_delete_chat"), style: .destructive, handler: { _ in
             self.dcContext.deleteChat(chatId: chatId)
             self.getChatList()
         }))

+ 6 - 6
deltachat-ios/Controller/NewChatViewController.swift

@@ -302,10 +302,10 @@ class NewChatViewController: UITableViewController {
 
     private func askToDeleteContact(contactId: Int, context: DcContext) {
         let contact = DcContact(id: contactId)
-        let alert = UIAlertController(title: String.localized("delete"),
-                                      message: String.localizedStringWithFormat(String.localized("delete_contact"), contact.nameNAddr),
-                                      preferredStyle: .alert)
-        alert.addAction(UIAlertAction(title: String.localized("ok"), style: .default, handler: { _ in
+        let alert = UIAlertController(title: String.localizedStringWithFormat(String.localized("delete_contact"), contact.nameNAddr),
+                                      message: nil,
+                                      preferredStyle: .actionSheet)
+        alert.addAction(UIAlertAction(title: String.localized("delete"), style: .destructive, handler: { _ in
             self.dismiss(animated: true, completion: nil)
             if context.deleteContact(contactId: contactId) {
                 self.contactIds = Utils.getContactIds()
@@ -322,8 +322,8 @@ class NewChatViewController: UITableViewController {
         let dcContact = DcContact(id: contactId)
         let alert = UIAlertController(title: String.localizedStringWithFormat(String.localized("ask_start_chat_with"), dcContact.nameNAddr),
                                       message: nil,
-                                      preferredStyle: .alert)
-        alert.addAction(UIAlertAction(title: String.localized("ok"), style: .default, handler: { _ in
+                                      preferredStyle: .actionSheet)
+        alert.addAction(UIAlertAction(title: String.localized("start_chat"), style: .default, handler: { _ in
             self.dismiss(animated: true, completion: nil)
             self.coordinator?.showNewChat(contactId: contactId)
         }))

+ 3 - 3
deltachat-ios/Controller/SettingsController.swift

@@ -218,11 +218,11 @@ internal final class SettingsViewController: QuickTableViewController {
 
         let dbfile = appDelegate.dbfile()
         let dburl = URL(fileURLWithPath: dbfile, isDirectory: false)
-        let alert = UIAlertController(title: String.localized("delete_account"),
-                                      message: String.localized("delete_account_message"),
+        let alert = UIAlertController(title: String.localized("delete_account_message"),
+                                      message: nil,
                                       preferredStyle: .actionSheet)
 
-        alert.addAction(UIAlertAction(title: String.localized("delete"), style: .destructive, handler: { _ in
+        alert.addAction(UIAlertAction(title: String.localized("delete_account"), style: .destructive, handler: { _ in
             appDelegate.stop()
             appDelegate.close()
             do {