Skip to content

Commit 615ea49

Browse files
hackiftekharhackiftekhar
committed
- Removed color picker textfield from demo
1 parent 19e111f commit 615ea49

26 files changed

Lines changed: 207 additions & 839 deletions

‎Demo.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@
3333
4CE611A01B98B7250020591A /* DemoObjCUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE6119F1B98B7250020591A /* DemoObjCUITests.m */; };
3434
4CE74F441CF047610093AC0C /* RefreshLayoutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F431CF047610093AC0C /* RefreshLayoutViewController.m */; };
3535
4CE74F4D1CF080C10093AC0C /* TextViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F4C1CF080C10093AC0C /* TextViewController.m */; };
36-
4CE74F581CF185F70093AC0C /* ColorPickerTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F501CF185F70093AC0C /* ColorPickerTextField.m */; };
37-
4CE74F591CF185F70093AC0C /* ColorPickerTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F501CF185F70093AC0C /* ColorPickerTextField.m */; };
38-
4CE74F5A1CF185F70093AC0C /* HFColorButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F531CF185F70093AC0C /* HFColorButton.m */; };
39-
4CE74F5B1CF185F70093AC0C /* HFColorButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F531CF185F70093AC0C /* HFColorButton.m */; };
40-
4CE74F5C1CF185F70093AC0C /* HFColorPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F551CF185F70093AC0C /* HFColorPickerView.m */; };
41-
4CE74F5D1CF185F70093AC0C /* HFColorPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F551CF185F70093AC0C /* HFColorPickerView.m */; };
42-
4CE74F5E1CF185F70093AC0C /* UIColor+HexColors.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F571CF185F70093AC0C /* UIColor+HexColors.m */; };
43-
4CE74F5F1CF185F70093AC0C /* UIColor+HexColors.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F571CF185F70093AC0C /* UIColor+HexColors.m */; };
4436
4CE74F621CF1864E0093AC0C /* ColorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F611CF1864E0093AC0C /* ColorTableViewCell.m */; };
4537
4CE74F651CF186720093AC0C /* TextFieldTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F641CF186720093AC0C /* TextFieldTableViewCell.m */; };
4638
4CE74F681CF1BBCC0093AC0C /* ImageSwitchTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE74F671CF1BBCC0093AC0C /* ImageSwitchTableViewCell.m */; };
@@ -201,14 +193,6 @@
201193
4CE74F431CF047610093AC0C /* RefreshLayoutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RefreshLayoutViewController.m; sourceTree = "<group>"; };
202194
4CE74F4B1CF080C10093AC0C /* TextViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextViewController.h; sourceTree = "<group>"; };
203195
4CE74F4C1CF080C10093AC0C /* TextViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TextViewController.m; sourceTree = "<group>"; };
204-
4CE74F4F1CF185F70093AC0C /* ColorPickerTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorPickerTextField.h; sourceTree = "<group>"; };
205-
4CE74F501CF185F70093AC0C /* ColorPickerTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ColorPickerTextField.m; sourceTree = "<group>"; };
206-
4CE74F521CF185F70093AC0C /* HFColorButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HFColorButton.h; sourceTree = "<group>"; };
207-
4CE74F531CF185F70093AC0C /* HFColorButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HFColorButton.m; sourceTree = "<group>"; };
208-
4CE74F541CF185F70093AC0C /* HFColorPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HFColorPickerView.h; sourceTree = "<group>"; };
209-
4CE74F551CF185F70093AC0C /* HFColorPickerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HFColorPickerView.m; sourceTree = "<group>"; };
210-
4CE74F561CF185F70093AC0C /* UIColor+HexColors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+HexColors.h"; sourceTree = "<group>"; };
211-
4CE74F571CF185F70093AC0C /* UIColor+HexColors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+HexColors.m"; sourceTree = "<group>"; };
212196
4CE74F601CF1864E0093AC0C /* ColorTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorTableViewCell.h; sourceTree = "<group>"; };
213197
4CE74F611CF1864E0093AC0C /* ColorTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ColorTableViewCell.m; sourceTree = "<group>"; };
214198
4CE74F631CF186720093AC0C /* TextFieldTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextFieldTableViewCell.h; sourceTree = "<group>"; };
@@ -382,29 +366,6 @@
382366
path = ../../DemoObjCUITests;
383367
sourceTree = "<group>";
384368
};
385-
4CE74F4E1CF185F70093AC0C /* Color Picker TextField */ = {
386-
isa = PBXGroup;
387-
children = (
388-
4CE74F4F1CF185F70093AC0C /* ColorPickerTextField.h */,
389-
4CE74F501CF185F70093AC0C /* ColorPickerTextField.m */,
390-
4CE74F511CF185F70093AC0C /* HFColorPicker */,
391-
4CE74F561CF185F70093AC0C /* UIColor+HexColors.h */,
392-
4CE74F571CF185F70093AC0C /* UIColor+HexColors.m */,
393-
);
394-
path = "Color Picker TextField";
395-
sourceTree = "<group>";
396-
};
397-
4CE74F511CF185F70093AC0C /* HFColorPicker */ = {
398-
isa = PBXGroup;
399-
children = (
400-
4CE74F521CF185F70093AC0C /* HFColorButton.h */,
401-
4CE74F531CF185F70093AC0C /* HFColorButton.m */,
402-
4CE74F541CF185F70093AC0C /* HFColorPickerView.h */,
403-
4CE74F551CF185F70093AC0C /* HFColorPickerView.m */,
404-
);
405-
path = HFColorPicker;
406-
sourceTree = "<group>";
407-
};
408369
9D0BB82E18BB1AE100667349 /* Other Frameworks */ = {
409370
isa = PBXGroup;
410371
children = (
@@ -495,7 +456,6 @@
495456
C0CB61921B884D4100C33368 /* Cell */,
496457
C0CB619B1B884D4100C33368 /* Resources */,
497458
C0CB61A11B884D4100C33368 /* Storyboard */,
498-
C0CB61A31B884D4100C33368 /* Third Party */,
499459
C0CB61A71B884D4100C33368 /* ViewController */,
500460
);
501461
name = Objective_C_Demo;
@@ -546,14 +506,6 @@
546506
path = Storyboard;
547507
sourceTree = "<group>";
548508
};
549-
C0CB61A31B884D4100C33368 /* Third Party */ = {
550-
isa = PBXGroup;
551-
children = (
552-
4CE74F4E1CF185F70093AC0C /* Color Picker TextField */,
553-
);
554-
path = "Third Party";
555-
sourceTree = "<group>";
556-
};
557509
C0CB61A71B884D4100C33368 /* ViewController */ = {
558510
isa = PBXGroup;
559511
children = (
@@ -870,7 +822,7 @@
870822
DefaultBuildSystemTypeForWorkspace = Latest;
871823
LastSwiftMigration = 0700;
872824
LastSwiftUpdateCheck = 1250;
873-
LastUpgradeCheck = 1430;
825+
LastUpgradeCheck = 1520;
874826
ORGANIZATIONNAME = Iftekhar;
875827
TargetAttributes = {
876828
4CE6119C1B98B7250020591A = {
@@ -1122,26 +1074,22 @@
11221074
C06E24F22ACB3C15002ECBE4 /* BaseTableViewController.swift in Sources */,
11231075
4C0EFE2F1CF332DD00C908D3 /* TextViewController.swift in Sources */,
11241076
C08372572ACAFE6500416081 /* ReloadLayout1892ViewController.swift in Sources */,
1125-
4CE74F5D1CF185F70093AC0C /* HFColorPickerView.m in Sources */,
11261077
C0CB61FC1B884F7900C33368 /* AppDelegate.swift in Sources */,
11271078
C07DF1302AE17BB600698057 /* UITableView+Extension.swift in Sources */,
11281079
C06E24FA2ACB4015002ECBE4 /* PageViewController.swift in Sources */,
11291080
C0CB61EE1B884F2700C33368 /* CollectionViewDemoController.swift in Sources */,
11301081
C0CB61F81B884F2700C33368 /* ViewController.swift in Sources */,
1131-
4CE74F591CF185F70093AC0C /* ColorPickerTextField.m in Sources */,
11321082
C0D070F32AF8C43200963B19 /* TextFieldView.swift in Sources */,
11331083
C016B6D82B4D990A0005CB07 /* EnableMode2000ViewController.swift in Sources */,
11341084
4C0EFE1F1CF2F9F500C908D3 /* ColorTableViewCell.swift in Sources */,
11351085
C0F841FA2ACAC8C400616ECD /* AutofillPasswordViewController.swift in Sources */,
11361086
4C0EFE291CF332BF00C908D3 /* RefreshLayoutViewController.swift in Sources */,
11371087
4C34D9EF1D1319A60013E61D /* SearchViewController.swift in Sources */,
11381088
C08372592ACB046900416081 /* SafeAreaViewController.swift in Sources */,
1139-
4CE74F5F1CF185F70093AC0C /* UIColor+HexColors.m in Sources */,
11401089
C0C8A0102A5C9D0B0015C4EE /* TestViewController.swift in Sources */,
11411090
C083725F2ACB1D3700416081 /* BaseViewController.swift in Sources */,
11421091
C03C87F51B8DCBF100295DFA /* SettingsViewController.swift in Sources */,
11431092
4C0EFE231CF2FA1200C908D3 /* ImageSwitchTableViewCell.swift in Sources */,
1144-
4CE74F5B1CF185F70093AC0C /* HFColorButton.m in Sources */,
11451093
C0CB61F71B884F2700C33368 /* TextViewSpecialCaseViewController.swift in Sources */,
11461094
4C0EFE211CF2FA0600C908D3 /* TextFieldTableViewCell.swift in Sources */,
11471095
C06E24F82ACB3FD8002ECBE4 /* StackViewController.swift in Sources */,
@@ -1170,19 +1118,16 @@
11701118
C0CB620F1B884FA100C33368 /* TableViewInContainerViewController.m in Sources */,
11711119
4CE74F4D1CF080C10093AC0C /* TextViewController.m in Sources */,
11721120
C0CB620E1B884FA100C33368 /* SpecialCaseViewController.m in Sources */,
1173-
4CE74F581CF185F70093AC0C /* ColorPickerTextField.m in Sources */,
11741121
4CE74F681CF1BBCC0093AC0C /* ImageSwitchTableViewCell.m in Sources */,
11751122
C0CB62091B884FA100C33368 /* ManualToolbarViewController.m in Sources */,
11761123
C0CB62071B884FA100C33368 /* CustomViewController.m in Sources */,
11771124
4CE49FCF1D9E7FD40094FB36 /* PopoverViewController.m in Sources */,
11781125
C0CB62051B884FA100C33368 /* CollectionViewDemoController.m in Sources */,
11791126
C0CB61FF1B884FA100C33368 /* OptionTableViewCell.m in Sources */,
11801127
C0CB620D1B884FA100C33368 /* SettingsViewController.m in Sources */,
1181-
4CE74F5A1CF185F70093AC0C /* HFColorButton.m in Sources */,
11821128
4C134C811D10758F00C016CA /* SearchViewController.m in Sources */,
11831129
C0CB62081B884FA100C33368 /* ExampleTableViewController.m in Sources */,
11841130
C0CB61FD1B884FA100C33368 /* AppDelegate.m in Sources */,
1185-
4CE74F5C1CF185F70093AC0C /* HFColorPickerView.m in Sources */,
11861131
C0CB61FE1B884FA100C33368 /* NavigationTableViewCell.m in Sources */,
11871132
C0CB62021B884FA100C33368 /* main.m in Sources */,
11881133
C0CB620C1B884FA100C33368 /* OptionsViewController.m in Sources */,
@@ -1192,7 +1137,6 @@
11921137
C0CB62121B884FA100C33368 /* TextViewSpecialCaseViewController.m in Sources */,
11931138
4CE74F621CF1864E0093AC0C /* ColorTableViewCell.m in Sources */,
11941139
C0CB62111B884FA100C33368 /* TextSelectionViewController.m in Sources */,
1195-
4CE74F5E1CF185F70093AC0C /* UIColor+HexColors.m in Sources */,
11961140
4CE74F651CF186720093AC0C /* TextFieldTableViewCell.m in Sources */,
11971141
);
11981142
runOnlyForDeploymentPostprocessing = 0;
@@ -1549,6 +1493,7 @@
15491493
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
15501494
SWIFT_OBJC_BRIDGING_HEADER = "Demo/Swift_Demo/Resources/IQKeyboardManger-Swift-Bridging-Header.h";
15511495
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1496+
SWIFT_STRICT_CONCURRENCY = complete;
15521497
SWIFT_VERSION = 5.0;
15531498
TARGETED_DEVICE_FAMILY = "1,2,6";
15541499
};
@@ -1597,6 +1542,7 @@
15971542
SUPPORTS_MACCATALYST = NO;
15981543
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
15991544
SWIFT_OBJC_BRIDGING_HEADER = "Demo/Swift_Demo/Resources/IQKeyboardManger-Swift-Bridging-Header.h";
1545+
SWIFT_STRICT_CONCURRENCY = complete;
16001546
SWIFT_VERSION = 5.0;
16011547
TARGETED_DEVICE_FAMILY = "1,2,6";
16021548
};
@@ -1607,6 +1553,7 @@
16071553
buildSettings = {
16081554
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
16091555
ALWAYS_SEARCH_USER_PATHS = NO;
1556+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
16101557
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
16111558
CLANG_ENABLE_OBJC_ARC = YES;
16121559
CLANG_WARN_ASSIGN_ENUM = YES;
@@ -1672,6 +1619,7 @@
16721619
ONLY_ACTIVE_ARCH = YES;
16731620
OTHER_SWIFT_FLAGS = "$(inherited)";
16741621
SDKROOT = iphoneos;
1622+
SWIFT_VERSION = 5.0;
16751623
};
16761624
name = Debug;
16771625
};
@@ -1680,6 +1628,7 @@
16801628
buildSettings = {
16811629
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
16821630
ALWAYS_SEARCH_USER_PATHS = NO;
1631+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
16831632
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
16841633
CLANG_ENABLE_OBJC_ARC = YES;
16851634
CLANG_WARN_ASSIGN_ENUM = YES;
@@ -1740,6 +1689,7 @@
17401689
SDKROOT = iphoneos;
17411690
SWIFT_COMPILATION_MODE = wholemodule;
17421691
SWIFT_OPTIMIZATION_LEVEL = "-O";
1692+
SWIFT_VERSION = 5.0;
17431693
VALIDATE_PRODUCT = YES;
17441694
};
17451695
name = Release;
@@ -1770,7 +1720,7 @@
17701720
GCC_WARN_UNUSED_LABEL = YES;
17711721
GCC_WARN_UNUSED_PARAMETER = NO;
17721722
INFOPLIST_FILE = Demo/Objective_C_Demo/Resources/Info.plist;
1773-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1723+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
17741724
LD_RUNPATH_SEARCH_PATHS = (
17751725
"$(inherited)",
17761726
"@executable_path/Frameworks",
@@ -1816,7 +1766,7 @@
18161766
GCC_WARN_UNUSED_LABEL = YES;
18171767
GCC_WARN_UNUSED_PARAMETER = NO;
18181768
INFOPLIST_FILE = Demo/Objective_C_Demo/Resources/Info.plist;
1819-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1769+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
18201770
LD_RUNPATH_SEARCH_PATHS = (
18211771
"$(inherited)",
18221772
"@executable_path/Frameworks",

‎Demo.xcodeproj/xcshareddata/xcschemes/DemoExtension.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1520"
44
wasCreatedForAppExtension = "YES"
55
version = "2.0">
66
<BuildAction

‎Demo.xcodeproj/xcshareddata/xcschemes/DemoObjC.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Demo.xcodeproj/xcshareddata/xcschemes/DemoSwift.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Demo/Objective_C_Demo/Cell/ColorTableViewCell.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@
2222
// THE SOFTWARE.
2323

2424
#import <UIKit/UIKit.h>
25-
#import "ColorPickerTextField.h"
2625

2726
@interface ColorTableViewCell : UITableViewCell
2827

2928
@property (strong, nonatomic) IBOutlet UILabel *labelTitle;
3029
@property (strong, nonatomic) IBOutlet UILabel *labelSubtitle;
3130

32-
@property (strong, nonatomic) IBOutlet ColorPickerTextField *colorPickerTextField;
31+
@property (strong, nonatomic) IBOutlet UIView *selectedColorView;
3332

3433
@end

0 commit comments

Comments
 (0)