NewsBlur/clients/ios/Classes/UnreadCountView.m
David Sinclair 375e3757e2 #1693 (2022 Redesign)
- Laboriously updated the icons (finding the names in the web inspector, updating the code, inspecting the colors, setting those separately, dealing with scaling issues, etc etc).
- Let me know if you spot any icons that I missed, or unscaled icons (they have to be explicitly sized, otherwise appear huge).
- More space between story title and story content.
- More space when reading a folder.
- Added Compact/Comfortable to feed detail menu.
- Changing Compact/Comfortable also adjusts the feed detail list.
- Adjusted the color of the story content etc in the feed detail list.
- Removed top and bottom borders from feed title gradient in story detail.
- More space in story detail header.
- The feed detail is offset when selected.
- Updated the feeds social, search, and saved background colors.
- Unread counts no longer have a shadow, and have more space.
- Folders and feeds remain selected in the feeds list when returning from a story or refreshing.
- Folders in the feeds list no longer have a different background color.
- The folders and feeds highlight is now rounded and unbordered like on web.
2022-07-20 21:35:16 -07:00

155 lines
5.9 KiB
Objective-C

//
// UnreadCountView.m
// NewsBlur
//
// Created by Samuel Clay on 10/3/12.
// Copyright (c) 2012 NewsBlur. All rights reserved.
//
#import <QuartzCore/QuartzCore.h>
#import "UnreadCountView.h"
#import "UIView+TKCategory.h"
static UIFont *indicatorFont = nil;
@implementation UnreadCountView
const int COUNT_HEIGHT = 18;
@synthesize appDelegate;
@synthesize psWidth, psPadding, ntWidth, ntPadding;
@synthesize psCount, ntCount, blueCount;
@synthesize rect;
+ (void) initialize {
if (self == [UnreadCountView class]) {
indicatorFont = [UIFont boldSystemFontOfSize:12];
}
}
- (void)drawRect:(CGRect)r {
self.userInteractionEnabled = NO;
return [self drawInRect:r ps:psCount nt:ntCount listType:NBFeedListFolder];
}
- (void)drawInRect:(CGRect)r ps:(NSInteger)ps nt:(NSInteger)nt listType:(NBFeedListType)listType {
rect = CGRectInset(r, 12, 0);
rect.size.width -= 18; // Scrollbar padding
if (listType == NBFeedListSaved || (listType == NBFeedListFolder && self.blueCount)) {
blueCount = ps;
psCount = ps;
ntCount = 0;
} else {
blueCount = 0;
psCount = ps;
ntCount = nt;
}
[self calculateOffsets:ps nt:nt];
NSInteger psOffset = ps == 0 ? 0 : psWidth - 20;
NSInteger ntOffset = nt == 0 ? 0 : ntWidth - 20;
if (ps > 0 || blueCount) {
CGRect rr;
if (listType == NBFeedListSocial) {
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
rr = CGRectMake(rect.size.width + rect.origin.x - psOffset, CGRectGetMidY(r)-COUNT_HEIGHT/2, psWidth, COUNT_HEIGHT);
} else {
rr = CGRectMake(rect.size.width + rect.origin.x - psOffset, CGRectGetMidY(r)-COUNT_HEIGHT/2, psWidth, COUNT_HEIGHT);
}
} else if (listType == NBFeedListFolder) {
rr = CGRectMake(rect.size.width + rect.origin.x - psOffset - 22, CGRectGetMidY(r)-COUNT_HEIGHT/2-1, psWidth, COUNT_HEIGHT);
} else {
rr = CGRectMake(rect.size.width + rect.origin.x - psOffset, CGRectGetMidY(r)-COUNT_HEIGHT/2, psWidth, COUNT_HEIGHT);
}
if (blueCount) {
[UIColorFromFixedRGB(0x11448B) set];
} else {
[UIColorFromFixedRGB(0x6EA74A) set];
}
[UIView drawRoundRectangleInRect:rr withRadius:4];
NSString *psStr = [NSString stringWithFormat:@"%ld", (long)ps];
CGSize size = [psStr sizeWithAttributes:@{NSFontAttributeName: indicatorFont}];
float x_pos = (rr.size.width - size.width) / 2;
float y_pos = (rr.size.height - size.height) / 2;
UIColor *psColor;
if (blueCount) {
psColor = UIColorFromFixedRGB(NEWSBLUR_BLACK_COLOR);
} else {
psColor = UIColorFromFixedRGB(0x4E872A);
}
[psStr
drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos + 1)
withAttributes:@{NSFontAttributeName: indicatorFont,
NSForegroundColorAttributeName: psColor}];
[psStr
drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos)
withAttributes:@{NSFontAttributeName: indicatorFont,
NSForegroundColorAttributeName: UIColorFromFixedRGB(NEWSBLUR_WHITE_COLOR)}];
}
if (nt > 0 && appDelegate.selectedIntelligence <= 0) {
CGRect rr;
if (listType == NBFeedListSocial) {
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
rr = CGRectMake(rect.size.width + rect.origin.x - psWidth - psPadding - ntOffset, CGRectGetMidY(r)-COUNT_HEIGHT/2, ntWidth, COUNT_HEIGHT);
} else {
rr = CGRectMake(rect.size.width + rect.origin.x - psWidth - psPadding - ntOffset, CGRectGetMidY(r)-COUNT_HEIGHT/2, ntWidth, COUNT_HEIGHT);
}
} else if (listType == NBFeedListFolder) {
rr = CGRectMake(rect.size.width + rect.origin.x - psWidth - psPadding - ntOffset - 22, CGRectGetMidY(r)-COUNT_HEIGHT/2-1, ntWidth, COUNT_HEIGHT);
} else {
rr = CGRectMake(rect.size.width + rect.origin.x - psWidth - psPadding - ntOffset, CGRectGetMidY(r)-COUNT_HEIGHT/2, ntWidth, COUNT_HEIGHT);
}
if (rr.origin.x > CGFLOAT_MAX) {
return;
}
[UIColorFromLightDarkRGB(0xB3B6AD, 0xA3A69D) set];
[UIView drawRoundRectangleInRect:rr withRadius:4];
NSString *ntStr = [NSString stringWithFormat:@"%ld", (long)nt];
CGSize size = [ntStr sizeWithAttributes:@{NSFontAttributeName: indicatorFont}];
float x_pos = (rr.size.width - size.width) / 2;
float y_pos = (rr.size.height - size.height) / 2;
[ntStr
drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos + 1)
withAttributes:@{NSFontAttributeName: indicatorFont,
NSForegroundColorAttributeName:UIColorFromLightSepiaMediumDarkRGB(0x93968D, 0x93968D, 0x93968D, 0x93968D)}];
[ntStr
drawAtPoint:CGPointMake(rr.origin.x + x_pos, rr.origin.y + y_pos)
withAttributes:@{NSFontAttributeName: indicatorFont,
NSForegroundColorAttributeName:UIColorFromLightSepiaMediumDarkRGB(0xFFFFFF, 0xF8F8E9, 0x606060, 0x000000)}];
}
}
- (void)calculateOffsets:(NSInteger)ps nt:(NSInteger)nt {
psWidth = ps == 0 ? 0 : ps < 10 ? 16 : ps < 100 ? 24 : ps < 1000 ? 30 : ps < 10000 ? 36 : 42;
ntWidth = nt == 0 ? 0 : nt < 10 ? 16 : nt < 100 ? 24 : nt < 1000 ? 30 : nt < 10000 ? 36 : 42;
psPadding = ps == 0 ? 0 : 2;
ntPadding = nt == 0 ? 0 : 2;
}
- (NSInteger)offsetWidth {
NSInteger width = 0;
if (self.psCount > 0) {
width += psWidth + psPadding;
}
if (self.ntCount > 0 && appDelegate.selectedIntelligence <= 0) {
width += ntWidth + ntPadding;
}
return width;
}
@end