PDFEdit(iOS) - 暗黑模式图标调整

Edit-Ctrl-Demo/Edit-Ctrl-Demo/Assets.xcassets/CPDFThunbnailImageEnter.imageset/Contents.json

@@ -5,6 +5,17 @@
       "idiom" : "universal",
       "scale" : "1x"
     },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "filename" : "thumbnail2pdf.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
     {
       "appearances" : [
         {
@@ -20,6 +31,16 @@
       "idiom" : "universal",
       "scale" : "2x"
     },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
     {
       "appearances" : [
         {
@@ -34,6 +55,16 @@
       "idiom" : "universal",
       "scale" : "3x"
     },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
     {
       "appearances" : [
         {

Edit-Ctrl-Demo/Edit-Ctrl-Demo/Assets.xcassets/CPDFThunbnailImageEnter.imageset/thumbnail2pdf.pdf

@@ -0,0 +1,105 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 1.250000 1.000000 cm
+0.262745 0.278431 0.301961 scn
+0.750000 17.750000 m
+0.000000 17.750000 l
+0.000000 17.000000 l
+0.000000 3.000000 l
+0.000000 2.250000 l
+0.750000 2.250000 l
+3.750000 2.250000 l
+3.750000 1.500000 l
+3.750000 0.000000 l
+5.250000 0.000000 l
+16.250000 0.000000 l
+17.750000 0.000000 l
+17.750000 1.500000 l
+17.750000 12.500000 l
+17.750000 14.000000 l
+16.250000 14.000000 l
+15.500000 14.000000 l
+15.500000 17.000000 l
+15.500000 17.750000 l
+14.750000 17.750000 l
+0.750000 17.750000 l
+h
+14.000000 14.000000 m
+14.000000 16.250000 l
+1.500000 16.250000 l
+1.500000 3.750000 l
+3.750000 3.750000 l
+3.750000 12.500000 l
+3.750000 14.000000 l
+5.250000 14.000000 l
+14.000000 14.000000 l
+h
+5.250000 2.250000 m
+5.250000 1.500000 l
+16.250000 1.500000 l
+16.250000 12.500000 l
+5.250000 12.500000 l
+5.250000 3.750000 l
+5.250000 2.250000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  907
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000997 00000 n
+0000001019 00000 n
+0000001192 00000 n
+0000001266 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1325
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFProperties/CPDFColorSelectView.h

@@ -32,6 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) UILabel *colorLabel;
 
+
 @end
 
 NS_ASSUME_NONNULL_END

compdfkit-tools/compdfkit-tools/Common/Views/PDFProperties/CPDFOpacitySliderView.h

@@ -36,9 +36,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, assign) CGFloat  defaultValue;
 
+@property (nonatomic, assign) CGFloat leftMargin;
+@property (nonatomic, assign) CGFloat rightMargin;
+@property (nonatomic, assign) CGFloat rightTitleMargin;
+
 
 @property (nonatomic, weak) id<CPDFOpacitySliderViewDelegate> delegate;
 
+
 @end
 
 NS_ASSUME_NONNULL_END

compdfkit-tools/compdfkit-tools/Common/Views/PDFProperties/CPDFOpacitySliderView.m

@@ -50,6 +50,8 @@
 
         self.sliderCount = 10;
         
+        self.leftMargin = self.rightMargin = self.rightTitleMargin = 0;
+        
         self.backgroundColor = [CPDFColorUtils CPDFViewControllerBackgroundColor];
     }
     return self;
@@ -69,13 +71,12 @@
 - (void)layoutSubviews {
     [super layoutSubviews];
     self.titleLabel.frame = CGRectMake(10, 0, self.frame.size.width, self.frame.size.height/2);
-    self.opacitySlider.frame = CGRectMake(20, self.frame.size.height/2, self.frame.size.width - 130, self.frame.size.height/2);
-    self.startLabel.frame = CGRectMake(self.frame.size.width - 90, self.frame.size.height/2 + 10, 80, self.frame.size.height/2 - 15);
+    self.opacitySlider.frame = CGRectMake(20 - self.leftMargin, self.frame.size.height/2, self.frame.size.width - 130 + self.leftMargin + self.rightMargin, self.frame.size.height/2);
 
-    self.startLabel.frame = CGRectMake(self.frame.size.width - 100, self.frame.size.height/2 + 7.5, 80, self.frame.size.height/2 - 15);
-    self.startLabel.frame = CGRectMake(self.frame.size.width - 100, self.frame.size.height/2 + 7.5, 80, self.frame.size.height/2 - 15);
+    self.startLabel.frame = CGRectMake(self.frame.size.width - 100 + self.rightMargin, self.frame.size.height/2 + 7.5, 80, self.frame.size.height/2 - 15);
 }
 
+
 #pragma mark - Action
 
 - (void)buttonItemClicked_changes:(UISlider *)sender {

compdfkit-tools/compdfkit-tools/Common/Views/PDFProperties/CPDFThicknessSliderView.h

@@ -38,6 +38,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, assign) CGFloat thick;
 
+@property (nonatomic, assign) CGFloat leftMargin;
+@property (nonatomic, assign) CGFloat rightMargin;
+@property (nonatomic, assign) CGFloat leftTitleMargin;
+
 @property (nonatomic, weak) id<CPDFThicknessSliderViewDelegate> delegate;
 
 @end

compdfkit-tools/compdfkit-tools/Common/Views/PDFProperties/CPDFThicknessSliderView.m

@@ -49,6 +49,7 @@
         
         self.thick = 1;
         self.sliderCount  = 10;
+        self.leftTitleMargin = self.rightMargin = self.leftMargin = 0;
     }
     return self;
 }
@@ -68,9 +69,9 @@
 
 - (void)layoutSubviews {
     [super layoutSubviews];
-    self.titleLabel.frame = CGRectMake(20, 0, self.frame.size.width, self.frame.size.height/2);
-    self.thicknessSlider.frame = CGRectMake(20, self.frame.size.height/2, self.frame.size.width - 130, self.frame.size.height/2);
-    self.startLabel.frame = CGRectMake(self.frame.size.width - 100, self.frame.size.height/2 + 7.5, 80, self.frame.size.height/2 -15);
+    self.titleLabel.frame = CGRectMake(20 -self.leftTitleMargin, 0, self.frame.size.width, self.frame.size.height/2);
+    self.thicknessSlider.frame = CGRectMake(20-self.leftMargin, self.frame.size.height/2, self.frame.size.width - 130 + self.leftMargin + self.rightMargin, self.frame.size.height/2);
+    self.startLabel.frame = CGRectMake(self.frame.size.width - 100 + self.rightMargin, self.frame.size.height/2 + 7.5, 80, self.frame.size.height/2 -15);
 }
 
 #pragma mark - Action

compdfkit-tools/compdfkit-tools/Edit/CPDFEditCell/CPDFImagePropertyCell.m

@@ -164,7 +164,8 @@
         self.transformSplitView.backgroundColor =  [UIColor colorWithRed:0 green:0 blue:0 alpha:0.1];
         [self.transformView addSubview:self.transformSplitView];
         
-        
+        self.opacityView.rightMargin = 10;
+        self.opacityView.leftMargin = 5;
         
     }
     return self;
@@ -188,7 +189,7 @@
     self.transformSplitView.frame = CGRectMake(50, 0, 1, 32);
     self.vBtn.frame = CGRectMake(51, 0, 50, 32);
     
-    self.opacityView.frame = CGRectMake(6, CGRectGetMaxY(self.transformView.frame)+ 10, self.frame.size.width - 12, 90);
+    self.opacityView.frame = CGRectMake(6, CGRectGetMaxY(self.transformView.frame)+ 10, self.frame.size.width - 12, 80);
     
     self.toolsLabel.frame = CGRectMake(16, CGRectGetMaxY(self.opacityView.frame) + 16, self.bounds.size.width, 20);
     

compdfkit-tools/compdfkit-tools/Edit/CPDFEditCell/CPDFTextPropertyCell.m

@@ -168,6 +168,12 @@
         [self.dropMenuView addSubview:self.fontSelectBtn];
         
         self.styleView.backgroundColor = [UIColor colorWithRed:73/255. green:130/255. blue:230/255. alpha:0.08];
+        self.opacityView.rightMargin = 10;
+        self.opacityView.leftMargin = 5;
+        
+        self.thickSliderView.rightMargin = 20;
+        self.thickSliderView.leftMargin = 5;
+        self.thickSliderView.leftTitleMargin = 10;
         
     }
     return self;
@@ -176,7 +182,7 @@
 -(void)layoutSubviews {
     [super layoutSubviews];
     
-    self.colorView.frame = CGRectMake(10, 0, self.frame.size.width-20, 80);
+    self.colorView.frame = CGRectMake(0, 0, self.frame.size.width, 80);
     self.opacityView.frame = CGRectMake(10, CGRectGetMaxY(self.colorView.frame), self.frame.size.width-10, 80);
     self.fontView.frame = CGRectMake(10, CGRectGetMaxY(self.opacityView.frame)+ 20, self.frame.size.width-20, 30);
     self.alignmentView.frame = CGRectMake(10, CGRectGetMaxY(self.fontView.frame) + 20, self.frame.size.width-20, 30);

compdfkit-tools/compdfkit-tools/Edit/CPDFEditViewController.m

@@ -18,7 +18,7 @@
 #import <ComPDFKit/ComPDFKit.h>
 #import "CPDFColorUtils.h"
 
-@interface CPDFEditViewController ()<UITableViewDelegate,UITableViewDataSource,CPDFColorPickerViewDelegate,CPDFEditFontNameSelectViewDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate>
+@interface CPDFEditViewController ()<UITableViewDelegate,UITableViewDataSource,CPDFColorPickerViewDelegate,CPDFEditFontNameSelectViewDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate,UIColorPickerViewControllerDelegate>
 
 @property (nonatomic, strong) UIView      * splitView;
 @property (nonatomic, strong) UITableView * tableView;
@@ -153,11 +153,19 @@
         cell.actionBlock = ^(CPDFTextActionType actionType) {
             if(actionType == CPDFTextActionColorSelect){
                 //Add colorSelectView
-                self.colorPickerView = [[CPDFColorPickerView alloc] initWithFrame:self.view.frame];
-                self.colorPickerView.delegate = self;
-                self.colorPickerView.backgroundColor = [CPDFColorUtils CPDFViewControllerBackgroundColor];
-
-                [self.view addSubview:self.colorPickerView];
+                
+                if (@available(iOS 14.0, *)) {
+                    UIColorPickerViewController *picker = [[UIColorPickerViewController alloc] init];
+                    picker.delegate = self;
+                    [self presentViewController:picker animated:YES completion:nil];
+                } else {
+                    self.colorPickerView = [[CPDFColorPickerView alloc] initWithFrame:self.view.frame];
+                    self.colorPickerView.delegate = self;
+                    self.colorPickerView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+                    self.colorPickerView.backgroundColor = [CPDFColorUtils CPDFViewControllerBackgroundColor];
+                    [self.view addSubview:self.colorPickerView];
+                }
+                
             }else if(actionType == CPDFTextActionFontNameSelect) {
                 //Add actionFontNameSelect
                 self.fontSelectView = [[CPDFEditFontNameSelectView alloc] initWithFrame:self.view.bounds];
@@ -282,6 +290,12 @@
     [self.pdfView setEditingSelectionFontName:fontName];
 }
 
+#pragma mark - UIColorPickerViewControllerDelegate
+
+- (void)colorPickerViewControllerDidFinish:(UIColorPickerViewController *)viewController API_AVAILABLE(ios(14.0)) {
+    [self.pdfView setEditingSelectionFontColor:viewController.selectedColor];
+}
+
 #pragma mark - setMode
 - (void)setEditMode:(CPDFEditMode)editMode{
     _editMode = editMode;

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/CPDFSearchResultsViewController.m

@@ -16,6 +16,7 @@
 #import <ComPDFKit/ComPDFKit.h>
 #import <CoreText/CoreText.h>
 #import "UIViewController+LeftItem.h"
+#import "CPDFColorUtils.h"
 
 #define kTextSearch_Content_Length_Max 100
 
@@ -77,9 +78,11 @@
     
     self.searchResultView.backgroundColor = [UIColor colorWithRed:242./255 green:242/255. blue:242/255. alpha:1.0];
     self.pageLabel.font = [UIFont systemFontOfSize:14];
-    self.pageLabel.text = @"page";
+    self.pageLabel.text = NSLocalizedString(@"Page",nil);
     self.pageLabel.textAlignment = NSTextAlignmentRight;
+    self.pageLabel.textColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:1.0];
     self.searchResultLabel.font = [UIFont systemFontOfSize:14];
+    self.searchResultLabel.textColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:1.0];
     [self.searchResultView addSubview:self.searchResultLabel];
     [self.searchResultView addSubview:self.pageLabel];
     [self.view addSubview:self.searchResultView];
@@ -100,6 +103,8 @@
     [self.backBtn setImage:[UIImage imageNamed:@"CPDFEditClose" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil] forState:UIControlStateNormal];
     [self.backBtn addTarget:self action:@selector(buttonItemClicked_back:) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:self.backBtn];
+    
+    self.view.backgroundColor = [CPDFColorUtils CPDFViewControllerBackgroundColor];
 }
 
 - (void)buttonItemClicked_back:(UIButton *)button {

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/Images.xcassets/CPDFSearchImageClose.imageset/Contents.json

@@ -6,12 +6,43 @@
       "scale" : "1x"
     },
     {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "closel.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/Images.xcassets/CPDFSearchImageClose.imageset/closel.pdf

@@ -0,0 +1,87 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+0.707107 0.707107 -0.707107 0.707107 14.853586 -5.813791 cm
+1.000000 1.000000 1.000000 scn
+6.999999 7.170410 m
+6.999999 6.420410 l
+8.499999 6.420410 l
+8.499999 7.170410 l
+8.499999 13.420383 l
+14.750000 13.420383 l
+15.500000 13.420383 l
+15.500000 14.920383 l
+14.750000 14.920383 l
+8.499999 14.920383 l
+8.499999 21.170410 l
+8.499999 21.920410 l
+6.999999 21.920410 l
+6.999999 21.170410 l
+6.999999 14.920383 l
+0.750000 14.920383 l
+-0.000000 14.920383 l
+-0.000000 13.420383 l
+0.750000 13.420383 l
+6.999999 13.420383 l
+6.999999 7.170410 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  572
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000662 00000 n
+0000000684 00000 n
+0000000857 00000 n
+0000000931 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+990
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/Images.xcassets/CPDFSearchImageList.imageset/Contents.json

@@ -1,17 +1,46 @@
 {
   "images" : [
     {
-      "filename" : "ze-bars@1x.png",
+      "filename" : "searchlist.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "ze-bars@2x.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "searchlistl.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "ze-bars@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/Images.xcassets/CPDFSearchImageList.imageset/searchlist.pdf

@@ -0,0 +1,101 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.000000 4.250000 cm
+0.262745 0.278431 0.301961 scn
+0.750000 10.000000 m
+1.164214 10.000000 1.500000 10.335787 1.500000 10.750000 c
+1.500000 11.164213 1.164214 11.500000 0.750000 11.500000 c
+0.335786 11.500000 0.000000 11.164213 0.000000 10.750000 c
+0.000000 10.335787 0.335786 10.000000 0.750000 10.000000 c
+h
+3.000000 10.000000 m
+16.000000 10.000001 l
+16.000000 11.500000 l
+3.000000 11.500000 l
+3.000000 10.000000 l
+h
+0.750000 5.000000 m
+1.164214 5.000000 1.500000 5.335786 1.500000 5.750000 c
+1.500000 6.164214 1.164214 6.500000 0.750000 6.500000 c
+0.335786 6.500000 0.000000 6.164214 0.000000 5.750000 c
+0.000000 5.335786 0.335786 5.000000 0.750000 5.000000 c
+h
+3.000000 5.000000 m
+16.000000 5.000001 l
+16.000000 6.500000 l
+3.000000 6.500000 l
+3.000000 5.000000 l
+h
+1.500000 0.750000 m
+1.500000 0.335787 1.164214 0.000000 0.750000 0.000000 c
+0.335786 0.000000 0.000000 0.335787 0.000000 0.750000 c
+0.000000 1.164213 0.335786 1.500000 0.750000 1.500000 c
+1.164214 1.500000 1.500000 1.164213 1.500000 0.750000 c
+h
+16.000000 0.000001 m
+3.000000 0.000000 l
+3.000000 1.500000 l
+16.000000 1.500000 l
+16.000000 0.000001 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1195
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000001285 00000 n
+0000001308 00000 n
+0000001481 00000 n
+0000001555 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1614
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/Images.xcassets/CPDFSearchImageList.imageset/searchlistl.pdf

@@ -0,0 +1,101 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 2.000000 4.250000 cm
+1.000000 1.000000 1.000000 scn
+0.750000 10.000000 m
+1.164214 10.000000 1.500000 10.335787 1.500000 10.750000 c
+1.500000 11.164213 1.164214 11.500000 0.750000 11.500000 c
+0.335786 11.500000 0.000000 11.164213 0.000000 10.750000 c
+0.000000 10.335787 0.335786 10.000000 0.750000 10.000000 c
+h
+3.000000 10.000000 m
+16.000000 10.000001 l
+16.000000 11.500000 l
+3.000000 11.500000 l
+3.000000 10.000000 l
+h
+0.750000 5.000000 m
+1.164214 5.000000 1.500000 5.335786 1.500000 5.750000 c
+1.500000 6.164214 1.164214 6.500000 0.750000 6.500000 c
+0.335786 6.500000 0.000000 6.164214 0.000000 5.750000 c
+0.000000 5.335786 0.335786 5.000000 0.750000 5.000000 c
+h
+3.000000 5.000000 m
+16.000000 5.000001 l
+16.000000 6.500000 l
+3.000000 6.500000 l
+3.000000 5.000000 l
+h
+1.500000 0.750000 m
+1.500000 0.335787 1.164214 0.000000 0.750000 0.000000 c
+0.335786 0.000000 0.000000 0.335787 0.000000 0.750000 c
+0.000000 1.164213 0.335786 1.500000 0.750000 1.500000 c
+1.164214 1.500000 1.500000 1.164213 1.500000 0.750000 c
+h
+16.000000 0.000001 m
+3.000000 0.000000 l
+3.000000 1.500000 l
+16.000000 1.500000 l
+16.000000 0.000001 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1195
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000001285 00000 n
+0000001308 00000 n
+0000001481 00000 n
+0000001555 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1614
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/Images.xcassets/CPDFSearchImageNext.imageset/Contents.json

@@ -1,17 +1,46 @@
 {
   "images" : [
     {
-      "filename" : "ze-arrow@1x.png",
+      "filename" : "right.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "ze-arrow@2x.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "rightl.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "ze-arrow@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/Images.xcassets/CPDFSearchImageNext.imageset/right.pdf

@@ -0,0 +1,83 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+-0.707117 -0.707096 -0.707117 0.707096 19.142715 5.890365 cm
+0.262745 0.278431 0.301961 scn
+0.000000 5.765869 m
+-0.750000 5.765869 l
+-0.750000 5.015869 l
+0.000000 5.015869 l
+0.000000 5.765869 l
+h
+11.360001 6.515869 m
+0.000000 6.515869 l
+0.000000 5.015869 l
+11.360001 5.015869 l
+11.360001 6.515869 l
+h
+0.750000 5.765869 m
+0.750000 17.125870 l
+-0.750000 17.125870 l
+-0.750000 5.765869 l
+0.750000 5.765869 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  443
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000533 00000 n
+0000000555 00000 n
+0000000728 00000 n
+0000000802 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+861
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/Images.xcassets/CPDFSearchImageNext.imageset/rightl.pdf

@@ -0,0 +1,83 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+-0.707117 -0.707096 -0.707117 0.707096 16.235081 6.693908 cm
+1.000000 1.000000 1.000000 scn
+0.000000 4.575027 m
+-0.750000 4.575027 l
+-0.750000 3.825027 l
+0.000000 3.825027 l
+0.000000 4.575027 l
+h
+8.485153 5.325027 m
+0.000000 5.325027 l
+0.000000 3.825027 l
+8.485153 3.825027 l
+8.485153 5.325027 l
+h
+0.750000 4.575027 m
+0.750000 13.060181 l
+-0.750000 13.060181 l
+-0.750000 4.575027 l
+0.750000 4.575027 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  440
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000530 00000 n
+0000000552 00000 n
+0000000725 00000 n
+0000000799 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+858
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/Images.xcassets/CPDFSearchImagePrevious.imageset/Contents.json

@@ -1,17 +1,46 @@
 {
   "images" : [
     {
-      "filename" : "ze-arrow-left@1x.png",
+      "filename" : "left.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "ze-arrow-left@2x.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "leftl.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "ze-arrow-left@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/Images.xcassets/CPDFSearchImagePrevious.imageset/left.pdf

@@ -0,0 +1,83 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+0.707117 -0.707096 0.707117 0.707096 1.921651 5.886373 cm
+0.262745 0.278431 0.301961 scn
+0.000000 5.767526 m
+-0.750000 5.767526 l
+-0.750000 5.017526 l
+0.000000 5.017526 l
+0.000000 5.767526 l
+h
+11.363990 6.517526 m
+0.000000 6.517526 l
+0.000000 5.017526 l
+11.363990 5.017526 l
+11.363990 6.517526 l
+h
+0.750000 5.767526 m
+0.750000 17.131516 l
+-0.750000 17.131516 l
+-0.750000 5.767526 l
+0.750000 5.767526 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  440
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000530 00000 n
+0000000552 00000 n
+0000000725 00000 n
+0000000799 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+858
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/Images.xcassets/CPDFSearchImagePrevious.imageset/leftl.pdf

@@ -0,0 +1,83 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+0.707117 -0.707096 0.707117 0.707096 3.764918 6.693908 cm
+1.000000 1.000000 1.000000 scn
+0.000000 4.575027 m
+-0.750000 4.575027 l
+-0.750000 3.825027 l
+0.000000 3.825027 l
+0.000000 4.575027 l
+h
+8.485153 5.325027 m
+0.000000 5.325027 l
+0.000000 3.825027 l
+8.485153 3.825027 l
+8.485153 5.325027 l
+h
+0.750000 4.575027 m
+0.750000 13.060181 l
+-0.750000 13.060181 l
+-0.750000 4.575027 l
+0.750000 4.575027 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  437
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000000527 00000 n
+0000000549 00000 n
+0000000722 00000 n
+0000000796 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+855
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFThumbnail/CPDFThumbnailViewController.m

@@ -15,6 +15,7 @@
 
 #import <ComPDFKit/ComPDFKit.h>
 #import "UIViewController+LeftItem.h"
+#import "CPDFColorUtils.h"
 
 @interface CPDFThumbnailViewController () <UICollectionViewDelegate,UICollectionViewDataSource>
 
@@ -74,6 +75,7 @@
     self.titleLabel.text =  NSLocalizedString(@"Thumbnail", nil);
     self.titleLabel.font = [UIFont systemFontOfSize:20];
     self.titleLabel.adjustsFontSizeToFitWidth = YES;
+    self.titleLabel.textColor = [CPDFColorUtils CAnyReverseBackgooundColor];
     [self.view addSubview:self.titleLabel];
     
     self.backBtn = [[UIButton alloc] init];
@@ -81,6 +83,7 @@
     [self.backBtn setImage:[UIImage imageNamed:@"CPDFEditClose" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil] forState:UIControlStateNormal];
     [self.backBtn addTarget:self action:@selector(buttonItemClicked_back:) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:self.backBtn];
+    self.view.backgroundColor = [CPDFColorUtils CPDFViewControllerBackgroundColor];
     
 }