IME-LONDON
/
LONDON-IOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

added animateions values

pull/1/head
gme_2 6 years ago
parent
f519d4a72b
commit
5333f2bf36
7 changed files with 64 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      GMERemittance/Home/Home.storyboard
  2. 14
      GMERemittance/Module/GmeContacts/User Interface/View/GmeContacts.storyboard
  3. 6
      GMERemittance/Module/Main/User Interface/View/MainViewController.swift
  4. 14
      GMERemittance/Profile/Profile.storyboard
  5. 14
      GMERemittance/Recipient/RecipientListViewController.storyboard
  6. 2
      Pods/RAMAnimatedTabBarController/RAMAnimatedTabBarController/Animations/BounceAnimation/RAMBounceAnimation.swift
  7. 6
      Pods/RAMAnimatedTabBarController/RAMAnimatedTabBarController/RAMAnimatedTabBarController.swift

18
GMERemittance/Home/Home.storyboard
View File

@ -1160,7 +1160,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8WZ-lQ-Im6" userLabel="LoadMoreView">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7wo-T4-XhL">
<rect key="frame" x="155.5" y="7.5" width="63" height="29"/>
@ -1209,7 +1209,7 @@
<viewLayoutGuide key="safeArea" id="a9o-Ya-spC"/>
</view>
<extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
<tabBarItem key="tabBarItem" enabled="NO" title="Home" image="ic-home" id="OVu-c7-qcE" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
<tabBarItem key="tabBarItem" title="Home" image="ic-home" id="OVu-c7-qcE" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
<connections>
<outlet property="animation" destination="phT-Pi-kps" id="f2v-s5-rwY"/>
</connections>
@ -1239,7 +1239,19 @@
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="lUO-16-Ibq" userLabel="First Responder" sceneMemberID="firstResponder"/>
<customObject id="phT-Pi-kps" customClass="RAMLeftRotationAnimation" customModule="RAMAnimatedTabBarController"/>
<customObject id="phT-Pi-kps" customClass="RAMBounceAnimation" customModule="RAMAnimatedTabBarController">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="textSelectedColor">
<color key="value" red="0.92549019607843142" green="0.10980392156862745" blue="0.14117647058823529" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="iconSelectedColor">
<color key="value" red="0.92549019610000005" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="duration">
<real key="value" value="0.33000000000000002"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</customObject>
</objects>
<point key="canvasLocation" x="2013.5999999999999" y="686.35682158920542"/>
</scene>

14
GMERemittance/Module/GmeContacts/User Interface/View/GmeContacts.storyboard
View File

@ -266,7 +266,19 @@ Wongogdong Jung-Angdaero 445 Wongogdong Jung-Angdaero 445</string>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="8je-5K-XuW" userLabel="First Responder" sceneMemberID="firstResponder"/>
<customObject id="9ca-r1-bx1" customClass="RAMLeftRotationAnimation" customModule="RAMAnimatedTabBarController"/>
<customObject id="9ca-r1-bx1" customClass="RAMBounceAnimation" customModule="RAMAnimatedTabBarController">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="textSelectedColor">
<color key="value" red="0.92549019610000005" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="iconSelectedColor">
<color key="value" red="0.92549019610000005" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="duration">
<real key="value" value="0.33000000000000002"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</customObject>
</objects>
<point key="canvasLocation" x="-92" y="232.53373313343329"/>
</scene>

6
GMERemittance/Module/Main/User Interface/View/MainViewController.swift
View File

@ -28,6 +28,7 @@ class MainViewController: RAMAnimatedTabBarController {
override func viewDidLoad() {
super.viewDidLoad()
self.setupAppearance()
}
@ -56,6 +57,8 @@ class MainViewController: RAMAnimatedTabBarController {
// viewController.tabBarItem.titlePositionAdjustment = UIOffsetMake(0, -5)
})
}
}
extension MainViewController: MainViewInterface {
@ -173,3 +176,6 @@ extension UIColor {
}

14
GMERemittance/Profile/Profile.storyboard
View File

@ -270,7 +270,19 @@
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="aCj-wy-8sG" userLabel="First Responder" sceneMemberID="firstResponder"/>
<customObject id="xLP-Ov-t1I" customClass="RAMLeftRotationAnimation" customModule="RAMAnimatedTabBarController"/>
<customObject id="xLP-Ov-t1I" customClass="RAMBounceAnimation" customModule="RAMAnimatedTabBarController">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="textSelectedColor">
<color key="value" red="0.92549019610000005" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="iconSelectedColor">
<color key="value" red="0.92549019610000005" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="duration">
<real key="value" value="0.33000000000000002"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</customObject>
</objects>
<point key="canvasLocation" x="5469.6000000000004" y="1905.697151424288"/>
</scene>

14
GMERemittance/Recipient/RecipientListViewController.storyboard
View File

@ -162,7 +162,19 @@
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="gVi-gd-HhN" userLabel="First Responder" sceneMemberID="firstResponder"/>
<customObject id="RoD-1O-uQ3" customClass="RAMLeftRotationAnimation" customModule="RAMAnimatedTabBarController"/>
<customObject id="RoD-1O-uQ3" customClass="RAMBounceAnimation" customModule="RAMAnimatedTabBarController">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="textSelectedColor">
<color key="value" red="0.92549019610000005" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="iconSelectedColor">
<color key="value" red="0.92549019610000005" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="duration">
<real key="value" value="0.33000000000000002"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</customObject>
<tapGestureRecognizer id="fvv-yf-Atf">
<connections>
<action selector="addNewRecipientTap:" destination="IRF-H1-BUJ" id="c5g-aa-p9H"/>

2
Pods/RAMAnimatedTabBarController/RAMAnimatedTabBarController/Animations/BounceAnimation/RAMBounceAnimation.swift
View File

@ -75,7 +75,7 @@ open class RAMBounceAnimation: RAMItemAnimation {
func playBounceAnimation(_ icon: UIImageView) {
let bounceAnimation = CAKeyframeAnimation(keyPath: Constants.AnimationKeys.Scale)
bounceAnimation.values = [1.0, 1.4, 0.9, 1.15, 0.95, 1.02, 1.0]
bounceAnimation.values = [1.0, 1.2, 0.85, 1.0]
bounceAnimation.duration = TimeInterval(duration)
bounceAnimation.calculationMode = kCAAnimationCubic

6
Pods/RAMAnimatedTabBarController/RAMAnimatedTabBarController/RAMAnimatedTabBarController.swift
View File

@ -316,12 +316,12 @@ open class RAMAnimatedTabBarController: UITabBarController {
container.backgroundColor = (items as [RAMAnimatedTabBarItem])[index].bgDefaultColor
container.addSubview(icon)
let itemSize = item.image?.size ?? CGSize(width: 30, height: 30)
createConstraints(icon, container: container, size: itemSize, yOffset: -5 - item.yOffSet)
let itemSize = item.image?.size ?? CGSize(width: 25, height: 25)
createConstraints(icon, container: container, size: itemSize, yOffset: -5 - 2)
container.addSubview(textLabel)
let textLabelWidth = tabBar.frame.size.width / CGFloat(items.count) - 5.0
createConstraints(textLabel, container: container, width: textLabelWidth, yOffset: 16 - item.yOffSet, heightRelation: .greaterThanOrEqual)
createConstraints(textLabel, container: container, width: textLabelWidth, yOffset: 16 - 5, heightRelation: .greaterThanOrEqual)
if item.isEnabled == false {
icon.alpha = 0.5

Write Preview
Loading…
Cancel
Save