Jelajahi Sumber

use volume off / volume on icons instead of bell for notifications

cyberta 3 tahun lalu
induk
melakukan
73c94d19bd
19 mengubah file dengan 11 tambahan dan 44 penghapusan
  1. 0 23
      deltachat-ios/Assets.xcassets/ic_notifications_off.imageset/Contents.json
  2. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/ic_notifications_off.imageset/bell-off-outline_white_1x.png
  3. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/ic_notifications_off.imageset/bell-off-outline_white_2x.png
  4. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/ic_notifications_off.imageset/bell-off-outline_white_3x.png
  5. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/ic_notifications_on.imageset/bell-outline_white_1x.png
  6. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/ic_notifications_on.imageset/bell-outline_white_2x.png
  7. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/ic_notifications_on.imageset/bell-outline_white_3x.png
  8. 3 3
      deltachat-ios/Assets.xcassets/volume_off.imageset/Contents.json
  9. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/volume_off.imageset/baseline_volume_off_white_24pt_1x.png
  10. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/volume_off.imageset/baseline_volume_off_white_24pt_2x.png
  11. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/volume_off.imageset/baseline_volume_off_white_24pt_3x.png
  12. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/volume_off.imageset/volume-off_1x.png
  13. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/volume_off.imageset/volume-off_2x.png
  14. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/volume_off.imageset/volume-off_3x.png
  15. 3 3
      deltachat-ios/Assets.xcassets/volume_on.imageset/Contents.json
  16. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/volume_on.imageset/volume-high_1x.png
  17. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/volume_on.imageset/volume-high_2x.png
  18. TEMPAT SAMPAH
      deltachat-ios/Assets.xcassets/volume_on.imageset/volume-high_3x.png
  19. 5 15
      deltachat-ios/View/ContactDetailHeader.swift

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

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "bell-off-outline_white_1x.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "bell-off-outline_white_2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "bell-off-outline_white_3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/ic_notifications_off.imageset/bell-off-outline_white_1x.png


TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/ic_notifications_off.imageset/bell-off-outline_white_2x.png


TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/ic_notifications_off.imageset/bell-off-outline_white_3x.png


TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/ic_notifications_on.imageset/bell-outline_white_1x.png


TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/ic_notifications_on.imageset/bell-outline_white_2x.png


TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/ic_notifications_on.imageset/bell-outline_white_3x.png


+ 3 - 3
deltachat-ios/Assets.xcassets/volume_off.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "baseline_volume_off_white_24pt_1x.png",
+      "filename" : "volume-off_1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "baseline_volume_off_white_24pt_2x.png",
+      "filename" : "volume-off_2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "baseline_volume_off_white_24pt_3x.png",
+      "filename" : "volume-off_3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/volume_off.imageset/baseline_volume_off_white_24pt_1x.png


TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/volume_off.imageset/baseline_volume_off_white_24pt_2x.png


TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/volume_off.imageset/baseline_volume_off_white_24pt_3x.png


TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/volume_off.imageset/volume-off_1x.png


TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/volume_off.imageset/volume-off_2x.png


TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/volume_off.imageset/volume-off_3x.png


+ 3 - 3
deltachat-ios/Assets.xcassets/ic_notifications_on.imageset/Contents.json → deltachat-ios/Assets.xcassets/volume_on.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "bell-outline_white_1x.png",
+      "filename" : "volume-high_1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "bell-outline_white_2x.png",
+      "filename" : "volume-high_2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "bell-outline_white_3x.png",
+      "filename" : "volume-high_3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/volume_on.imageset/volume-high_1x.png


TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/volume_on.imageset/volume-high_2x.png


TEMPAT SAMPAH
deltachat-ios/Assets.xcassets/volume_on.imageset/volume-high_3x.png


+ 5 - 15
deltachat-ios/View/ContactDetailHeader.swift

@@ -63,11 +63,7 @@ class ContactDetailHeader: UIView {
         button.translatesAutoresizingMaskIntoConstraints = false
         button.addTarget(self, action: #selector(muteBtnTapped), for: .touchUpInside)
         button.backgroundColor = DcColors.profileCellBackgroundColor
-        if #available(iOS 13.0, *) {
-            button.setImage(UIImage(systemName: "bell")?.sd_tintedImage(with: .systemBlue), for: .normal)
-        } else {
-            button.setImage(UIImage(named: "ic_notifications_on")?.sd_tintedImage(with: .systemBlue), for: .normal)
-        }
+        button.setImage(UIImage(named: "volume_on")?.sd_tintedImage(with: .systemBlue), for: .normal)
         button.layer.cornerRadius = 16
         button.layer.borderColor = DcColors.colorDisabled.cgColor
         button.layer.borderWidth = 1
@@ -143,16 +139,10 @@ class ContactDetailHeader: UIView {
     }
 
     func setMuted(isMuted: Bool) {
-        if #available(iOS 13.0, *) {
-            muteButton.setImage(isMuted ? UIImage(systemName: "bell.slash")?.sd_tintedImage(with: .systemBlue) :
-                                    UIImage(systemName: "bell")?.sd_tintedImage(with: .systemBlue),
-                                for: .normal)
-        } else {
-            muteButton.setImage(isMuted ?
-                                UIImage(named: "ic_notifications_off")?.sd_tintedImage(with: .systemBlue) :
-                                    UIImage(named: "ic_notifications_on")?.sd_tintedImage(with: .systemBlue),
-                                for: .normal)
-        }
+        muteButton.setImage(isMuted ?
+                            UIImage(named: "volume_off")?.sd_tintedImage(with: .systemBlue) :
+                                UIImage(named: "volume_on")?.sd_tintedImage(with: .systemBlue),
+                            for: .normal)
     }
 
     func showMuteButton(show: Bool) {