Skip to content

modal blocked #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
juangdelvalle wants to merge 12 commits into from
Closed

modal blocked #84

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a871e6b
Fix blocked modal when dismissed with drag down gesture
juangdelvalle Feb 18, 2020
0b99e61
Update podspec
juangdelvalle Feb 18, 2020
b62c185
Update project to Swift 5
juangdelvalle Feb 18, 2020
3266765
PR feedback
juangdelvalle Mar 5, 2020
914e35a
remove specific version of swift on podspec to pass CI
juangdelvalle Apr 23, 2020
3226b4a
update .yml to pass CI
juangdelvalle Apr 23, 2020
8f9c674
add swift associated versions on podspec
juangdelvalle Apr 23, 2020
c96eaf2
increase retries to avoid stalled build
juangdelvalle Apr 23, 2020
60c0449
update pods to avoid build stalls
juangdelvalle Apr 23, 2020
f1b26a6
update example project to latest swift
juangdelvalle Apr 23, 2020
e7daf59
update cocoapods
juangdelvalle Apr 23, 2020
09e0a31
remove swift specific version on podspec
juangdelvalle Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .swift-version
View file
Open in desktop

This file was deleted.

25 changes: 10 additions & 15 deletions Yoshi.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,21 @@
#

Pod::Spec.new do |s|
s.name = "Yoshi"
s.version = "3.0.0"
s.summary = "A helpful companion for your iOS app."

# This description is used to generate tags and improve search results.
# * Think: What does it do? Why did you write it? What is the focus?
# * Try to keep it short, snappy and to the point.
# * Write the description between the DESC delimiters below.
# * Finally, don't worry about the indent, CocoaPods strips it!
s.name = 'Yoshi'
s.version = '3.0.1'
s.summary = 'A helpful companion for your iOS app.'
s.license = 'MIT'

@MichaelCampbell MichaelCampbell Feb 28, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we no longer link reference the license file?

@juangdelvalle juangdelvalle Mar 5, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as I understand, is no longer required to make a reference to a license file, but I can change it to make the reference anyway.

s.homepage = 'https://github.com/prolificinteractive/Yoshi'
s.authors = { 'Michael Campbell' => 'Michael@prolificinteractive.com' , 'Luna An' => 'luna@prolificinteractive.com'}
s.source = { :git => "https://github.com/prolificinteractive/Yoshi.git", :tag => s.version }
s.screenshots = 'https://raw.githubusercontent.com/prolificinteractive/Yoshi/a6e85e87cbd67f2bb3bfe60157e7b13281d80f20/Images/Yoshi.png", "https://raw.githubusercontent.com/prolificinteractive/Yoshi/c66cdf8dc2ab643fe57996d20d3cd37b8b70ceff/Images/Yoshi_iPad.png'
s.description = <<-DESC
Yoshi is a convenient wrapper around the UI code that is often needed for displaying debug menus. Out of the box, Yoshi provides easy-to-implement date, list and custom menus.
DESC

s.homepage = "https://github.com/prolificinteractive/Yoshi"
s.screenshots = "https://raw.githubusercontent.com/prolificinteractive/Yoshi/a6e85e87cbd67f2bb3bfe60157e7b13281d80f20/Images/Yoshi.png", "https://raw.githubusercontent.com/prolificinteractive/Yoshi/c66cdf8dc2ab643fe57996d20d3cd37b8b70ceff/Images/Yoshi_iPad.png"
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { "Michael Campbell" => "Michael@prolificinteractive.com" , "Luna An" => "luna@prolificinteractive.com"}
s.source = { :git => "https://github.com/prolificinteractive/Yoshi.git", :tag => s.version.to_s }
s.ios.deployment_target = '8.0'
s.swift_versions = ['4.2', '5.0', '5.1']

@paulmiard paulmiard Mar 5, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is an open PR that takes care of Swift 5 changes. Don't we need to merge it before adding 5.x to the list?
See #83

@juangdelvalle juangdelvalle Mar 5, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR I also migrated the code to Swift 5 (the other PR wasn't approved yet so I thought about killing two birds with the same stone)

@paulmiard paulmiard Mar 5, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't look at the details in the other PR but looked like there was more going on. Are you saying the other PR can be declined all together once this is merged? I guess I will diff it to see what else was in there once we merge but happy to hear your thoughts


s.platform = :ios, '8.0'

@MichaelCampbell MichaelCampbell Feb 28, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is platform no longer required?

@juangdelvalle juangdelvalle Mar 5, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

platform is now specified in s.ios.deployment_target = '8.0'

s.requires_arc = true

# Default subspec that contains all shared code files for the library
Expand Down
23 changes: 16 additions & 7 deletions Yoshi/Yoshi.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,20 +353,21 @@
TargetAttributes = {
276BCEA01C29A6EF002138C7 = {
CreatedOnToolsVersion = 7.2;
LastSwiftMigration = 0900;
LastSwiftMigration = 1130;
};
276BCEAA1C29A6EF002138C7 = {
CreatedOnToolsVersion = 7.2;
LastSwiftMigration = 0900;
LastSwiftMigration = 1130;
};
};
};
buildConfigurationList = 276BCE9B1C29A6EF002138C7 /* Build configuration list for PBXProject "Yoshi" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 276BCE971C29A6EF002138C7;
productRefGroup = 276BCEA21C29A6EF002138C7 /* Products */;
Expand Down Expand Up @@ -561,64 +562,72 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Yoshi/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 3.0.1;
PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.Yoshi;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
276BCEB71C29A6EF002138C7 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Yoshi/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 3.0.1;
PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.Yoshi;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
276BCEB91C29A6EF002138C7 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = YoshiTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.YoshiTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
276BCEBA1C29A6EF002138C7 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = YoshiTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.YoshiTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
7 changes: 6 additions & 1 deletion Yoshi/Yoshi/YoshiConfigurationManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

/// The configuration manager for the debug menu.
final class YoshiConfigurationManager {
final class YoshiConfigurationManager: NSObject, UIAdaptivePresentationControllerDelegate {

/// The default instance.
static let sharedInstance = YoshiConfigurationManager()
Expand Down Expand Up @@ -131,12 +131,17 @@ final class YoshiConfigurationManager {
})
})

navigationController.presentationController?.delegate = self
navigationController.modalPresentationStyle = .formSheet
navigationController.setViewControllers([debugViewController], animated: false)

rootViewController.present(navigationController, animated: true, completion: nil)
self.debugViewController = debugViewController
}
}

func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
dismiss()
}

}