Skip to content

Commit

Permalink
Show the navigation bar during appearance.
Browse files Browse the repository at this point in the history
  • Loading branch information
amyleecodes committed Jul 13, 2017
1 parent ed0e1fe commit 785628a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions Library/SwiftyGiphyViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ public class SwiftyGiphyViewController: UIViewController {

public override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)

self.navigationController?.setNavigationBarHidden(false, animated: animated)

if self.navigationController?.viewControllers.count == 1 && self.navigationController?.presentingViewController != nil
{
Expand Down
8 changes: 4 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PODS:
- SDWebImage/GIF (4.0.0):
- FLAnimatedImage (~> 1.0)
- SDWebImage/Core
- SwiftyGiphy (1.0.1):
- SwiftyGiphy (1.0.8):
- FLAnimatedImage (~> 1.0)
- NSTimer-Blocks
- ObjectMapper (~> 2.2)
Expand All @@ -17,15 +17,15 @@ DEPENDENCIES:

EXTERNAL SOURCES:
SwiftyGiphy:
:path: ../SwiftyGiphy
:path: "../SwiftyGiphy"

SPEC CHECKSUMS:
FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
NSTimer-Blocks: 88faf9aef5f250ead087f3f67ae642517083bf36
ObjectMapper: 81d0e5d7c57129e3e93f29a04bdf9669542b37d2
SDWebImage: 76a6348bdc74eb5a55dd08a091ef298e56b55e41
SwiftyGiphy: f6c392d12c0e1553407a32a2c0e389ec58005ba3
SwiftyGiphy: 35f60c50a2e775c77260ddbd141d149a3f5f6baa

PODFILE CHECKSUM: 99ae6577f47a8d8b2d37875a1c21f2c41e5295fb

COCOAPODS: 1.2.0
COCOAPODS: 1.2.1
2 changes: 1 addition & 1 deletion SwiftyGiphy.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'SwiftyGiphy'
s.version = '1.0.8'
s.version = '1.0.9'
s.summary = 'Provides a UI and API layer for Giphy discovery and integration.'

# This description is used to generate tags and improve search results.
Expand Down
2 changes: 1 addition & 1 deletion SwiftyGiphy.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
C42C1016CF1E162D2AACBF98 /* [CP] Copy Pods Resources */ = {
Expand Down

0 comments on commit 785628a

Please sign in to comment.