Merge pull request #31 from CabageMan/master

Change "contact us" links

Cartfile

@@ -1,15 +0,0 @@
-github "Ramotion/circle-menu"
-github "Ramotion/folding-cell"
-github "Ramotion/paper-switch"
-github "Ramotion/paper-onboarding"
-github "Ramotion/preview-transition"
-github "Ramotion/expanding-collection"
-github "Ramotion/animated-tab-bar"
-github "Ramotion/reel-search"
-github "Ramotion/navigation-stack"
-github "ober01/UPCarouselFlowLayout"
-github "eddiekaiger/SwiftyAttributes"
-github "nakiostudio/EasyPeasy"
-github "facebook/pop"
-github "ReactiveX/RxSwift"
-github "RxSwiftCommunity/NSObject-Rx"

Cartfile.resolved

@@ -1,15 +0,0 @@
-github "nakiostudio/EasyPeasy" "1.4"
-github "ReactiveX/RxSwift" "3.0.1"
-github "eddiekaiger/SwiftyAttributes" "v3.0.0"
-github "ober01/UPCarouselFlowLayout" "1.1.1"
-github "Ramotion/animated-tab-bar" "2.1.1"
-github "Ramotion/circle-menu" "2.0.2"
-github "Ramotion/expanding-collection" "1.0.4"
-github "Ramotion/folding-cell" "2.0.2"
-github "Ramotion/navigation-stack" "1.0.0"
-github "Ramotion/paper-onboarding" "2.0.1"
-github "Ramotion/paper-switch" "2.0.2"
-github "facebook/pop" "1.0.9"
-github "Ramotion/preview-transition" "2.0.2"
-github "Ramotion/reel-search" "2.0.2"
-github "RxSwiftCommunity/NSObject-Rx" "2.0.0"

Podfile

@@ -1,24 +1,37 @@
-platform :ios, '10.0'
+platform :ios, '11.0'
 
 target 'Showroom' do
   use_frameworks!
+  inhibit_all_warnings!
 
 pod 'CircleMenu'
 pod 'FoldingCell'
 pod 'RAMPaperSwitch'
 pod 'paper-onboarding'
-pod "PreviewTransition"
+pod 'PreviewTransition'
 pod 'expanding-collection'
 pod 'RAMAnimatedTabBarController'
 pod 'RAMReel'
 pod 'Navigation-stack'
-# pod "UPCarouselFlowLayout"
-pod 'UPCarouselFlowLayout', :git => 'https://github.com/ink-spot/UPCarouselFlowLayout.git'
 pod 'SwiftyAttributes'
-pod "EasyPeasy"
+pod 'EasyPeasy'
 pod 'pop'
 pod 'RxSwift'
 pod 'RxCocoa'
 pod 'NSObject+Rx'
+pod 'Device'
+
+pod 'Firebase/Core'
+pod 'Firebase/Auth'
+pod 'Firebase/Firestore'
+
+pod 'ElongationPreview'
+pod 'GlidingCollection'
+pod 'OAuthSwift'
+pod 'RxAlamofire'
+pod 'Nuke'
+pod 'Gifu'
+pod 'KeychainAccess'
+pod 'MBProgressHUD'
 
 end

Podfile.lock

@@ -1,68 +1,254 @@
 PODS:
-  - CircleMenu (2.0.1)
-  - EasyPeasy (1.4)
-  - expanding-collection (1.0.4)
-  - FoldingCell (2.0.3)
-  - Navigation-stack (1.0.0)
-  - NSObject+Rx (2.0.0):
-    - RxSwift
-  - paper-onboarding (2.0.1)
-  - pop (1.0.9)
-  - PreviewTransition (2.0.1)
-  - RAMAnimatedTabBarController (2.1.1)
-  - RAMPaperSwitch (2.0.2)
-  - RAMReel (2.0.2)
-  - RxCocoa (3.0.1):
-    - RxSwift (~> 3.0)
-  - RxSwift (3.0.1)
-  - SwiftyAttributes (3.0.0)
-  - UPCarouselFlowLayout (1.0.0)
+  - Alamofire (4.8.2)
+  - BoringSSL-GRPC (0.0.2):
+    - BoringSSL-GRPC/Implementation (= 0.0.2)
+    - BoringSSL-GRPC/Interface (= 0.0.2)
+  - BoringSSL-GRPC/Implementation (0.0.2):
+    - BoringSSL-GRPC/Interface (= 0.0.2)
+  - BoringSSL-GRPC/Interface (0.0.2)
+  - CircleMenu (4.1.0)
+  - Device (3.1.2)
+  - EasyPeasy (1.9.0)
+  - ElongationPreview (2.1.0)
+  - expanding-collection (3.1.0)
+  - Firebase/Auth (5.20.2):
+    - Firebase/CoreOnly
+    - FirebaseAuth (= 5.4.2)
+  - Firebase/Core (5.20.2):
+    - Firebase/CoreOnly
+    - FirebaseAnalytics (= 5.8.1)
+  - Firebase/CoreOnly (5.20.2):
+    - FirebaseCore (= 5.4.1)
+  - Firebase/Firestore (5.20.2):
+    - Firebase/CoreOnly
+    - FirebaseFirestore (= 1.2.1)
+  - FirebaseAnalytics (5.8.1):
+    - FirebaseCore (~> 5.4)
+    - FirebaseInstanceID (~> 3.8)
+    - GoogleAppMeasurement (= 5.8.1)
+    - GoogleUtilities/AppDelegateSwizzler (~> 5.2)
+    - GoogleUtilities/MethodSwizzler (~> 5.2)
+    - GoogleUtilities/Network (~> 5.2)
+    - "GoogleUtilities/NSData+zlib (~> 5.2)"
+    - nanopb (~> 0.3)
+  - FirebaseAuth (5.4.2):
+    - FirebaseAuthInterop (~> 1.0)
+    - FirebaseCore (~> 5.2)
+    - GoogleUtilities/Environment (~> 5.2)
+    - GTMSessionFetcher/Core (~> 1.1)
+  - FirebaseAuthInterop (1.0.0)
+  - FirebaseCore (5.4.1):
+    - GoogleUtilities/Environment (~> 5.2)
+    - GoogleUtilities/Logger (~> 5.2)
+  - FirebaseFirestore (1.2.1):
+    - FirebaseAuthInterop (~> 1.0)
+    - FirebaseCore (~> 5.2)
+    - FirebaseFirestore/abseil-cpp (= 1.2.1)
+    - "gRPC-C++ (= 0.0.6)"
+    - leveldb-library (~> 1.20)
+    - nanopb (~> 0.3.901)
+    - Protobuf (~> 3.1)
+  - FirebaseFirestore/abseil-cpp (1.2.1):
+    - FirebaseAuthInterop (~> 1.0)
+    - FirebaseCore (~> 5.2)
+    - "gRPC-C++ (= 0.0.6)"
+    - leveldb-library (~> 1.20)
+    - nanopb (~> 0.3.901)
+    - Protobuf (~> 3.1)
+  - FirebaseInstanceID (3.8.1):
+    - FirebaseCore (~> 5.2)
+    - GoogleUtilities/Environment (~> 5.2)
+    - GoogleUtilities/UserDefaults (~> 5.2)
+  - FoldingCell (5.0.1)
+  - Gifu (3.2.0)
+  - GlidingCollection (2.1.0)
+  - GoogleAppMeasurement (5.8.1):
+    - GoogleUtilities/AppDelegateSwizzler (~> 5.2)
+    - GoogleUtilities/MethodSwizzler (~> 5.2)
+    - GoogleUtilities/Network (~> 5.2)
+    - "GoogleUtilities/NSData+zlib (~> 5.2)"
+    - nanopb (~> 0.3)
+  - GoogleUtilities/AppDelegateSwizzler (5.7.0):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Network
+  - GoogleUtilities/Environment (5.7.0)
+  - GoogleUtilities/Logger (5.7.0):
+    - GoogleUtilities/Environment
+  - GoogleUtilities/MethodSwizzler (5.7.0):
+    - GoogleUtilities/Logger
+  - GoogleUtilities/Network (5.7.0):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (5.7.0)"
+  - GoogleUtilities/Reachability (5.7.0):
+    - GoogleUtilities/Logger
+  - GoogleUtilities/UserDefaults (5.7.0):
+    - GoogleUtilities/Logger
+  - "gRPC-C++ (0.0.6)":
+    - "gRPC-C++/Implementation (= 0.0.6)"
+    - "gRPC-C++/Interface (= 0.0.6)"
+  - "gRPC-C++/Implementation (0.0.6)":
+    - "gRPC-C++/Interface (= 0.0.6)"
+    - gRPC-Core (= 1.17.0)
+    - nanopb (~> 0.3)
+  - "gRPC-C++/Interface (0.0.6)"
+  - gRPC-Core (1.17.0):
+    - gRPC-Core/Implementation (= 1.17.0)
+    - gRPC-Core/Interface (= 1.17.0)
+  - gRPC-Core/Implementation (1.17.0):
+    - BoringSSL-GRPC (= 0.0.2)
+    - gRPC-Core/Interface (= 1.17.0)
+    - nanopb (~> 0.3)
+  - gRPC-Core/Interface (1.17.0)
+  - GTMSessionFetcher/Core (1.2.1)
+  - KeychainAccess (3.2.0)
+  - leveldb-library (1.20)
+  - MBProgressHUD (1.1.0)
+  - nanopb (0.3.901):
+    - nanopb/decode (= 0.3.901)
+    - nanopb/encode (= 0.3.901)
+  - nanopb/decode (0.3.901)
+  - nanopb/encode (0.3.901)
+  - Navigation-stack (3.1.0)
+  - "NSObject+Rx (4.4.1)":
+    - RxSwift (~> 4.3)
+  - Nuke (7.6.1)
+  - OAuthSwift (1.3.0)
+  - paper-onboarding (6.1.3)
+  - pop (1.0.12)
+  - PreviewTransition (4.1.0)
+  - Protobuf (3.7.0)
+  - RAMAnimatedTabBarController (5.0.0)
+  - RAMPaperSwitch (3.1.0)
+  - RAMReel (4.1.0)
+  - RxAlamofire (4.4.1):
+    - RxAlamofire/Core (= 4.4.1)
+  - RxAlamofire/Core (4.4.1):
+    - Alamofire (~> 4.8)
+    - RxSwift (~> 4.5)
+  - RxCocoa (4.5.0):
+    - RxSwift (>= 4.4.2, ~> 4.4)
+  - RxSwift (4.5.0)
+  - SwiftyAttributes (5.1.0)
 
 DEPENDENCIES:
   - CircleMenu
+  - Device
   - EasyPeasy
+  - ElongationPreview
   - expanding-collection
+  - Firebase/Auth
+  - Firebase/Core
+  - Firebase/Firestore
   - FoldingCell
+  - Gifu
+  - GlidingCollection
+  - KeychainAccess
+  - MBProgressHUD
   - Navigation-stack
-  - NSObject+Rx
+  - "NSObject+Rx"
+  - Nuke
+  - OAuthSwift
   - paper-onboarding
   - pop
   - PreviewTransition
   - RAMAnimatedTabBarController
   - RAMPaperSwitch
   - RAMReel
+  - RxAlamofire
   - RxCocoa
   - RxSwift
   - SwiftyAttributes
-  - UPCarouselFlowLayout (from `https://github.com/ink-spot/UPCarouselFlowLayout.git`)
 
-EXTERNAL SOURCES:
-  UPCarouselFlowLayout:
-    :git: https://github.com/ink-spot/UPCarouselFlowLayout.git
-
-CHECKOUT OPTIONS:
-  UPCarouselFlowLayout:
-    :commit: df51f35b7b4df76d283db8dd3c78ac59b542545d
-    :git: https://github.com/ink-spot/UPCarouselFlowLayout.git
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+    - BoringSSL-GRPC
+    - CircleMenu
+    - Device
+    - EasyPeasy
+    - ElongationPreview
+    - expanding-collection
+    - Firebase
+    - FirebaseAnalytics
+    - FirebaseAuth
+    - FirebaseAuthInterop
+    - FirebaseCore
+    - FirebaseFirestore
+    - FirebaseInstanceID
+    - FoldingCell
+    - Gifu
+    - GlidingCollection
+    - GoogleAppMeasurement
+    - GoogleUtilities
+    - "gRPC-C++"
+    - gRPC-Core
+    - GTMSessionFetcher
+    - KeychainAccess
+    - leveldb-library
+    - MBProgressHUD
+    - nanopb
+    - Navigation-stack
+    - "NSObject+Rx"
+    - Nuke
+    - OAuthSwift
+    - paper-onboarding
+    - pop
+    - PreviewTransition
+    - Protobuf
+    - RAMAnimatedTabBarController
+    - RAMPaperSwitch
+    - RAMReel
+    - RxAlamofire
+    - RxCocoa
+    - RxSwift
+    - SwiftyAttributes
 
 SPEC CHECKSUMS:
-  CircleMenu: a964e8b03aae58c84b40d5cf64630b62bef077eb
-  EasyPeasy: c2e49ceb822edc0a5fffefd66240fff10129047d
-  expanding-collection: be78b5822d7382d3da02b52d52273f4661567a64
-  FoldingCell: 2f3113051609167776743415fc00ed877ac6d62c
-  Navigation-stack: 85ac0a7bd4002e7888c528d8817f10ffe2c225da
-  NSObject+Rx: 2a9cd801d9c847e6d2486cbad8d7701b67834e70
-  paper-onboarding: a8e001214d9ce9decf78e160b3823f396dbd51ac
-  pop: f667631a5108a2e60d9e8797c9b32ddaf2080bce
-  PreviewTransition: 2f612e341ccae573a1c08b8521fe19a28fe5d763
-  RAMAnimatedTabBarController: 128e0d71dc802766de575a3c59c6fdcc8e2f921b
-  RAMPaperSwitch: 1b7a2cd640a0e5beda0e280ecb33c5704a3e20d1
-  RAMReel: f9dd6643aaa001b52c55d5fbe4b42170dd271298
-  RxCocoa: 15a52fc590dcc700cb4a690a633b5c5184ce3a78
-  RxSwift: af5680055c4ad04480189c52d28385b1029493a6
-  SwiftyAttributes: 92a9f6512be7a11a2530046220f1c1fbb644e407
-  UPCarouselFlowLayout: adfa361c52315c0efc56dbe2555c494b8940f58a
+  Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
+  BoringSSL-GRPC: 2a230d9cd93e7ce39916044f645cebb31f37dde6
+  CircleMenu: a66095199a5e26f19acbb212f077010257767fe5
+  Device: 62242076214c30fb5760174b3601cefafa70a481
+  EasyPeasy: 19a84ef8f8bbcf925b9fecc29d1d78b7dab96718
+  ElongationPreview: 84b401d349bfcf855e94d6cc6b95d609260b6d96
+  expanding-collection: 7eb1fc48c6ec5e00c8887fe46c595c31b81b578a
+  Firebase: 0c8cf33f266410c61ab3e2265cfa412200351d9c
+  FirebaseAnalytics: ece1aa57a4f43c64d53a648b5a5e05151aae947b
+  FirebaseAuth: dd7bbf03a5aee0eafb3a1aee4d2812bd74bac890
+  FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
+  FirebaseCore: f1a9a8be1aee4bf71a2fc0f4096df6788bdfda61
+  FirebaseFirestore: faca891c0f0d1d6c10c793473e2f6a29d75014b5
+  FirebaseInstanceID: a122b0c258720cf250551bb2bedf48c699f80d90
+  FoldingCell: 9197b915a415af9e52a857964066797af6a51c2b
+  Gifu: 7bcb6427457d85e0b4dff5a84ec5947ac19a93ea
+  GlidingCollection: a15dbd9ec1775c781453bc36e6104d0c9dec20fb
+  GoogleAppMeasurement: ffe513e90551844a739e7bcbb1d2aca1c28a4338
+  GoogleUtilities: 273e67030e0de313e7304f6dcfa96fc5214f6c23
+  "gRPC-C++": e76441995900ac90e9bd98644ab4733f12521edf
+  gRPC-Core: 4028031ed2c5267cca0d846c876d8046b1ecb9b6
+  GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
+  KeychainAccess: 3b1bf8a77eb4c6ea1ce9404c292e48f948954c6b
+  leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5
+  MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
+  nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
+  Navigation-stack: 8fa9f033c2c4fa8aebbbefcd5e204891f68a7bc9
+  "NSObject+Rx": 9884a92f19b610795c431e10b4e601913b59c9e9
+  Nuke: d0782693c570cb4f79e2a187859ef7f06f19365d
+  OAuthSwift: 7ef2f74cb570e1e30e2aeddc58fccc0f3891d057
+  paper-onboarding: 47ded9ede6ae9dd7ec135dddd8bd3e170b79d799
+  pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
+  PreviewTransition: b030422e53d050b0bb05ec05a0629b2aa6c15269
+  Protobuf: 7a877b7f3e5964e3fce995e2eb323dbc6831bb5a
+  RAMAnimatedTabBarController: 6736db7bec2ec74d64059ee9cb40cb9bd281338e
+  RAMPaperSwitch: 4ab6358e37cc90060693f10fb60fb6b73f6492c3
+  RAMReel: 198e41f62d65f54c44797679ade03b4a1cef9709
+  RxAlamofire: ed65f451f5a9a59419b0b9e705043dc01410edd9
+  RxCocoa: cbf70265dc65a981d4ac982e513c10cf23df24a0
+  RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575
+  SwiftyAttributes: 4052d19536cf17f7fa9aead9d7840463ae14da7e
 
-PODFILE CHECKSUM: 5ad265008b8d334bdfe0c409fde02476d76b80f9
+PODFILE CHECKSUM: d7fff2ae7c6a193321d0ab5ece764f8543368c65
 
-COCOAPODS: 1.1.1
+COCOAPODS: 1.6.2

README.md

@@ -1,8 +1,9 @@
 # showroom
-## About
-This project is maintained by Ramotion, Inc.<br>
-We specialize in the designing and coding of custom UI for Mobile Apps and Websites.<br><br>**Looking for developers for your project?** [[▶︎CONTACT OUR TEAM◀︎](http://business.ramotion.com?utm_source=gthb&utm_medium=special&utm_campaign=animated-tab-bar-contact-us/#Get_in_Touch)]
+Once the designers have created a gorgeous UI, you will need a team that will be able to turn this design into a working mobile application or website which will look and work exactly the way you have approved it at the design stage.
 
+Ramotion has been creating interfaces for many years and now we are ready to turn them into working mobile, web, and VR apps. Recently, our mobile application developers have released a [series of Swift controls](https://github.com/ramotion), which quickly gained popularity among mobile developers on Github and allowed Ramotion to become [the # 1 contributor to Swift projects on the platform](http://github-awards.com/users/search?login=ramotion).
+
+We are very pleased that our work has found an echo among different engineers and will continue to develop new controls and make them Open Source. If you are not a software development engineer, you can download our native iOS app - Showroom. Our developers have created it so you can see and evaluate the quality of engineering in our team.
 
 
 [![Animation](https://raw.githubusercontent.com/Ramotion/animated-tab-bar/master/Screenshots/tab-bar-icons-iphone-ramotion-animation-interface-design.gif)](https://github.com/Ramotion/animated-tab-bar)
@@ -18,3 +19,8 @@ Card peek/pop controller
 [![Animation](https://raw.githubusercontent.com/Ramotion/navigation-stack/master/Navigation-Stack.gif)](https://github.com/Ramotion/navigation-stack)
 ##NavigationStack
 Stack-modeled navigation controller
+
+## Play with our UI controls here
+
+
+<a href="https://itunes.apple.com/app/apple-store/id1182360240?pt=550053&ct=gthb-showroom&mt=8" > <img src="https://github.com/Ramotion/navigation-stack/raw/master/Download_on_the_App_Store_Badge_US-UK_135x40.png" width="170" height="58"></a>

Showroom.xcodeproj/xcshareddata/xcschemes/Showroom.xcscheme

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1020"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "84C180C81DAE155300C056F8"
+               BuildableName = "Showroom.app"
+               BlueprintName = "Showroom"
+               ReferencedContainer = "container:Showroom.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "84C180C81DAE155300C056F8"
+            BuildableName = "Showroom.app"
+            BlueprintName = "Showroom"
+            ReferencedContainer = "container:Showroom.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "84C180C81DAE155300C056F8"
+            BuildableName = "Showroom.app"
+            BlueprintName = "Showroom"
+            ReferencedContainer = "container:Showroom.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-_UIConstraintBasedLayoutPlaySoundOnUnsatisfiable YES"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "84C180C81DAE155300C056F8"
+            BuildableName = "Showroom.app"
+            BlueprintName = "Showroom"
+            ReferencedContainer = "container:Showroom.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Showroom.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Showroom/AnimatedTabBar.storyboard

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="15G1108" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="nTR-uO-otv">
-    <device id="retina4_7" orientation="portrait">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="nTR-uO-otv">
+    <device id="retina3_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Item-->
+        <!--Fume-->
         <scene sceneID="qVz-k3-Tvk">
             <objects>
                 <viewController id="7Xx-BE-Sbs" sceneMemberID="viewController">
@@ -18,11 +18,11 @@
                         <viewControllerLayoutGuide type="bottom" id="7fn-45-Qbp"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Lzh-PY-yuy">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FumeAnimation" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pmq-tT-RgP">
-                                <rect key="frame" x="13.5" y="182.5" width="348" height="71"/>
+                                <rect key="frame" x="-14" y="89" width="348" height="71"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="71" id="Usb-kh-lLp"/>
                                     <constraint firstAttribute="width" constant="348" id="bci-uf-WOP"/>
@@ -38,7 +38,7 @@
                             <constraint firstAttribute="centerX" secondItem="pmq-tT-RgP" secondAttribute="centerX" id="iwI-qI-fgK"/>
                         </constraints>
                     </view>
-                    <tabBarItem key="tabBarItem" title="Item" image="drop" id="Gez-4m-5Kv" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
+                    <tabBarItem key="tabBarItem" title="Fume" image="drop" id="Gez-4m-5Kv" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="color" keyPath="textColor">
                                 <color key="value" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -60,7 +60,7 @@
             </objects>
             <point key="canvasLocation" x="1349" y="-239"/>
         </scene>
-        <!--Item1-->
+        <!--Flip-->
         <scene sceneID="uhE-Yc-yfF">
             <objects>
                 <viewController id="42O-Ao-FbU" sceneMemberID="viewController">
@@ -69,11 +69,11 @@
                         <viewControllerLayoutGuide type="bottom" id="Nt4-04-65E"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="YoF-hX-CRc">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TransitionItemAnimation" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AoW-Hw-RSu">
-                                <rect key="frame" x="13.5" y="183.5" width="348" height="71"/>
+                                <rect key="frame" x="-14" y="90" width="348" height="71"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="348" id="53E-wq-v8T"/>
                                     <constraint firstAttribute="height" constant="71" id="KrB-Me-Mu4"/>
@@ -89,7 +89,7 @@
                             <constraint firstAttribute="centerY" secondItem="AoW-Hw-RSu" secondAttribute="centerY" constant="114.5" id="lVu-Tj-IPd"/>
                         </constraints>
                     </view>
-                    <tabBarItem key="tabBarItem" title="Item1" image="icon_pin" id="iSE-Yz-L6y" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
+                    <tabBarItem key="tabBarItem" title="Flip" image="icon_pin" id="iSE-Yz-L6y" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="color" keyPath="textColor">
                                 <color key="value" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -114,7 +114,7 @@
             </objects>
             <point key="canvasLocation" x="1349" y="479"/>
         </scene>
-        <!--Item2-->
+        <!--Rotate-->
         <scene sceneID="dS5-i0-oB3">
             <objects>
                 <viewController id="Imi-R9-fIZ" sceneMemberID="viewController">
@@ -123,11 +123,11 @@
                         <viewControllerLayoutGuide type="bottom" id="Rt3-Zu-Ad3"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="9Q9-Lc-kcp">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="RotationAnimation" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fgc-KC-eWZ">
-                                <rect key="frame" x="13.5" y="183.5" width="348" height="71"/>
+                                <rect key="frame" x="-14" y="90" width="348" height="71"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="348" id="0Yq-EZ-XUo"/>
                                     <constraint firstAttribute="height" constant="71" id="KPJ-MZ-jcy"/>
@@ -143,7 +143,7 @@
                             <constraint firstAttribute="centerY" secondItem="fgc-KC-eWZ" secondAttribute="centerY" constant="114.5" id="T2Z-EI-6dH"/>
                         </constraints>
                     </view>
-                    <tabBarItem key="tabBarItem" title="Item2" image="icon_user" id="efa-Dy-5Tu" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
+                    <tabBarItem key="tabBarItem" title="Rotate" image="icon_user" id="efa-Dy-5Tu" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="color" keyPath="textColor">
                                 <color key="value" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -165,10 +165,10 @@
             </objects>
             <point key="canvasLocation" x="1349" y="1228"/>
         </scene>
-        <!--Animated Tab Bar Controller-->
+        <!--Animated Tab Bar View Controller-->
         <scene sceneID="qSh-1X-lUr">
             <objects>
-                <tabBarController storyboardIdentifier="RAMAnimatedTabBarController" automaticallyAdjustsScrollViewInsets="NO" id="nTR-uO-otv" customClass="RAMAnimatedTabBarController" customModule="RAMAnimatedTabBarController" sceneMemberID="viewController">
+                <tabBarController storyboardIdentifier="RAMAnimatedTabBarController" automaticallyAdjustsScrollViewInsets="NO" id="nTR-uO-otv" customClass="AnimatedTabBarViewController" customModule="Showroom" customModuleProvider="target" sceneMemberID="viewController">
                     <toolbarItems/>
                     <nil key="simulatedBottomBarMetrics"/>
                     <tabBar key="tabBar" contentMode="scaleToFill" id="cYc-q5-Asg">
@@ -188,7 +188,7 @@
             </objects>
             <point key="canvasLocation" x="537" y="479"/>
         </scene>
-        <!--Item4-->
+        <!--Bounce-->
         <scene sceneID="Nvw-78-lIl">
             <objects>
                 <viewController id="pFC-zY-OuJ" customClass="BounceAnimationViewController" customModule="Showroom" customModuleProvider="target" sceneMemberID="viewController">
@@ -197,11 +197,11 @@
                         <viewControllerLayoutGuide type="bottom" id="4e7-2D-z2o"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="rC5-VN-nxu">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bounce Animation" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ddZ-cn-FS6">
-                                <rect key="frame" x="13.5" y="183.5" width="348" height="71"/>
+                                <rect key="frame" x="-14" y="90" width="348" height="71"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="71" id="Jpp-R0-QUY"/>
                                     <constraint firstAttribute="width" constant="348" id="aYR-iI-fOu"/>
@@ -210,23 +210,14 @@
                                 <color key="textColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EqY-Im-oRJ">
-                                <rect key="frame" x="16" y="50" width="35" height="30"/>
-                                <state key="normal" title="done"/>
-                                <connections>
-                                    <action selector="dismisHandler:" destination="pFC-zY-OuJ" eventType="touchUpInside" id="ljU-FN-n6B"/>
-                                </connections>
-                            </button>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="EqY-Im-oRJ" firstAttribute="leading" secondItem="rC5-VN-nxu" secondAttribute="leadingMargin" id="RwM-qY-OmQ"/>
                             <constraint firstAttribute="centerX" secondItem="ddZ-cn-FS6" secondAttribute="centerX" id="Z0u-QU-m8t"/>
-                            <constraint firstItem="EqY-Im-oRJ" firstAttribute="top" secondItem="rC5-VN-nxu" secondAttribute="topMargin" constant="50" id="jXB-gR-nyz"/>
                             <constraint firstAttribute="centerY" secondItem="ddZ-cn-FS6" secondAttribute="centerY" constant="114.5" id="wZD-uz-a6I"/>
                         </constraints>
                     </view>
-                    <tabBarItem key="tabBarItem" title="Item4" image="Settings" id="Eh6-Nj-j6B" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
+                    <tabBarItem key="tabBarItem" title="Bounce" image="Settings" id="Eh6-Nj-j6B" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="color" keyPath="textColor">
                                 <color key="value" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -251,7 +242,7 @@
             </objects>
             <point key="canvasLocation" x="-237" y="1228"/>
         </scene>
-        <!--Item3-->
+        <!--Transform-->
         <scene sceneID="4yz-ST-cNI">
             <objects>
                 <viewController id="OfP-b3-buV" sceneMemberID="viewController">
@@ -260,11 +251,11 @@
                         <viewControllerLayoutGuide type="bottom" id="Oul-xk-NL1"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="6Gk-Oa-ok2">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FrameItemAnimation" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FOS-iI-REq">
-                                <rect key="frame" x="13.5" y="183.5" width="348" height="71"/>
+                                <rect key="frame" x="-14" y="90" width="348" height="71"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="348" id="3uB-b1-tpH"/>
                                     <constraint firstAttribute="height" constant="71" id="epT-Qv-lUg"/>
@@ -280,7 +271,7 @@
                             <constraint firstAttribute="centerX" secondItem="FOS-iI-REq" secondAttribute="centerX" id="xJj-L1-hBL"/>
                         </constraints>
                     </view>
-                    <tabBarItem key="tabBarItem" title="Item3" image="Tools_00028" id="jvs-QR-4qe" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
+                    <tabBarItem key="tabBarItem" title="Transform" image="Tools_00028" id="jvs-QR-4qe" customClass="RAMAnimatedTabBarItem" customModule="RAMAnimatedTabBarController">
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="color" keyPath="textColor">
                                 <color key="value" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

Showroom/AnimationTabBar/AnimatedTabBarViewController.swift

@@ -0,0 +1,26 @@
+//
+//  AnimatedTabBarViewController.swift
+//  Showroom
+//
+//  Created by Abdurahim Jauzee on 23/05/2017.
+//  Copyright © 2017 Alex K. All rights reserved.
+//
+
+import UIKit
+import RAMAnimatedTabBarController
+
+class AnimatedTabBarViewController: RAMAnimatedTabBarController {
+  
+  override func viewDidLoad() {
+    super.viewDidLoad()
+    MenuPopUpViewController.showPopup(on: self, url: Showroom.Control.animationTabBar.sharedURL) { [weak self] in
+      self?.dismiss(animated: true, completion: nil)
+    }
+  }
+  
+  override func viewWillAppear(_ animated: Bool) {
+    super.viewWillAppear(animated)
+    ThingersTapViewController.showPopup(on: self)
+  }
+  
+}

Showroom/AnimationTabBar/BounceAnimationViewController.swift

@@ -12,8 +12,6 @@ class BounceAnimationViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
-        // Do any additional setup after loading the view.
     }
 
   @IBAction func dismisHandler(_ sender: Any) {
@@ -22,18 +20,6 @@ class BounceAnimationViewController: UIViewController {
   }
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
     }
-    
-
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destinationViewController.
-        // Pass the selected object to the new view controller.
-    }
-    */
 
 }

Showroom/AppDelegate.swift

@@ -7,6 +7,9 @@
 //
 
 import UIKit
+import ElongationPreview
+import OAuthSwift
+import RxSwift
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -14,51 +17,78 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   var window: UIWindow?
 
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-    // Override point for customization after application launch.
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        
+        configureNavigationBar()
+        AppAnalytics.configuration([.google])
+        configureElongationPreviewControl()
+        ReelSearchViewModel.shared.initializeDatabase()
     
-    configureNavigationBar()
+        return true
+  }
+}
+
+// MARK: Handle callback url
+extension AppDelegate {
     
-    return true
-  }
-
-  func applicationWillResignActive(_ application: UIApplication) {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
-  }
-
-  func applicationDidEnterBackground(_ application: UIApplication) {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-  }
-
-  func applicationWillEnterForeground(_ application: UIApplication) {
-    // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
-  }
-
-  func applicationDidBecomeActive(_ application: UIApplication) {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-  }
-
-  func applicationWillTerminate(_ application: UIApplication) {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-  }
+    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
+        if (url.host == "oauth") {
+            OAuthSwift.handle(url: url)
+        }
+        return true
+    }
+    
+    func applicationDidBecomeActive(_ application: UIApplication) {
+        let topVC = UIApplication.getTopMostViewController()
+        guard topVC is DribbbleShotsViewController else { return }
+        
+        if KeychainManager.getKeychain() == nil {
+            topVC?.dismiss(animated: true, completion: {
+                let message = "You must be logged in\nto send a shot."
+                UIAlertController.show(message: message, completionAction: { })
+            })
+        }
+    }
 }
 
 extension AppDelegate {
   
-  fileprivate func configureNavigationBar() {
-    //transparent background
-    UINavigationBar.appearance().setBackgroundImage(UIImage(), for: .default)
-    UINavigationBar.appearance().shadowImage = UIImage()
-    UINavigationBar.appearance().isTranslucent = true
-    
-    
-    if let font = UIFont(name: "Avenir-medium" , size: 18) {
-      UINavigationBar.appearance().titleTextAttributes = [
-        NSForegroundColorAttributeName : UIColor.white,
-        NSFontAttributeName : font
-      ]
+    fileprivate func configureNavigationBar() {
+        //transparent background
+        UINavigationBar.appearance().setBackgroundImage(UIImage(), for: .default)
+        UINavigationBar.appearance().shadowImage = UIImage()
+        UINavigationBar.appearance().isTranslucent = true
+        
+        
+        if let font = UIFont(name: "Avenir-medium", size: 18) {
+            UINavigationBar.appearance().titleTextAttributes = [
+                NSAttributedString.Key.foregroundColor: UIColor.white,
+                NSAttributedString.Key.font: font,
+            ]
+        }
     }
+    
+  fileprivate func configureElongationPreviewControl() {
+    // Customize ElongationConfig
+    var config = ElongationConfig()
+    config.scaleViewScaleFactor = 0.9
+    config.topViewHeight = 190
+    config.bottomViewHeight = 170
+    config.bottomViewOffset = 20
+    config.parallaxFactor = 100
+    config.separatorHeight = 0.5
+    config.separatorColor = UIColor.white
+    
+    // Durations for presenting/dismissing detail screen
+    config.detailPresentingDuration = 0.4
+    config.detailDismissingDuration = 0.4
+    
+    // Customize behaviour
+    config.headerTouchAction = .collpaseOnBoth
+    
+    // Save created appearance object as default
+    ElongationConfig.shared = config
   }
+  
 }