fixed bundle management

Author: guidosabatini-sysdata

R.objc/Sources/ImagesGenerator.m

@@ -133,7 +133,7 @@ - (BOOL)writeInResourceFileWithError:(NSError *__autoreleasing *)error
         [self.clazz.extension.properties addObject:property];
 
         // generate getter implementation
-        NSString* implString = [NSString stringWithFormat:@"return [UIImage imageNamed:@\"%@\"];", res.originalName];
+        NSString* implString = [NSString stringWithFormat:@"return [UIImage imageNamed:@\"%@\" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil];", res.originalName];
         RMethodImplementation *impl = [[RMethodImplementation alloc] initWithReturnType:@"UIImage*" signature:res.methodName implementation:implString];
         [self.clazz.implementation.methods addObject:impl];
     }

R.objc/Sources/StringsGenerator.m

@@ -317,10 +317,10 @@ - (NSString*) localizedStringWithKey:(NSString*)key fromTable:(NSString*)table
 {
     if (Session.shared.isSysdataVersion)
     {
-        return [NSString stringWithFormat:@"SDLocalizedStringFromTable(@\"%@\", @\"%@\")", key, table];
+        return [NSString stringWithFormat:@"SDLocalizedStringFromTableInBundleForClass(@\"%@\", @\"%@\", self.class)", key, table];
     } else {
         table = [table stringByReplacingOccurrencesOfString:@".strings" withString:@""];
-        return [NSString stringWithFormat:@"NSLocalizedStringFromTable(@\"%@\", @\"%@\", nil)", key, table];
+        return [NSString stringWithFormat:@"NSLocalizedStringFromTableInBundle(@\"%@\", @\"%@\", [NSBundle bundleForClass:self.class], nil)", key, table];
     }
 }