Parcourir la source

add all-media icon to assets, adapt others icons

this makes qr-code and settings slightly lighter
and better fitting overall.

the "delta main chat icon" stays as is,
appearing a little bit bolder now.
B. Petersen il y a 2 ans
Parent
commit
b3948e43ab

+ 23 - 0
deltachat-ios/Assets.xcassets/rectangle.on.rectangle.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "rectangle.on.rectangle.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "rectangle.on.rectangle@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "rectangle.on.rectangle@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
deltachat-ios/Assets.xcassets/rectangle.on.rectangle.imageset/rectangle.on.rectangle.png


BIN
deltachat-ios/Assets.xcassets/rectangle.on.rectangle.imageset/rectangle.on.rectangle@2x.png


BIN
deltachat-ios/Assets.xcassets/rectangle.on.rectangle.imageset/rectangle.on.rectangle@3x.png


+ 13 - 8
deltachat-ios/Coordinator/AppCoordinator.swift

@@ -37,7 +37,12 @@ class AppCoordinator {
     private func createQrNavigationController() -> UINavigationController {
         let root = QrPageController(dcAccounts: dcAccounts)
         let nav = UINavigationController(rootViewController: root)
-        let settingsImage = UIImage(named: "qr_code")
+        let settingsImage: UIImage?
+        if #available(iOS 13.0, *) {
+            settingsImage = UIImage(systemName: "qrcode")
+        } else {
+            settingsImage = UIImage(named: "qr_code")
+        }
         nav.tabBarItem = UITabBarItem(title: String.localized("qr_code"), image: settingsImage, tag: qrTab)
         return nav
     }
@@ -45,12 +50,7 @@ class AppCoordinator {
     private func createAllMediaNavigationController() -> UINavigationController {
         let root = AllMediaViewController(dcAccounts: dcAccounts)
         let nav = UINavigationController(rootViewController: root)
-        let settingsImage: UIImage?
-        if #available(iOS 13.0, *) {
-            settingsImage = UIImage(systemName: "rectangle.on.rectangle")
-        } else {
-            settingsImage = UIImage(named: "report_card") // TODO: if image is settled, add it to assets
-        }
+        let settingsImage = UIImage(named: "rectangle.on.rectangle")
         nav.tabBarItem = UITabBarItem(title: String.localized("menu_all_media"), image: settingsImage, tag: chatsTab)
         return nav
     }
@@ -66,7 +66,12 @@ class AppCoordinator {
     private func createSettingsNavigationController() -> UINavigationController {
         let root = SettingsViewController(dcAccounts: dcAccounts)
         let nav = UINavigationController(rootViewController: root)
-        let settingsImage = UIImage(named: "settings")
+        let settingsImage: UIImage?
+        if #available(iOS 13.0, *) {
+             settingsImage = UIImage(systemName: "gear")
+         } else {
+             settingsImage = UIImage(named: "settings")
+         }
         nav.tabBarItem = UITabBarItem(title: String.localized("menu_settings"), image: settingsImage, tag: settingsTab)
         return nav
     }