Add support for Reddit v2020.0.0

This commit is contained in:
lint
2020-01-15 23:11:53 -05:00
parent dc0ad9363d
commit 6d84dd5230

View File

@ -6,8 +6,8 @@ static BOOL isRedditEnabled;
static BOOL isTFDeletedOnly; static BOOL isTFDeletedOnly;
static CGFloat pushshiftRequestTimeoutValue; static CGFloat pushshiftRequestTimeoutValue;
int firstVersionPart = 4; int firstVersionPart = 2020;
int secondVersionPart = 49; int secondVersionPart = 0;
%group Reddit_v4_current %group Reddit_v4_current
@ -100,6 +100,19 @@ int secondVersionPart = 49;
id isNightMode; id isNightMode;
id textColor; id textColor;
if (firstVersionPart == 2020){
themeManager = [[%c(ThemeManager) alloc] initWithAppSettings:[%c(AppSettings) sharedSettings]];
isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"];
if (isNightMode) {
textColor = [[themeManager darkTheme] bodyTextColor];
} else{
textColor = [[themeManager lightTheme] bodyTextColor];
}
[themeManager release];
} else {
if (secondVersionPart >= 45){ if (secondVersionPart >= 45){
themeManager = [[%c(ThemeManager) alloc] initWithAppSettings:[%c(AppSettings) sharedSettings]]; themeManager = [[%c(ThemeManager) alloc] initWithAppSettings:[%c(AppSettings) sharedSettings]];
isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"]; isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"];
@ -134,6 +147,7 @@ int secondVersionPart = 49;
textColor = [[themeManager dayTheme] bodyTextColor]; textColor = [[themeManager dayTheme] bodyTextColor];
} }
} }
}
bodyMutableAttributedText = [[NSMutableAttributedString alloc] initWithAttributedString:[%c(NSAttributedStringMarkdownParser) attributedStringUsingCurrentConfig:body]]; bodyMutableAttributedText = [[NSMutableAttributedString alloc] initWithAttributedString:[%c(NSAttributedStringMarkdownParser) attributedStringUsingCurrentConfig:body]];
@ -227,6 +241,19 @@ int secondVersionPart = 49;
id isNightMode; id isNightMode;
id textColor; id textColor;
if (firstVersionPart == 2020){
themeManager = [[%c(ThemeManager) alloc] initWithAppSettings:[%c(AppSettings) sharedSettings]];
isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"];
if (isNightMode) {
textColor = [[themeManager darkTheme] bodyTextColor];
} else{
textColor = [[themeManager lightTheme] bodyTextColor];
}
[themeManager release];
} else {
if (secondVersionPart >= 45){ if (secondVersionPart >= 45){
themeManager = [[%c(ThemeManager) alloc] initWithAppSettings:[%c(AppSettings) sharedSettings]]; themeManager = [[%c(ThemeManager) alloc] initWithAppSettings:[%c(AppSettings) sharedSettings]];
isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"]; isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"];
@ -261,6 +288,7 @@ int secondVersionPart = 49;
textColor = [[themeManager dayTheme] bodyTextColor]; textColor = [[themeManager dayTheme] bodyTextColor];
} }
} }
}
NSMutableAttributedString *bodyMutableAttributedText = [[NSMutableAttributedString alloc] initWithAttributedString:[%c(NSAttributedStringMarkdownParser) attributedStringUsingCurrentConfig:body]]; NSMutableAttributedString *bodyMutableAttributedText = [[NSMutableAttributedString alloc] initWithAttributedString:[%c(NSAttributedStringMarkdownParser) attributedStringUsingCurrentConfig:body]];
@ -276,6 +304,9 @@ int secondVersionPart = 49;
[post setSelfPostRichTextAttributed:bodyMutableAttributedText]; [post setSelfPostRichTextAttributed:bodyMutableAttributedText];
[post setPreviewFeedPostTextString:bodyMutableAttributedText]; [post setPreviewFeedPostTextString:bodyMutableAttributedText];
if (firstVersionPart == 2020){
[[[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] contentNode] configureSelfTextNode];
} else {
if (secondVersionPart >= 44){ if (secondVersionPart >= 44){
[[[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] contentNode] configureSelfTextNode]; [[[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] contentNode] configureSelfTextNode];
} else if (secondVersionPart >= 38) { } else if (secondVersionPart >= 38) {
@ -284,6 +315,7 @@ int secondVersionPart = 49;
[[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] configureSelfTextNode]; [[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] configureSelfTextNode];
[[[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] titleNode] configureNodes]; [[[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] titleNode] configureNodes];
} }
}
[bodyMutableAttributedText release]; [bodyMutableAttributedText release];
} }
@ -626,8 +658,8 @@ static void prefsChanged(CFNotificationCenterRef center, void *observer, CFStrin
secondVersionPart = [redditVersion[1] intValue]; secondVersionPart = [redditVersion[1] intValue];
} }
@catch (NSException *exc){ @catch (NSException *exc){
firstVersionPart = 4; firstVersionPart = 2020;
secondVersionPart = 49; secondVersionPart = 0;
} }
if ([processName isEqualToString:@"Reddit"]){ if ([processName isEqualToString:@"Reddit"]){
@ -635,8 +667,8 @@ static void prefsChanged(CFNotificationCenterRef center, void *observer, CFStrin
CFNotificationCenterAddObserver(CFNotificationCenterGetDarwinNotifyCenter(), NULL, prefsChanged, CFSTR("com.lint.undelete.prefs.changed"), NULL, CFNotificationSuspensionBehaviorDeliverImmediately); CFNotificationCenterAddObserver(CFNotificationCenterGetDarwinNotifyCenter(), NULL, prefsChanged, CFSTR("com.lint.undelete.prefs.changed"), NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
if (firstVersionPart == 4){ if (firstVersionPart == 4 || firstVersionPart == 2020){
if (secondVersionPart <= 32){ if (secondVersionPart <= 32 && firstVersionPart != 2020){
%init(Reddit_v4_ios10); %init(Reddit_v4_ios10);
} else{ } else{
%init(Reddit_v4_current); %init(Reddit_v4_current);