Skip to content

Commit

Permalink
Merge pull request #1 from jghg02/develop
Browse files Browse the repository at this point in the history
Added a new icon and podespec file.
  • Loading branch information
jghg02 authored May 16, 2018
2 parents f7aad36 + c196a2b commit aa973c7
Show file tree
Hide file tree
Showing 15 changed files with 122 additions and 6 deletions.
Binary file modified .DS_Store
Binary file not shown.
48 changes: 48 additions & 0 deletions Example/JCore-ui.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
607FACCD1AFB9204008FA782 /* Frameworks */,
607FACCE1AFB9204008FA782 /* Resources */,
65F32BDDD25761D9709ABACB /* [CP] Embed Pods Frameworks */,
238B2BCDB4BD5A86C96302CD /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -196,6 +197,8 @@
607FACE11AFB9204008FA782 /* Sources */,
607FACE21AFB9204008FA782 /* Frameworks */,
607FACE31AFB9204008FA782 /* Resources */,
179458F4B3830D5E2F42AC11 /* [CP] Embed Pods Frameworks */,
30CC059B91B164BBE4CA7A93 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -268,6 +271,51 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
179458F4B3830D5E2F42AC11 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JCore-ui_Tests/Pods-JCore-ui_Tests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
238B2BCDB4BD5A86C96302CD /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JCore-ui_Example/Pods-JCore-ui_Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
30CC059B91B164BBE4CA7A93 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JCore-ui_Tests/Pods-JCore-ui_Tests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
65F32BDDD25761D9709ABACB /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
18 changes: 18 additions & 0 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
PODS:
- JCore-ui (0.3.1):
- JCore-ui/JCButton (= 0.3.1)
- JCore-ui/JCButton (0.3.1)

DEPENDENCIES:
- JCore-ui (from `../`)

EXTERNAL SOURCES:
JCore-ui:
:path: ../

SPEC CHECKSUMS:
JCore-ui: 5436d7137b2e9d9997a04f46bd4564926c0d90fc

PODFILE CHECKSUM: 54016283ddc823ff9bd7ce46cac8607d18bec579

COCOAPODS: 1.4.0
4 changes: 2 additions & 2 deletions Example/Pods/Local Podspecs/JCore-ui.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions JCore-ui.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'JCore-ui'
s.version = '0.3.1'
s.version = '0.3.2'
s.summary = 'This is an UI Lib for iOS'
s.platform = :ios, "10.0"

Expand All @@ -34,8 +34,8 @@ Pod::Spec.new do |s|


s.source_files = 'LibraryComponents/**/*'
# s.resources = 'LibraryComponents/Resources/*.xcassets'

s.resources = 'LibraryComponents/Resources/*.xcassets'

# s.resource_bundles = {
# 'JCore-ui' => ['LibraryComponents/Resources/*.xcassets','LibraryComponents/Resources/*.xcassets/*.json']
Expand Down
Binary file modified LibraryComponents/.DS_Store
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "avatar.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "avatar-2.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions LibraryComponents/Resources/JCoreIcons.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion LibraryComponents/UI/Loader/JCoreLoaderView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class JCoreLoaderView: UIView {
jloaderView?.blurStyle = UIViewBlurStyle.extraLightStyle

//Set image into xib
jloaderView?.iconLogo.image = UIImage(named: "JCoreLoading", in: JCoreUtils.frameworkBundle(), compatibleWith: nil)
jloaderView?.iconLogo.image = UIImage(named: "Loading", in: JCoreUtils.frameworkBundle(), compatibleWith: nil)

let rotacion = CABasicAnimation(keyPath: "transform.rotation.z")
rotacion.toValue = CGFloat(.pi * 2.0)
Expand Down

0 comments on commit aa973c7

Please sign in to comment.