Browse Source

Fix Reddit incorrect text color bug

master
lint 3 years ago
parent
commit
bed2ca26a6
2 changed files with 25 additions and 4 deletions
  1. +6
    -0
      tweak/Reddit.h
  2. +19
    -4
      tweak/Reddit.xm

+ 6
- 0
tweak/Reddit.h View File

@@ -169,6 +169,8 @@
@interface AppSettings
+ (id)sharedSettings;
- (BOOL)useDarkMode;
- (BOOL)isAutoDarkModeEnabled;
@end
@interface AccountManager
@@ -208,3 +210,7 @@
@interface MarkDownParser
+ (id)attributedStringFromMarkdownString:(id)arg1;
@end
@interface UITraitCollection ()
+ (id)_currentTraitCollection;
@end

+ 19
- 4
tweak/Reddit.xm View File

@@ -102,16 +102,31 @@ int secondVersionPart = 0;
id textColor;
if (firstVersionPart == 2020) {
themeManager = [[%c(ThemeManager) alloc] initWithAppSettings:[%c(AppSettings) sharedSettings]];
AppSettings *appSettings = [%c(AppSettings) sharedSettings];
themeManager = [[%c(ThemeManager) alloc] initWithAppSettings:appSettings];
isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"];
if (isNightMode) {
textColor = [[themeManager darkTheme] bodyTextColor];
if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"13.0") && [appSettings isAutoDarkModeEnabled]) {
NSInteger sysInterfaceStyle = [[UITraitCollection _currentTraitCollection] userInterfaceStyle];
if (sysInterfaceStyle == UIUserInterfaceStyleDark){
textColor = [[themeManager darkTheme] bodyTextColor];
} else {
textColor = [[themeManager lightTheme] bodyTextColor];
}
} else {
textColor = [[themeManager lightTheme] bodyTextColor];
if (isNightMode) {
textColor = [[themeManager darkTheme] bodyTextColor];
} else {
textColor = [[themeManager lightTheme] bodyTextColor];
}
}
[themeManager release];
} else {
if (secondVersionPart >= 45) {

Loading…
Cancel
Save