diff options
author | Vitaly Takmazov | 2017-03-27 01:47:46 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2017-06-28 21:26:57 +0300 |
commit | 9fd3a914fee6c22d7d7148ca100df72aa7cfc74e (patch) | |
tree | 9a40469481a1af6d6555bafe5ff3e1388fa35fbe /Juick | |
parent | 9f4b7a156a40769a0383911ab38e9ed09f986507 (diff) |
update images again, fix reply count
Diffstat (limited to 'Juick')
13 files changed, 9 insertions, 8 deletions
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 Binary files differdeleted file mode 100644 index 5b12fec..0000000 --- a/Juick/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png +++ /dev/null diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png Binary files differdeleted file mode 100644 index a6a6f4f..0000000 --- a/Juick/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png +++ /dev/null diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-76.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-76.png Binary files differindex 733f828..a48db7c 100644 --- a/Juick/Images.xcassets/AppIcon.appiconset/Icon-76.png +++ b/Juick/Images.xcassets/AppIcon.appiconset/Icon-76.png diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png Binary files differindex f80ad01..266499c 100644 --- a/Juick/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png +++ b/Juick/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png Binary files differindex d168de5..ea74b28 100644 --- a/Juick/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png +++ b/Juick/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png Binary files differindex d5a6c52..a727de2 100644 --- a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png +++ b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@2x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@2x.png Binary files differnew file mode 100644 index 0000000..3959fca --- /dev/null +++ b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@2x.png diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@3x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@3x.png Binary files differnew file mode 100644 index 0000000..ae0092c --- /dev/null +++ b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small-60@3x.png diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png Binary files differindex d0536cd..71f908b 100644 --- a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png +++ b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png diff --git a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png Binary files differindex 15e6f49..7b26fda 100644 --- a/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png +++ b/Juick/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png 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 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>1.0.12</string> + <string>1.0.14</string> + <key>ITSAppUsesNonExemptEncryption</key> + <false/> <key>LSApplicationCategoryType</key> <string>public.app-category.social-networking</string> <key>LSRequiresIPhoneOS</key> 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; |