Merge branch 'mkirk/fixup-audio-margins'

Signal/Images.xcassets/audio_pause_black_40.imageset/Contents.json

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

Signal/Images.xcassets/audio_pause_black_48.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "play_black_40@1x.png",
+      "filename" : "pause-48@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "play_black_40@2x.png",
+      "filename" : "pause-48@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "play_black_40@3x.png",
+      "filename" : "pause-48@3x.png",
       "scale" : "3x"
     }
   ],

Signal/Images.xcassets/audio_pause_blue_bubble.imageset/Contents.json

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

Signal/Images.xcassets/audio_pause_white_40.imageset/Contents.json

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

Signal/Images.xcassets/audio_pause_white_bubble.imageset/Contents.json

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

Signal/Images.xcassets/audio_pause_white_large.imageset/Contents.json

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

Signal/Images.xcassets/audio_play_black_48.imageset/Contents.json

@@ -2,16 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "play_button_large.png",
+      "filename" : "play-48@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "play_button_large@2x.png",
+      "filename" : "play-48@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "play-48@3x.png",
       "scale" : "3x"
     }
   ],

Signal/Images.xcassets/audio_play_blue_bubble.imageset/Contents.json

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

Signal/Images.xcassets/audio_play_white_40.imageset/Contents.json

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

Signal/Images.xcassets/audio_play_white_bubble.imageset/Contents.json

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

Signal/Images.xcassets/audio_play_white_large.imageset/Contents.json

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

Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m

@@ -108,12 +108,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)setAudioIconToPlay
 {
-    [self setAudioIcon:[UIImage imageNamed:@"audio_play_black_40"]];
+    [self setAudioIcon:[UIImage imageNamed:@"audio_play_black_48"]];
 }
 
 - (void)setAudioIconToPause
 {
-    [self setAudioIcon:[UIImage imageNamed:@"audio_pause_black_40"]];
+    [self setAudioIcon:[UIImage imageNamed:@"audio_pause_black_48"]];
 }
 
 - (void)updateAudioProgressView
@@ -140,7 +140,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (CGFloat)vMargin
 {
-    return 0.f;
+    return 5.f;
 }
 
 - (CGFloat)vMargin
@@ -164,7 +164,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (CGFloat)iconSize
 {
-    return 40.f;
+    return 48.f;
 }
 
 - (CGFloat)iconSize
@@ -182,6 +182,8 @@ NS_ASSUME_NONNULL_BEGIN
     self.axis = UILayoutConstraintAxisHorizontal;
     self.alignment = UIStackViewAlignmentCenter;
     self.spacing = self.hSpacing;
+    self.layoutMarginsRelativeArrangement = YES;
+    self.layoutMargins = UIEdgeInsetsMake(self.vMargin, 0, self.vMargin, 0);
 
     _audioPlayPauseButton = [UIButton buttonWithType:UIButtonTypeCustom];
     self.audioPlayPauseButton.enabled = NO;

Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m

@@ -55,7 +55,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (CGFloat)vMargin
 {
-    return 0.f;
+    return 5.f;
 }
 
 - (CGSize)measureSizeWithMaxMessageWidth:(CGFloat)maxMessageWidth
@@ -92,6 +92,8 @@ NS_ASSUME_NONNULL_BEGIN
     self.axis = UILayoutConstraintAxisHorizontal;
     self.alignment = UIStackViewAlignmentCenter;
     self.spacing = self.hSpacing;
+    self.layoutMarginsRelativeArrangement = YES;
+    self.layoutMargins = UIEdgeInsetsMake(self.vMargin, 0, self.vMargin, 0);
 
     // attachment_file
     UIImage *image = [UIImage imageNamed:@"generic-attachment"];