Selaa lähdekoodia

Add new icons and add missing 3x icons

Tanner Bennett 6 vuotta sitten
vanhempi
commit
a95a31cf74

+ 2 - 2
Classes/Toolbar/FLEXExplorerToolbar.m

@@ -48,7 +48,7 @@
         
         UIImage *dragHandle = [FLEXResources dragHandle];
         self.dragHandleImageView = [[UIImageView alloc] initWithImage:dragHandle];
-        self.dragHandleImageView.tintColor = [FLEXColor iconColor];
+        self.dragHandleImageView.tintColor = [[FLEXColor iconColor] colorWithAlphaComponent:0.666];
         [self.dragHandle addSubview:self.dragHandleImageView];
         
         UIImage *globalsIcon = [FLEXResources globeIcon];
@@ -224,7 +224,7 @@
 
 + (CGFloat)dragHandleWidth
 {
-    return 30.0;
+    return [FLEXResources dragHandle].size.width;
 }
 
 + (CGFloat)descriptionLabelHeight

+ 23 - 18
Classes/Utility/FLEXResources.h

@@ -11,24 +11,29 @@
 
 @interface FLEXResources : NSObject
 
-+ (UIImage *)closeIcon;
-+ (UIImage *)dragHandle;
-+ (UIImage *)globeIcon;
-+ (UIImage *)hierarchyIndentPattern;
-+ (UIImage *)listIcon;
-+ (UIImage *)moveIcon;
-+ (UIImage *)selectIcon;
-+ (UIImage *)checkerPattern;
+@property (readonly, class) UIImage *closeIcon;
+@property (readonly, class) UIImage *dragHandle;
+@property (readonly, class) UIImage *globeIcon;
+@property (readonly, class) UIImage *hierarchyIndentPattern;
+@property (readonly, class) UIImage *listIcon;
+@property (readonly, class) UIImage *moveIcon;
+@property (readonly, class) UIImage *selectIcon;
+@property (readonly, class) UIImage *checkerPattern;
 
-+ (UIImage *)jsonIcon;
-+ (UIImage *)textPlainIcon;
-+ (UIImage *)htmlIcon;
-+ (UIImage *)audioIcon;
-+ (UIImage *)jsIcon;
-+ (UIImage *)plistIcon;
-+ (UIImage *)textIcon;
-+ (UIImage *)videoIcon;
-+ (UIImage *)xmlIcon;
-+ (UIImage *)binaryIcon;
+@property (readonly, class) UIImage *jsonIcon;
+@property (readonly, class) UIImage *textPlainIcon;
+@property (readonly, class) UIImage *htmlIcon;
+@property (readonly, class) UIImage *audioIcon;
+@property (readonly, class) UIImage *jsIcon;
+@property (readonly, class) UIImage *plistIcon;
+@property (readonly, class) UIImage *textIcon;
+@property (readonly, class) UIImage *videoIcon;
+@property (readonly, class) UIImage *xmlIcon;
+@property (readonly, class) UIImage *binaryIcon;
+
+@property (readonly, class) UIImage *rangeSliderLeftHandle;
+@property (readonly, class) UIImage *rangeSliderRightHandle;
+@property (readonly, class) UIImage *rangeSliderTrack;
+@property (readonly, class) UIImage *rangeSliderFill;
 
 @end

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 4452 - 51
Classes/Utility/FLEXResources.m


+ 1 - 1
Classes/Utility/FLEXUtility.m

@@ -101,7 +101,7 @@
             UIGraphicsEndImageContext();
 
             // Create dynamic color provider
-            patternColor = [UIColor colorWithDynamicProvider:^UIColor * _Nonnull(UITraitCollection * _Nonnull traitCollection) {
+            patternColor = [UIColor colorWithDynamicProvider:^UIColor *(UITraitCollection *traitCollection) {
                 return (traitCollection.userInterfaceStyle == UIUserInterfaceStyleLight
                         ? [UIColor colorWithPatternImage:indentationPatternImage]
                         : [UIColor colorWithPatternImage:darkModePatternImage]);