diff --git a/control b/control index 0d89210..68dc019 100644 --- a/control +++ b/control @@ -1,7 +1,7 @@ Package: com.lint.undelete Name: TFDidThatSay? Depends: mobilesubstrate -Version: 1.2.3 +Version: 1.2.4 Architecture: iphoneos-arm Description: See "[deleted]" comments and posts without leaving Reddit! Maintainer: lint diff --git a/tweak/Apollo.h b/tweak/Apollo.h index b541b06..fe38f6b 100644 --- a/tweak/Apollo.h +++ b/tweak/Apollo.h @@ -17,6 +17,7 @@ //custom element @property(strong,nonatomic) id undeleteButton; + @end /* -- Post Interfaces -- */ diff --git a/tweak/Reddit.h b/tweak/Reddit.h index 57fc363..f5905a0 100644 --- a/tweak/Reddit.h +++ b/tweak/Reddit.h @@ -107,6 +107,13 @@ @end @interface ThemeManager + +// >= 4.45.0 +@property(assign,nonatomic) id darkTheme; +@property(assign,nonatomic) id lightTheme; +-(id) initWithAppSettings:(id) arg1; + +// < 4.45.0 @property(assign,nonatomic) id dayTheme; @property(assign,nonatomic) id nightTheme; -(id) initWithTraitCollection:(id) arg1 appSettings:(id) arg2; diff --git a/tweak/Reddit.xm b/tweak/Reddit.xm index a65081b..1efb7bc 100644 --- a/tweak/Reddit.xm +++ b/tweak/Reddit.xm @@ -86,16 +86,34 @@ body = @"[an error occured]"; } - id themeManager = [[%c(ThemeManager) alloc] initWithTraitCollection:nil appSettings:[%c(AppSettings) sharedSettings]]; - id isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"]; + + NSArray* appVersion = [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] componentsSeparatedByString:@"."]; + + id themeManager; + id isNightMode; id textColor; - if (isNightMode) { - textColor = [[themeManager nightTheme] bodyTextColor]; - } else{ - textColor = [[themeManager dayTheme] bodyTextColor]; - } - + if ([appVersion[1] integerValue] >= 45){ + 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]; + } + + } else { + themeManager = [[%c(ThemeManager) alloc] initWithTraitCollection:nil appSettings:[%c(AppSettings) sharedSettings]]; + isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"]; + + if (isNightMode) { + textColor = [[themeManager nightTheme] bodyTextColor]; + } else{ + textColor = [[themeManager dayTheme] bodyTextColor]; + } + } + NSMutableAttributedString *bodyMutableAttributedText = [[NSMutableAttributedString alloc] initWithAttributedString:[%c(NSAttributedStringMarkdownParser) attributedStringUsingCurrentConfig:body]]; [bodyMutableAttributedText beginEditing]; @@ -202,17 +220,34 @@ } } else if (error != nil || data == nil){ body = @"[an error occured]"; - } + } - id themeManager = [[%c(ThemeManager) alloc] initWithTraitCollection:nil appSettings:[%c(AppSettings) sharedSettings]]; - id isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"]; + NSArray* appVersion = [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] componentsSeparatedByString:@"."]; + + id themeManager; + id isNightMode; id textColor; - if (isNightMode) { - textColor = [[themeManager nightTheme] bodyTextColor]; - } else{ - textColor = [[themeManager dayTheme] bodyTextColor]; - } + if ([appVersion[1] integerValue] >= 45){ + 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]; + } + + } else { + themeManager = [[%c(ThemeManager) alloc] initWithTraitCollection:nil appSettings:[%c(AppSettings) sharedSettings]]; + isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"]; + + if (isNightMode) { + textColor = [[themeManager nightTheme] bodyTextColor]; + } else{ + textColor = [[themeManager dayTheme] bodyTextColor]; + } + } NSMutableAttributedString *bodyMutableAttributedText = [[NSMutableAttributedString alloc] initWithAttributedString:[%c(NSAttributedStringMarkdownParser) attributedStringUsingCurrentConfig:body]]; @@ -228,12 +263,12 @@ [post setAuthor:author]; [post setValue:body forKey:@"selfText"]; - if ([[[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] componentsSeparatedByString:@"."][1] integerValue] >= 44){ + if ([appVersion[1] integerValue] >= 44){ [[[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] contentNode] configureSelfTextNode]; } else { [[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] configureSelfTextNode]; } - + [request release]; [queue release]; [bodyMutableAttributedText release];