Merge branch 'level3tjg:master' into master

Macleykun · Aug 23, 2024 · 63341eb · 63341eb
2 parents 5b5d2dc + cc37c84
commit 63341eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -20,6 +20,7 @@ TWEAK_NAME = RedditFilter
 $(TWEAK_NAME)_FILES = $(wildcard *.x*)
 $(TWEAK_NAME)_CFLAGS = -fobjc-arc -Iinclude -Wno-module-import-in-extern-c
 $(TWEAK_NAME)_INJECT_DYLIBS = $(THEOS_OBJ_DIR)/RedditSideloadFix.dylib
+$(TWEAK_NAME)_LOGOS_DEFAULT_GENERATOR = internal
 
 ifeq ($(SIDELOADED),1)
   SUBPROJECTS += RedditSideloadFix

diff --git a/Tweak.xm b/Tweak.xm
@@ -8,10 +8,6 @@
 #import <objc/runtime.h>
 #import "Preferences.h"
 
-@interface UIImage ()
-+ (UIImage *)imageNamed:(NSString *)name inBundle:(NSBundle *)bundle;
-@end
-
 static NSMutableArray *assetBundles;
 
 extern "C" UIImage *iconWithName(NSString *iconName) {
@@ -25,9 +21,11 @@ extern "C" UIImage *iconWithName(NSString *iconName) {
     for (NSString *iconSize in commonIconSizes) {
       if (iconImage) break;
       iconImage = [UIImage imageNamed:[NSString stringWithFormat:@"%@_%@", iconName, iconSize]
-                             inBundle:bundle];
+                               inBundle:bundle
+          compatibleWithTraitCollection:nil];
     }
-    if (!iconImage) iconImage = [UIImage imageNamed:iconName inBundle:bundle];
+    if (!iconImage)
+      iconImage = [UIImage imageNamed:iconName inBundle:bundle compatibleWithTraitCollection:nil];
   }
   return iconImage;
 }