Esign 1.72

Update contract
Modify template editor, supoort touch label

Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj

@@ -15,7 +15,7 @@
 		3C6B628127102F7C00E74CF9 /* DatePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C6B628027102F7B00E74CF9 /* DatePickerViewController.m */; };
 		3C6B62842710324B00E74CF9 /* TouchImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C6B62822710324B00E74CF9 /* TouchImageView.m */; };
 		3C6B62872710325500E74CF9 /* CustomIOSAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C6B62852710325500E74CF9 /* CustomIOSAlertView.m */; };
-		3C6B62B5272FBCD600E74CF9 /* 2021 GECI - Home Improvement Contract.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C6B62B4272FBCD600E74CF9 /* 2021 GECI - Home Improvement Contract.json */; };
+		3C7758192892741D00064C39 /* GECI - Home Improvement Contract - Bin & J W Inc.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C7758182892741D00064C39 /* GECI - Home Improvement Contract - Bin & J W Inc.pdf */; };
 		3C9FFA172744861A0067830C /* GECI - Home Improvement Contract - Wilson Ma.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C9FFA102744861A0067830C /* GECI - Home Improvement Contract - Wilson Ma.pdf */; };
 		3C9FFA182744861A0067830C /* GECI - Home Improvement Contract - Tan.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C9FFA112744861A0067830C /* GECI - Home Improvement Contract - Tan.pdf */; };
 		3C9FFA192744861A0067830C /* GECI - Home Improvement Contract - Fong Huang.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C9FFA122744861A0067830C /* GECI - Home Improvement Contract - Fong Huang.pdf */; };
@@ -121,7 +121,7 @@
 		3C6B62832710324B00E74CF9 /* TouchImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TouchImageView.h; path = ../../../common/customUI/TouchImageView.h; sourceTree = "<group>"; };
 		3C6B62852710325500E74CF9 /* CustomIOSAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomIOSAlertView.m; path = ../../../common/customUI/CustomIOSAlertView.m; sourceTree = "<group>"; };
 		3C6B62862710325500E74CF9 /* CustomIOSAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomIOSAlertView.h; path = ../../../common/customUI/CustomIOSAlertView.h; sourceTree = "<group>"; };
-		3C6B62B4272FBCD600E74CF9 /* 2021 GECI - Home Improvement Contract.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "2021 GECI - Home Improvement Contract.json"; sourceTree = "<group>"; };
+		3C7758182892741D00064C39 /* GECI - Home Improvement Contract - Bin & J W Inc.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Bin & J W Inc.pdf"; sourceTree = "<group>"; };
 		3C9FFA102744861A0067830C /* GECI - Home Improvement Contract - Wilson Ma.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Wilson Ma.pdf"; sourceTree = "<group>"; };
 		3C9FFA112744861A0067830C /* GECI - Home Improvement Contract - Tan.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Tan.pdf"; sourceTree = "<group>"; };
 		3C9FFA122744861A0067830C /* GECI - Home Improvement Contract - Fong Huang.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract - Fong Huang.pdf"; sourceTree = "<group>"; };
@@ -580,7 +580,6 @@
 		7128C3261E1251DE00FF635B /* pdf resource */ = {
 			isa = PBXGroup;
 			children = (
-				3C6B62B4272FBCD600E74CF9 /* 2021 GECI - Home Improvement Contract.json */,
 				3C4F575528655018003C0005 /* 2022 GECI - Home Improvement Contract.json */,
 				3C9FFA122744861A0067830C /* GECI - Home Improvement Contract - Fong Huang.pdf */,
 				3C142585283C6C610017076A /* GECI - Home Improvement Contract - MMJ Remodeling Inc.pdf */,
@@ -589,6 +588,7 @@
 				3C9FFA162744861A0067830C /* GECI - Home Improvement Contract - Sunshine Remodeling Inc.pdf */,
 				3C9FFA112744861A0067830C /* GECI - Home Improvement Contract - Tan.pdf */,
 				3C9FFA102744861A0067830C /* GECI - Home Improvement Contract - Wilson Ma.pdf */,
+				3C7758182892741D00064C39 /* GECI - Home Improvement Contract - Bin & J W Inc.pdf */,
 				714B870A1E24CAE200A40D18 /* debug.json */,
 				425A00F31F8F0EC200286D6F /* attribute_template.json */,
 				42DDB87B1F91E351002CCE22 /* template_type.json */,
@@ -682,7 +682,6 @@
 				42DDB87E1F91E949002CCE22 /* template_example.json in Resources */,
 				3C9FFA1D2744861A0067830C /* GECI - Home Improvement Contract - Sunshine Remodeling Inc.pdf in Resources */,
 				3C142586283C6C620017076A /* GECI - Home Improvement Contract - MMJ Remodeling Inc.pdf in Resources */,
-				3C6B62B5272FBCD600E74CF9 /* 2021 GECI - Home Improvement Contract.json in Resources */,
 				3CC7E7B723C5CB7800BE5561 /* Launch Screen.storyboard in Resources */,
 				42DDB87C1F91E367002CCE22 /* template_type.json in Resources */,
 				425A00F41F8F196900286D6F /* attribute_template.json in Resources */,
@@ -698,6 +697,7 @@
 				42DDB8751F91C081002CCE22 /* ControlTemplateVC.xib in Resources */,
 				714B870B1E24CAE300A40D18 /* debug.json in Resources */,
 				3C9FFA172744861A0067830C /* GECI - Home Improvement Contract - Wilson Ma.pdf in Resources */,
+				3C7758192892741D00064C39 /* GECI - Home Improvement Contract - Bin & J W Inc.pdf in Resources */,
 				3C6B627E27102F6800E74CF9 /* CommonEditor.storyboard in Resources */,
 				714B37081E70FCFE00E99B90 /* cam_scan.storyboard in Resources */,
 				3C9FFA182744861A0067830C /* GECI - Home Improvement Contract - Tan.pdf in Resources */,
@@ -915,12 +915,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 50973;
+				CURRENT_PROJECT_VERSION = 51294;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				INFOPLIST_FILE = "Granite Expo eSign/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.71;
+				MARKETING_VERSION = 1.72;
 				PRODUCT_BUNDLE_IDENTIFIER = "usai.redant.Granite-Expo-eSign";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -930,12 +930,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 50973;
+				CURRENT_PROJECT_VERSION = 51294;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				INFOPLIST_FILE = "Granite Expo eSign/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.71;
+				MARKETING_VERSION = 1.72;
 				PRODUCT_BUNDLE_IDENTIFIER = "usai.redant.Granite-Expo-eSign";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

Ants Contract/Granite Expo eSign/Granite Expo eSign/DocumentTemplateViewController.m

@@ -1314,6 +1314,7 @@
 }
 
 - (void)focusControlView:(UIView *)view frame:(CGRect)frame{
+
     
     [self recoveryFocusView];
     
@@ -1327,6 +1328,8 @@
         self.focusViewNormalColor = self.focusView.backgroundColor;
         self.focusView.backgroundColor = [UIColor redColor];
         
+        
+        
         if ([self.focusView isKindOfClass:[UIImageView class]]) {
             UIImageView *iv = (UIImageView *)self.focusView;
             UIImage *ig = iv.image;
@@ -1344,23 +1347,24 @@
                 [tf setText:@"Text"];
             }
         }
-        else if ([self.focusView isKindOfClass:[UILabel class]])
+        else if (self.focusView.class ==[TouchLabel class])
         {
-            UILabel *lb = (UILabel *)self.focusView;
+            TouchLabel *lb = (TouchLabel *)self.focusView;
             if (lb.text == nil || lb.text.length == 0) {
                 [lb setText:@"Text"];
             }
  
         }
-        else if ([self.focusView isKindOfClass:[TouchLabel class]])
+        else if ([self.focusView isKindOfClass: [UILabel class]])
         {
-            TouchLabel *lb = (TouchLabel *)self.focusView;
+            UILabel *lb = (UILabel *)self.focusView;
             if (lb.text == nil || lb.text.length == 0) {
                 [lb setText:@"Text"];
             }
  
         }
 
+
         else if ([self.focusView isKindOfClass:[UIButton class]]) {
             UIButton *btn = (UIButton *)self.focusView;
             NSString *str = [btn titleForState:UIControlStateNormal];
@@ -1449,7 +1453,10 @@
         [self.attrTableDataSource changeData:[controlItem mutableCopy] type:ItemTypeLabel forIndex:index];
     } else if([type isEqualToString:@"DatePicker"]) {
         [self.attrTableDataSource changeData:[controlItem mutableCopy] type:ItemTypeDatePicker forIndex:index];
-    } else {
+    }else if([type isEqualToString:@"TouchLabel"]) {
+        [self.attrTableDataSource changeData:[controlItem mutableCopy] type:ItemTypeTouchLabel forIndex:index];
+    }
+    else {
         [self.attrTableDataSource changeData:nil type:ItemTypeNone forIndex:-1];
     }
     

Ants Contract/Granite Expo eSign/Granite Expo eSign/Template Attributes /AttributeTableDataSourceAndDelegate.h

@@ -17,6 +17,7 @@ typedef enum : NSUInteger {
     ItemTypeCheck,
     ItemTypeLabel,
     ItemTypeDatePicker,
+    ItemTypeTouchLabel,
     ItemTypeNone
 } ItemType;
 

Ants Contract/Granite Expo eSign/Granite Expo eSign/Template Attributes /AttributeTableDataSourceAndDelegate.m

@@ -152,6 +152,10 @@ typedef enum {
             key = @"DatePicker";
         }
             break;
+        case ItemTypeTouchLabel: {
+            key = @"TouchLabel";
+        }
+            break;
         default: {
             self.template_data = nil;
         }

Ants Contract/Granite Expo eSign/Granite Expo eSign/TemplateViewController.m

@@ -339,6 +339,11 @@ typedef enum {
             [self addDatePicker:control destView:self.editControlView index:i update:NO];
             
         }
+        else if([control[@"type"] isEqualToString:@"TouchLabel"])
+        {
+            [self addTouchLabel:[control mutableCopy] destView:self.editControlView index:i update:NO];
+            
+        }
     }
     
 }

Ants Contract/Granite Expo eSign/attribute_template.json

@@ -329,7 +329,7 @@
             }
         }
     },
-    "Touch_Label":{
+    "TouchLabel":{
         "Information": {
             "type": {
                 "type": 1,