From 9fd3a914fee6c22d7d7148ca100df72aa7cfc74e Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Mon, 27 Mar 2017 01:47:46 +0300 Subject: update images again, fix reply count --- .../Images.xcassets/AppIcon.appiconset/Contents.json | 4 ++-- .../Images.xcassets/AppIcon.appiconset/Icon-60@2x.png | Bin 2523 -> 0 bytes .../Images.xcassets/AppIcon.appiconset/Icon-60@3x.png | Bin 4269 -> 0 bytes Juick/Images.xcassets/AppIcon.appiconset/Icon-76.png | Bin 1517 -> 1019 bytes .../Images.xcassets/AppIcon.appiconset/Icon-76@2x.png | Bin 3376 -> 2321 bytes .../AppIcon.appiconset/Icon-83.5@2x.png | Bin 3996 -> 2826 bytes .../AppIcon.appiconset/Icon-Small-40@2x.png | Bin 1725 -> 1259 bytes .../AppIcon.appiconset/Icon-Small-60@2x.png | Bin 0 -> 1737 bytes .../AppIcon.appiconset/Icon-Small-60@3x.png | Bin 0 -> 2939 bytes .../AppIcon.appiconset/Icon-Small@2x.png | Bin 1206 -> 920 bytes .../AppIcon.appiconset/Icon-Small@3x.png | Bin 1865 -> 1294 bytes Juick/Supporting Files/Juick-Info.plist | 4 +++- Juick/Views/MessageCell.m | 9 ++++----- 13 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 Juick/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png delete mode 100644 Juick/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png create mode 100644 Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@2x.png create mode 100644 Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@3x.png (limited to 'Juick') diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Contents.json b/Juick/Images.xcassets/AppIcon.appiconset/Contents.json index dbd6347..a0828f6 100644 --- a/Juick/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Juick/Images.xcassets/AppIcon.appiconset/Contents.json @@ -50,13 +50,13 @@ { "size" : "60x60", "idiom" : "iphone", - "filename" : "Icon-60@2x.png", + "filename" : "Icon-Small-60@2x.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "Icon-60@3x.png", + "filename" : "Icon-Small-60@3x.png", "scale" : "3x" }, { diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png deleted file mode 100644 index 5b12fec..0000000 Binary files a/Juick/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png and /dev/null differ diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png deleted file mode 100644 index a6a6f4f..0000000 Binary files a/Juick/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png and /dev/null differ diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-76.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-76.png index 733f828..a48db7c 100644 Binary files a/Juick/Images.xcassets/AppIcon.appiconset/Icon-76.png and b/Juick/Images.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png index f80ad01..266499c 100644 Binary files a/Juick/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png and b/Juick/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png differ diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png index d168de5..ea74b28 100644 Binary files a/Juick/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png and b/Juick/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png index d5a6c52..a727de2 100644 Binary files a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png and b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png differ diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@2x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@2x.png new file mode 100644 index 0000000..3959fca Binary files /dev/null and b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@2x.png differ diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@3x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@3x.png new file mode 100644 index 0000000..ae0092c Binary files /dev/null and b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@3x.png differ diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png index d0536cd..71f908b 100644 Binary files a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png and b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png index 15e6f49..7b26fda 100644 Binary files a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png and b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png differ diff --git a/Juick/Supporting Files/Juick-Info.plist b/Juick/Supporting Files/Juick-Info.plist index e08722f..0c481a1 100644 --- a/Juick/Supporting Files/Juick-Info.plist +++ b/Juick/Supporting Files/Juick-Info.plist @@ -21,7 +21,9 @@ CFBundleSignature ???? CFBundleVersion - 1.0.12 + 1.0.14 + ITSAppUsesNonExemptEncryption + LSApplicationCategoryType public.app-category.social-networking LSRequiresIPhoneOS diff --git a/Juick/Views/MessageCell.m b/Juick/Views/MessageCell.m index 13f33a5..2d34029 100644 --- a/Juick/Views/MessageCell.m +++ b/Juick/Views/MessageCell.m @@ -30,14 +30,13 @@ formatter.dateFormat = @"yyyy-MM-dd HH:mm:ss"; [formatter setTimeZone:[NSTimeZone timeZoneWithName:@"UTC"]]; - self.timestamp.text = [[formatter dateFromString:msg.timestamp] timeAgo]; - if (msg.repliesCount > 0) { + self.timestamp.text = [[formatter dateFromString:msg.timestamp] timeAgoSinceNow]; + NSUInteger count = [msg.repliesCount unsignedIntegerValue]; + if (count > 0) { if ([msg.repliesBy length] > 0) { self.summary.text = [NSString stringWithFormat:@"%@ replies by %@", msg.repliesCount, msg.repliesBy]; } else { - if (msg.repliesCount > 0) { - self.summary.text = [NSString stringWithFormat:@"%@ replies", msg.repliesCount]; - } + self.summary.text = [NSString stringWithFormat:@"%@ replies", msg.repliesCount]; } } else { self.summary.text = nil; -- cgit v1.2.3