PDFTools(iOS)-edit、view交叉测试bug的修复

Annotation-Ctrl-Demo/Annotation-Ctrl-Demo/CPDFViewController.m

@@ -19,7 +19,6 @@
 
 @interface CPDFViewController () <CPDFSoundPlayBarDelegate,CPDFAnnotationBarDelegate,CPDFToolsViewControllerDelegate,CPDFNoteOpenViewControllerDelegate,CPDFBOTAViewControllerDelegate>
 
-
 @property(nonatomic, strong) CPDFAnnotationBar *annotationBar;
 
 @property(nonatomic, strong) CPDFSoundPlayBar *soundPlayBar;

Edit-Ctrl-Demo/Edit-Ctrl-Demo.xcodeproj/project.pbxproj

@@ -396,7 +396,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 4GGQPGRTSV;
+				DEVELOPMENT_TEAM = Q43DRF894U;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Edit-Ctrl-Demo/Info.plist";

Edit-Ctrl-Demo/Edit-Ctrl-Demo/CPDFViewController.m

@@ -113,7 +113,7 @@
 - (void)enterEditMode {
     self.pdfListView.toolModel = CToolModelEdit;
     self.toolBar.hidden = NO;
-    self.navigationTitle = NSLocalizedString(@"Edit", nil);
+    self.navigationTitle = NSLocalizedString(@"Content Edit", nil);
     [self.titleButton setTitle:self.navigationTitle forState:UIControlStateNormal];
     [self.pdfListView beginEditingLoadType:CEditingLoadTypeText | CEditingLoadTypeImage];
     [self viewWillLayoutSubviews];

compdfkit-tools/compdfkit-tools.xcodeproj/project.pbxproj

@@ -123,6 +123,8 @@
 		C9B9EC5029F52DCC00C6A5D2 /* AAPLCustomPresentationController.m in Sources */ = {isa = PBXBuildFile; fileRef = C9B9EC4F29F52DCC00C6A5D2 /* AAPLCustomPresentationController.m */; };
 		C9B9EC5929F54E9600C6A5D2 /* CAnnotStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = C9B9EC5729F54E9600C6A5D2 /* CAnnotStyle.h */; };
 		C9B9EC5A29F54E9600C6A5D2 /* CAnnotStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = C9B9EC5829F54E9600C6A5D2 /* CAnnotStyle.m */; };
+		C9E792D02A1CE2CF0013D6A8 /* CPDFEditImageSampleView.h in Headers */ = {isa = PBXBuildFile; fileRef = C9E792CE2A1CE2CF0013D6A8 /* CPDFEditImageSampleView.h */; };
+		C9E792D12A1CE2CF0013D6A8 /* CPDFEditImageSampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = C9E792CF2A1CE2CF0013D6A8 /* CPDFEditImageSampleView.m */; };
 		C9FBA20E2A0D1119003FABEC /* CPDFStampViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C9FBA20C2A0D1119003FABEC /* CPDFStampViewController.h */; };
 		C9FBA20F2A0D1119003FABEC /* CPDFStampViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C9FBA20D2A0D1119003FABEC /* CPDFStampViewController.m */; };
 		C9FBA2122A0D1172003FABEC /* CStampCollectionViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = C9FBA2102A0D1172003FABEC /* CStampCollectionViewCell.h */; };
@@ -370,6 +372,8 @@
 		C9B9EC4F29F52DCC00C6A5D2 /* AAPLCustomPresentationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AAPLCustomPresentationController.m; sourceTree = "<group>"; };
 		C9B9EC5729F54E9600C6A5D2 /* CAnnotStyle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CAnnotStyle.h; sourceTree = "<group>"; };
 		C9B9EC5829F54E9600C6A5D2 /* CAnnotStyle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CAnnotStyle.m; sourceTree = "<group>"; };
+		C9E792CE2A1CE2CF0013D6A8 /* CPDFEditImageSampleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPDFEditImageSampleView.h; sourceTree = "<group>"; };
+		C9E792CF2A1CE2CF0013D6A8 /* CPDFEditImageSampleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPDFEditImageSampleView.m; sourceTree = "<group>"; };
 		C9FBA20C2A0D1119003FABEC /* CPDFStampViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPDFStampViewController.h; sourceTree = "<group>"; };
 		C9FBA20D2A0D1119003FABEC /* CPDFStampViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPDFStampViewController.m; sourceTree = "<group>"; };
 		C9FBA2102A0D1172003FABEC /* CStampCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CStampCollectionViewCell.h; sourceTree = "<group>"; };
@@ -554,6 +558,8 @@
 				4F6C796929FBD532008C9501 /* CPDFEditFontNameSelectView.m */,
 				4FECFF682A15FBC7008DE530 /* CPDFEditTextSampleView.h */,
 				4FECFF692A15FBC7008DE530 /* CPDFEditTextSampleView.m */,
+				C9E792CE2A1CE2CF0013D6A8 /* CPDFEditImageSampleView.h */,
+				C9E792CF2A1CE2CF0013D6A8 /* CPDFEditImageSampleView.m */,
 			);
 			path = CPDFEditCell;
 			sourceTree = "<group>";
@@ -1220,6 +1226,7 @@
 				F32DA17E29ED904300E19ECA /* CPDFBOTAViewController.h in Headers */,
 				F32DA16829ED904300E19ECA /* CPDFOutlineViewCell.h in Headers */,
 				F35DD19B2A06850700B57F5B /* CPDFAnnotation+PDFListView.h in Headers */,
+				C9E792D02A1CE2CF0013D6A8 /* CPDFEditImageSampleView.h in Headers */,
 				C918CEC929FA140C00D43974 /* CPDFInkViewController.h in Headers */,
 				C9FBA2342A11BEFB003FABEC /* CStampColorSelectView.h in Headers */,
 				F382636E29EFD0D9003F1DFD /* CPDFListView.h in Headers */,
@@ -1416,6 +1423,7 @@
 				F32DA17F29ED904300E19ECA /* CNavigationController.m in Sources */,
 				F382636D29EFD0D9003F1DFD /* CPDFListView.m in Sources */,
 				C9AF184229F22BBD00EC4979 /* CPDFAnnotationBarButton.m in Sources */,
+				C9E792D12A1CE2CF0013D6A8 /* CPDFEditImageSampleView.m in Sources */,
 				F32DA17329ED904300E19ECA /* CPDFThumbnailViewController.m in Sources */,
 				C91BE7C42A02352B0038F2BC /* CPDFFreeTextViewController.m in Sources */,
 				C918CEDC29FB73C800D43974 /* CPDFArrowStyleView.m in Sources */,

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFBase/CPDFAnnotationBaseViewController.m

@@ -169,6 +169,11 @@
 - (void)pickerView:(CPDFColorPickerView *)colorPickerView color:(UIColor *)color {
     self.sampleView.color = color;
     [self.sampleView setNeedsDisplay];
+    
+    CGFloat red, green, blue, alpha;
+    [color getRed:&red green:&green blue:&blue alpha:&alpha];
+    self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 #pragma mark - CPDFOpacitySliderViewDelegate
@@ -176,6 +181,7 @@
 - (void)opacitySliderView:(CPDFOpacitySliderView *)opacitySliderView opacity:(CGFloat)opacity {
     self.sampleView.opcity = opacity;
     [self.sampleView setNeedsDisplay];
+    
 }
 
 @end

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFFreeText/CPDFFreeTextViewController.m

@@ -102,7 +102,7 @@
     [self.scrcollView addSubview:self.italicBtn];
     
     self.alignmentLabel = [[UILabel alloc] init];
-    self.alignmentLabel.text = NSLocalizedString(@"Alignment Mode", nil);
+    self.alignmentLabel.text = NSLocalizedString(@"Alignment", nil);
     self.alignmentLabel.textColor = [UIColor grayColor];
     self.alignmentLabel.font = [UIFont systemFontOfSize:12.0];
     [self.scrcollView addSubview:self.alignmentLabel];
@@ -178,8 +178,8 @@
 #pragma mark - Protect Mehtods
 
 - (void)commomInitTitle {
-    self.titleLabel.text = NSLocalizedString(@"Free Text", nil);
-    self.colorView.colorLabel.text = NSLocalizedString(@"Text Color", nil);
+    self.titleLabel.text = NSLocalizedString(@"Text Box", nil);
+    self.colorView.colorLabel.text = NSLocalizedString(@"Font Color", nil);
     
     self.sampleView.selecIndex = CPDFSamplesFreeText;
     self.sampleView.color = [UIColor blueColor];
@@ -447,6 +447,11 @@
         [self.delegate freeTextViewController:self annotStyle:self.annotStyle];
     }
     [self.sampleView setNeedsDisplay];
+    
+    CGFloat red, green, blue, alpha;
+    [color getRed:&red green:&green blue:&blue alpha:&alpha];
+    self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 #pragma mark - UIColorPickerViewControllerDelegate
@@ -462,6 +467,7 @@
     CGFloat red, green, blue, alpha;
     [viewController.selectedColor getRed:&red green:&green blue:&blue alpha:&alpha];
     self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 @end

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFHighlight/CPDFHighlightViewController.m

@@ -58,6 +58,11 @@
         [self.delegate highlightViewController:self annotStyle:self.annotStyle];
     }
     [self.sampleView setNeedsDisplay];
+    
+    CGFloat red, green, blue, alpha;
+    [color getRed:&red green:&green blue:&blue alpha:&alpha];
+    self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 #pragma mark - CPDFOpacitySliderViewDelegate
@@ -84,6 +89,7 @@
     CGFloat red, green, blue, alpha;
     [viewController.selectedColor getRed:&red green:&green blue:&blue alpha:&alpha];
     self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 @end

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFInk/CPDFInkViewController.m

@@ -48,7 +48,7 @@
 
 - (void)commomInitTitle {
     self.titleLabel.text = NSLocalizedString(@"Ink", nil);
-    self.thicknessView.titleLabel.text = NSLocalizedString(@"Thickness:", nil);
+    self.thicknessView.titleLabel.text = NSLocalizedString(@"Line Width", nil);
     self.sampleView.selecIndex = CPDFSamplesFreehand;
     self.sampleView.thickness = 4.0;
 }
@@ -110,6 +110,11 @@
         [self.delegate inkViewController:self annotStyle:self.annotStyle];
     }
     [self.sampleView setNeedsDisplay];
+    
+    CGFloat red, green, blue, alpha;
+    [color getRed:&red green:&green blue:&blue alpha:&alpha];
+    self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 #pragma mark - CPDFOpacitySliderViewDelegate
@@ -136,6 +141,7 @@
     CGFloat red, green, blue, alpha;
     [viewController.selectedColor getRed:&red green:&green blue:&blue alpha:&alpha];
     self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 @end

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFLink/CPDFLinkViewController.m

@@ -255,7 +255,8 @@
     _pageTextField.layer.cornerRadius = 5.0;
     _pageTextField.delegate = self;
     _pageTextField.font = [UIFont systemFontOfSize:18.0];
-    _pageTextField.placeholder = NSLocalizedString(@"Please enter page number", nil);
+    NSString *str = [NSString stringWithFormat:@"1~%ld", self.pageCount];
+    _pageTextField.placeholder = NSLocalizedString(str, nil);
     [_pageTextField setKeyboardType:UIKeyboardTypeNumberPad];
     [self.scrcollView addSubview:_pageTextField];
     
@@ -271,7 +272,7 @@
     _emailTextField.layer.cornerRadius = 5.0;
     _emailTextField.delegate = self;
     _emailTextField.font = [UIFont systemFontOfSize:18.0];
-    _emailTextField.placeholder = NSLocalizedString(@"Please enter a Email", nil);
+    _emailTextField.placeholder = NSLocalizedString(@"support@compdf.com", nil);
     [self.scrcollView addSubview:_emailTextField];
     offstY +=_urlTextField.frame.size.height;
     

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFShape/CPDFShapeArrowViewController.m

@@ -54,7 +54,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.arrowLabel = [[UILabel alloc] init];
-    self.arrowLabel.text = NSLocalizedString(@"Start Line Style", nil);
+    self.arrowLabel.text = NSLocalizedString(@"Start", nil);
     self.arrowLabel.textColor = [UIColor grayColor];
     self.arrowLabel.font = [UIFont systemFontOfSize:12.0];
     [self.scrcollView addSubview:self.arrowLabel];
@@ -72,7 +72,7 @@
     [self.arrowBtn addSubview:self.startDrawView];
     
     self.trialLabel = [[UILabel alloc] init];
-    self.trialLabel.text = NSLocalizedString(@"Tail Line Style", nil);
+    self.trialLabel.text = NSLocalizedString(@"End", nil);
     self.trialLabel.textColor = [UIColor grayColor];
     self.trialLabel.font = [UIFont systemFontOfSize:12.0];
     self.trialLabel.autoresizingMask = UIViewAutoresizingFlexibleRightMargin;
@@ -328,6 +328,11 @@
             [self.lineDelegate arrowViewController:self annotStyle:self.annotStyle];
         }
     }
+    
+    CGFloat red, green, blue, alpha;
+    [color getRed:&red green:&green blue:&blue alpha:&alpha];
+    self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 #pragma mark - UIColorPickerViewControllerDelegate
@@ -352,6 +357,7 @@
     CGFloat red, green, blue, alpha;
     [viewController.selectedColor getRed:&red green:&green blue:&blue alpha:&alpha];
     self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 @end

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFShape/CPDFShapeCircleViewController.m

@@ -116,7 +116,7 @@
             break;
         case CPDFViewAnnotationModeSquare:
         {
-            self.titleLabel.text = NSLocalizedString(@"Square", nil);
+            self.titleLabel.text = NSLocalizedString(@"Rectangle", nil);
         }
             break;
         case CPDFViewAnnotationModeArrow:
@@ -135,9 +135,9 @@
     }
     
     self.fillColorSelectView.colorLabel.text = NSLocalizedString(@"Fill Color", nil);
-    self.thicknessView.titleLabel.text = NSLocalizedString(@"Thickness", nil);
-    self.colorView.colorLabel.text = NSLocalizedString(@"Border Color", nil);
-    self.dottedView.titleLabel.text = NSLocalizedString(@"Dashed Setting", nil);
+    self.thicknessView.titleLabel.text = NSLocalizedString(@"Line Width", nil);
+    self.colorView.colorLabel.text = NSLocalizedString(@"Line Color", nil);
+    self.dottedView.titleLabel.text = NSLocalizedString(@"Line and Border Style", nil);
 }
 
 - (void)updatePreferredContentSizeWithTraitCollection:(UITraitCollection *)traitCollection {
@@ -277,6 +277,11 @@
     } else if (colorPickerView == self.fillColorPicker) {
         [self updateFillColor:color];
     }
+    
+    CGFloat red, green, blue, alpha;
+    [color getRed:&red green:&green blue:&blue alpha:&alpha];
+    self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 #pragma mark - UIColorPickerViewControllerDelegate
@@ -293,6 +298,7 @@
     CGFloat red, green, blue, alpha;
     [viewController.selectedColor getRed:&red green:&green blue:&blue alpha:&alpha];
     self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 @end

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFSignature/CPDFSignatureEditViewController.m

@@ -78,9 +78,9 @@
     [self.view addSubview:self.segmentedControl];
     
     self.emptyLabel = [[UILabel alloc] init];
-    self.emptyLabel.font = [UIFont systemFontOfSize:27];
+    self.emptyLabel.font = [UIFont systemFontOfSize:23];
     self.emptyLabel.textColor = [UIColor grayColor];
-    self.emptyLabel.text = NSLocalizedString(@"Signature Here", nil);
+    self.emptyLabel.text = NSLocalizedString(@"Enter your signature", nil);
     self.emptyLabel.textAlignment = NSTextAlignmentCenter;
     [self.view addSubview:self.emptyLabel];
     
@@ -129,7 +129,7 @@
     [self.headerView addSubview:self.cacelButon];
     
     self.saveButton = [[UIButton alloc] init];
-    [self.saveButton setTitle:NSLocalizedString(@"Done", nil) forState:UIControlStateNormal];
+    [self.saveButton setTitle:NSLocalizedString(@"Save", nil) forState:UIControlStateNormal];
     [self.saveButton setTitleColor:[UIColor grayColor] forState:UIControlStateNormal];
     [self.saveButton addTarget:self action:@selector(buttonItemClicked_Save:) forControlEvents:UIControlEventTouchUpInside];
     [self.headerView addSubview:self.saveButton];
@@ -138,7 +138,7 @@
     self.bottomBorder.backgroundColor = [UIColor blackColor].CGColor;
     self.textField = [[UITextField alloc] init];
     self.textField.delegate = self;
-    self.textField.placeholder = NSLocalizedString(@"Signature Here", nil);
+    self.textField.placeholder = NSLocalizedString(@"Enter your signature", nil);
     self.textField.textAlignment = NSTextAlignmentCenter;
     self.textField.font = [UIFont systemFontOfSize:30];
     [self.view addSubview:self.textField];
@@ -397,14 +397,14 @@
 #pragma mark - Private Methods
 
 - (void)createImageSignature {
-    UIAlertAction *cameraAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Use Camera", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *cameraAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Camera", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         UIImagePickerController *imagePickerController = [[UIImagePickerController alloc] init];
         imagePickerController.delegate = self;
         imagePickerController.sourceType = UIImagePickerControllerSourceTypeCamera;
         [self presentViewController:imagePickerController animated:YES completion:nil];
     }];
     
-    UIAlertAction *photoAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Photo Library", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *photoAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Choose from Album", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         UIImagePickerController *imagePickerController = [[UIImagePickerController alloc] init];
         imagePickerController.delegate = self;
         imagePickerController.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFSignature/CPDFSignatureViewController.m

@@ -204,7 +204,7 @@
     UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
                                                            style:UIAlertActionStyleCancel
                                                          handler:nil];
-    UIAlertAction *OKAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Sure", nil)
+    UIAlertAction *OKAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
                                                            style:UIAlertActionStyleDefault
                                                      handler:^(UIAlertAction * _Nonnull action) {
         NSIndexPath *indexSet = [self.tableView indexPathForCell:signatureViewCell];
@@ -214,8 +214,8 @@
         }
         [self.tableView reloadData];
     }];
-    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Tip", nil)
-                                                                   message:NSLocalizedString(@"Are you sure you want to delete the signature?", nil)
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Warning", nil)
+                                                                   message:NSLocalizedString(@"Are you sure to delete?", nil)
                                                             preferredStyle:UIAlertControllerStyleAlert];
     [alert addAction:cancelAction];
     [alert addAction:OKAction];

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFSquiggly/CPDFSquigglyViewController.m

@@ -58,6 +58,11 @@
         [self.delegate squigglyViewController:self annotStyle:self.annotStyle];
     }
     [self.sampleView setNeedsDisplay];
+    
+    CGFloat red, green, blue, alpha;
+    [color getRed:&red green:&green blue:&blue alpha:&alpha];
+    self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 #pragma mark - CPDFOpacitySliderViewDelegate
@@ -84,6 +89,7 @@
     CGFloat red, green, blue, alpha;
     [viewController.selectedColor getRed:&red green:&green blue:&blue alpha:&alpha];
     self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 @end

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFStamp/CPDFStampViewController.m

@@ -100,7 +100,7 @@ PDFAnnotationStampKey const PDFAnnotationStampKeyShape = @"PDFAnnotationStampKey
     [self.backBtn addTarget:self action:@selector(buttonItemClicked_back:) forControlEvents:UIControlEventTouchUpInside];
     [self.headerView addSubview:self.backBtn];
     
-    NSArray *segmmentArray = [NSArray arrayWithObjects:NSLocalizedString(@"Standard", nil), NSLocalizedString(@"Customize", nil), nil];
+    NSArray *segmmentArray = [NSArray arrayWithObjects:NSLocalizedString(@"Standard", nil), NSLocalizedString(@"Custom", nil), nil];
     self.segmentedControl = [[UISegmentedControl alloc] initWithItems:segmmentArray];
     self.segmentedControl.selectedSegmentIndex = 0;
     self.segmentedControl.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
@@ -270,14 +270,14 @@ PDFAnnotationStampKey const PDFAnnotationStampKeyShape = @"PDFAnnotationStampKey
 }
 
 - (void)createImageSignature {
-    UIAlertAction *cameraAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Use Camera", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *cameraAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Camera", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         UIImagePickerController *imagePickerController = [[UIImagePickerController alloc] init];
         imagePickerController.delegate = self;
         imagePickerController.sourceType = UIImagePickerControllerSourceTypeCamera;
         [self presentViewController:imagePickerController animated:YES completion:nil];
     }];
     
-    UIAlertAction *photoAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Photo Library", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *photoAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Choose from Album", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         UIImagePickerController *imagePickerController = [[UIImagePickerController alloc] init];
         imagePickerController.delegate = self;
         imagePickerController.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
@@ -663,7 +663,7 @@ PDFAnnotationStampKey const PDFAnnotationStampKeyShape = @"PDFAnnotationStampKey
     UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
                                                            style:UIAlertActionStyleCancel
                                                          handler:nil];
-    UIAlertAction *OKAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Sure", nil)
+    UIAlertAction *OKAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
                                                            style:UIAlertActionStyleDefault
                                                      handler:^(UIAlertAction * _Nonnull action) {
         NSIndexPath *select = [self.tableView indexPathForCell:customizeStampTableViewCell];
@@ -675,8 +675,8 @@ PDFAnnotationStampKey const PDFAnnotationStampKeyShape = @"PDFAnnotationStampKey
         
         [self.tableView reloadData];
     }];
-    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Tip", nil)
-                                                                   message:NSLocalizedString(@"Are you sure you want to delete the stamp?", nil)
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Warning", nil)
+                                                                   message:NSLocalizedString(@"Are you sure to delete?", nil)
                                                             preferredStyle:UIAlertControllerStyleAlert];
     [alert addAction:cancelAction];
     [alert addAction:OKAction];

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFStamp/CStampShapView.m

@@ -39,7 +39,7 @@
 - (instancetype)initWithFrame:(CGRect)frame {
     if (self = [super initWithFrame:frame]) {
         self.titleLabel = [[UILabel alloc] init];
-        self.titleLabel.text = NSLocalizedString(@"Shape", nil);
+        self.titleLabel.text = NSLocalizedString(@"Style", nil);
         self.titleLabel.autoresizingMask = UIViewAutoresizingFlexibleRightMargin;
         self.titleLabel.textColor = [UIColor grayColor];
         self.titleLabel.font = [UIFont systemFontOfSize:12.0];

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFStamp/CStampTextViewController.m

@@ -66,7 +66,7 @@
     
     self.doneBtn = [[UIButton alloc] init];
     self.doneBtn.autoresizingMask = UIViewAutoresizingFlexibleRightMargin;
-    [self.doneBtn setTitle:NSLocalizedString(@"Done", nil) forState:UIControlStateNormal];
+    [self.doneBtn setTitle:NSLocalizedString(@"Save", nil) forState:UIControlStateNormal];
     [self.doneBtn setTitleColor:[UIColor blueColor] forState:UIControlStateNormal];
     [self.doneBtn addTarget:self action:@selector(buttonItemClicked_done:) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:self.doneBtn];
@@ -105,7 +105,7 @@
     self.stampTextField.delegate = self;
     self.stampTextField.borderStyle = UITextBorderStyleNone;
     [self.stampTextField addTarget:self action:@selector(textFieldEditChange:) forControlEvents:UIControlEventEditingChanged];
-    self.stampTextField.placeholder = NSLocalizedString(@"Example Text", nil);
+    self.stampTextField.placeholder = NSLocalizedString(@"Text", nil);
     [self.scrcollView addSubview:self.stampTextField];
     
     self.colorView = [[CStampColorSelectView alloc] init];

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFStrikeout/CPDFStrikeoutViewController.m

@@ -53,6 +53,11 @@
         [self.delegate strikeoutViewController:self annotStyle:self.annotStyle];
     }
     [self.sampleView setNeedsDisplay];
+    
+    CGFloat red, green, blue, alpha;
+    [color getRed:&red green:&green blue:&blue alpha:&alpha];
+    self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 #pragma mark - CPDFOpacitySliderViewDelegate
@@ -79,6 +84,7 @@
     CGFloat red, green, blue, alpha;
     [viewController.selectedColor getRed:&red green:&green blue:&blue alpha:&alpha];
     self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 @end

compdfkit-tools/compdfkit-tools/Annotation/PDFProperties/PDFUnderline/CPDFUnderlineViewController.m

@@ -58,6 +58,12 @@
         [self.delegate underlineViewController:self annotStyle:self.annotStyle];
     }
     [self.sampleView setNeedsDisplay];
+    
+    
+    CGFloat red, green, blue, alpha;
+    [color getRed:&red green:&green blue:&blue alpha:&alpha];
+    self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 #pragma mark - CPDFOpacitySliderViewDelegate
@@ -84,6 +90,7 @@
     CGFloat red, green, blue, alpha;
     [viewController.selectedColor getRed:&red green:&green blue:&blue alpha:&alpha];
     self.opacitySliderView.opacitySlider.value = alpha;
+    self.opacitySliderView.startLabel.text = [NSString stringWithFormat:@"%d%%", (int)((self.opacitySliderView.opacitySlider.value/1)*100)];
 }
 
 @end

compdfkit-tools/compdfkit-tools/Common/Controls/BOTA/CPDFBOTAViewController.m

@@ -116,7 +116,7 @@
 
 - (void)updatePreferredContentSizeWithTraitCollection:(UITraitCollection *)traitCollection
 {
-    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width,self.view.bounds.size.height * 0.9);
+    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width,traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? (self.view.bounds.size.width*0.9) : 800);
 
 }
 

compdfkit-tools/compdfkit-tools/Common/Controls/Tools/CPDFToolsViewController.m

@@ -118,7 +118,7 @@
 
 - (void)updatePreferredContentSizeWithTraitCollection:(UITraitCollection *)traitCollection
 {
-    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width,self.view.bounds.size.height * 0.25);
+    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width, traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? 220 : 220);
 
 }
 

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageFreeText.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "text.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "text 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageFreeText.imageset/text 1.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
+1.000000 0.000000 -0.000000 1.000000 3.250000 2.250000 cm
+1.000000 1.000000 1.000000 scn
+13.500000 15.000000 m
+13.500000 11.750000 l
+12.000000 11.750000 l
+12.000000 13.500000 l
+7.500000 13.500000 l
+7.500000 1.500000 l
+9.083658 1.500000 l
+9.083658 0.000000 l
+4.416992 0.000000 l
+4.416992 1.500000 l
+6.000000 1.500000 l
+6.000000 13.500000 l
+1.500000 13.500000 l
+1.500000 11.750000 l
+0.000000 11.750000 l
+0.000000 15.000000 l
+13.500000 15.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  484
+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
+0000000574 00000 n
+0000000596 00000 n
+0000000769 00000 n
+0000000843 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+902
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageFreehand.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "ic.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageFreehand.imageset/ic 1.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
+0.707107 -0.707107 0.707107 0.707107 -1.393567 2.849231 cm
+1.000000 1.000000 1.000000 scn
+0.000000 16.970581 m
+6.000000 16.970581 l
+6.000000 13.955862 l
+0.000000 13.955862 l
+0.000000 16.970581 l
+h
+0.000000 12.955862 m
+0.000000 3.970581 l
+3.000000 -1.029419 l
+6.000000 3.970581 l
+6.000000 12.955862 l
+0.000000 12.955862 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  360
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 14.849121 14.849243 ]
+     /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
+0000000450 00000 n
+0000000472 00000 n
+0000000645 00000 n
+0000000719 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+778
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageHighLight.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "ic.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageHighLight.imageset/ic 1.pdf

@@ -0,0 +1,88 @@
+%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.000000 0.000000 cm
+0.528802 0.547571 0.595833 scn
+12.607775 1.000021 m
+7.696358 13.278564 l
+6.303642 13.278564 l
+1.392225 1.000021 l
+0.000000 1.000021 l
+0.000000 0.000021 l
+4.000000 0.000021 l
+4.000000 1.000021 l
+3.007762 1.000021 l
+4.107717 3.750021 l
+9.892282 3.750021 l
+10.992238 1.000021 l
+10.000000 1.000021 l
+10.000000 0.000021 l
+14.000000 0.000021 l
+14.000000 1.000021 l
+12.607775 1.000021 l
+h
+9.492299 4.750021 m
+7.000000 10.981022 l
+4.507701 4.750021 l
+9.492299 4.750021 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  560
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 14.000000 13.278564 ]
+     /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
+0000000650 00000 n
+0000000672 00000 n
+0000000845 00000 n
+0000000919 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+978
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageImage.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "nor.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "nor 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageImage.imageset/nor 1.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
+1.000000 0.000000 -0.000000 1.000000 1.250000 3.250000 cm
+1.000000 1.000000 1.000000 scn
+0.000000 13.500000 m
+17.500000 13.500000 l
+17.500000 0.000000 l
+0.000000 0.000000 l
+0.000000 13.500000 l
+h
+16.000000 12.000000 m
+1.500000 12.000000 l
+1.500000 3.540523 l
+4.544956 6.750000 l
+8.814282 3.250000 l
+11.121848 5.682244 l
+15.894180 1.500000 l
+16.000000 1.500000 l
+16.000000 12.000000 l
+h
+13.250000 7.750000 m
+14.078427 7.750000 14.750000 8.421573 14.750000 9.250000 c
+14.750000 10.078427 14.078427 10.750000 13.250000 10.750000 c
+12.421573 10.750000 11.750000 10.078427 11.750000 9.250000 c
+11.750000 8.421573 12.421573 7.750000 13.250000 7.750000 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  687
+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
+0000000777 00000 n
+0000000799 00000 n
+0000000972 00000 n
+0000001046 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1105
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageLink.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "nor.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "nor 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageLink.imageset/nor 1.pdf

@@ -0,0 +1,91 @@
+%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.161133 1.161255 cm
+1.000000 1.000000 1.000000 scn
+17.677670 11.667205 m
+13.169864 7.159399 l
+12.109203 8.220059 l
+15.556350 11.667205 l
+11.667262 15.556292 l
+8.220117 12.109146 l
+7.159456 13.169806 l
+11.667262 17.677612 l
+17.677670 11.667205 l
+h
+5.568466 9.457496 m
+2.121321 6.010350 l
+6.010408 2.121264 l
+9.457554 5.568409 l
+10.518213 4.507749 l
+6.010408 -0.000057 l
+0.000000 6.010350 l
+4.507806 10.518156 l
+5.568466 9.457496 l
+h
+7.954951 6.894234 m
+10.783379 9.722661 l
+9.722718 10.783321 l
+6.894291 7.954894 l
+7.954951 6.894234 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  611
+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
+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/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageNote.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "ic_subtoolbar_mytools_note.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "note.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageNote.imageset/note.pdf

@@ -0,0 +1,86 @@
+%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.000000 cm
+1.000000 1.000000 1.000000 scn
+16.000000 15.000000 m
+0.000000 15.000000 l
+0.000000 3.000000 l
+3.000000 3.000000 l
+3.000000 0.000000 l
+8.000000 3.000000 l
+16.000000 3.000000 l
+16.000000 15.000000 l
+h
+3.000000 12.000000 m
+9.000000 12.000000 l
+9.000000 10.500000 l
+3.000000 10.500000 l
+3.000000 12.000000 l
+h
+3.000000 8.500000 m
+13.000000 8.500000 l
+13.000000 7.000000 l
+3.000000 7.000000 l
+3.000000 8.500000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  505
+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
+0000000595 00000 n
+0000000617 00000 n
+0000000790 00000 n
+0000000864 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+923
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImagePencilDraw.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "pencil.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "pencil 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImagePencilDraw.imageset/pencil 1.pdf

@@ -0,0 +1,99 @@
+%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.250000 cm
+1.000000 1.000000 1.000000 scn
+8.750000 16.000000 m
+4.745935 16.000000 1.500000 12.754065 1.500000 8.750000 c
+1.500000 6.455398 2.565989 4.409769 4.229763 3.081322 c
+4.986542 7.243610 l
+5.016206 7.406761 5.068908 7.564867 5.143067 7.713185 c
+7.184752 11.796556 l
+7.829670 13.086392 9.670331 13.086390 10.315248 11.796556 c
+12.356933 7.713185 l
+12.431091 7.564868 12.483793 7.406763 12.513458 7.243610 c
+13.270238 3.081322 l
+14.934011 4.409769 16.000000 6.455398 16.000000 8.750000 c
+16.000000 12.754065 12.754065 16.000000 8.750000 16.000000 c
+h
+8.750000 1.500000 m
+7.620227 1.500000 6.550811 1.758416 5.597635 2.219365 c
+6.462348 6.975283 l
+6.463864 6.983624 6.465802 6.991874 6.468152 7.000000 c
+11.031848 6.999999 l
+11.034198 6.991874 11.036136 6.983624 11.037653 6.975284 c
+11.902365 2.219365 l
+10.949189 1.758416 9.879772 1.500000 8.750000 1.500000 c
+h
+10.286475 8.499999 m
+8.973607 11.125735 l
+8.881475 11.309999 8.618525 11.309998 8.526394 11.125736 c
+7.213525 8.500000 l
+10.286475 8.499999 l
+h
+0.000000 8.750000 m
+0.000000 13.582492 3.917508 17.500000 8.750000 17.500000 c
+13.582492 17.500000 17.500000 13.582492 17.500000 8.750000 c
+17.500000 3.917508 13.582492 0.000000 8.750000 0.000000 c
+3.917508 0.000000 0.000000 3.917508 0.000000 8.750000 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1353
+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
+0000001443 00000 n
+0000001466 00000 n
+0000001639 00000 n
+0000001713 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1772
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageProperties.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "list.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "list 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageProperties.imageset/list 1.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 2.000000 cm
+1.000000 1.000000 1.000000 scn
+6.854621 14.749999 m
+16.000000 14.749999 l
+16.000000 13.249999 l
+6.854620 13.249998 l
+6.557926 12.517042 5.839344 12.000000 5.000000 12.000000 c
+4.160656 12.000000 3.442074 12.517042 3.145380 13.249998 c
+0.000000 13.249998 l
+0.000000 14.749998 l
+3.145379 14.749998 l
+3.442072 15.482957 4.160655 16.000000 5.000000 16.000000 c
+5.839345 16.000000 6.557928 15.482957 6.854621 14.749999 c
+h
+0.000000 7.249997 m
+9.145380 7.249998 l
+9.442075 6.517042 10.160657 6.000000 11.000000 6.000000 c
+11.839343 6.000000 12.557926 6.517041 12.854620 7.249998 c
+16.000000 7.249998 l
+16.000000 8.749998 l
+12.854622 8.749998 l
+12.557929 9.482956 11.839345 10.000000 11.000000 10.000000 c
+10.160655 10.000000 9.442071 9.482957 9.145378 8.749998 c
+0.000000 8.749997 l
+0.000000 7.249997 l
+h
+3.145381 1.249996 m
+0.000000 1.249996 l
+0.000000 2.749996 l
+3.145378 2.749996 l
+3.442071 3.482956 4.160654 4.000000 5.000000 4.000000 c
+5.839345 4.000000 6.557929 3.482956 6.854622 2.749996 c
+16.000000 2.749997 l
+16.000000 1.249997 l
+6.854620 1.249996 l
+6.557925 0.517040 5.839343 0.000000 5.000000 0.000000 c
+4.160657 0.000000 3.442075 0.517040 3.145381 1.249996 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1262
+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
+0000001352 00000 n
+0000001375 00000 n
+0000001548 00000 n
+0000001622 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1681
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageRedo.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "redo.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "redo 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageRedo.imageset/redo 1.pdf

@@ -0,0 +1,84 @@
+%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 19.000000 2.528687 cm
+1.000000 1.000000 1.000000 scn
+0.530330 10.632927 m
+0.000000 10.102597 l
+0.530330 9.572268 l
+5.368716 4.733881 l
+6.429376 5.794541 l
+2.871321 9.352596 l
+12.020658 9.352596 l
+14.189099 9.352596 15.946970 7.594728 15.946970 5.426288 c
+15.946970 3.257847 14.189101 1.499979 12.020661 1.499979 c
+2.000000 1.499979 l
+2.000000 -0.000021 l
+12.020661 -0.000021 l
+15.017529 -0.000021 17.446970 2.429420 17.446970 5.426288 c
+17.446970 8.423156 15.017525 10.852596 12.020658 10.852596 c
+2.871319 10.852596 l
+6.429376 14.410653 l
+5.368716 15.471313 l
+0.530330 10.632927 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  660
+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
+0000000750 00000 n
+0000000772 00000 n
+0000000945 00000 n
+0000001019 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1078
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageShapeArrow.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "arrow.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "arrow 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageShapeArrow.imageset/arrow 1.pdf

@@ -0,0 +1,76 @@
+%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.469727 1.469727 cm
+1.000000 1.000000 1.000000 scn
+15.280330 8.530273 m
+15.280330 15.280273 l
+8.530330 15.280273 l
+8.530330 13.780273 l
+12.719670 13.780273 l
+0.000000 1.060603 l
+1.060660 -0.000057 l
+13.780330 12.719612 l
+13.780330 8.530273 l
+15.280330 8.530273 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  340
+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
+0000000430 00000 n
+0000000452 00000 n
+0000000625 00000 n
+0000000699 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+758
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageShapeCircle.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "oval.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "oval 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageShapeCircle.imageset/oval 1.pdf

@@ -0,0 +1,77 @@
+%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.750000 cm
+1.000000 1.000000 1.000000 scn
+8.250000 16.500000 m
+3.693651 16.500000 0.000000 12.806349 0.000000 8.250000 c
+0.000000 3.693651 3.693651 0.000000 8.250000 0.000000 c
+12.806349 0.000000 16.500000 3.693651 16.500000 8.250000 c
+16.500000 12.806349 12.806349 16.500000 8.250000 16.500000 c
+h
+8.250000 15.000000 m
+11.977922 15.000000 15.000000 11.977922 15.000000 8.250000 c
+15.000000 4.522078 11.977922 1.500000 8.250000 1.500000 c
+4.522078 1.500000 1.500000 4.522078 1.500000 8.250000 c
+1.500000 11.977922 4.522078 15.000000 8.250000 15.000000 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  640
+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
+0000000730 00000 n
+0000000752 00000 n
+0000000925 00000 n
+0000000999 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1058
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageShapeLine.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "line.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "line 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageShapeLine.imageset/line 1.pdf

@@ -0,0 +1,71 @@
+%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.469727 1.469604 cm
+1.000000 1.000000 1.000000 scn
+14.000000 15.060669 m
+15.060660 14.000009 l
+1.060660 0.000009 l
+0.000000 1.060669 l
+14.000000 15.060669 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  234
+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
+0000000324 00000 n
+0000000346 00000 n
+0000000519 00000 n
+0000000593 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+652
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageShapeRectangle.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "rec.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "rec 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageShapeRectangle.imageset/rec 1.pdf

@@ -0,0 +1,77 @@
+%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 3.250000 cm
+1.000000 1.000000 1.000000 scn
+17.500000 13.500000 m
+0.000000 13.500000 l
+0.000000 0.000000 l
+17.500000 0.000000 l
+17.500000 13.500000 l
+h
+16.000000 12.000000 m
+16.000000 1.500000 l
+1.500000 1.500000 l
+1.500000 12.000000 l
+16.000000 12.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  342
+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
+0000000432 00000 n
+0000000454 00000 n
+0000000627 00000 n
+0000000701 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+760
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageSignature.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "nor.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "nor 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageSignature.imageset/nor 1.pdf

@@ -0,0 +1,108 @@
+%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.889160 1.483276 cm
+1.000000 1.000000 1.000000 scn
+16.202795 12.859945 m
+11.253048 17.809692 l
+8.071068 13.213499 l
+4.181981 12.152838 l
+4.181981 12.152838 3.982433 10.430017 3.474874 8.617305 c
+3.115443 7.333624 2.023970 4.853914 1.417502 3.515867 c
+1.048270 3.685406 0.597010 3.618120 0.292893 3.314004 c
+-0.097631 2.923479 -0.097631 2.290315 0.292893 1.899790 c
+0.683417 1.509266 1.316582 1.509266 1.707107 1.899790 c
+2.017654 2.210338 2.081248 2.674317 1.897897 3.047709 c
+3.084634 3.614276 5.232831 4.584049 7.010407 5.081771 c
+9.617112 5.811648 10.545941 5.788877 10.545941 5.788877 c
+11.606602 9.677964 l
+16.202795 12.859945 l
+h
+14.865218 3.172400 m
+14.560407 3.678793 13.990632 3.872368 13.176373 3.853580 c
+11.843590 3.822828 9.380374 3.204309 5.335240 1.847342 c
+4.073792 1.417948 l
+4.562962 -0.000048 l
+4.980837 0.143490 l
+9.106980 1.554564 11.658496 2.237961 12.965968 2.341055 c
+13.210973 2.353979 l
+13.332891 2.354455 l
+13.408545 2.353151 13.472960 2.348739 13.526207 2.342020 c
+13.535913 2.340799 l
+13.458778 1.967508 l
+13.397528 1.661427 13.385180 1.500134 13.421536 1.267578 c
+13.497416 0.782209 13.827616 0.423435 14.336223 0.284988 c
+14.995405 0.105551 16.097439 0.270704 17.958416 0.817015 c
+18.539791 0.992378 l
+18.096962 2.425522 l
+17.826523 2.342947 l
+16.414690 1.917196 15.490141 1.724684 15.008798 1.710440 c
+14.936913 1.710800 l
+15.008714 2.059508 l
+15.092236 2.520182 15.076522 2.821354 14.865218 3.172400 c
+h
+8.778174 8.970858 m
+7.363961 10.385071 l
+5.242641 6.849538 l
+8.778174 8.970858 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1595
+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
+0000001685 00000 n
+0000001708 00000 n
+0000001881 00000 n
+0000001955 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+2014
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageSound.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "music.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "music 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageSound.imageset/music 1.pdf

@@ -0,0 +1,109 @@
+%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 1.719482 cm
+1.000000 1.000000 1.000000 scn
+9.500000 16.680542 m
+9.500000 15.340271 l
+9.500000 1.340271 l
+9.500000 0.000000 l
+8.357699 0.701053 l
+3.975866 3.390271 l
+0.750000 3.390271 l
+0.000000 3.390271 l
+0.000000 4.140271 l
+0.000000 12.540271 l
+0.000000 13.290271 l
+0.750000 13.290271 l
+3.975867 13.290271 l
+8.357699 15.979489 l
+9.500000 16.680542 l
+h
+8.000000 14.000000 m
+4.579960 11.901052 l
+4.399451 11.790271 l
+4.187658 11.790271 l
+1.500000 11.790271 l
+1.500000 4.890271 l
+4.187658 4.890271 l
+4.399451 4.890271 l
+4.579959 4.779489 l
+8.000000 2.680542 l
+8.000000 14.000000 l
+h
+16.672375 8.609959 m
+16.672375 11.367714 14.461385 13.590271 11.750000 13.590271 c
+11.750000 15.090271 l
+15.304147 15.090271 18.172375 12.181732 18.172375 8.609959 c
+18.172375 5.038186 15.304147 2.129646 11.750000 2.129646 c
+11.750000 3.629646 l
+14.461385 3.629646 16.672375 5.852204 16.672375 8.609959 c
+h
+12.000000 10.530542 m
+12.542832 10.530542 13.250000 9.911864 13.250000 8.780542 c
+13.250000 7.649220 12.542832 7.030542 12.000000 7.030542 c
+12.000000 5.530542 l
+13.666307 5.530542 14.750000 7.150440 14.750000 8.780542 c
+14.750000 10.410645 13.666307 12.030542 12.000000 12.030542 c
+12.000000 10.530542 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1278
+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
+0000001368 00000 n
+0000001391 00000 n
+0000001564 00000 n
+0000001638 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1697
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageSquiggly.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "ic_subtoolbar_mytools_underline.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageSquiggly.imageset/ic.pdf

@@ -0,0 +1,88 @@
+%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.000000 0.000000 cm
+1.000000 1.000000 1.000000 scn
+10.000000 1.000021 m
+10.992238 1.000021 l
+9.892282 3.750021 l
+4.107718 3.750021 l
+3.007762 1.000021 l
+4.000000 1.000021 l
+4.000000 0.000021 l
+0.000000 0.000021 l
+0.000000 1.000021 l
+1.392225 1.000021 l
+6.303642 13.278564 l
+7.696358 13.278564 l
+12.607775 1.000021 l
+14.000000 1.000021 l
+14.000000 0.000021 l
+10.000000 0.000021 l
+10.000000 1.000021 l
+h
+4.507701 4.750021 m
+9.492299 4.750021 l
+7.000000 10.981022 l
+4.507701 4.750021 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  560
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 14.000000 13.278564 ]
+     /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
+0000000650 00000 n
+0000000672 00000 n
+0000000845 00000 n
+0000000919 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+978
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageStamp.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "nor.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "nor 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageStamp.imageset/nor 1.pdf

@@ -0,0 +1,86 @@
+%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.500000 cm
+1.000000 1.000000 1.000000 scn
+9.982011 7.524785 m
+11.187527 8.213807 12.000000 9.512022 12.000000 11.000000 c
+12.000000 13.209139 10.209139 15.000000 8.000000 15.000000 c
+5.790861 15.000000 4.000000 13.209139 4.000000 11.000000 c
+4.000000 9.512019 4.812476 8.213802 6.017996 7.524781 c
+6.107453 7.396823 6.500000 6.803784 6.500000 6.250000 c
+6.500000 5.625000 6.000000 5.000000 6.000000 5.000000 c
+0.000000 5.000000 l
+0.000000 3.500000 l
+16.000000 3.500000 l
+16.000000 5.000000 l
+10.000000 5.000000 l
+10.000000 5.000000 9.500000 5.625000 9.500000 6.250000 c
+9.500000 6.803790 9.892559 7.396836 9.982011 7.524785 c
+h
+16.000000 0.000000 m
+16.000000 1.500000 l
+0.000000 1.500000 l
+0.000000 0.000000 l
+16.000000 0.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/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageStrikeout.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "ic.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageStrikeout.imageset/ic 1.pdf

@@ -0,0 +1,82 @@
+%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.000000 0.000000 cm
+1.000000 1.000000 1.000000 scn
+11.849375 1.000000 m
+10.713867 1.000000 l
+10.713867 0.000000 l
+14.999581 0.000000 l
+14.999581 1.000000 l
+13.464911 1.000000 l
+8.196358 14.171387 l
+6.803642 14.171387 l
+1.535083 0.999987 l
+0.000000 0.999987 l
+0.000000 -0.000013 l
+4.285714 -0.000013 l
+4.285714 0.999987 l
+3.150620 0.999987 l
+7.500000 11.873844 l
+11.849375 1.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  460
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 14.999512 14.171387 ]
+     /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
+0000000550 00000 n
+0000000572 00000 n
+0000000745 00000 n
+0000000819 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+878
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageUnderline.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "ic_subtoolbar_mytools_underline.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "ic.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageUnderline.imageset/ic.pdf

@@ -0,0 +1,88 @@
+%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.000000 0.000000 cm
+1.000000 1.000000 1.000000 scn
+10.000000 1.000021 m
+10.992238 1.000021 l
+9.892282 3.750021 l
+4.107718 3.750021 l
+3.007762 1.000021 l
+4.000000 1.000021 l
+4.000000 0.000021 l
+0.000000 0.000021 l
+0.000000 1.000021 l
+1.392225 1.000021 l
+6.303642 13.278564 l
+7.696358 13.278564 l
+12.607775 1.000021 l
+14.000000 1.000021 l
+14.000000 0.000021 l
+10.000000 0.000021 l
+10.000000 1.000021 l
+h
+4.507701 4.750021 m
+9.492299 4.750021 l
+7.000000 10.981022 l
+4.507701 4.750021 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  560
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 14.000000 13.278564 ]
+     /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
+0000000650 00000 n
+0000000672 00000 n
+0000000845 00000 n
+0000000919 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+978
+%%EOF

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageUndo.imageset/Contents.json

@@ -3,6 +3,16 @@
     {
       "filename" : "undo.pdf",
       "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "undo 1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

compdfkit-tools/compdfkit-tools/Common/Views/PDFAnnotationBar/Image.xcassets/CPDFAnnotationBarImageUndo.imageset/undo 1.pdf

@@ -0,0 +1,84 @@
+%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 2.528687 cm
+1.000000 1.000000 1.000000 scn
+0.530330 10.632927 m
+0.000000 10.102597 l
+0.530330 9.572268 l
+5.368716 4.733881 l
+6.429376 5.794541 l
+2.871321 9.352596 l
+12.020658 9.352596 l
+14.189099 9.352596 15.946970 7.594728 15.946970 5.426288 c
+15.946970 3.257847 14.189101 1.499979 12.020661 1.499979 c
+2.000000 1.499979 l
+2.000000 -0.000021 l
+12.020661 -0.000021 l
+15.017529 -0.000021 17.446970 2.429420 17.446970 5.426288 c
+17.446970 8.423156 15.017525 10.852596 12.020658 10.852596 c
+2.871319 10.852596 l
+6.429376 14.410653 l
+5.368716 15.471313 l
+0.530330 10.632927 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  657
+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
+0000000747 00000 n
+0000000769 00000 n
+0000000942 00000 n
+0000001016 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1075
+%%EOF

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

@@ -56,7 +56,7 @@
         [self addSubview:self.headerView];
         
         self.titleLabel = [[UILabel alloc] initWithFrame:CGRectMake((self.frame.size.width - 120)/2, 0, 120, 50)];
-        self.titleLabel.text = NSLocalizedString(@"Font Name", nil);
+        self.titleLabel.text = NSLocalizedString(@"Font Style", nil);
         self.titleLabel.autoresizingMask  = UIViewAutoresizingFlexibleHeight;
         [self.headerView addSubview:self.titleLabel];
         

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

@@ -70,7 +70,7 @@
 
 - (void)layoutSubviews {
     [super layoutSubviews];
-    self.titleLabel.frame = CGRectMake(20, 0, self.frame.size.width, self.frame.size.height/2);
+    self.titleLabel.frame = CGRectMake(20-self.rightTitleMargin, 0, self.frame.size.width, self.frame.size.height/2);
     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.rightMargin, self.frame.size.height/2 + 7.5, 80, self.frame.size.height/2 - 15);

compdfkit-tools/compdfkit-tools/Common/Views/PDFView/PDFListView/CPDFListView+Edit.m

@@ -74,9 +74,9 @@
                         deleteItem = item;
                     }
                 }
-                UIMenuItem * leftRotateItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Left Rotate", nil) action:@selector(leftRotateCropActionClick:)];
+                UIMenuItem * leftRotateItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Rotate Left", nil) action:@selector(leftRotateCropActionClick:)];
                 
-                UIMenuItem * rightRotateItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Right Rotate", nil) action:@selector(leftRotateCropActionClick:)];
+                UIMenuItem * rightRotateItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Rotate Right", nil) action:@selector(leftRotateCropActionClick:)];
                 
                 UIMenuItem * rPlaceItem  = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Replace", nil) action:@selector(replaceActionClick:)];
                 
@@ -84,10 +84,10 @@
                 
                 UIMenuItem * opacityItem  = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Opacity", nil) action:@selector(opacityEditingItemAction:)];
                 
-                UIMenuItem * hMirrorItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"HMirror", nil) action:@selector(horizontalMirrorClick:)];
-                UIMenuItem * vMirrorItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"VMirror", nil) action:@selector(verticalMirrorClick:)];
+                UIMenuItem * hMirrorItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Flip horizontal", nil) action:@selector(horizontalMirrorClick:)];
+                UIMenuItem * vMirrorItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Flip vertical", nil) action:@selector(verticalMirrorClick:)];
                 
-                UIMenuItem * extractItem  = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Extract", nil) action:@selector(extractActionClick:)];                
+                UIMenuItem * extractItem  = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Export", nil) action:@selector(extractActionClick:)];                
                 
                 [menuItems addObject:leftRotateItem];
                 [menuItems addObject:rightRotateItem];
@@ -103,7 +103,7 @@
                 [menuItems addObject:deleteItem];
             }else{
                 [menuItems removeAllObjects];
-                UIMenuItem * propertyItem  = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Property", nil) action:@selector(propertyEditingItemAction:)];
+                UIMenuItem * propertyItem  = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Properties", nil) action:@selector(propertyEditingItemAction:)];
                 
                 UIMenuItem * opacityItem  = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"Opacity", nil) action:@selector(opacityEditingItemAction:)];
                 

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

@@ -35,15 +35,15 @@
 - (instancetype)initWithFrame:(CGRect)frame {
     if (self == [super initWithFrame:frame]) {
         _titleLabel = [[UILabel alloc] initWithFrame:CGRectMake((self.frame.size.width - 120)/2, 0, 120, (self.bounds.size.height - 40)/6)];
-        _titleLabel.text = NSLocalizedString(@"Font Name", nil);
+        _titleLabel.text = NSLocalizedString(@"Font Style", nil);
         _titleLabel.autoresizingMask  = UIViewAutoresizingFlexibleHeight;
         [self addSubview:self.titleLabel];
         
-//        _backBtn = [[UIButton alloc] initWithFrame:CGRectMake(10, 0, 40, (self.bounds.size.height - 40)/6)];
-//        _backBtn.autoresizingMask = UIViewAutoresizingFlexibleHeight;
-//        [_backBtn setImage:[UIImage imageNamed:@"CPDFAnnotationBarImageUndo" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil] forState:UIControlStateNormal];
-//        [_backBtn addTarget:self action:@selector(buttonItemClicked_back:) forControlEvents:UIControlEventTouchUpInside];
-//        [self addSubview:self.backBtn];
+        _backBtn = [[UIButton alloc] initWithFrame:CGRectMake(10, 0, 40, (self.bounds.size.height - 40)/6)];
+        _backBtn.autoresizingMask = UIViewAutoresizingFlexibleHeight;
+        [_backBtn setImage:[UIImage imageNamed:@"CPDFAnnotationBarImageUndo" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil] forState:UIControlStateNormal];
+        [_backBtn addTarget:self action:@selector(buttonItemClicked_back:) forControlEvents:UIControlEventTouchUpInside];
+        [self addSubview:self.backBtn];
         
         if(!self.fontNameArr) {
             self.fontNameArr = [[NSMutableArray alloc] initWithObjects:@"FontName1",@"fontName2",@"fontName3",nil];
@@ -144,8 +144,6 @@
     }
     
     [self.mTableView reloadData];
-    
-    [self buttonItemClicked_back:nil];
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {

compdfkit-tools/compdfkit-tools/Edit/CPDFEditCell/CPDFEditImageSampleView.h

@@ -0,0 +1,23 @@
+//
+//  CPDFEditImageSampleView.h
+//  compdfkit-tools
+//
+//  Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.
+//
+//  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
+//  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
+//  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
+//
+
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CPDFEditImageSampleView : UIView
+
+@property (nonatomic, strong) UIImageView *imageView;
+
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,61 @@
+//
+//  CPDFEditImageSampleView.m
+//  compdfkit-tools
+//
+//  Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.
+//
+//  THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
+//  AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT.
+//  UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES.
+//
+
+#import "CPDFEditImageSampleView.h"
+#import "CPDFImagePropertyCell.h"
+
+#import <compdfkit_tools/CPDFColorUtils.h>
+
+@interface CPDFEditImageSampleView ()
+
+@end
+
+@implementation CPDFEditImageSampleView
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    if (self = [super initWithFrame:frame]) {
+        self.imageView = [[UIImageView alloc] init];
+        self.imageView.image = [UIImage imageNamed:@"CPDFEditImageSample" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil];
+        self.imageView.userInteractionEnabled = YES;
+        [self addSubview:self.imageView];
+        self.backgroundColor = [CPDFColorUtils CAnnotationSampleDrawBackgoundColor];
+    }
+    return self;
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    self.imageView.frame = CGRectInset(self.bounds, (self.bounds.size.width/7)*3, self.bounds.size.height/4);
+//
+//
+//    if (self.rotateType == CPDFImageRotateTypeLeft) {
+//        self.imageView.transform = CGAffineTransformRotate(self.imageView.transform, -M_PI/2);
+//    } else if (self.rotateType == CPDFImageRotateTypeRight) {
+//        self.imageView.transform = CGAffineTransformRotate(self.imageView.transform, M_PI/2);
+//    }
+//
+//
+//    if (self.transFormType) {
+//        if (self.transFormType == CPDFImageTransFormTypeVertical) {
+//            self.imageView.transform = CGAffineTransformScale(self.imageView.transform, 1.0, -1.0);
+//        } else if (self.transFormType == CPDFImageTransFormTypeHorizontal) {
+//            self.imageView.transform = CGAffineTransformScale(self.imageView.transform, -1.0, 1.0);
+//        }
+//    }
+//
+//    if (self.opacity) {
+//        self.imageView.alpha = self.opacity;
+//    } else {
+//        self.imageView.alpha = 1.0;
+//    }
+}
+
+@end

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

@@ -11,8 +11,8 @@
 #import <UIKit/UIKit.h>
 
 typedef NS_ENUM(NSUInteger, CPDFImageRotateType) {
-    CPDFImageRotateTypeLeft,
-    CPDFImageRotateTypeRight
+    CPDFImageRotateTypeLeft = -1,
+    CPDFImageRotateTypeRight = 1
 };
 
 typedef NS_ENUM(NSUInteger, CPDFImageTransFormType) {

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

@@ -10,8 +10,11 @@
 #import "CPDFImagePropertyCell.h"
 #import "CPDFDropDownMenu.h"
 #import "CPDFOpacitySliderView.h"
+#import "CPDFColorUtils.h"
+
 #import <ComPDFKit/ComPDFKit.h>
 
+
 @interface CPDFImagePropertyCell()<CPDFDropDownMenuDelegate,CPDFOpacitySliderViewDelegate>
 
 @property (nonatomic, strong) CPDFDropDownMenu * menu;
@@ -58,7 +61,7 @@
         self.leftRotateBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [self.leftRotateBtn addTarget:self action:@selector(leftRotateAction:) forControlEvents:UIControlEventTouchUpInside];
         [self.leftRotateBtn setImage:[UIImage imageNamed:@"CPDFEditIRotate" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil] forState:UIControlStateNormal];
-        NSString * leftTitle = [NSString stringWithFormat:@" %@",NSLocalizedString(@"Left", nil)];
+        NSString * leftTitle = [NSString stringWithFormat:@" %@",NSLocalizedString(@"Rotate Left", nil)];
         [self.leftRotateBtn setTitle:leftTitle forState:UIControlStateNormal];
         [self.leftRotateBtn setTitleColor:[UIColor colorWithRed:67/255. green:71/255. blue:77/255. alpha:1.] forState:UIControlStateNormal];
         self.leftRotateBtn.titleLabel.font = [UIFont systemFontOfSize:14.];
@@ -70,7 +73,7 @@
         self.rightRotateBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [self.rightRotateBtn addTarget:self action:@selector(rightRotateAction:) forControlEvents:UIControlEventTouchUpInside];
         [self.rightRotateBtn setImage:[UIImage imageNamed:@"CPDFEditRRotate" inBundle:[NSBundle bundleForClass:self.class] compatibleWithTraitCollection:nil] forState:UIControlStateNormal];
-        NSString * rightTitle = [NSString stringWithFormat:@" %@",NSLocalizedString(@"Right", nil)];
+        NSString * rightTitle = [NSString stringWithFormat:@" %@",NSLocalizedString(@"Rotate Right", nil)];
         [self.rightRotateBtn setTitle:rightTitle forState:UIControlStateNormal];
         [self.rightRotateBtn setTitleColor:[UIColor colorWithRed:67/255. green:71/255. blue:77/255. alpha:1.] forState:UIControlStateNormal];
         self.rightRotateBtn.titleLabel.font = [UIFont systemFontOfSize:14.];
@@ -82,7 +85,7 @@
         
         self.transformLabel = [[UILabel alloc] init];
         self.transformLabel.font = [UIFont systemFontOfSize:13];
-        self.transformLabel.text =  NSLocalizedString(@"Transform", nil);
+        self.transformLabel.text =  NSLocalizedString(@"Flip", nil);
         self.transformLabel.textColor = [UIColor colorWithRed:153./255 green:153./255 blue:153./255 alpha:1.];
         [self.contentView addSubview:self.transformLabel];
         
@@ -227,6 +230,11 @@
 
 
 - (IBAction)horizontalAction:(UIButton *)sender {
+    if (sender.selected) {
+        sender.backgroundColor = [CPDFColorUtils CAnnotationBarSelectBackgroundColor];
+    } else {
+        sender.backgroundColor = [CPDFColorUtils CAnnotationPropertyViewControllerBackgoundColor];
+    }
     sender.selected = !sender.selected;
     if(self.transFormBlock){
         self.transFormBlock(CPDFImageTransFormTypeHorizontal, sender.selected);
@@ -234,6 +242,11 @@
 }
 
 - (IBAction)verticalAction:(UIButton *)sender{
+    if (sender.selected) {
+        sender.backgroundColor = [CPDFColorUtils CAnnotationBarSelectBackgroundColor];
+    } else {
+        sender.backgroundColor = [CPDFColorUtils CAnnotationPropertyViewControllerBackgoundColor];
+    }
     sender.selected = !sender.selected;
     if(self.transFormBlock){
         self.transFormBlock(CPDFImageTransFormTypeVertical, sender.selected);

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

@@ -46,7 +46,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) CPDFView * pdfView;
 
-
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -122,7 +122,7 @@
         
         
         self.thickSliderView = [[CPDFThicknessSliderView alloc] initWithFrame:CGRectMake(10, CGRectGetMaxY(self.fontView.frame) + 10, self.frame.size.width-20, 90)];
-        self.thickSliderView.titleLabel.text = NSLocalizedString(@"Size", nil);
+        self.thickSliderView.titleLabel.text = NSLocalizedString(@"Font Size", nil);
         self.thickSliderView.titleLabel.font = [UIFont systemFontOfSize:14];
         self.thickSliderView.titleLabel.textColor = [UIColor colorWithRed:153./255 green:153./255 blue:153./255 alpha:1.];
         self.thickSliderView.thick = 10;
@@ -172,6 +172,7 @@
         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.opacityView.rightTitleMargin = 10;
         
         self.thickSliderView.rightMargin = 20;
         self.thickSliderView.leftMargin = 5;

compdfkit-tools/compdfkit-tools/Edit/CPDFEditImageAssets.xcassets/CPDFEditImageSample.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tools_edit_image_property_preview.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

compdfkit-tools/compdfkit-tools/Edit/CPDFEditToolBar/CPDFEditToolBar.m

@@ -103,6 +103,8 @@
     self.splitView = [[UIView alloc] initWithFrame:CGRectMake(self.leftView.bounds.size.width-1, 12, 1, 20)];
     self.splitView.backgroundColor = [UIColor colorWithRed:0. green:0. blue:0. alpha:0.1];
     [self.leftView addSubview:self.splitView];
+    
+    [self updateButtonState];
 }
 
 

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

@@ -18,6 +18,7 @@
 #import <ComPDFKit/ComPDFKit.h>
 #import "CPDFColorUtils.h"
 #import "CPDFEditTextSampleView.h"
+#import "CPDFEditImageSampleView.h"
 
 @interface CPDFEditViewController ()<UITableViewDelegate,UITableViewDataSource,CPDFColorPickerViewDelegate,CPDFEditFontNameSelectViewDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate,UIColorPickerViewControllerDelegate>
 
@@ -27,6 +28,7 @@
 @property (nonatomic, strong) CPDFEditFontNameSelectView * fontSelectView;
 @property (nonatomic, strong) UIButton *backBtn;
 @property (nonatomic, strong) CPDFEditTextSampleView * textSampleView;
+@property (nonatomic, strong) CPDFEditImageSampleView * imageSampleView;
 
 @end
 
@@ -65,9 +67,9 @@
     self.titleLabel = [[UILabel alloc] init];
     self.titleLabel.autoresizingMask = UIViewAutoresizingFlexibleRightMargin;
     if(self.editMode == CPDFEditModeText){
-        self.titleLabel.text =  NSLocalizedString(@"Text Property", nil);
+        self.titleLabel.text =  NSLocalizedString(@"Text Properties", nil);
     }else{
-        self.titleLabel.text =  NSLocalizedString(@"Image Property", nil);
+        self.titleLabel.text =  NSLocalizedString(@"Image Properties", nil);
     }
     self.titleLabel.font = [UIFont systemFontOfSize:20];
     self.titleLabel.adjustsFontSizeToFitWidth = YES;
@@ -128,45 +130,77 @@
 - (void)updatePreferredContentSizeWithTraitCollection:(UITraitCollection *)traitCollection
 {
     if(self.editMode == CPDFEditModeText){
-        self.preferredContentSize = CGSizeMake(self.view.bounds.size.width, traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? 300 : 400);
+        self.preferredContentSize = CGSizeMake(self.view.bounds.size.width, traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? 300 : 600);
     }else{
-        self.preferredContentSize = CGSizeMake(self.view.bounds.size.width, traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? 300 : 400);
+        self.preferredContentSize = CGSizeMake(self.view.bounds.size.width, traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? 300 : 520);
     }
 
 }
 
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
-    UIView * view = [[UIView alloc] initWithFrame:CGRectMake(20, 0, self.view.bounds.size.width-40, 120)];
-    view.backgroundColor = [UIColor whiteColor];
-    view.layer.borderWidth = 1.0;
-    view.layer.borderColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.1].CGColor;
-    view.backgroundColor = [CPDFColorUtils CAnnotationSampleBackgoundColor];
-    
-    self.textSampleView = [[CPDFEditTextSampleView alloc] init];
-    self.textSampleView.backgroundColor = [UIColor whiteColor];
-    self.textSampleView.layer.borderColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.1].CGColor;
-    self.textSampleView.layer.borderWidth = 1.0;
-    self.textSampleView.autoresizingMask = UIViewAutoresizingFlexibleRightMargin;
-    self.textSampleView.frame  = CGRectMake((self.view.frame.size.width - 300)/2, 15, 300, view.bounds.size.height - 30);
-    
-    self.textSampleView.textAlignmnet = self.pdfView.editingSelectionAlignment;
-    self.textSampleView.textColor = self.pdfView.editingSelectionFontColor;
-    self.textSampleView.textOpacity = [self.pdfView getCurrentOpacity];
-    self.textSampleView.fontName = self.pdfView.editingSelectionFontName;
-    self.textSampleView.isBold = self.pdfView.isBoldCurrentSelection;
-    self.textSampleView.isItalic = self.pdfView.isItalicCurrentSelection;
-    self.textSampleView.fontSize = self.pdfView.editingSelectionFontSize;
-    
-    [view addSubview:self.textSampleView];
-    return view;
+    if(self.editMode == CPDFEditModeText){
+        UIView * view = [[UIView alloc] initWithFrame:CGRectMake(20, 0, self.view.bounds.size.width-40, 120)];
+        view.backgroundColor = [UIColor whiteColor];
+        view.layer.borderWidth = 1.0;
+        view.layer.borderColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.1].CGColor;
+        view.backgroundColor = [CPDFColorUtils CAnnotationSampleBackgoundColor];
+        
+        self.textSampleView = [[CPDFEditTextSampleView alloc] init];
+        self.textSampleView.backgroundColor = [UIColor whiteColor];
+        self.textSampleView.layer.borderColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.1].CGColor;
+        self.textSampleView.layer.borderWidth = 1.0;
+        self.textSampleView.autoresizingMask = UIViewAutoresizingFlexibleRightMargin;
+        self.textSampleView.frame  = CGRectMake((self.view.frame.size.width - 300)/2, 15, 300, view.bounds.size.height - 30);
+        
+        self.textSampleView.textAlignmnet = self.pdfView.editingSelectionAlignment;
+        self.textSampleView.textColor = self.pdfView.editingSelectionFontColor;
+        self.textSampleView.textOpacity = [self.pdfView getCurrentOpacity];
+        self.textSampleView.fontName = self.pdfView.editingSelectionFontName;
+        self.textSampleView.isBold = self.pdfView.isBoldCurrentSelection;
+        self.textSampleView.isItalic = self.pdfView.isItalicCurrentSelection;
+        self.textSampleView.fontSize = self.pdfView.editingSelectionFontSize;
+        
+        [view addSubview:self.textSampleView];
+        
+        return view;
+    } else {
+        UIView * view = [[UIView alloc] initWithFrame:CGRectMake(20, 0, self.view.bounds.size.width-40, 120)];
+        view.backgroundColor = [UIColor whiteColor];
+        view.layer.borderWidth = 1.0;
+        view.layer.borderColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.1].CGColor;
+        view.backgroundColor = [CPDFColorUtils CAnnotationSampleBackgoundColor];
+        
+        self.imageSampleView = [[CPDFEditImageSampleView alloc] init];
+        self.imageSampleView.backgroundColor = [UIColor whiteColor];
+        self.imageSampleView.layer.borderColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.1].CGColor;
+        self.imageSampleView.layer.borderWidth = 1.0;
+        self.imageSampleView.autoresizingMask = UIViewAutoresizingFlexibleRightMargin;
+        self.imageSampleView.frame  = CGRectMake((self.view.frame.size.width - 300)/2, 15, 300, view.bounds.size.height - 30);
+        
+        if ([self.pdfView getRotationEditArea:(CPDFEditImageArea *)self.pdfView.editingArea] > 0) {
+            if ([self.pdfView getRotationEditArea:(CPDFEditImageArea *)self.pdfView.editingArea] > 90) {
+                self.imageSampleView.imageView.transform = CGAffineTransformRotate(self.imageSampleView.imageView.transform, M_PI);
+            } else {
+                self.imageSampleView.imageView.transform = CGAffineTransformRotate(self.imageSampleView.imageView.transform, M_PI/2);
+            }
+        } else if (([self.pdfView getRotationEditArea:(CPDFEditImageArea *)self.pdfView.editingArea] < 0)) {
+            self.imageSampleView.imageView.transform = CGAffineTransformRotate(self.imageSampleView.imageView.transform, -M_PI/2);
+        }
+//        self.imageSampleView.transFormType = 0;
+        self.imageSampleView.imageView.alpha = [self.pdfView getCurrentOpacity];
+        
+        [view addSubview:self.imageSampleView];
+        
+        return view;
+    }
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
     if(self.editMode == CPDFEditModeText){
         return 120;
     }else{
-        return 0;
+        return 120;
     }
 
 }
@@ -262,21 +296,31 @@
         cell.rotateBlock = ^(CPDFImageRotateType rotateType, BOOL isRotated) {
             if(rotateType == CPDFImageRotateTypeLeft){
                 [self.pdfView rotateEditArea:(CPDFEditImageArea*)self.pdfView.editingArea rotateAngle:-90];
+                self.imageSampleView.imageView.transform = CGAffineTransformRotate(self.imageSampleView.imageView.transform, -M_PI/2);
+                [self.imageSampleView setNeedsLayout];
             }else if(rotateType == CPDFImageRotateTypeRight){
                 [self.pdfView rotateEditArea:(CPDFEditImageArea*)self.pdfView.editingArea rotateAngle:90];
+                self.imageSampleView.imageView.transform = CGAffineTransformRotate(self.imageSampleView.imageView.transform, M_PI/2);
+                [self.imageSampleView setNeedsLayout];
             }
         };
         
         cell.transFormBlock = ^(CPDFImageTransFormType transformType, BOOL isTransformed) {
             if(transformType == CPDFImageTransFormTypeVertical){
                 [self.pdfView verticalMirrorEditArea:(CPDFEditImageArea*)self.pdfView.editingArea];
+                self.imageSampleView.imageView.transform = CGAffineTransformScale(self.imageSampleView.imageView.transform, 1.0, -1.0);
+                [self.imageSampleView setNeedsLayout];
             }else if(transformType == CPDFImageTransFormTypeHorizontal){
                 [self.pdfView horizontalMirrorEditArea:(CPDFEditImageArea*)self.pdfView.editingArea];
+                self.imageSampleView.imageView.transform = CGAffineTransformScale(self.imageSampleView.imageView.transform, -1.0, 1.0);
+                [self.imageSampleView setNeedsLayout];
             }
         };
         
         cell.transparencyBlock = ^(CGFloat transparency) {
             [self.pdfView setImageTransparencyEditArea:(CPDFEditImageArea*)self.pdfView.editingArea transparency:transparency];
+            self.imageSampleView.imageView.alpha = transparency;
+            [self.imageSampleView setNeedsLayout];
         };
         
         cell.replaceImageBlock = ^{
@@ -294,7 +338,7 @@
         cell.exportImageBlock = ^{
             BOOL saved = [self.pdfView extractImageWithEditImageArea:self.pdfView.editingArea];
             if(saved){
-                UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"" message:NSLocalizedString(@"Saved Success!", nil) preferredStyle:UIAlertControllerStyleAlert];
+                UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"" message:NSLocalizedString(@"Export Successfully!", nil) preferredStyle:UIAlertControllerStyleAlert];
 
                 [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK!", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
                     [self controllerDismiss];
@@ -302,7 +346,7 @@
 
                 [self presentViewController:alertController animated:YES completion:nil];
             }else{
-                UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"" message:NSLocalizedString(@"Saved Failed!", nil) preferredStyle:UIAlertControllerStyleAlert];
+                UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"" message:NSLocalizedString(@"Export Failed!", nil) preferredStyle:UIAlertControllerStyleAlert];
 
                 [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK!", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
                     [self controllerDismiss];
@@ -345,6 +389,13 @@
 - (void)colorPickerViewControllerDidFinish:(UIColorPickerViewController *)viewController API_AVAILABLE(ios(14.0)) {
     self.textSampleView.textColor = viewController.selectedColor;
     [self.pdfView setEditingSelectionFontColor:viewController.selectedColor];
+    
+    CGFloat red, green, blue, alpha;
+    [viewController.selectedColor getRed:&red green:&green blue:&blue alpha:&alpha];
+    
+    self.textSampleView.textOpacity = alpha;
+    [self.pdfView setCharsFontTransparency:alpha];
+    [self.tableView reloadData];
 }
 
 #pragma mark - setMode

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

@@ -56,9 +56,9 @@
 -(void)layoutSubviews {
     [super layoutSubviews];
     
-    _modeSwitch.frame = CGRectMake(self.contentView.frame.size.width - 50, (self.contentView.frame.size.height - 30)/2, 30, 40);
+    _modeSwitch.frame = CGRectMake(self.contentView.frame.size.width - 50, (self.contentView.frame.size.height - 25)/2, 30, 40);
     
-    _checkImageView.frame = CGRectMake(self.contentView.frame.size.width - 40, (self.contentView.frame.size.height - 40)/2, 30, 30);
+    _checkImageView.frame = CGRectMake(self.contentView.frame.size.width - 40, (self.contentView.frame.size.height - 30)/2, 30, 30);
     _iconImageView.frame = CGRectMake(20, 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);
     _splitView.frame = CGRectMake(0, self.contentView.frame.size.height-1, self.contentView.frame.size.width, 1);

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

@@ -209,7 +209,7 @@ typedef NS_ENUM(NSUInteger, CDisplayPDFType) {
 
 - (void)updatePreferredContentSizeWithTraitCollection:(UITraitCollection *)traitCollection
 {
-    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width,self.view.bounds.size.height * 0.9);
+    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width,traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? (self.view.bounds.size.width*0.9) : 800);
 
 }
 

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

@@ -89,7 +89,7 @@
 
 - (void)updatePreferredContentSizeWithTraitCollection:(UITraitCollection *)traitCollection
 {
-    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width,self.view.bounds.size.height * 0.9);
+    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width,traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? (self.view.bounds.size.width*0.9) : 800);
 
 }
 

compdfkit-tools/compdfkit-tools/Viewer/PDFOutlie/CPDFOutlineViewController.m

@@ -79,7 +79,7 @@
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.tableView.rowHeight = UITableViewAutomaticDimension;
-    self.tableView.estimatedRowHeight = 60;
+    self.tableView.estimatedRowHeight = 80;
     self.tableView.tableFooterView = [[UIView alloc] init];
     [self.tableView setSeparatorStyle:UITableViewCellSeparatorStyleNone];
     

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

@@ -113,24 +113,6 @@
     }];
 }
 
-//- (void)viewWillLayoutSubviews {
-//
-//    if (@available(iOS 11.0, *)) {
-//
-//        self.titleLabel.frame = CGRectMake((self.view.frame.size.width - 120)/2, 5, 120, 50);
-//
-//        self.tableView.frame = CGRectMake(self.view.safeAreaInsets.left, 62, self.view.frame.size.width - self.view.safeAreaInsets.left - self.view.safeAreaInsets.right, self.view.frame.size.height - 92);
-//        self.backBtn.frame = CGRectMake(self.view.frame.size.width - 60, 5, 50, 50);
-//
-//    } else {
-//        self.titleLabel.frame = CGRectMake((self.view.frame.size.width - 120)/2, 5, 120, 50);
-//        self.tableView.frame = CGRectMake(0, 62, self.view.frame.size.width, self.view.frame.size.height - 92);
-//        self.backBtn.frame = CGRectMake(self.view.frame.size.width - 60, 5, 50, 50);
-//    }
-//
-//
-//}
-
 - (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
     [super willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
     [self updatePreferredContentSizeWithTraitCollection:newCollection];
@@ -138,7 +120,7 @@
 
 - (void)updatePreferredContentSizeWithTraitCollection:(UITraitCollection *)traitCollection
 {
-    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width,self.view.bounds.size.height * 0.9);
+    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width,traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? (self.view.bounds.size.width*0.9) : 800);
 
 }
 

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

@@ -100,7 +100,7 @@
 
 - (void)updatePreferredContentSizeWithTraitCollection:(UITraitCollection *)traitCollection
 {
-    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width,self.view.bounds.size.height * 0.9);
+    self.preferredContentSize = CGSizeMake(self.view.bounds.size.width,traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact ? (self.view.bounds.size.width*0.9) : 800);
 
 }
 

viewer-ctrl-demo/viewer-ctrl-demo.xcodeproj/project.pbxproj

@@ -364,7 +364,7 @@
 				CODE_SIGN_ENTITLEMENTS = "viewer-ctrl-demo/viewer-ctrl-demo.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 4GGQPGRTSV;
+				DEVELOPMENT_TEAM = Q43DRF894U;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = "";
@@ -395,7 +395,7 @@
 				CODE_SIGN_ENTITLEMENTS = "viewer-ctrl-demo/viewer-ctrl-demo.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 4GGQPGRTSV;
+				DEVELOPMENT_TEAM = Q43DRF894U;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = "";