Merge pull request #13 from lojals/feat/change-identity

Rename control for EmojiSelectorView

.travis.yml

@@ -9,5 +9,5 @@ language: objective-c
 # - gem install cocoapods # Since Travis is not always on latest version
 # - pod install --project-directory=Example
 script:
-- set -o pipefail && xcodebuild test -workspace Example/JOEmojiableBtn.xcworkspace -scheme JOEmojiableBtn-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty
+- set -o pipefail && xcodebuild test -workspace Example/EmojiSelectorView.xcworkspace -scheme EmojiSelectorView-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty
 - pod lib lint

Pod/Classes/CGRect+init.swift → CGRect+init.swift

@@ -1,6 +1,6 @@
 //
 //  CGRect+init.swift
-//  JOEmojiableBtn
+//  EmojiSelectorView
 //
 //  Created by Jorge R Ovalle Z on 4/7/18.
 //

Pod/Classes/CGSize+init.swift → CGSize+init.swift

@@ -1,6 +1,6 @@
 //
 //  CGSize+init.swift
-//  JOEmojiableBtn
+//  EmojiSelectorView
 //
 //  Created by Jorge R Ovalle Z on 4/7/18.
 //

JOEmojiableBtn.podspec → EmojiSelectorView.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
-  s.name             = "JOEmojiableBtn"
+  s.name             = "EmojiSelectorView"
   s.version          = "4.0.0"
   s.summary          = "Option selector that can be used as reactions"
 
   s.description      = "Totally customizable Options (Emoji) Selector based on Reactions"
 
-  s.homepage         = "https://github.com/lojals/JOEmojiableBtn"
+  s.homepage         = "https://github.com/lojals/EmojiSelectorView"
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { "Jorge Ovalle" => "jroz9105@gmail.com" }
-  s.source           = { :git => "https://github.com/lojals/JOEmojiableBtn.git", :tag => s.version.to_s }
+  s.source           = { :git => "https://github.com/lojals/EmojiSelectorView.git", :tag => s.version.to_s }
   s.social_media_url = 'https://github.com/lojals'
 
   s.ios.deployment_target = '10.0'
@@ -17,6 +17,6 @@ Pod::Spec.new do |s|
 
   s.source_files = 'Pod/Classes/**/*'
   s.resource_bundles = {
-    'JOEmojiableBtn' => ['Pod/Assets/*.png']
+    'EmojiSelectorView' => ['Pod/Assets/*.png']
   }
 end

Example/JOEmojiableBtn.xcodeproj/xcshareddata/xcschemes/JOEmojiableBtn-Example.xcscheme → Example/EmojiSelectorView.xcodeproj/xcshareddata/xcschemes/EmojiSelectorView-Example.xcscheme

@@ -15,9 +15,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-               BuildableName = "JOEmojiableBtn_Example.app"
-               BlueprintName = "JOEmojiableBtn_Example"
-               ReferencedContainer = "container:JOEmojiableBtn.xcodeproj">
+               BuildableName = "EmojiSelectorView_Example.app"
+               BlueprintName = "EmojiSelectorView_Example"
+               ReferencedContainer = "container:EmojiSelectorView.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -29,9 +29,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "607FACE41AFB9204008FA782"
-               BuildableName = "JOEmojiableBtn_Tests.xctest"
-               BlueprintName = "JOEmojiableBtn_Tests"
-               ReferencedContainer = "container:JOEmojiableBtn.xcodeproj">
+               BuildableName = "EmojiSelectorView_Tests.xctest"
+               BlueprintName = "EmojiSelectorView_Tests"
+               ReferencedContainer = "container:EmojiSelectorView.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -45,9 +45,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "JOEmojiableBtn_Example.app"
-            BlueprintName = "JOEmojiableBtn_Example"
-            ReferencedContainer = "container:JOEmojiableBtn.xcodeproj">
+            BuildableName = "EmojiSelectorView_Example.app"
+            BlueprintName = "EmojiSelectorView_Example"
+            ReferencedContainer = "container:EmojiSelectorView.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <Testables>
@@ -56,9 +56,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "607FACE41AFB9204008FA782"
-               BuildableName = "JOEmojiableBtn_Tests.xctest"
-               BlueprintName = "JOEmojiableBtn_Tests"
-               ReferencedContainer = "container:JOEmojiableBtn.xcodeproj">
+               BuildableName = "EmojiSelectorView_Tests.xctest"
+               BlueprintName = "EmojiSelectorView_Tests"
+               ReferencedContainer = "container:EmojiSelectorView.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -78,9 +78,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "JOEmojiableBtn_Example.app"
-            BlueprintName = "JOEmojiableBtn_Example"
-            ReferencedContainer = "container:JOEmojiableBtn.xcodeproj">
+            BuildableName = "EmojiSelectorView_Example.app"
+            BlueprintName = "EmojiSelectorView_Example"
+            ReferencedContainer = "container:EmojiSelectorView.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </LaunchAction>
@@ -95,9 +95,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "JOEmojiableBtn_Example.app"
-            BlueprintName = "JOEmojiableBtn_Example"
-            ReferencedContainer = "container:JOEmojiableBtn.xcodeproj">
+            BuildableName = "EmojiSelectorView_Example.app"
+            BlueprintName = "EmojiSelectorView_Example"
+            ReferencedContainer = "container:EmojiSelectorView.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

Example/JOEmojiableBtn/AppDelegate.swift → Example/EmojiSelectorView/AppDelegate.swift

@@ -1,6 +1,6 @@
 //
 //  AppDelegate.swift
-//  JOEmojiableBtn
+//  EmojiSelectorView
 //
 //  Created by Jorge Ovalle on 02/29/2016.
 //

Example/JOEmojiableBtn/Base.lproj/LaunchScreen.xib → Example/EmojiSelectorView/Base.lproj/LaunchScreen.xib

@@ -22,7 +22,7 @@
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="JOEmojiableBtn" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="EmojiSelectorView" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
                     <rect key="frame" x="20" y="140" width="441" height="43"/>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>

Example/JOEmojiableBtn/Base.lproj/Main.storyboard → Example/EmojiSelectorView/Base.lproj/Main.storyboard

@@ -12,7 +12,7 @@
         <!--View Controller-->
         <scene sceneID="ufC-wZ-h7g">
             <objects>
-                <viewController id="vXZ-lx-hvc" customClass="ViewController" customModule="JOEmojiableBtn_Example" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="vXZ-lx-hvc" customClass="ViewController" customModule="EmojiSelectorView_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="jyV-Pf-zRb"/>
                         <viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>

Example/JOEmojiableBtn/ViewController.swift → Example/EmojiSelectorView/ViewController.swift

@@ -1,14 +1,14 @@
 //
 //  ViewController.swift
-//  JOEmojiableBtn
+//  EmojiSelectorView
 //
 //  Created by Jorge Raul Ovalle Zuleta on 2/28/16.
 //
 
 import UIKit
-import JOEmojiableBtn
+import EmojiSelectorView
 
-class ViewController: UIViewController, JOEmojiableDelegate {
+class ViewController: UIViewController, EmojiSelectorViewDelegate {
 
     // MARK: DesignConstants
     enum DesignConstants {
@@ -21,12 +21,12 @@ class ViewController: UIViewController, JOEmojiableDelegate {
     // MARK: Properties definition
 
     let optionsDataset = [
-        JOEmojiableOption(image: "img_1", name: "dislike"),
-        JOEmojiableOption(image: "img_2", name: "broken"),
-        JOEmojiableOption(image: "img_3", name: "he he"),
-        JOEmojiableOption(image: "img_4", name: "ooh"),
-        JOEmojiableOption(image: "img_5", name: "meh!"),
-        JOEmojiableOption(image: "img_6", name: "ahh!")
+        EmojiSelectorViewOption(image: "img_1", name: "dislike"),
+        EmojiSelectorViewOption(image: "img_2", name: "broken"),
+        EmojiSelectorViewOption(image: "img_3", name: "he he"),
+        EmojiSelectorViewOption(image: "img_4", name: "ooh"),
+        EmojiSelectorViewOption(image: "img_5", name: "meh!"),
+        EmojiSelectorViewOption(image: "img_6", name: "ahh!")
     ]
 
     private var label: UILabel {
@@ -54,7 +54,7 @@ class ViewController: UIViewController, JOEmojiableDelegate {
         view.addSubview(labelInfo)
 
         // Sample 1 using `default` configuration.
-        let buttonSample1 = JOEmojiableBtn(frame: CGRect(origin: CGPoint(x: 40, y: 200),
+        let buttonSample1 = EmojiSelectorView(frame: CGRect(origin: CGPoint(x: 40, y: 200),
                                                          size: DesignConstants.sampleButtonSize))
         buttonSample1.delegate = self
         buttonSample1.backgroundColor = DesignConstants.mainSampleColor
@@ -65,13 +65,13 @@ class ViewController: UIViewController, JOEmojiableDelegate {
         view.addSubview(buttonSample1)
 
         // Sample 2 using custom configuration.
-        let config = JOEmojiableConfig(spacing: 2,
+        let config = EmojiSelectorView.Config(spacing: 2,
                                        size: 30,
                                        minSize: 34,
                                        maxSize: 45,
                                        spaceBetweenComponents: 30)
 
-        let buttonSample2 = JOEmojiableBtn(frame: CGRect(origin: CGPoint(x: 40, y: 300),
+        let buttonSample2 = EmojiSelectorView(frame: CGRect(origin: CGPoint(x: 40, y: 300),
                                                          size: DesignConstants.sampleButtonSize),
                                            config: config)
         buttonSample2.delegate = self
@@ -85,12 +85,12 @@ class ViewController: UIViewController, JOEmojiableDelegate {
 
     // MARK: JOEmojiableDelegate
 
-    func selectedOption(_ sender: JOEmojiableBtn, index: Int) {
+    func selectedOption(_ sender: EmojiSelectorView, index: Int) {
         print("Option \(index) selected")
         labelInfo.text = "Option \(index) selected"
     }
 
-    func cancelledAction(_ sender: JOEmojiableBtn) {
+    func cancelledAction(_ sender: EmojiSelectorView) {
         print("User cancelled selection")
         labelInfo.text = "User cancelled selection"
     }

Example/Podfile

@@ -1,10 +1,10 @@
 use_frameworks!
 platform :ios, '12.0'
 
-target 'JOEmojiableBtn_Example' do
-  pod 'JOEmojiableBtn', :path => '../'
+target 'EmojiSelectorView_Example' do
+  pod 'EmojiSelectorView', :path => '../'
 end
 
-target 'JOEmojiableBtn_Tests' do
-  pod 'JOEmojiableBtn', :path => '../'
+target 'EmojiSelectorView_Tests' do
+  pod 'EmojiSelectorView', :path => '../'
 end

Example/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - JOEmojiableBtn (4.0.0)
+  - EmojiSelectorView (4.0.0)
 
 DEPENDENCIES:
-  - JOEmojiableBtn (from `../`)
+  - EmojiSelectorView (from `../`)
 
 EXTERNAL SOURCES:
-  JOEmojiableBtn:
+  EmojiSelectorView:
     :path: "../"
 
 SPEC CHECKSUMS:
-  JOEmojiableBtn: 5b0aea14550fd5b2ebb3dac79cb51200dfb4e0da
+  EmojiSelectorView: b658b7d87c27acdf5ffa4b6be828adf88b03109d
 
-PODFILE CHECKSUM: dd6b6b4e88f149e88bc90157ed66f11bae6bca04
+PODFILE CHECKSUM: 51e94af6b43e01a708f019db669b91c92e99f4e7
 
 COCOAPODS: 1.8.4