PDFTools - 预览模块处理

compdfkit-tools/compdfkit-tools/Common/Controls/PDFNavigationController/UIViewController+LeftItem.m

@@ -16,7 +16,6 @@
 @implementation UIViewController(LeftItem)
 
 -(void)changeleftItem{
-    UIImageView *imagview = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 32, 32)];
 
     
     UIBarButtonItem *left = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"CNavigationImageNameBackArrow" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] style:UIBarButtonItemStyleDone target:self action:@selector(back)];

compdfkit-tools/compdfkit-tools/Common/Views/PDFNavigationRightView/CNavigationRightView.m

@@ -123,7 +123,7 @@ typedef void (^Clickback) (NSUInteger tag);
         [button addTarget:self action:@selector(buttonClickItem:) forControlEvents:UIControlEventTouchUpInside];
         [self addSubview:button];
         if(i == self.dataArray.count - 1){
-            
+            width += offset;
         }else{
             width += (button.frame.size.width + offset);
         }
@@ -131,7 +131,6 @@ typedef void (^Clickback) (NSUInteger tag);
     }
     
     self.bounds = CGRectMake(0, 0, width + offset, height);
-    NSLog(@"bounds %@",NSStringFromCGRect(self.bounds));
 }
 
 #pragma mark - Action

compdfkit-tools/compdfkit-tools/Common/Views/PDFNavigationRightView/NavigationRightImage.xcassets/CNavigationImageNameInformation.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "imformation.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

compdfkit-tools/compdfkit-tools/Common/Views/PDFNavigationRightView/NavigationRightImage.xcassets/CNavigationImageNameInformation.imageset/imformation.pdf

@@ -0,0 +1,89 @@
+%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 0.942322 0.942383 cm
+0.262745 0.278431 0.301961 scn
+1.500000 9.057664 m
+1.500000 13.231663 4.883694 16.615356 9.057693 16.615356 c
+13.231690 16.615356 16.615385 13.231663 16.615385 9.057664 c
+16.615385 4.883666 13.231690 1.499971 9.057693 1.499971 c
+4.883694 1.499971 1.500000 4.883666 1.500000 9.057664 c
+h
+9.057693 18.115356 m
+4.055267 18.115356 0.000000 14.060089 0.000000 9.057664 c
+0.000000 4.055239 4.055267 -0.000029 9.057693 -0.000029 c
+14.060118 -0.000029 18.115385 4.055239 18.115385 9.057664 c
+18.115385 14.060089 14.060118 18.115356 9.057693 18.115356 c
+h
+9.980770 11.826895 m
+9.980770 11.317093 9.567494 10.903818 9.057693 10.903818 c
+8.547892 10.903818 8.134616 11.317093 8.134616 11.826895 c
+8.134616 12.336696 8.547892 12.749971 9.057693 12.749971 c
+9.567494 12.749971 9.980770 12.336696 9.980770 11.826895 c
+h
+8.307693 4.442279 m
+8.307693 9.980741 l
+9.807693 9.980741 l
+9.807693 4.442279 l
+8.307693 4.442279 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1003
+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
+0000001093 00000 n
+0000001116 00000 n
+0000001289 00000 n
+0000001363 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1422
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFNavigationRightView/NavigationRightImage.xcassets/CNavigationImageNameNewFile.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "newfile.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

compdfkit-tools/compdfkit-tools/Common/Views/PDFNavigationRightView/NavigationRightImage.xcassets/CNavigationImageNameNewFile.imageset/newfile.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 1.500000 cm
+0.262745 0.278431 0.301961 scn
+14.500000 1.500000 m
+1.500000 1.500000 l
+1.500000 15.500000 l
+9.685191 15.500000 l
+14.500000 11.744036 l
+14.500000 8.500000 l
+14.500000 1.500000 l
+h
+16.000000 12.476326 m
+10.201057 17.000000 l
+1.500000 17.000000 l
+0.000000 17.000000 l
+0.000000 15.500000 l
+0.000000 1.500000 l
+0.000000 0.000000 l
+1.500000 0.000000 l
+14.500000 0.000000 l
+16.000000 0.000000 l
+16.000000 1.500000 l
+16.000000 8.500000 l
+16.000000 12.476326 l
+h
+8.750000 11.000000 m
+8.750000 8.750000 l
+11.000000 8.750000 l
+11.000000 7.250000 l
+8.750000 7.250000 l
+8.750000 5.000000 l
+7.250000 5.000000 l
+7.250000 7.250000 l
+5.000000 7.250000 l
+5.000000 8.750000 l
+7.250000 8.750000 l
+7.250000 11.000000 l
+8.750000 11.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  817
+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
+0000000907 00000 n
+0000000929 00000 n
+0000001102 00000 n
+0000001176 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1235
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFNavigationRightView/NavigationRightImage.xcassets/CNavigationImageNamePreview.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "pageset.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

compdfkit-tools/compdfkit-tools/Common/Views/PDFNavigationRightView/NavigationRightImage.xcassets/CNavigationImageNamePreview.imageset/pageset.pdf

@@ -0,0 +1,199 @@
+%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.666016 2.250000 cm
+0.262745 0.278431 0.301961 scn
+16.666666 7.750000 m
+17.310650 7.365571 l
+17.540136 7.750000 l
+17.310650 8.134428 l
+16.666666 7.750000 l
+h
+0.000000 7.750000 m
+-0.643984 8.134428 l
+-0.873469 7.750000 l
+-0.643984 7.365571 l
+0.000000 7.750000 l
+h
+16.666666 7.750000 m
+16.022682 8.134428 16.022770 8.134575 16.022844 8.134699 c
+16.022850 8.134708 16.022909 8.134809 16.022921 8.134829 c
+16.022945 8.134867 16.022911 8.134811 16.022823 8.134664 c
+16.022646 8.134367 16.022243 8.133698 16.021620 8.132662 c
+16.020370 8.130590 16.018230 8.127052 16.015213 8.122094 c
+16.009174 8.112178 15.999622 8.096588 15.986643 8.075705 c
+15.960680 8.033928 15.921033 7.971016 15.868401 7.889988 c
+15.763083 7.727850 15.606099 7.493677 15.403049 7.211539 c
+14.995981 6.645918 14.408673 5.894369 13.686237 5.145842 c
+12.206971 3.613152 10.311919 2.250000 8.333333 2.250000 c
+8.333333 0.750000 l
+10.957120 0.750000 13.228734 2.511848 14.765541 4.104158 c
+15.551142 4.918131 16.184223 5.729082 16.620533 6.335336 c
+16.839172 6.639135 17.009626 6.893243 17.126324 7.072902 c
+17.184700 7.162773 17.229704 7.234138 17.260641 7.283915 c
+17.276112 7.308807 17.288071 7.328313 17.296432 7.342048 c
+17.300615 7.348915 17.303898 7.354341 17.306271 7.358278 c
+17.307457 7.360246 17.308414 7.361842 17.309145 7.363060 c
+17.309511 7.363668 17.309818 7.364182 17.310070 7.364602 c
+17.310194 7.364811 17.310341 7.365054 17.310402 7.365158 c
+17.310534 7.365377 17.310650 7.365571 16.666666 7.750000 c
+h
+8.333333 2.250000 m
+6.354747 2.250000 4.459694 3.613152 2.980429 5.145842 c
+2.257993 5.894369 1.670685 6.645918 1.263617 7.211539 c
+1.060567 7.493677 0.903582 7.727850 0.798265 7.889988 c
+0.745634 7.971016 0.705986 8.033928 0.680023 8.075705 c
+0.667043 8.096588 0.657491 8.112178 0.651454 8.122094 c
+0.648435 8.127052 0.646296 8.130590 0.645047 8.132662 c
+0.644423 8.133698 0.644021 8.134367 0.643843 8.134664 c
+0.643754 8.134811 0.643722 8.134867 0.643745 8.134829 c
+0.643756 8.134809 0.643816 8.134708 0.643822 8.134699 c
+0.643896 8.134575 0.643984 8.134428 0.000000 7.750000 c
+-0.643984 7.365571 -0.643867 7.365377 -0.643737 7.365158 c
+-0.643674 7.365054 -0.643529 7.364811 -0.643404 7.364602 c
+-0.643153 7.364182 -0.642845 7.363668 -0.642480 7.363060 c
+-0.641749 7.361842 -0.640790 7.360246 -0.639604 7.358278 c
+-0.637231 7.354341 -0.633948 7.348915 -0.629767 7.342048 c
+-0.621405 7.328313 -0.609445 7.308807 -0.593975 7.283915 c
+-0.563038 7.234138 -0.518034 7.162773 -0.459658 7.072902 c
+-0.342960 6.893243 -0.172507 6.639135 0.046133 6.335336 c
+0.482443 5.729082 1.115524 4.918131 1.901125 4.104158 c
+3.437932 2.511848 5.709546 0.750000 8.333333 0.750000 c
+8.333333 2.250000 l
+h
+0.000000 7.750000 m
+0.643984 7.365571 0.643896 7.365425 0.643822 7.365301 c
+0.643816 7.365292 0.643756 7.365191 0.643745 7.365172 c
+0.643722 7.365133 0.643754 7.365188 0.643843 7.365336 c
+0.644021 7.365633 0.644423 7.366302 0.645047 7.367338 c
+0.646296 7.369409 0.648435 7.372948 0.651454 7.377906 c
+0.657491 7.387822 0.667043 7.403412 0.680023 7.424296 c
+0.705986 7.466072 0.745634 7.528984 0.798265 7.610012 c
+0.903582 7.772150 1.060567 8.006323 1.263617 8.288461 c
+1.670685 8.854082 2.257993 9.605631 2.980429 10.354158 c
+4.459694 11.886848 6.354747 13.250000 8.333333 13.250000 c
+8.333333 14.750000 l
+5.709546 14.750000 3.437932 12.988152 1.901125 11.395842 c
+1.115524 10.581869 0.482443 9.770918 0.046133 9.164664 c
+-0.172507 8.860865 -0.342960 8.606756 -0.459658 8.427097 c
+-0.518034 8.337227 -0.563038 8.265862 -0.593975 8.216085 c
+-0.609445 8.191193 -0.621405 8.171687 -0.629767 8.157952 c
+-0.633948 8.151085 -0.637231 8.145658 -0.639604 8.141722 c
+-0.640790 8.139754 -0.641749 8.138159 -0.642480 8.136940 c
+-0.642845 8.136332 -0.643153 8.135818 -0.643404 8.135399 c
+-0.643529 8.135189 -0.643674 8.134947 -0.643737 8.134842 c
+-0.643867 8.134623 -0.643984 8.134428 0.000000 7.750000 c
+h
+8.333333 13.250000 m
+10.311919 13.250000 12.206971 11.886848 13.686237 10.354158 c
+14.408673 9.605631 14.995981 8.854082 15.403049 8.288461 c
+15.606099 8.006323 15.763083 7.772150 15.868401 7.610012 c
+15.921033 7.528984 15.960680 7.466072 15.986643 7.424296 c
+15.999622 7.403412 16.009174 7.387822 16.015213 7.377906 c
+16.018230 7.372948 16.020370 7.369409 16.021620 7.367338 c
+16.022243 7.366302 16.022646 7.365633 16.022823 7.365336 c
+16.022911 7.365188 16.022945 7.365133 16.022921 7.365172 c
+16.022909 7.365191 16.022850 7.365292 16.022844 7.365301 c
+16.022770 7.365425 16.022682 7.365571 16.666666 7.750000 c
+17.310650 8.134428 17.310534 8.134623 17.310402 8.134842 c
+17.310341 8.134947 17.310194 8.135189 17.310070 8.135399 c
+17.309818 8.135818 17.309511 8.136332 17.309145 8.136940 c
+17.308414 8.138159 17.307457 8.139754 17.306271 8.141722 c
+17.303898 8.145658 17.300615 8.151085 17.296432 8.157952 c
+17.288071 8.171687 17.276112 8.191193 17.260641 8.216085 c
+17.229704 8.265862 17.184700 8.337227 17.126324 8.427097 c
+17.009626 8.606756 16.839172 8.860865 16.620533 9.164664 c
+16.184223 9.770918 15.551142 10.581869 14.765541 11.395842 c
+13.228734 12.988152 10.957120 14.750000 8.333333 14.750000 c
+8.333333 13.250000 l
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 8.000000 6.500000 cm
+0.262745 0.278431 0.301961 scn
+3.250000 3.500000 m
+3.250000 2.809644 2.690356 2.250000 2.000000 2.250000 c
+2.000000 0.750000 l
+3.518783 0.750000 4.750000 1.981217 4.750000 3.500000 c
+3.250000 3.500000 l
+h
+2.000000 2.250000 m
+1.309644 2.250000 0.750000 2.809644 0.750000 3.500000 c
+-0.750000 3.500000 l
+-0.750000 1.981217 0.481217 0.750000 2.000000 0.750000 c
+2.000000 2.250000 l
+h
+0.750000 3.500000 m
+0.750000 4.190356 1.309644 4.750000 2.000000 4.750000 c
+2.000000 6.250000 l
+0.481217 6.250000 -0.750000 5.018783 -0.750000 3.500000 c
+0.750000 3.500000 l
+h
+2.000000 4.750000 m
+2.690356 4.750000 3.250000 4.190356 3.250000 3.500000 c
+4.750000 3.500000 l
+4.750000 5.018783 3.518783 6.250000 2.000000 6.250000 c
+2.000000 4.750000 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  5966
+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
+0000006056 00000 n
+0000006079 00000 n
+0000006252 00000 n
+0000006326 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+6385
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFNavigationRightView/NavigationRightImage.xcassets/CNavigationImageNameShare.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "share.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

compdfkit-tools/compdfkit-tools/Common/Views/PDFNavigationRightView/NavigationRightImage.xcassets/CNavigationImageNameShare.imageset/share.pdf

@@ -0,0 +1,103 @@
+%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.750000 1.746948 cm
+0.262745 0.278431 0.301961 scn
+16.447018 16.442316 m
+15.699378 16.450533 l
+11.668878 16.494833 l
+10.921238 16.503052 l
+10.937572 14.998524 l
+11.685211 14.990306 l
+13.598865 14.969273 l
+6.181601 7.506130 l
+5.652908 6.974168 l
+6.710293 5.910242 l
+7.238986 6.442204 l
+14.960099 14.211076 l
+14.975967 14.227042 l
+15.003935 11.651055 l
+15.012101 10.898791 l
+16.507381 10.882357 l
+16.499214 11.634621 l
+16.455185 15.690051 l
+16.447018 16.442316 l
+h
+0.750000 16.492550 m
+0.000000 16.492550 l
+0.000000 15.742550 l
+0.000000 0.749971 l
+0.000000 -0.000029 l
+0.750000 -0.000029 l
+15.650415 -0.000029 l
+16.400415 -0.000029 l
+16.400415 0.749971 l
+16.400415 8.246261 l
+14.900415 8.246261 l
+14.900415 1.499971 l
+1.500000 1.499971 l
+1.500000 14.992550 l
+8.200208 14.992550 l
+8.200208 16.492550 l
+0.750000 16.492550 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  897
+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
+0000000987 00000 n
+0000001009 00000 n
+0000001182 00000 n
+0000001256 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1315
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFPopMenu/CPDFPopMenuView.h

@@ -16,7 +16,8 @@
 typedef NS_ENUM(NSInteger, CPDFPopMenuViewType) {
     CPDFPopMenuViewTypeSetting = 0,
     CPDFPopMenuViewTypeInfo,
-    CPDFPopMenuViewTypeShare
+    CPDFPopMenuViewTypeShare,
+    CPDFPopMenuViewTypeAddFile
 };
 
 

compdfkit-tools/compdfkit-tools/Common/Views/PDFPopMenu/CPDFPopMenuView.m

@@ -36,8 +36,8 @@
 
 - (void)setUp {
     
-    self.menuItemTitleArr = [[NSMutableArray alloc] initWithObjects:NSLocalizedString(@"Preview Settings", nil),NSLocalizedString(@"Information", nil),NSLocalizedString(@"Share", nil), nil];
-    self.menuItemIconArr = [[NSMutableArray alloc] initWithObjects:@"",@"",@"", nil];
+    self.menuItemTitleArr = [[NSMutableArray alloc] initWithObjects:NSLocalizedString(@"Preview Settings", nil),NSLocalizedString(@"Information", nil),NSLocalizedString(@"Share", nil),NSLocalizedString(@"Open New File", nil),nil];
+    self.menuItemIconArr = [[NSMutableArray alloc] initWithObjects:@"CNavigationImageNamePreview",@"CNavigationImageNameInformation",@"CNavigationImageNameShare",@"CNavigationImageNameNewFile",nil];
     
     self.tableView = [[UITableView alloc] init];
     self.tableView.layer.cornerRadius = 5.0;
@@ -69,8 +69,9 @@
     }
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
     cell.titleL.text = self.menuItemTitleArr[indexPath.row];
+    cell.iconImage.image = [UIImage imageNamed:self.menuItemIconArr[indexPath.row] inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil];
     
-    if(indexPath.row == 2){
+    if(indexPath.row == 3){
         [cell hiddenLineView:YES];
     }else{
         [cell hiddenLineView:NO];

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/CPDFDisplayTableViewCell.h

@@ -18,6 +18,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) UIImageView *checkImageView;
 
+@property (nonatomic, strong) UIImageView *iconImageView;
+
+@property (nonatomic, strong) UILabel  * titleLabel;
+
 @property (nonatomic, strong) UISwitch *modeSwitch;
 
 @property (nonatomic, copy) void(^switchBlock)(void);

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/CPDFDisplayTableViewCell.m

@@ -18,6 +18,7 @@
     if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
         _modeSwitch = [[UISwitch alloc] init];
         _modeSwitch.hidden = YES;
+        _modeSwitch.transform = CGAffineTransformMakeScale(0.75, 0.75);
         [_modeSwitch sizeToFit];
         [_modeSwitch addTarget:self action:@selector(switchAction:) forControlEvents:UIControlEventValueChanged];
 
@@ -29,6 +30,14 @@
                       compatibleWithTraitCollection:nil];
         _checkImageView.hidden = YES;
         [self.contentView addSubview:_checkImageView];
+        
+        _iconImageView = [[UIImageView alloc] init];
+        [self.contentView addSubview:_iconImageView];
+        
+        _titleLabel = [[UILabel alloc] init];
+        _titleLabel.font = [UIFont systemFontOfSize:17.];
+        [self.contentView addSubview:_titleLabel];
+        
     }
     return self;
 }
@@ -36,9 +45,11 @@
 -(void)layoutSubviews {
     [super layoutSubviews];
     
-    _modeSwitch.frame = CGRectMake(self.contentView.frame.size.width - 60, (self.contentView.frame.size.height - 40)/2, 40, 50);
+    _modeSwitch.frame = CGRectMake(self.contentView.frame.size.width - 50, (self.contentView.frame.size.height - 30)/2, 30, 40);
     
-    _checkImageView.frame = CGRectMake(self.contentView.frame.size.width - 50, (self.contentView.frame.size.height - 40)/2, 40, 40);
+    _checkImageView.frame = CGRectMake(self.contentView.frame.size.width - 40, (self.contentView.frame.size.height - 40)/2, 30, 30);
+    _iconImageView.frame = CGRectMake(10, 12, 20, 20);
+    _titleLabel.frame = CGRectMake(CGRectGetMaxX(_iconImageView.frame) + 10, 12, self.contentView.frame.size.width - _modeSwitch.frame.size.width - 40 - _iconImageView.frame.size.width, 20);
 }
 
 #pragma mark - Action

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/CPDFDisplayViewController.m

@@ -16,6 +16,7 @@
 
 #import "CPDFDisplayTableViewCell.h"
 #import "CActivityIndicatorView.h"
+#import "CPDFColorUtils.h"
 
 typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
     CDisplayPDFTypeSinglePage = 0,
@@ -24,6 +25,7 @@ typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
     CDisplayPDFTypeContinuousScroll,
     CDisplayPDFTypeCropMode,
     CDisplayPDFTypeVerticalScrolling,
+    CDisplayPDFTypeHorizontalScrolling,
     CDisplayPDFTypeThemesLight,
     CDisplayPDFTypeThemesDark,
     CDisplayPDFTypeThemesSepia,
@@ -88,6 +90,13 @@ typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
                    compatibleWithTraitCollection:nil];
                 self.titilName = NSLocalizedString(@"Vertical Scrolling", nil);
                 break;
+                
+            case CDisplayPDFTypeHorizontalScrolling:
+                self.image = [UIImage imageNamed:@"CDisplayImageNameHorizontalScrolling"
+                                        inBundle:[NSBundle bundleForClass:self.class]
+                   compatibleWithTraitCollection:nil];
+                self.titilName = NSLocalizedString(@"Horizontal Scrolling", nil);
+                break;
             case CDisplayPDFTypeThemesLight:
                 self.image = [UIImage imageNamed:@"CDisplayImageNameThemesLight"
                                         inBundle:[NSBundle bundleForClass:self.class]
@@ -133,6 +142,10 @@ typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
 
 @property (nonatomic, strong) CPDFView * pdfview;
 
+@property (nonatomic, strong) UILabel *titleLabel;
+
+@property (nonatomic, strong) UIButton *doneBtn;
+
 @end
 
 @implementation CPDFDisplayViewController
@@ -154,23 +167,63 @@ typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
     self.tableView.autoresizingMask = (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
-    self.tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
+    self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.tableFooterView = [[UIView alloc] init];
     [self.view addSubview:self.tableView];
     [self.tableView reloadData];
     // Do any additional setup after loading the view.
+    self.view.backgroundColor = [CPDFColorUtils CPDFViewControllerBackgroundColor];
+    [self updatePreferredContentSizeWithTraitCollection:self.traitCollection];
+    
+    self.doneBtn = [UIButton buttonWithType:UIButtonTypeSystem];
+    self.doneBtn.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin;
+    [self.doneBtn setTitle:NSLocalizedString(@"Done", nil) forState:UIControlStateNormal];
+    [self.doneBtn addTarget:self action:@selector(buttonItemClicked_back:) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:self.doneBtn];
+    
+    self.titleLabel = [[UILabel alloc] init];
+    self.titleLabel.text =  NSLocalizedString(@"Preview Settings", nil);
+    self.titleLabel.font = [UIFont boldSystemFontOfSize:17];
+    self.titleLabel.adjustsFontSizeToFitWidth = YES;
+    self.titleLabel.textAlignment = NSTextAlignmentCenter;
+    [self.view addSubview:self.titleLabel];
+}
+
+- (void)buttonItemClicked_back:(id)sender {
+    [self dismissViewControllerAnimated:YES completion:^{
+            
+    }];
+}
+
+- (void)viewWillLayoutSubviews {
+    self.doneBtn.frame = CGRectMake(self.view.frame.size.width - 60, 5, 50, 50);
+    self.titleLabel.frame = CGRectMake((self.view.frame.size.width - 120)/2, 5, 120, 50);
+    self.tableView.frame = CGRectMake(0, 70, self.view.frame.size.width, self.view.frame.size.height - 50);
+}
+
+- (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
+    [super willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
+    [self updatePreferredContentSizeWithTraitCollection:newCollection];
+}
+
+- (void)updatePreferredContentSizeWithTraitCollection:(UITraitCollection *)traitCollection
+{
+    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width,self.view.bounds.size.height * 0.9);
+
 }
 
 #pragma mark - Accessors
 
 - (NSArray *)displayModeArray {
     if(!_displayModeArray) {
-        _displayModeArray = @[@(CDisplayPDFTypeSinglePage),
+        _displayModeArray = @[
+                             @(CDisplayPDFTypeVerticalScrolling),
+                             @(CDisplayPDFTypeHorizontalScrolling),
+                              @(CDisplayPDFTypeSinglePage),
                               @(CDisplayPDFTypeTwoPages),
                               @(CDisplayPDFTypeBookMode),
                               @(CDisplayPDFTypeContinuousScroll),
-                              @(CDisplayPDFTypeCropMode),
-                              @(CDisplayPDFTypeVerticalScrolling)];
+                              @(CDisplayPDFTypeCropMode)];
     }
     return _displayModeArray;
 }
@@ -259,14 +312,19 @@ typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
 #pragma mark - UITableViewDataSource
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    return 2;
+    return 4;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    if (0 == section)
-        return self.displayModeArray.count;
-     else
-        return self.themesArray.count;
+    if(section == 0){
+        return 2;
+    }else if(section == 1){
+        return 3;
+    }else if(section == 2){
+        return 2;
+    }else{
+        return 4;
+    }
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -277,33 +335,46 @@ typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
     }
     
     CPDFDisplayModel *model = nil;
-    if(0 == indexPath.section) {
+
+    if(indexPath.section == 0){
         model = [[CPDFDisplayModel alloc]initWithType:[[self.displayModeArray objectAtIndex:indexPath.row] integerValue]];
-    } else {
+    }else if(indexPath.section == 1){
+        model = [[CPDFDisplayModel alloc]initWithType:[[self.displayModeArray objectAtIndex:indexPath.row + 2] integerValue]];
+    }else if(indexPath.section == 2){
+        model = [[CPDFDisplayModel alloc]initWithType:[[self.displayModeArray objectAtIndex:indexPath.row + 5] integerValue]];
+    }else{
         model = [[CPDFDisplayModel alloc]initWithType:[[self.themesArray objectAtIndex:indexPath.row] integerValue]];
     }
         
     switch (model.tag) {
         case CDisplayPDFTypeSinglePage:
+            cell.modeSwitch.hidden = YES;
+            cell.checkImageView.hidden = YES;
             if([self isSinglePage])
                 cell.checkImageView.hidden = NO;
             break;
         case CDisplayPDFTypeTwoPages:
+            cell.modeSwitch.hidden = YES;
+            cell.checkImageView.hidden = YES;
             if([self isTwoPage])
                 cell.checkImageView.hidden = NO;
             break;
         case CDisplayPDFTypeBookMode:
+            cell.modeSwitch.hidden = YES;
+            cell.checkImageView.hidden = YES;
             if([self isBookMode])
                 cell.checkImageView.hidden = NO;
             break;
         case CDisplayPDFTypeContinuousScroll:
             cell.modeSwitch.hidden = NO;
+            cell.checkImageView.hidden = YES;
             if(self.pdfview.displaysPageBreaks)
                [cell.modeSwitch setOn:YES animated:NO];
             else
                 [cell.modeSwitch setOn:NO animated:NO];
             break;
         case CDisplayPDFTypeCropMode:
+            cell.checkImageView.hidden = YES;
             cell.modeSwitch.hidden = NO;
             if(self.pdfview.displayCrop)
                [cell.modeSwitch setOn:YES animated:NO];
@@ -312,6 +383,7 @@ typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
             break;
         case CDisplayPDFTypeVerticalScrolling:
             cell.modeSwitch.hidden = NO;
+            cell.checkImageView.hidden = YES;
             if(CPDFDisplayDirectionVertical == self.pdfview.displayDirection)
                [cell.modeSwitch setOn:YES animated:NO];
             else
@@ -319,18 +391,26 @@ typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
 
             break;
         case CDisplayPDFTypeThemesLight:
+            cell.modeSwitch.hidden = YES;
+            cell.checkImageView.hidden = YES;
             if(CPDFDisplayModeNormal == self.pdfview.displayMode)
                 cell.checkImageView.hidden = NO;
             break;
         case CDisplayPDFTypeThemesDark:
+            cell.modeSwitch.hidden = YES;
+            cell.checkImageView.hidden = YES;
             if(CPDFDisplayModeNight == self.pdfview.displayMode)
                 cell.checkImageView.hidden = NO;
             break;
         case CDisplayPDFTypeThemesSepia:
+            cell.modeSwitch.hidden = YES;
+            cell.checkImageView.hidden = YES;
             if(CPDFDisplayModeSoft == self.pdfview.displayMode)
                 cell.checkImageView.hidden = NO;
             break;
         case CDisplayPDFTypeThemesReseda:
+            cell.modeSwitch.hidden = YES;
+            cell.checkImageView.hidden = YES;
             if(CPDFDisplayModeGreen == self.pdfview.displayMode)
                 cell.checkImageView.hidden = NO;
             break;
@@ -340,8 +420,8 @@ typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
             break;
     }
     
-    cell.imageView.image = model.image;
-    cell.textLabel.text = model.titilName?:@"";
+    cell.iconImageView.image = model.image;
+    cell.titleLabel.text = model.titilName?:@"";
     __block typeof(self) blockSelf = self;
     __block CPDFDisplayTableViewCell * blockCell = cell;
 
@@ -372,18 +452,28 @@ typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return 60.0;
+    return 44;
 }
 
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
-    if(0 == section)
+
+    if(section == 0){
         return NSLocalizedString(@"Display Mode",nil);
-     else
+    }else if(section == 1){
+        return @"";
+    }else if(section == 2){
+        return @"";
+    }else{
         return NSLocalizedString(@"Themes",nil);
+    }
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
-    return 30.0;
+    if(section == 1 || section == 2){
+        return 10;
+    }else{
+        return 30.0;
+    }
 }
 
 #pragma mark - UITableViewDelegate
@@ -392,10 +482,16 @@ typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     
     CDisplayPDFType type = CDisplayPDFTypeCropMode;
-    if(0 == indexPath.section)
+    
+    if(indexPath.section == 0){
         type = (CDisplayPDFType)[[self.displayModeArray objectAtIndex:indexPath.row] integerValue];
-    else
+    }else if(indexPath.section == 1) {
+        type = (CDisplayPDFType)[[self.displayModeArray objectAtIndex:indexPath.row + 2] integerValue];
+    }else if(indexPath.section == 2) {
+        type = (CDisplayPDFType)[[self.displayModeArray objectAtIndex:indexPath.row + 5] integerValue];
+    }else {
         type = (CDisplayPDFType)[[self.themesArray objectAtIndex:indexPath.row] integerValue];
+    }
         
     switch (type) {
         case CDisplayPDFTypeSinglePage:

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameBookMode.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "bookMode.png",
+      "filename" : "pagecover.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "bookMode@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "bookMode@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameBookMode.imageset/pagecover.pdf

@@ -0,0 +1,91 @@
+%PDF-1.7
+
+1 0 obj
+  << /ExtGState << /E1 << /ca 0.600000 >> >> >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+/E1 gs
+1.000000 0.000000 -0.000000 1.000000 1.000000 3.000000 cm
+0.000000 0.103662 0.304167 scn
+10.000000 6.000000 m
+0.000000 6.000000 l
+0.000000 0.000000 l
+10.000000 0.000000 l
+10.000000 6.000000 l
+h
+22.000000 6.000000 m
+12.000000 6.000000 l
+12.000000 0.000000 l
+22.000000 0.000000 l
+22.000000 6.000000 l
+h
+f*
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 1.000000 11.000000 cm
+0.000000 0.103662 0.304167 scn
+0.000000 10.000000 m
+7.000000 10.000000 l
+10.000000 6.800000 l
+10.000000 0.000000 l
+0.000000 0.000000 l
+0.000000 10.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  571
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.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
+0000000074 00000 n
+0000000701 00000 n
+0000000723 00000 n
+0000000896 00000 n
+0000000970 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1029
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameContinuousScroll.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "continuousScroll.png",
+      "filename" : "Continuous.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "continuousScroll@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "continuousScroll@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameContinuousScroll.imageset/Continuous.pdf

@@ -0,0 +1,75 @@
+%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 3.500000 2.000000 cm
+0.000000 0.103662 0.304167 scn
+0.029297 11.715749 m
+8.514579 20.000000 l
+16.999859 11.715749 l
+0.029297 11.715749 l
+h
+0.000000 8.284249 m
+8.485282 -0.000002 l
+16.970562 8.284249 l
+0.000000 8.284249 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  297
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.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
+0000000387 00000 n
+0000000409 00000 n
+0000000582 00000 n
+0000000656 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+715
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameCropMode.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "cropMode.png",
+      "filename" : "crop.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "cropMode@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "cropMode@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameCropMode.imageset/crop.pdf

@@ -0,0 +1,93 @@
+%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 2.599976 cm
+0.000000 0.103662 0.304167 scn
+4.834154 15.586880 m
+4.834154 3.813189 l
+15.586836 3.813189 l
+15.586836 15.586880 l
+4.834154 15.586880 l
+h
+3.334154 15.586880 m
+3.334154 3.063189 l
+3.334154 2.313189 l
+4.084154 2.313189 l
+15.586836 2.313189 l
+15.586836 0.000044 l
+17.086836 0.000044 l
+17.086836 2.313189 l
+20.420990 2.313189 l
+20.420990 3.813189 l
+17.086836 3.813189 l
+17.086836 16.336880 l
+17.086836 17.086880 l
+16.336836 17.086880 l
+4.834154 17.086880 l
+4.834154 19.400024 l
+3.334154 19.400024 l
+3.334154 17.086880 l
+0.000000 17.086880 l
+0.000000 15.586880 l
+3.334154 15.586880 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  676
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.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
+0000000766 00000 n
+0000000788 00000 n
+0000000961 00000 n
+0000001035 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1094
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameHorizontalScrolling.imageset/ scrolling.pdf

@@ -0,0 +1,121 @@
+%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 5.000000 cm
+0.000000 0.103662 0.304167 scn
+20.000000 14.000000 m
+0.000000 14.000000 l
+0.000000 0.000000 l
+20.000000 0.000000 l
+20.000000 14.000000 l
+h
+4.110707 5.250000 m
+4.451143 6.263514 l
+5.885655 6.263514 l
+6.223493 5.250000 l
+6.836799 5.250000 l
+5.482848 9.000000 l
+4.853950 9.000000 l
+3.500000 5.250000 l
+4.110707 5.250000 l
+h
+5.729730 6.731289 m
+4.607069 6.731289 l
+5.145010 8.342516 l
+5.189189 8.342516 l
+5.729730 6.731289 l
+h
+9.500000 1.000000 m
+9.500000 13.000000 l
+10.500000 13.000000 l
+10.500000 1.000000 l
+9.500000 1.000000 l
+h
+16.322245 6.307693 m
+16.322245 5.650208 15.841476 5.250000 15.041060 5.250000 c
+13.500000 5.250000 l
+13.500000 9.000000 l
+15.007277 9.000000 l
+15.711538 9.000000 16.135136 8.641373 16.135136 8.067047 c
+16.135136 8.061851 l
+16.135136 7.672037 15.846674 7.321206 15.477651 7.258836 c
+15.477651 7.214657 l
+15.984407 7.160083 16.322245 6.801455 16.322245 6.312890 c
+16.322245 6.307693 l
+h
+14.082121 7.404366 m
+14.773389 7.404366 l
+15.287942 7.404366 15.555614 7.596673 15.555614 7.960499 c
+15.555614 7.965696 l
+15.555614 8.319127 15.303535 8.524428 14.872141 8.524428 c
+14.082121 8.524428 l
+14.082121 7.404366 l
+h
+14.924116 5.725572 m
+14.082121 5.725572 l
+14.082121 6.959979 l
+14.890332 6.959979 l
+15.438669 6.959979 15.727131 6.752079 15.727131 6.349273 c
+15.727131 6.344075 l
+15.727131 5.941268 15.449064 5.725572 14.924116 5.725572 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1459
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.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
+0000001549 00000 n
+0000001572 00000 n
+0000001745 00000 n
+0000001819 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1878
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameHorizontalScrolling.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : " scrolling.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameSinglePage.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "single.png",
+      "filename" : "single page.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "single@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "single@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameSinglePage.imageset/single page.pdf

@@ -0,0 +1,72 @@
+%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 6.000000 4.000000 cm
+0.000000 0.103662 0.304167 scn
+0.000000 16.000000 m
+8.000000 16.000000 l
+12.000000 11.800000 l
+12.000000 0.000000 l
+0.000000 0.000000 l
+0.000000 16.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  254
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.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
+0000000344 00000 n
+0000000366 00000 n
+0000000539 00000 n
+0000000613 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+672
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameThemesDark.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "themesDark.png",
+      "filename" : "dark.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "themesDark@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "themesDark@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameThemesDark.imageset/dark.pdf

@@ -0,0 +1,73 @@
+%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 -1.682398 6.810217 cm
+0.000000 0.103662 0.304167 scn
+0.000000 5.067627 m
+2.610482 7.128672 4.285976 10.321558 4.285976 13.905777 c
+4.285976 17.083193 2.969230 19.953066 0.851639 21.999493 c
+1.883212 22.395826 3.003605 22.613037 4.174731 22.613037 c
+9.293479 22.613037 13.443045 18.463472 13.443045 13.344724 c
+13.443045 8.225976 9.293479 4.076410 4.174731 4.076410 c
+2.672957 4.076410 1.254612 4.433588 0.000000 5.067627 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  499
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.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
+0000000589 00000 n
+0000000611 00000 n
+0000000784 00000 n
+0000000858 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+917
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameThemesLight.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "themesLight.png",
+      "filename" : "light.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "themesLight@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "themesLight@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameThemesLight.imageset/light.pdf

@@ -0,0 +1,135 @@
+%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 0.992676 1.045288 cm
+0.000000 0.103662 0.304167 scn
+11.006105 18.747156 m
+10.509048 18.747156 10.106105 19.150099 10.106105 19.647156 c
+10.106105 21.062037 l
+10.106105 21.559092 10.509048 21.962036 11.006105 21.962036 c
+11.503161 21.962036 11.906105 21.559092 11.906105 21.062037 c
+11.906105 19.647156 l
+11.906105 19.150099 11.503161 18.747156 11.006105 18.747156 c
+h
+16.651409 11.069363 m
+16.651409 7.894856 14.077956 5.321411 10.903442 5.321411 c
+7.728927 5.321411 5.155475 7.894856 5.155475 11.069363 c
+5.155475 14.243870 7.728927 16.817314 10.903442 16.817314 c
+14.077956 16.817314 16.651409 14.243870 16.651409 11.069363 c
+h
+16.513626 17.744446 m
+16.161699 17.393429 16.161699 16.824318 16.513626 16.473301 c
+16.865553 16.122284 17.436138 16.122284 17.788063 16.473301 c
+18.791126 17.473772 l
+19.143053 17.824787 19.143053 18.393900 18.791126 18.744915 c
+18.439199 19.095932 17.868614 19.095932 17.516687 18.744915 c
+16.513626 17.744446 l
+h
+18.795591 10.980962 m
+18.795591 11.478018 19.198534 11.880962 19.695591 11.880962 c
+21.114132 11.880962 l
+21.611189 11.880962 22.014133 11.478018 22.014133 10.980962 c
+22.014133 10.483906 21.611189 10.080962 21.114132 10.080962 c
+19.695591 10.080962 l
+19.198534 10.080962 18.795591 10.483906 18.795591 10.980962 c
+h
+17.788107 5.488657 m
+17.436180 5.839674 16.865595 5.839674 16.513668 5.488657 c
+16.161741 5.137640 16.161741 4.568529 16.513668 4.217512 c
+17.516731 3.217041 l
+17.868656 2.866024 18.439241 2.866024 18.791168 3.217041 c
+19.143095 3.568058 19.143095 4.137169 18.791168 4.488186 c
+17.788107 5.488657 l
+h
+11.006138 3.214838 m
+11.503195 3.214838 11.906138 2.811893 11.906138 2.314838 c
+11.906138 0.899958 l
+11.906138 0.402901 11.503195 -0.000042 11.006138 -0.000042 c
+10.509082 -0.000042 10.106138 0.402901 10.106138 0.899958 c
+10.106138 2.314838 l
+10.106138 2.811893 10.509082 3.214838 11.006138 3.214838 c
+h
+5.499947 4.217463 m
+5.851873 4.568480 5.851873 5.137590 5.499947 5.488607 c
+5.148021 5.839624 4.577435 5.839624 4.225509 5.488607 c
+3.222447 4.488138 l
+2.870521 4.137121 2.870521 3.568010 3.222447 3.216993 c
+3.574373 2.865976 4.144958 2.865976 4.496885 3.216993 c
+5.499947 4.217463 l
+h
+3.218542 10.980947 m
+3.218542 10.483891 2.815598 10.080947 2.318542 10.080947 c
+0.900000 10.080947 l
+0.402944 10.080947 0.000000 10.483891 0.000000 10.980947 c
+0.000000 11.478004 0.402944 11.880947 0.900000 11.880947 c
+2.318542 11.880947 l
+2.815598 11.880947 3.218542 11.478004 3.218542 10.980947 c
+h
+4.225374 16.473255 m
+4.577301 16.122238 5.147886 16.122238 5.499813 16.473255 c
+5.851739 16.824272 5.851739 17.393383 5.499813 17.744400 c
+4.496750 18.744869 l
+4.144824 19.095886 3.574239 19.095886 3.222312 18.744869 c
+2.870386 18.393852 2.870386 17.824741 3.222312 17.473724 c
+4.225374 16.473255 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  2829
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.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
+0000002919 00000 n
+0000002942 00000 n
+0000003115 00000 n
+0000003189 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+3248
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameThemesReseda.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "themesReseda.png",
+      "filename" : "Eye Care.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "themesReseda@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "themesReseda@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameThemesReseda.imageset/Eye Care.pdf

@@ -0,0 +1,167 @@
+%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.070251 3.250000 cm
+0.000000 0.103662 0.304167 scn
+10.679739 17.750000 m
+10.679739 18.164213 10.343952 18.500000 9.929739 18.500000 c
+9.515526 18.500000 9.179739 18.164213 9.179739 17.750000 c
+9.179739 14.750000 l
+9.179739 14.335787 9.515526 14.000000 9.929739 14.000000 c
+10.343952 14.000000 10.679739 14.335787 10.679739 14.750000 c
+10.679739 17.750000 l
+h
+1.887624 6.250000 m
+1.976075 6.143833 2.080236 6.021737 2.199133 5.887124 c
+2.636921 5.391467 3.269865 4.731361 4.049597 4.073080 c
+5.631215 2.737811 7.710241 1.500000 9.929740 1.500000 c
+12.149240 1.500000 14.228266 2.737811 15.809883 4.073080 c
+16.589615 4.731361 17.222557 5.391467 17.660345 5.887124 c
+17.779243 6.021737 17.883404 6.143833 17.971855 6.250000 c
+17.883404 6.356167 17.779243 6.478263 17.660345 6.612876 c
+17.222557 7.108533 16.589615 7.768639 15.809883 8.426920 c
+14.228266 9.762189 12.149240 11.000000 9.929740 11.000000 c
+7.710241 11.000000 5.631215 9.762189 4.049597 8.426920 c
+3.269865 7.768639 2.636921 7.108533 2.199133 6.612876 c
+2.080236 6.478263 1.976075 6.356167 1.887624 6.250000 c
+h
+18.929739 6.250000 m
+19.534748 6.693244 19.534605 6.693439 19.534447 6.693655 c
+19.534052 6.694192 l
+19.532984 6.695642 l
+19.529739 6.700040 l
+19.518835 6.714701 l
+19.509615 6.727040 19.496506 6.744459 19.479605 6.766619 c
+19.445805 6.810932 19.396801 6.874244 19.333349 6.953840 c
+19.206499 7.112963 19.021574 7.337578 18.784603 7.605874 c
+18.311541 8.141467 17.626467 8.856362 16.777519 9.573080 c
+15.101777 10.987812 12.680803 12.500000 9.929740 12.500000 c
+7.178677 12.500000 4.757703 10.987812 3.081961 9.573080 c
+2.233013 8.856362 1.547937 8.141467 1.074876 7.605874 c
+0.837904 7.337578 0.652979 7.112963 0.526130 6.953840 c
+0.462677 6.874244 0.413675 6.810932 0.379875 6.766619 c
+0.362973 6.744459 0.349864 6.727040 0.340644 6.714701 c
+0.329739 6.700040 l
+0.326494 6.695642 l
+0.325427 6.694192 l
+0.325033 6.693655 l
+0.324875 6.693439 0.324732 6.693244 0.929740 6.250000 c
+0.324732 6.693244 l
+0.000000 6.250000 l
+0.324732 5.806756 l
+0.929740 6.250000 l
+0.324732 5.806756 0.324875 5.806561 0.325033 5.806345 c
+0.325427 5.805808 l
+0.326494 5.804358 l
+0.329739 5.799960 l
+0.340644 5.785299 l
+0.349864 5.772960 0.362973 5.755541 0.379875 5.733381 c
+0.413675 5.689068 0.462677 5.625757 0.526130 5.546161 c
+0.652979 5.387037 0.837904 5.162422 1.074876 4.894126 c
+1.547937 4.358533 2.233013 3.643638 3.081961 2.926920 c
+4.757703 1.512188 7.178677 0.000000 9.929740 0.000000 c
+12.680803 0.000000 15.101777 1.512188 16.777519 2.926920 c
+17.626467 3.643638 18.311541 4.358533 18.784603 4.894126 c
+19.021574 5.162422 19.206499 5.387037 19.333349 5.546161 c
+19.396801 5.625757 19.445805 5.689068 19.479605 5.733381 c
+19.496506 5.755541 19.509615 5.772960 19.518835 5.785299 c
+19.529739 5.799960 l
+19.532984 5.804358 l
+19.534052 5.805808 l
+19.534447 5.806345 l
+19.534605 5.806561 19.534748 5.806756 18.929739 6.250000 c
+h
+18.929739 6.250000 m
+19.534748 5.806756 l
+19.859478 6.250000 l
+19.534748 6.693244 l
+18.929739 6.250000 l
+h
+9.809740 7.500000 m
+9.185658 7.500000 8.679740 6.994081 8.679740 6.370000 c
+8.679740 5.745918 9.185658 5.240000 9.809740 5.240000 c
+10.433822 5.240000 10.939740 5.745918 10.939740 6.370000 c
+10.939740 6.994081 10.433822 7.500000 9.809740 7.500000 c
+h
+7.179740 6.370000 m
+7.179740 7.822509 8.357231 9.000000 9.809740 9.000000 c
+11.262249 9.000000 12.439740 7.822509 12.439740 6.370000 c
+12.439740 4.917491 11.262249 3.740000 9.809740 3.740000 c
+8.357231 3.740000 7.179740 4.917491 7.179740 6.370000 c
+h
+19.080626 16.364365 m
+19.419930 16.126781 19.502392 15.659122 19.264809 15.319818 c
+17.544079 12.862362 l
+17.306496 12.523058 16.838837 12.440598 16.499533 12.678181 c
+16.160229 12.915764 16.077768 13.383423 16.315351 13.722727 c
+18.036079 16.180183 l
+18.273663 16.519485 18.741322 16.601948 19.080626 16.364365 c
+h
+1.315376 15.319818 m
+1.077793 15.659122 1.160254 16.126781 1.499557 16.364365 c
+1.838861 16.601948 2.306520 16.519485 2.544104 16.180183 c
+4.264833 13.722727 l
+4.502416 13.383423 4.419955 12.915764 4.080651 12.678181 c
+3.741348 12.440598 3.273688 12.523058 3.036105 12.862362 c
+1.315376 15.319818 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  4189
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.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
+0000004279 00000 n
+0000004302 00000 n
+0000004475 00000 n
+0000004549 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+4608
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameThemesSepia.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "themesSepia.png",
+      "filename" : "Paper.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "themesSepia@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "themesSepia@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameThemesSepia.imageset/Paper.pdf

@@ -0,0 +1,170 @@
+%PDF-1.7
+
+1 0 obj
+  << /Type /XObject
+     /Length 2 0 R
+     /Group << /Type /Group
+               /S /Transparency
+            >>
+     /Subtype /Form
+     /Resources << >>
+     /BBox [ 0.000000 0.000000 24.000000 24.000000 ]
+  >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 7.000000 6.726562 cm
+1.000000 1.000000 1.000000 scn
+0.000000 0.000000 m
+4.070312 11.273438 l
+5.960938 11.273438 l
+10.031250 0.000000 l
+8.187500 0.000000 l
+7.171875 3.046875 l
+2.859375 3.046875 l
+1.835938 0.000000 l
+0.000000 0.000000 l
+h
+4.945312 9.296875 m
+3.328125 4.453125 l
+6.703125 4.453125 l
+5.078125 9.296875 l
+4.945312 9.296875 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+2 0 obj
+  412
+endobj
+
+3 0 obj
+  << /Type /XObject
+     /Length 4 0 R
+     /Group << /Type /Group
+               /S /Transparency
+            >>
+     /Subtype /Form
+     /Resources << >>
+     /BBox [ 0.000000 0.000000 24.000000 24.000000 ]
+  >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 3.000000 3.000000 cm
+0.078431 0.376471 0.952941 scn
+0.000000 16.000000 m
+0.000000 17.104570 0.895431 18.000000 2.000000 18.000000 c
+16.000000 18.000000 l
+17.104570 18.000000 18.000000 17.104568 18.000000 16.000000 c
+18.000000 2.000000 l
+18.000000 0.895430 17.104570 0.000000 16.000000 0.000000 c
+2.000000 0.000000 l
+0.895430 0.000000 0.000000 0.895430 0.000000 2.000000 c
+0.000000 16.000000 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+4 0 obj
+  468
+endobj
+
+5 0 obj
+  << /XObject << /X1 1 0 R >>
+     /ExtGState << /E1 << /SMask << /Type /Mask
+                                    /G 3 0 R
+                                    /S /Alpha
+                                 >>
+                          /Type /ExtGState
+                       >> >>
+  >>
+endobj
+
+6 0 obj
+  << /Length 7 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 3.000000 3.000000 cm
+0.000000 0.103662 0.304167 scn
+0.000000 16.000000 m
+0.000000 17.104570 0.895431 18.000000 2.000000 18.000000 c
+16.000000 18.000000 l
+17.104570 18.000000 18.000000 17.104568 18.000000 16.000000 c
+18.000000 2.000000 l
+18.000000 0.895430 17.104570 0.000000 16.000000 0.000000 c
+2.000000 0.000000 l
+0.895430 0.000000 0.000000 0.895430 0.000000 2.000000 c
+0.000000 16.000000 l
+h
+f
+n
+Q
+q
+/E1 gs
+/X1 Do
+Q
+
+endstream
+endobj
+
+7 0 obj
+  486
+endobj
+
+8 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
+     /Resources 5 0 R
+     /Contents 6 0 R
+     /Parent 9 0 R
+  >>
+endobj
+
+9 0 obj
+  << /Kids [ 8 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+10 0 obj
+  << /Pages 9 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 11
+0000000000 65535 f
+0000000010 00000 n
+0000000670 00000 n
+0000000692 00000 n
+0000001408 00000 n
+0000001430 00000 n
+0000001728 00000 n
+0000002270 00000 n
+0000002292 00000 n
+0000002465 00000 n
+0000002539 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 10 0 R
+   /Size 11
+>>
+startxref
+2599
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameTwoPages.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "twoPages.png",
+      "filename" : "double page.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "twoPages@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "twoPages@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameTwoPages.imageset/double page.pdf

@@ -0,0 +1,78 @@
+%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.000000 5.000000 cm
+0.000000 0.103662 0.304167 scn
+10.000000 14.000000 m
+0.000000 14.000000 l
+0.000000 0.000000 l
+10.000000 0.000000 l
+10.000000 14.000000 l
+h
+18.000000 14.000000 m
+12.000000 14.000000 l
+12.000000 0.000000 l
+22.000000 0.000000 l
+22.000000 9.800000 l
+18.000000 14.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  365
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.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
+0000000455 00000 n
+0000000477 00000 n
+0000000650 00000 n
+0000000724 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+783
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameVerticalScrolling.imageset/Contents.json

@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "verticalScrolling.png",
+      "filename" : "Horizontal scrolling.pdf",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "verticalScrolling@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "verticalScrolling@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFDisplaySetting/DisplayImage.xcassets/CDisplayImageNameVerticalScrolling.imageset/Horizontal scrolling.pdf

@@ -0,0 +1,121 @@
+%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 3.500000 4.000000 cm
+0.000000 0.103662 0.304167 scn
+0.000000 16.000000 m
+0.000000 0.000000 l
+17.000000 0.000000 l
+17.000000 16.000000 l
+0.000000 16.000000 l
+h
+0.500000 7.500000 m
+16.500000 7.500000 l
+16.500000 8.500000 l
+0.500000 8.500000 l
+0.500000 7.500000 l
+h
+7.951143 10.763514 m
+7.610707 9.750000 l
+7.000000 9.750000 l
+8.353951 13.500000 l
+8.982848 13.500000 l
+10.336799 9.750000 l
+9.723493 9.750000 l
+9.385654 10.763514 l
+7.951143 10.763514 l
+h
+8.107069 11.231289 m
+9.229730 11.231289 l
+8.689189 12.842516 l
+8.645010 12.842516 l
+8.107069 11.231289 l
+h
+10.322246 3.607680 m
+10.322246 2.950195 9.841476 2.549988 9.041060 2.549988 c
+7.500000 2.549988 l
+7.500000 6.299988 l
+9.007277 6.299988 l
+9.711538 6.299988 10.135136 5.941360 10.135136 5.367036 c
+10.135136 5.361838 l
+10.135136 4.972025 9.846674 4.621194 9.477651 4.558824 c
+9.477651 4.514645 l
+9.984407 4.460071 10.322246 4.101443 10.322246 3.612878 c
+10.322246 3.607680 l
+h
+8.082121 4.704353 m
+8.773389 4.704353 l
+9.287942 4.704353 9.555614 4.896662 9.555614 5.260487 c
+9.555614 5.265684 l
+9.555614 5.619115 9.303535 5.824416 8.872141 5.824416 c
+8.082121 5.824416 l
+8.082121 4.704353 l
+h
+8.924116 3.025559 m
+8.082121 3.025559 l
+8.082121 4.259967 l
+8.890332 4.259967 l
+9.438669 4.259967 9.727131 4.052067 9.727131 3.649261 c
+9.727131 3.644063 l
+9.727131 3.241256 9.449064 3.025559 8.924116 3.025559 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1435
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.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
+0000001525 00000 n
+0000001548 00000 n
+0000001721 00000 n
+0000001795 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1854
+%%EOF

compdfkit-tools/compdfkit-tools/Viewer/PDFMore/PDFInfo/CPDFInfoViewController.m

@@ -23,6 +23,8 @@
 
 @property (nonatomic, strong) UILabel *titleLabel;
 
+@property (nonatomic, strong) UIButton *doneBtn;
+
 @end
 
 @implementation CPDFInfoViewController
@@ -48,7 +50,6 @@
             self.view.backgroundColor = [UIColor colorWithRed:240/255. green:240/255. blue:240/255. alpha:1.];
         }
     } else {
-//         Fallback on earlier versions
         self.view.backgroundColor = [UIColor colorWithRed:240/255. green:240/255. blue:240/255. alpha:1.];
     }
     
@@ -66,9 +67,21 @@
     self.view.backgroundColor = [CPDFColorUtils CPDFViewControllerBackgroundColor];
     [self updatePreferredContentSizeWithTraitCollection:self.traitCollection];
     
+    self.doneBtn = [UIButton buttonWithType:UIButtonTypeSystem];
+    self.doneBtn.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin;
+    [self.doneBtn setTitle:NSLocalizedString(@"Done", nil) forState:UIControlStateNormal];
+    [self.doneBtn addTarget:self action:@selector(buttonItemClicked_back:) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:self.doneBtn];
+    
     
 }
 
+- (void)buttonItemClicked_back:(UIButton *)button {
+    [self dismissViewControllerAnimated:YES completion:^{
+            
+    }];
+}
+
 - (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
     [super willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
     [self updatePreferredContentSizeWithTraitCollection:newCollection];
@@ -83,7 +96,7 @@
 - (void)viewWillLayoutSubviews {
     self.titleLabel.frame = CGRectMake((self.view.frame.size.width - 120)/2, 5, 120, 50);
     self.curTableView.frame = CGRectMake(0, 70, self.view.frame.size.width, self.view.frame.size.height - 50);
-
+    self.doneBtn.frame = CGRectMake(self.view.frame.size.width - 60, 5, 50, 50);
 }
 
 -(void)viewWillDisappear:(BOOL)animated

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

@@ -15,6 +15,7 @@
 
 #import <ComPDFKit/ComPDFKit.h>
 #import <CoreText/CoreText.h>
+#import "UIViewController+LeftItem.h"
 
 #define kTextSearch_Content_Length_Max 100
 
@@ -24,6 +25,9 @@
 @property (nonatomic, strong) NSString *keyword;
 @property (nonatomic, strong) CPDFDocument *document;
 @property (nonatomic, strong) UITableView *tableView;
+@property (nonatomic, strong) UIView * searchResultView;
+@property (nonatomic, strong) UILabel * searchResultLabel;
+@property (nonatomic, strong) UILabel * pageLabel;
 
 @end
 
@@ -48,23 +52,54 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"CPDFSearchImagePrevious" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil] style:UIBarButtonItemStylePlain target:self action:@selector(buttonItemClicked_Back:)];
-    self.navigationItem.leftBarButtonItem = backItem;
-    
+    [self changeleftItem];
     self.title = NSLocalizedString(@"Search Results", nil);
     
     self.tableView = [[UITableView alloc] initWithFrame:self.view.frame style:UITableViewStylePlain];
     self.tableView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
+    self.view.backgroundColor = [UIColor whiteColor];
     self.tableView.rowHeight = UITableViewAutomaticDimension;
     self.tableView.estimatedRowHeight = 60;
     self.tableView.tableFooterView = [[UIView alloc] init];
+    self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     [self.tableView registerClass:[CPDFSearchViewCell class] forCellReuseIdentifier:@"cell"];
     
     [self.view addSubview:self.tableView];
+    
+    self.searchResultView = [[UIView alloc] init];
+    self.searchResultLabel = [[UILabel alloc] init];
+    self.pageLabel = [[UILabel alloc] init];
+    
+    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.textAlignment = NSTextAlignmentRight;
+    self.searchResultLabel.font = [UIFont systemFontOfSize:14];
+    [self.searchResultView addSubview:self.searchResultLabel];
+    [self.searchResultView addSubview:self.pageLabel];
+    [self.view addSubview:self.searchResultView];
+    
+    
+}
+
+- (void)viewWillLayoutSubviews {
+    [super viewWillLayoutSubviews];
+    
+    if (@available(iOS 11.0, *)) {
+        self.tableView.frame = CGRectMake(self.view.safeAreaInsets.left, self.view.safeAreaInsets.top +28, self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, self.view.frame.size.height - self.view.safeAreaInsets.bottom- self.view.safeAreaInsets.top - 28);
+        self.searchResultView.frame = CGRectMake(self.view.safeAreaInsets.left, self.view.safeAreaInsets.top, self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, 28);
+        self.searchResultLabel.frame = CGRectMake(20, 4, 200, 20);
+        self.searchResultLabel.text = [NSString stringWithFormat:@"%zd results found",self.resultArray.count];
+        self.pageLabel.frame = CGRectMake(self.view.frame.size.width - 50, 4, 40, 20);
+    } else {
+        self.tableView.frame = self.view.bounds;
+      
+    }
 }
 
+
 #pragma mark - Button Actions
 
 - (void)buttonItemClicked_Back:(id)sender {
@@ -95,6 +130,7 @@
         endLocation = range.location + maxEndLocation;
     }
     
+    
     NSMutableAttributedString * attributed  = nil;
     if (endLocation> startLocation) {
         NSString * currentString = [currentPage stringForRange:NSMakeRange(startLocation, endLocation - startLocation)];
@@ -107,13 +143,17 @@
             paragraphStyle.firstLineHeadIndent = 10.0;
             paragraphStyle.headIndent = 10.0;
             paragraphStyle.lineBreakMode = NSLineBreakByCharWrapping;
-            NSDictionary* dic = [NSDictionary dictionaryWithObjectsAndKeys:[UIFont fontWithName:@"HelveticaNeue-Medium" size:14.0],NSFontAttributeName,paragraphStyle,NSParagraphStyleAttributeName,nil];
+            NSDictionary* dic = [NSDictionary dictionaryWithObjectsAndKeys:[UIFont fontWithName:@"HelveticaNeue-Medium" size:13.0],NSFontAttributeName,paragraphStyle,NSParagraphStyleAttributeName,nil];
             
             NSRange range = [[attributed string] rangeOfString:[attributed string]];
             [attributed setAttributes:dic range:range];
             
+            dic = [NSDictionary dictionaryWithObjectsAndKeys:[UIColor colorWithRed:102./255. green:102/255. blue:102/255. alpha:1.],NSForegroundColorAttributeName,nil];
+            [attributed addAttributes:dic range:NSMakeRange(0, currentString.length)];
+            
             //hightlight string
             dic = [NSDictionary dictionaryWithObjectsAndKeys:[UIColor colorWithRed:1.0 green:220.0/255.0 blue:27.0/255.0 alpha:1.0],NSBackgroundColorAttributeName,nil];
+            
             if (attributed.length > tRange.length + tRange.location) {
                 [attributed addAttributes:dic range:tRange];
             }
@@ -140,6 +180,7 @@
     }
     CPDFSelection *selection = self.resultArray[indexPath.section][indexPath.row];
     cell.contentLabel.attributedText = [self getAttributedStringWithSelection:selection];
+    
     return cell;
 }
 
@@ -170,19 +211,12 @@
     
     UITableViewHeaderFooterView *view = [[UITableViewHeaderFooterView alloc] initWithFrame:CGRectMake(0, 0, tableView.bounds.size.width, 30)];
     view.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-    view.backgroundColor = [UIColor colorWithWhite:0.8 alpha:1.0];
-    
-    UILabel *label = [[UILabel alloc] init];
-    label.font = [UIFont boldSystemFontOfSize:16];
-    label.text = pageStr;
-    [label sizeToFit];
-    label.frame = CGRectMake(10, 0, label.bounds.size.width, view.bounds.size.height);
-    [view.contentView addSubview:label];
+    view.backgroundColor = [UIColor colorWithRed:250./255. green:252/255. blue:255/255. alpha:1];
     
     UILabel *sublabel = [[UILabel alloc] init];
     sublabel.font = [UIFont systemFontOfSize:14];
     sublabel.text = countStr;
-    sublabel.textColor = [UIColor colorWithRed:0.0 green:122.0/255.0 blue:1.0 alpha:1.0];
+    sublabel.textColor = [UIColor colorWithRed:67./255. green:71.0/255.0 blue:77./255.0 alpha:1.0];
     [sublabel sizeToFit];
     sublabel.frame = CGRectMake(view.bounds.size.width-sublabel.bounds.size.width-10, 0,
                                 sublabel.bounds.size.width, view.bounds.size.height);

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

@@ -52,10 +52,8 @@
 - (instancetype)initWithPDFView:(CPDFView *)pdfview {
     if (self = [super init]) {
         self.pdfView = pdfview;
-        
+        self.backgroundColor = [UIColor whiteColor];
         [self commonInit];
-        
-        self.backgroundColor = [CPDFColorUtils CPDFViewControllerBackgroundColor];
     }
     return self;
 }
@@ -199,8 +197,7 @@
     [self addSubview:self.previousItem];
     [self addSubview:self.doneItem];
     
-    [_doneItem setTitle:NSLocalizedString(@"Complete", nil) forState:UIControlStateNormal];
-    [_doneItem setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+    [_doneItem setImage:[UIImage imageNamed:@"CPDFSearchImageClose" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil] forState:UIControlStateNormal];
     _doneItem.titleLabel.adjustsFontSizeToFitWidth = YES;
     _searchBar.placeholder = NSLocalizedString(@"Search Text", nil);
     UITextField *searchField = [_searchBar valueForKey:@"searchField"];

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

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "close.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

compdfkit-tools/compdfkit-tools/Viewer/PDFSearch/Images.xcassets/CPDFSearchImageClose.imageset/close.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 -5.813704 14.853560 cm
+0.262745 0.278431 0.301961 scn
+7.000000 7.170288 m
+7.000000 6.420288 l
+8.500000 6.420288 l
+8.500000 7.170288 l
+8.500000 13.420261 l
+14.750000 13.420261 l
+15.500000 13.420261 l
+15.500000 14.920261 l
+14.750000 14.920261 l
+8.500000 14.920261 l
+8.500000 21.170288 l
+8.500000 21.920288 l
+7.000000 21.920288 l
+7.000000 21.170288 l
+7.000000 14.920261 l
+0.750000 14.920261 l
+0.000000 14.920261 l
+0.000000 13.420261 l
+0.750000 13.420261 l
+7.000000 13.420261 l
+7.000000 7.170288 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  570
+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
+0000000660 00000 n
+0000000682 00000 n
+0000000855 00000 n
+0000000929 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+988
+%%EOF

viewer-ctrl-demo/viewer-ctrl-demo/CPDFViewController.m

@@ -15,7 +15,7 @@
 #import <ComPDFKit/ComPDFKit.h>
 #import <compdfkit_tools/compdfkit_tools.h>
 
-@interface CPDFViewController ()<UISearchBarDelegate,CPDFViewDelegate,CPDFListViewDelegate, CPDFMoreListViewDelegate, CSearchToolbarDelegate, CPDFDisplayViewDelegate, CPDFBOTAViewControllerDelegate,CPDFSearchResultsDelegate, CPDFThumbnailViewControllerDelegate,CPDFPopMenuViewDelegate>
+@interface CPDFViewController ()<UISearchBarDelegate,CPDFViewDelegate,CPDFListViewDelegate, CPDFMoreListViewDelegate, CSearchToolbarDelegate, CPDFDisplayViewDelegate, CPDFBOTAViewControllerDelegate,CPDFSearchResultsDelegate, CPDFThumbnailViewControllerDelegate,CPDFPopMenuViewDelegate,UIDocumentPickerDelegate>
 
 @property(nonatomic, strong) NSString *filePath;
 
@@ -51,7 +51,6 @@
     [super viewDidLoad];
     
     self.view.backgroundColor = [CPDFColorUtils CPDFViewControllerBackgroundColor];
-    
     self.pdfListView = [[CPDFListView alloc] initWithFrame:self.view.bounds];
     self.pdfListView.performDelegate = self;
     self.pdfListView.delegate = self;
@@ -76,7 +75,6 @@
                 [blockSelf navigationRightItemMore];
                 break;
         }
-        
     }];
     
     //titleButton
@@ -101,17 +99,17 @@
 }
 
 - (void) titleButtonClickd:(UIButton *) button {
-    NSLog(@"titleButton Click");
+  
 }
 
 - (void)viewWillLayoutSubviews {
     [super viewWillLayoutSubviews];
     
     if (@available(iOS 11.0, *)) {
-        [self.popMenu showMenuInRect:CGRectMake(self.view.frame.size.width - self.view.safeAreaInsets.right - 250, self.view.safeAreaInsets.top - 10, 250, 155)];
+        [self.popMenu showMenuInRect:CGRectMake(self.view.frame.size.width - self.view.safeAreaInsets.right - 250, self.view.safeAreaInsets.top - 10, 250, 200)];
     } else {
         // Fallback on earlier versions
-        [self.popMenu showMenuInRect:CGRectMake(self.view.frame.size.width - 250, -10, 250, 155)];
+        [self.popMenu showMenuInRect:CGRectMake(self.view.frame.size.width - 250, -10, 250, 200)];
     }
     
     if (@available(iOS 11.0, *)) {
@@ -178,7 +176,6 @@
 - (void)navigationRightItemBota {
     CPDFBOTAViewController *botaViewController = [[CPDFBOTAViewController alloc] initWithPDFView:self.pdfListView];
     botaViewController.delegate = self;
-//    [self.navigationController pushViewController:botaViewController animated:NO];
     
     AAPLCustomPresentationController *presentationController NS_VALID_UNTIL_END_OF_SCOPE;
    
@@ -190,15 +187,15 @@
 }
 
 - (void)navigationRightItemMore {
-    CPDFPopMenuView * menuView = [[CPDFPopMenuView alloc] initWithFrame:CGRectMake(0, 0, 200, 155)];
+    CPDFPopMenuView * menuView = [[CPDFPopMenuView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
     menuView.delegate = self;
     self.popMenu = [CPDFPopMenu popMenuWithContentView:menuView];
     self.popMenu.dimCoverLayer = YES;
     if (@available(iOS 11.0, *)) {
-        [self.popMenu showMenuInRect:CGRectMake(self.view.frame.size.width - self.view.safeAreaInsets.right - 250, self.view.safeAreaInsets.top - 10, 250, 155)];
+        [self.popMenu showMenuInRect:CGRectMake(self.view.frame.size.width - self.view.safeAreaInsets.right - 250, self.view.safeAreaInsets.top - 10, 250, 200)];
     } else {
         // Fallback on earlier versions
-        [self.popMenu showMenuInRect:CGRectMake(self.view.frame.size.width - 250, -10, 250, 155)];
+        [self.popMenu showMenuInRect:CGRectMake(self.view.frame.size.width - 250, -10, 250, 200)];
     }
 }
 
@@ -341,6 +338,18 @@
 - (void)menuDidClickAtView:(CPDFPopMenuView *)view clickType:(CPDFPopMenuViewType)viewType {
     switch (viewType) {
         case CPDFPopMenuViewTypeSetting:
+            //display controller
+        {
+            [self.popMenu hideMenu];
+            CPDFDisplayViewController *displayVc = [[CPDFDisplayViewController alloc] initWithPDFView:self.pdfListView];
+            displayVc.delegate = self;
+            
+            
+            AAPLCustomPresentationController *presentationController NS_VALID_UNTIL_END_OF_SCOPE;
+            presentationController = [[AAPLCustomPresentationController alloc] initWithPresentedViewController:displayVc presentingViewController:self];
+            displayVc.transitioningDelegate = presentationController;
+            [self presentViewController:displayVc animated:YES completion:nil];
+        }
             
             break;
             
@@ -359,12 +368,74 @@
             break;
             
         case CPDFPopMenuViewTypeShare:
+        {
+            [self.popMenu hideMenu];
+            if (self.pdfListView.isEdited) {
+                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                    [self.pdfListView commitEditing];
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [self.pdfListView endOfEditing];
+                        [self shareAction];
+                    });
+                });
+            } else {
+                [self.pdfListView endOfEditing];
+                [self shareAction];
+            }
             
+        }
             break;
             
+        case CPDFPopMenuViewTypeAddFile:
+        {
+            [self.popMenu hideMenu];
+            NSArray *documentTypes = @[@"com.adobe.pdf"];
+            UIDocumentPickerViewController *documentPickerViewController = [[UIDocumentPickerViewController alloc] initWithDocumentTypes:documentTypes inMode:UIDocumentPickerModeOpen];
+                    documentPickerViewController.delegate = self;
+            [self presentViewController:documentPickerViewController animated:YES completion:nil];
+        }
+            
         default:
             break;
     }
 }
 
+- (void)shareAction {
+    UIActivityViewController *activityVC = [[UIActivityViewController alloc]initWithActivityItems:@[self.pdfListView.document.documentURL] applicationActivities:nil];
+        activityVC.definesPresentationContext = YES;
+        [self presentViewController:activityVC animated:YES completion:nil];
+        activityVC.completionWithItemsHandler = ^(UIActivityType  _Nullable activityType, BOOL completed, NSArray * _Nullable returnedItems, NSError * _Nullable activityError) {
+
+            if (completed) {
+                NSLog(@"Success!");
+            } else {
+                NSLog(@"Failed Or Canceled!");
+            }
+        };
+}
+
+#pragma mark - UIDocument Picker
+- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentAtURL:(NSURL *)url {
+    
+    __weak typeof(self) weakSelf = self;
+    BOOL canAccessingResource = [url startAccessingSecurityScopedResource];
+       if(canAccessingResource) {
+           NSFileCoordinator *fileCoordinator = [[NSFileCoordinator alloc] init];
+           NSError *error;
+           [fileCoordinator coordinateReadingItemAtURL:url options:0 error:&error byAccessor:^(NSURL *newURL) {
+               [weakSelf reloadDocumentWithFilePath:newURL.path completion:^(BOOL result) {
+                   
+               }];
+           }];
+           if (error) {
+               
+           }
+       } else {
+           // startAccessingSecurityScopedResource fail
+       }
+       [url stopAccessingSecurityScopedResource];
+    
+    
+}
+
 @end