diff --git a/TagNameDetection/TagNameDetection.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata similarity index 67% rename from TagNameDetection/TagNameDetection.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata index 505e314..919434a 100644 --- a/TagNameDetection/TagNameDetection.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/.swiftpm/xcode/package.xcworkspace/xcuserdata/datt.xcuserdatad/UserInterfaceState.xcuserstate b/.swiftpm/xcode/package.xcworkspace/xcuserdata/datt.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..47b8fd5 Binary files /dev/null and b/.swiftpm/xcode/package.xcworkspace/xcuserdata/datt.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TagNameDetection/TagNameDetection.xcodeproj/xcuserdata/datt.xcuserdatad/xcschemes/xcschememanagement.plist b/.swiftpm/xcode/xcuserdata/datt.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 65% rename from TagNameDetection/TagNameDetection.xcodeproj/xcuserdata/datt.xcuserdatad/xcschemes/xcschememanagement.plist rename to .swiftpm/xcode/xcuserdata/datt.xcuserdatad/xcschemes/xcschememanagement.plist index 88e7421..a240b3a 100644 --- a/TagNameDetection/TagNameDetection.xcodeproj/xcuserdata/datt.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/.swiftpm/xcode/xcuserdata/datt.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,12 +4,7 @@ SchemeUserState - TagNameDetection.xcscheme - - orderHint - 0 - - TagNameDetection.xcscheme_^#shared#^_ + DPTagTextView.xcscheme_^#shared#^_ orderHint 0 diff --git a/DPTagDetectionTextView.podspec b/DPTagTextView.podspec similarity index 92% rename from DPTagDetectionTextView.podspec rename to DPTagTextView.podspec index 34f4468..895835a 100644 --- a/DPTagDetectionTextView.podspec +++ b/DPTagTextView.podspec @@ -15,9 +15,9 @@ Pod::Spec.new do |s| # summary should be tweet-length, and the description more in depth. # - s.name = "DPTagDetectionTextView" - s.version = "1.5.4" - s.summary = "Tag detection and tag search for Textview." + s.name = "DPTagTextView" + s.version = "2.5.0" + s.summary = "Add & detect Tag/mention and tag search for Textview." # This description is used to generate tags and improve search results. # * Think: What does it do? Why did you write it? What is the focus? @@ -27,7 +27,7 @@ Pod::Spec.new do |s| # s.description = <<-DESC # DESC - s.homepage = "https://github.com/Datt1994/DPTagDetectionTextView" + s.homepage = "https://github.com/Datt1994/DPTagTextView" # s.screenshots = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif" @@ -52,7 +52,7 @@ Pod::Spec.new do |s| # profile URL. # - s.author = { "Datt1994" => "email@address.com" } + s.author = { "Datt1994" => "Datt1994@gmail.com" } # Or just: s.author = "Datt1994" # s.authors = { "Datt1994" => "email@address.com" } # s.social_media_url = "http://twitter.com/Datt1994" @@ -79,7 +79,7 @@ Pod::Spec.new do |s| # Supports git, hg, bzr, svn and HTTP. # - s.source = { :git => "https://github.com/Datt1994/DPTagDetectionTextView.git", :tag => s.version } + s.source = { :git => "https://github.com/Datt1994/DPTagTextView.git", :tag => s.version } # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # @@ -90,7 +90,7 @@ Pod::Spec.new do |s| # Not including the public_header_files will make all headers public. # - s.source_files = 'TagNameDetection/TagNameDetection/DPTagTextView/DPTagTextView.swift' + s.source_files = 'DPTagTextView/DPTagTextView/DPTagTextView/DPTagTextView.swift' # s.exclude_files = "Classes/Exclude" # s.public_header_files = "Classes/**/*.h" diff --git a/TagNameDetection/TagNameDetection.xcodeproj/project.pbxproj b/DPTagTextView/DPTagTextView.xcodeproj/project.pbxproj similarity index 58% rename from TagNameDetection/TagNameDetection.xcodeproj/project.pbxproj rename to DPTagTextView/DPTagTextView.xcodeproj/project.pbxproj index c9798aa..c669924 100644 --- a/TagNameDetection/TagNameDetection.xcodeproj/project.pbxproj +++ b/DPTagTextView/DPTagTextView.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + C689FF4525EAF769002D9335 /* DPTagTextView.h in Headers */ = {isa = PBXBuildFile; fileRef = C689FF4325EAF769002D9335 /* DPTagTextView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C689FF4825EAF769002D9335 /* DPTagTextView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C689FF4125EAF769002D9335 /* DPTagTextView.framework */; }; + C689FF4925EAF769002D9335 /* DPTagTextView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C689FF4125EAF769002D9335 /* DPTagTextView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + C689FF5125EAFAEE002D9335 /* DPTagTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6CDA76C20BD4E8100F91211 /* DPTagTextView.swift */; }; C6A605E22074A59F005E5F45 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A605E12074A59F005E5F45 /* AppDelegate.swift */; }; C6A605E42074A59F005E5F45 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A605E32074A59F005E5F45 /* ViewController.swift */; }; C6A605E72074A59F005E5F45 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C6A605E52074A59F005E5F45 /* Main.storyboard */; }; @@ -15,8 +19,35 @@ C6CDA76D20BD4E8100F91211 /* DPTagTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6CDA76C20BD4E8100F91211 /* DPTagTextView.swift */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + C689FF4625EAF769002D9335 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C6A605D62074A59F005E5F45 /* Project object */; + proxyType = 1; + remoteGlobalIDString = C689FF4025EAF769002D9335; + remoteInfo = DPTagTextView; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + C689FF4A25EAF769002D9335 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + C689FF4925EAF769002D9335 /* DPTagTextView.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - C6A605DE2074A59F005E5F45 /* TagNameDetection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TagNameDetection.app; sourceTree = BUILT_PRODUCTS_DIR; }; + C689FF4125EAF769002D9335 /* DPTagTextView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DPTagTextView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C689FF4325EAF769002D9335 /* DPTagTextView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DPTagTextView.h; sourceTree = ""; }; + C689FF4425EAF769002D9335 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C6A605DE2074A59F005E5F45 /* DPTagTextView-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DPTagTextView-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; C6A605E12074A59F005E5F45 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; C6A605E32074A59F005E5F45 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; C6A605E62074A59F005E5F45 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; @@ -27,10 +58,18 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + C689FF3E25EAF769002D9335 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; C6A605DB2074A59F005E5F45 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + C689FF4825EAF769002D9335 /* DPTagTextView.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -45,10 +84,20 @@ path = DPTagTextView; sourceTree = ""; }; + C689FF4225EAF769002D9335 /* DPTagTextView */ = { + isa = PBXGroup; + children = ( + C689FF4325EAF769002D9335 /* DPTagTextView.h */, + C689FF4425EAF769002D9335 /* Info.plist */, + ); + path = DPTagTextView; + sourceTree = ""; + }; C6A605D52074A59F005E5F45 = { isa = PBXGroup; children = ( - C6A605E02074A59F005E5F45 /* TagNameDetection */, + C6A605E02074A59F005E5F45 /* DPTagTextView */, + C689FF4225EAF769002D9335 /* DPTagTextView */, C6A605DF2074A59F005E5F45 /* Products */, ); sourceTree = ""; @@ -56,12 +105,13 @@ C6A605DF2074A59F005E5F45 /* Products */ = { isa = PBXGroup; children = ( - C6A605DE2074A59F005E5F45 /* TagNameDetection.app */, + C6A605DE2074A59F005E5F45 /* DPTagTextView-Example.app */, + C689FF4125EAF769002D9335 /* DPTagTextView.framework */, ); name = Products; sourceTree = ""; }; - C6A605E02074A59F005E5F45 /* TagNameDetection */ = { + C6A605E02074A59F005E5F45 /* DPTagTextView */ = { isa = PBXGroup; children = ( C65F46D7237030D100B8062F /* DPTagTextView */, @@ -72,27 +122,58 @@ C6A605EA2074A59F005E5F45 /* LaunchScreen.storyboard */, C6A605ED2074A59F005E5F45 /* Info.plist */, ); - path = TagNameDetection; + path = DPTagTextView; sourceTree = ""; }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + C689FF3C25EAF769002D9335 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + C689FF4525EAF769002D9335 /* DPTagTextView.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ - C6A605DD2074A59F005E5F45 /* TagNameDetection */ = { + C689FF4025EAF769002D9335 /* DPTagTextView */ = { isa = PBXNativeTarget; - buildConfigurationList = C6A605F02074A59F005E5F45 /* Build configuration list for PBXNativeTarget "TagNameDetection" */; + buildConfigurationList = C689FF4D25EAF769002D9335 /* Build configuration list for PBXNativeTarget "DPTagTextView" */; + buildPhases = ( + C689FF3C25EAF769002D9335 /* Headers */, + C689FF3D25EAF769002D9335 /* Sources */, + C689FF3E25EAF769002D9335 /* Frameworks */, + C689FF3F25EAF769002D9335 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = DPTagTextView; + productName = DPTagTextView; + productReference = C689FF4125EAF769002D9335 /* DPTagTextView.framework */; + productType = "com.apple.product-type.framework"; + }; + C6A605DD2074A59F005E5F45 /* DPTagTextView-Example */ = { + isa = PBXNativeTarget; + buildConfigurationList = C6A605F02074A59F005E5F45 /* Build configuration list for PBXNativeTarget "DPTagTextView-Example" */; buildPhases = ( C6A605DA2074A59F005E5F45 /* Sources */, C6A605DB2074A59F005E5F45 /* Frameworks */, C6A605DC2074A59F005E5F45 /* Resources */, + C689FF4A25EAF769002D9335 /* Embed Frameworks */, ); buildRules = ( ); dependencies = ( + C689FF4725EAF769002D9335 /* PBXTargetDependency */, ); - name = TagNameDetection; + name = "DPTagTextView-Example"; productName = TagNameDetection; - productReference = C6A605DE2074A59F005E5F45 /* TagNameDetection.app */; + productReference = C6A605DE2074A59F005E5F45 /* DPTagTextView-Example.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -102,16 +183,20 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1220; ORGANIZATIONNAME = Datt; TargetAttributes = { + C689FF4025EAF769002D9335 = { + CreatedOnToolsVersion = 12.2; + ProvisioningStyle = Automatic; + }; C6A605DD2074A59F005E5F45 = { CreatedOnToolsVersion = 9.2; ProvisioningStyle = Manual; }; }; }; - buildConfigurationList = C6A605D92074A59F005E5F45 /* Build configuration list for PBXProject "TagNameDetection" */; + buildConfigurationList = C6A605D92074A59F005E5F45 /* Build configuration list for PBXProject "DPTagTextView" */; compatibilityVersion = "Xcode 8.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -124,12 +209,20 @@ projectDirPath = ""; projectRoot = ""; targets = ( - C6A605DD2074A59F005E5F45 /* TagNameDetection */, + C6A605DD2074A59F005E5F45 /* DPTagTextView-Example */, + C689FF4025EAF769002D9335 /* DPTagTextView */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + C689FF3F25EAF769002D9335 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; C6A605DC2074A59F005E5F45 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -143,6 +236,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + C689FF3D25EAF769002D9335 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C689FF5125EAFAEE002D9335 /* DPTagTextView.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; C6A605DA2074A59F005E5F45 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -155,6 +256,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + C689FF4725EAF769002D9335 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = C689FF4025EAF769002D9335 /* DPTagTextView */; + targetProxy = C689FF4625EAF769002D9335 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ C6A605E52074A59F005E5F45 /* Main.storyboard */ = { isa = PBXVariantGroup; @@ -175,6 +284,65 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + C689FF4B25EAF769002D9335 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = DPTagTextView/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.5.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.Datt.DPTagTextView; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + C689FF4C25EAF769002D9335 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = DPTagTextView/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 2.5.0; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.Datt.DPTagTextView; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; C6A605EE2074A59F005E5F45 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -200,6 +368,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -225,7 +394,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -259,6 +428,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -278,7 +448,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -289,13 +459,14 @@ C6A605F12074A59F005E5F45 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = 3Y587YMRM5; - INFOPLIST_FILE = TagNameDetection/Info.plist; + DEVELOPMENT_TEAM = ""; + INFOPLIST_FILE = DPTagTextView/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.Datt.TagNameDetection; + PRODUCT_BUNDLE_IDENTIFIER = "com.Datt.DPTagTextView-example"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; @@ -306,13 +477,14 @@ C6A605F22074A59F005E5F45 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = 3Y587YMRM5; - INFOPLIST_FILE = TagNameDetection/Info.plist; + DEVELOPMENT_TEAM = ""; + INFOPLIST_FILE = DPTagTextView/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.Datt.TagNameDetection; + PRODUCT_BUNDLE_IDENTIFIER = "com.Datt.DPTagTextView-example"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; @@ -323,7 +495,16 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - C6A605D92074A59F005E5F45 /* Build configuration list for PBXProject "TagNameDetection" */ = { + C689FF4D25EAF769002D9335 /* Build configuration list for PBXNativeTarget "DPTagTextView" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C689FF4B25EAF769002D9335 /* Debug */, + C689FF4C25EAF769002D9335 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C6A605D92074A59F005E5F45 /* Build configuration list for PBXProject "DPTagTextView" */ = { isa = XCConfigurationList; buildConfigurations = ( C6A605EE2074A59F005E5F45 /* Debug */, @@ -332,7 +513,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C6A605F02074A59F005E5F45 /* Build configuration list for PBXNativeTarget "TagNameDetection" */ = { + C6A605F02074A59F005E5F45 /* Build configuration list for PBXNativeTarget "DPTagTextView-Example" */ = { isa = XCConfigurationList; buildConfigurations = ( C6A605F12074A59F005E5F45 /* Debug */, diff --git a/DPTagTextView/DPTagTextView.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/DPTagTextView/DPTagTextView.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..5595a22 --- /dev/null +++ b/DPTagTextView/DPTagTextView.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/TagNameDetection/TagNameDetection.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DPTagTextView/DPTagTextView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from TagNameDetection/TagNameDetection.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to DPTagTextView/DPTagTextView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/DPTagTextView/DPTagTextView.xcodeproj/project.xcworkspace/xcuserdata/datt.xcuserdatad/UserInterfaceState.xcuserstate b/DPTagTextView/DPTagTextView.xcodeproj/project.xcworkspace/xcuserdata/datt.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..521876b Binary files /dev/null and b/DPTagTextView/DPTagTextView.xcodeproj/project.xcworkspace/xcuserdata/datt.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/TagNameDetection/TagNameDetection.xcodeproj/project.xcworkspace/xcuserdata/dharmesh.xcuserdatad/UserInterfaceState.xcuserstate b/DPTagTextView/DPTagTextView.xcodeproj/project.xcworkspace/xcuserdata/dharmesh.xcuserdatad/UserInterfaceState.xcuserstate similarity index 100% rename from TagNameDetection/TagNameDetection.xcodeproj/project.xcworkspace/xcuserdata/dharmesh.xcuserdatad/UserInterfaceState.xcuserstate rename to DPTagTextView/DPTagTextView.xcodeproj/project.xcworkspace/xcuserdata/dharmesh.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/DPTagTextView/DPTagTextView.xcodeproj/xcshareddata/xcschemes/DPTagTextView.xcscheme b/DPTagTextView/DPTagTextView.xcodeproj/xcshareddata/xcschemes/DPTagTextView.xcscheme new file mode 100644 index 0000000..6896282 --- /dev/null +++ b/DPTagTextView/DPTagTextView.xcodeproj/xcshareddata/xcschemes/DPTagTextView.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TagNameDetection/TagNameDetection.xcodeproj/xcuserdata/datt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/DPTagTextView/DPTagTextView.xcodeproj/xcuserdata/datt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist similarity index 100% rename from TagNameDetection/TagNameDetection.xcodeproj/xcuserdata/datt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist rename to DPTagTextView/DPTagTextView.xcodeproj/xcuserdata/datt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist diff --git a/DPTagTextView/DPTagTextView.xcodeproj/xcuserdata/datt.xcuserdatad/xcschemes/xcschememanagement.plist b/DPTagTextView/DPTagTextView.xcodeproj/xcuserdata/datt.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..f6f9c95 --- /dev/null +++ b/DPTagTextView/DPTagTextView.xcodeproj/xcuserdata/datt.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,37 @@ + + + + + SchemeUserState + + DPTagTextView-Example.xcscheme_^#shared#^_ + + orderHint + 1 + + DPTagTextView.xcscheme_^#shared#^_ + + orderHint + 0 + + TagNameDetection.xcscheme + + orderHint + 0 + + TagNameDetection.xcscheme_^#shared#^_ + + orderHint + 0 + + + SuppressBuildableAutocreation + + C689FF4025EAF769002D9335 + + primary + + + + + diff --git a/TagNameDetection/TagNameDetection.xcodeproj/xcuserdata/dharmesh.xcuserdatad/xcschemes/xcschememanagement.plist b/DPTagTextView/DPTagTextView.xcodeproj/xcuserdata/dharmesh.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from TagNameDetection/TagNameDetection.xcodeproj/xcuserdata/dharmesh.xcuserdatad/xcschemes/xcschememanagement.plist rename to DPTagTextView/DPTagTextView.xcodeproj/xcuserdata/dharmesh.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/TagNameDetection/TagNameDetection/AppDelegate.swift b/DPTagTextView/DPTagTextView/AppDelegate.swift similarity index 100% rename from TagNameDetection/TagNameDetection/AppDelegate.swift rename to DPTagTextView/DPTagTextView/AppDelegate.swift diff --git a/TagNameDetection/TagNameDetection/Assets.xcassets/AppIcon.appiconset/Contents.json b/DPTagTextView/DPTagTextView/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from TagNameDetection/TagNameDetection/Assets.xcassets/AppIcon.appiconset/Contents.json rename to DPTagTextView/DPTagTextView/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/TagNameDetection/TagNameDetection/Base.lproj/LaunchScreen.storyboard b/DPTagTextView/DPTagTextView/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from TagNameDetection/TagNameDetection/Base.lproj/LaunchScreen.storyboard rename to DPTagTextView/DPTagTextView/Base.lproj/LaunchScreen.storyboard diff --git a/TagNameDetection/TagNameDetection/Base.lproj/Main.storyboard b/DPTagTextView/DPTagTextView/Base.lproj/Main.storyboard similarity index 100% rename from TagNameDetection/TagNameDetection/Base.lproj/Main.storyboard rename to DPTagTextView/DPTagTextView/Base.lproj/Main.storyboard diff --git a/DPTagTextView/DPTagTextView/DPTagTextView.h b/DPTagTextView/DPTagTextView/DPTagTextView.h new file mode 100644 index 0000000..7b96b96 --- /dev/null +++ b/DPTagTextView/DPTagTextView/DPTagTextView.h @@ -0,0 +1,19 @@ +// +// DPTagTextView.h +// DPTagTextView +// +// Created by Datt Patel on 28/02/21. +// Copyright © 2021 Datt. All rights reserved. +// + +#import + +//! Project version number for DPTagTextView. +FOUNDATION_EXPORT double DPTagTextViewVersionNumber; + +//! Project version string for DPTagTextView. +FOUNDATION_EXPORT const unsigned char DPTagTextViewVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/TagNameDetection/TagNameDetection/DPTagTextView/DPTagTextView.swift b/DPTagTextView/DPTagTextView/DPTagTextView/DPTagTextView.swift similarity index 100% rename from TagNameDetection/TagNameDetection/DPTagTextView/DPTagTextView.swift rename to DPTagTextView/DPTagTextView/DPTagTextView/DPTagTextView.swift diff --git a/TagNameDetection/TagNameDetection/Info.plist b/DPTagTextView/DPTagTextView/Info.plist similarity index 100% rename from TagNameDetection/TagNameDetection/Info.plist rename to DPTagTextView/DPTagTextView/Info.plist diff --git a/TagNameDetection/TagNameDetection/ViewController.swift b/DPTagTextView/DPTagTextView/ViewController.swift similarity index 94% rename from TagNameDetection/TagNameDetection/ViewController.swift rename to DPTagTextView/DPTagTextView/ViewController.swift index fe1d3e6..41f257b 100644 --- a/TagNameDetection/TagNameDetection/ViewController.swift +++ b/DPTagTextView/DPTagTextView/ViewController.swift @@ -17,7 +17,7 @@ class ViewController: UIViewController { let isTagDetection = true let arrUsers : [String] = ["Datt Patel", "Dharmesh Shah","Arpit Dhamane","Nirzar Gandhi","Pooja Shah","Nilomi Shah","Pradip Rathod","Jiten Goswami"] - let arrHashTag : [String] = ["random", "memes", "meme", "love", "photography", "art", "humor", "like", "follow", "funny", "photooftheday"] + let arrHashTag : [String] = ["random", "memes", "meme", "love", "photography", "art", "humor", "like", "follow", "funny", "photooftheday", "awesome"] var arrSearchUsers = [String]() override func viewDidLoad() { @@ -38,15 +38,8 @@ class ViewController: UIViewController { self.tagTextView.dpTagDelegate = self tbl.register(UITableViewCell.self, forCellReuseIdentifier: "cell") tbl.isHidden = true - // Do any additional setup after loading the view, typically from a nib. } - override func didReceiveMemoryWarning() { - super.didReceiveMemoryWarning() - // Dispose of any resources that can be recreated. - } - - @IBAction func tagDetectionSwitchAction(_ sender: UISwitch) { tagTextView.setTagDetection(sender.isOn) } diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..9bbf887 --- /dev/null +++ b/Package.swift @@ -0,0 +1,15 @@ +// swift-tools-version:5.0 +// +// Package.swift +// + +import PackageDescription + +let package = Package(name: "DPTagTextView", + platforms: [.iOS(.v10)], + products: [.library(name: "DPTagTextView", + targets: ["DPTagTextView"])], + targets: [.target(name: "DPTagTextView", + path: "DPTagTextView/DPTagTextView/DPTagTextView", + publicHeadersPath: "")], + swiftLanguageVersions: [.v5]) diff --git a/README.md b/README.md index 440a180..d732872 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,9 @@ -# DPTagDetectionTextView +# DPTagTextView +[![Platform](https://img.shields.io/cocoapods/p/DPTagTextView.svg?style=flat)](http://cocoapods.org/pods/DPTagTextView) +[![Language: Swift 5](https://img.shields.io/badge/language-swift5-f48041.svg?style=flat)](https://developer.apple.com/swift) +[![License](https://img.shields.io/cocoapods/l/DPOTPView.svg?style=flat)](https://github.com/Datt1994/DPTagTextView/blob/master/LICENSE) +[![Version](https://img.shields.io/cocoapods/v/DPTagTextView.svg?style=flat)](http://cocoapods.org/pods/DPTagTextView) +[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) Add & detect tag/mention using Textview. @@ -21,11 +26,11 @@ To integrate DPTagDetectionTextView into your Xcode project using CocoaPods, spe ```ruby source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '8.0' +platform :ios, '10.0' target 'TargetName' do use_frameworks! -pod 'DPTagDetectionTextView' +pod 'DPTagTextView' end ``` @@ -35,6 +40,31 @@ Then, run the following command: $ pod install ``` +## Installation with Carthage + +[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks. + +You can install Carthage with [Homebrew](http://brew.sh/) using the following command: + +```bash +$ brew update +$ brew install carthage +``` + +To integrate `DPOTPView` into your Xcode project using Carthage, specify it in your `Cartfile`: + +```ogdl +github "Datt1994/DPTagTextView" +``` + +Run `carthage` to build the framework and drag the framework (`DPTagTextView.framework`) into your Xcode project. + +## Installation with Swift Package Manager + +The [Swift Package Manager](https://swift.org/package-manager/) is a tool for automating the distribution of Swift code and is integrated into the `swift` compiler. + +To add the library as package dependency to your Xcode project, select File > Swift Packages > Add Package Dependency and enter its repository URL `https://github.com/Datt1994/DPTagTextView.git` + ## Add Manually diff --git a/TagNameDetection/TagNameDetection.xcodeproj/project.xcworkspace/xcuserdata/datt.xcuserdatad/UserInterfaceState.xcuserstate b/TagNameDetection/TagNameDetection.xcodeproj/project.xcworkspace/xcuserdata/datt.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 7db2eb7..0000000 Binary files a/TagNameDetection/TagNameDetection.xcodeproj/project.xcworkspace/xcuserdata/datt.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ