Skip to content

Commit

Permalink
Merge pull request #91 from pyconjp/release/v2.0.2
Browse files Browse the repository at this point in the history 
Release v2.0.2
  • Loading branch information
@yutailang0119
yutailang0119 authored Nov 4, 2017
2 parents 3816790 + 2af0367 commit 5232dbb
Show file tree
Hide file tree
Showing 74 changed files with 432 additions and 429 deletions.
52 changes: 38 additions & 14 deletions PyConJP.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1053,34 +1053,36 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0810;
LastUpgradeCheck = 0810;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = "PyCon JP";
TargetAttributes = {
DB77FD491E06720C00504869 = {
CreatedOnToolsVersion = 8.1;
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
};
DB77FD511E06720D00504869 = {
CreatedOnToolsVersion = 8.1;
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
TestTargetID = DBA1C0A81C7228E2004F0C8D;
};
DBA1C0A81C7228E2004F0C8D = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = KP7AT73S3W;
LastSwiftMigration = 0800;
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
};
DBA1C0BC1C7228E2004F0C8D = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = 3T8B5JQDB8;
LastSwiftMigration = 0800;
LastSwiftMigration = 0900;
TestTargetID = DBA1C0A81C7228E2004F0C8D;
};
DBA1C0C71C7228E2004F0C8D = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = 3T8B5JQDB8;
LastSwiftMigration = 0800;
LastSwiftMigration = 0900;
TestTargetID = DBA1C0A81C7228E2004F0C8D;
};
};
Expand Down Expand Up @@ -1526,7 +1528,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -1558,7 +1561,8 @@
PRODUCT_BUNDLE_IDENTIFIER = jp.pycon.WebAPIFramework;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand All @@ -1577,7 +1581,8 @@
PRODUCT_BUNDLE_IDENTIFIER = jp.pycon.WebAPIFrameworkTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PyConJP.app/PyConJP";
};
name = Debug;
Expand All @@ -1594,7 +1599,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = jp.pycon.WebAPIFrameworkTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PyConJP.app/PyConJP";
};
name = Release;
Expand All @@ -1608,14 +1614,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -1656,14 +1668,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -1708,7 +1726,8 @@
PRODUCT_BUNDLE_IDENTIFIER = jp.pycon.pyconjp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Debug;
Expand All @@ -1732,7 +1751,8 @@
PRODUCT_BUNDLE_IDENTIFIER = jp.pycon.pyconjp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Release;
Expand All @@ -1751,7 +1771,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = yutaro.PyConJPTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PyConJP.app/PyConJP";
};
name = Debug;
Expand All @@ -1770,7 +1791,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = yutaro.PyConJPTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PyConJP.app/PyConJP";
};
name = Release;
Expand All @@ -1789,7 +1811,8 @@
PRODUCT_BUNDLE_IDENTIFIER = yutaro.PyConJPUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TEST_TARGET_NAME = PyConJP;
USES_XCTRUNNER = YES;
};
Expand All @@ -1809,7 +1832,8 @@
PRODUCT_BUNDLE_IDENTIFIER = yutaro.PyConJPUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TEST_TARGET_NAME = PyConJP;
USES_XCTRUNNER = YES;
};
Expand Down
4 changes: 3 additions & 1 deletion PyConJP.xcodeproj/xcshareddata/xcschemes/PyConJP.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand Down Expand Up @@ -75,6 +76,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
7 changes: 5 additions & 2 deletions PyConJP/Application/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate, ReceiveLocalNotificationP

UINavigationBar.appearance().barTintColor = UIColor.PyConJP2017.navy
UINavigationBar.appearance().tintColor = .white
UINavigationBar.appearance().titleTextAttributes = [NSForegroundColorAttributeName: UIColor.white]
UINavigationBar.appearance().titleTextAttributes = [NSAttributedStringKey.foregroundColor: UIColor.white]
if #available(iOS 11.0, *) {
UINavigationBar.appearance().largeTitleTextAttributes = [NSAttributedStringKey.foregroundColor: UIColor.white]
}

UITabBar.appearance().tintColor = UIColor.PyConJP2017.yellow
UITabBarItem.appearance().setTitleTextAttributes([NSFontAttributeName: UIFont.boldSystemFont(ofSize: 10), NSForegroundColorAttributeName: UIColor.PyConJP2017.yellow], for: .selected)
UITabBarItem.appearance().setTitleTextAttributes([NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: 10), NSAttributedStringKey.foregroundColor: UIColor.PyConJP2017.yellow], for: .selected)

let configuration = Realm.Configuration(schemaVersion: 1, deleteRealmIfMigrationNeeded: true)
Realm.Configuration.defaultConfiguration = configuration
Expand Down
6 changes: 3 additions & 3 deletions PyConJP/Assets.xcassets/App/Icon/BarItem/BookmarkCollections.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "bookmark_collections.png",
"filename" : "bookmark_collections@1x.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "bookmark_collections2x.png",
"filename" : "bookmark_collections@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "bookmark_collections3x.png",
"filename" : "bookmark_collections@3x.png",
"scale" : "3x"
}
],
Expand Down
0 ...ections.imageset/bookmark_collections.png → ...ions.imageset/bookmark_collections@1x.png
View file
File renamed without changes
0 ...tions.imageset/bookmark_collections2x.png → ...ions.imageset/bookmark_collections@2x.png
View file
File renamed without changes
0 ...tions.imageset/bookmark_collections3x.png → ...ions.imageset/bookmark_collections@3x.png
View file
File renamed without changes
6 changes: 3 additions & 3 deletions PyConJP/Assets.xcassets/App/Icon/BarItem/Conference.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "record_voice_over.png",
"filename" : "record_voice_over@1x.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "record_voice_over2x.png",
"filename" : "record_voice_over@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "record_voice_over3x.png",
"filename" : "record_voice_over@3x.png",
"scale" : "3x"
}
],
Expand Down
0 ...Conference.imageset/record_voice_over.png → ...ference.imageset/record_voice_over@1x.png
View file
File renamed without changes
0 ...nference.imageset/record_voice_over2x.png → ...ference.imageset/record_voice_over@2x.png
View file
File renamed without changes
0 ...nference.imageset/record_voice_over3x.png → ...ference.imageset/record_voice_over@3x.png
View file
File renamed without changes
6 changes: 3 additions & 3 deletions PyConJP/Assets.xcassets/App/Icon/BarItem/Events.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "view_list.png",
"filename" : "view_list@1x.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "view_list2x.png",
"filename" : "view_list@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "view_list3x.png",
"filename" : "view_list@3x.png",
"scale" : "3x"
}
],
Expand Down
0 ...con/BarItem/Events.imageset/view_list.png → .../BarItem/Events.imageset/view_list@1x.png
View file
File renamed without changes
0 ...n/BarItem/Events.imageset/view_list2x.png → .../BarItem/Events.imageset/view_list@2x.png
View file
File renamed without changes
0 ...n/BarItem/Events.imageset/view_list3x.png → .../BarItem/Events.imageset/view_list@3x.png
View file
File renamed without changes
6 changes: 3 additions & 3 deletions PyConJP/Assets.xcassets/App/Icon/BarItem/More.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "more_horiz.png",
"filename" : "more_horiz@1x.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "more_horiz2x.png",
"filename" : "more_horiz@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "more_horiz3x.png",
"filename" : "more_horiz@3x.png",
"scale" : "3x"
}
],
Expand Down
0 ...Icon/BarItem/More.imageset/more_horiz.png → ...n/BarItem/More.imageset/more_horiz@1x.png
View file
File renamed without changes
0 ...on/BarItem/More.imageset/more_horiz2x.png → ...n/BarItem/More.imageset/more_horiz@2x.png
View file
File renamed without changes
0 ...on/BarItem/More.imageset/more_horiz3x.png → ...n/BarItem/More.imageset/more_horiz@3x.png
View file
File renamed without changes
6 changes: 3 additions & 3 deletions PyConJP/Assets.xcassets/App/Icon/Talk/BookmarkOff.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "bookmark_off.png",
"filename" : "bookmark_off@1x.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "bookmark_off2x.png",
"filename" : "bookmark_off@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "bookmark_off3x.png",
"filename" : "bookmark_off@3x.png",
"scale" : "3x"
}
],
Expand Down
0 ...alk/BookmarkOff.imageset/bookmark_off.png → .../BookmarkOff.imageset/bookmark_off@1x.png
View file
File renamed without changes
0 ...k/BookmarkOff.imageset/bookmark_off2x.png → .../BookmarkOff.imageset/bookmark_off@2x.png
View file
File renamed without changes
0 ...k/BookmarkOff.imageset/bookmark_off3x.png → .../BookmarkOff.imageset/bookmark_off@3x.png
View file
File renamed without changes
6 changes: 3 additions & 3 deletions PyConJP/Assets.xcassets/App/Icon/Talk/BookmarkOn.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "bookmark_on.png",
"filename" : "bookmark_on@1x.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "bookmark_on2x.png",
"filename" : "bookmark_on@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "bookmark_on3x.png",
"filename" : "bookmark_on@3x.png",
"scale" : "3x"
}
],
Expand Down
0 .../Talk/BookmarkOn.imageset/bookmark_on.png → ...lk/BookmarkOn.imageset/bookmark_on@1x.png
View file
File renamed without changes
0 ...alk/BookmarkOn.imageset/bookmark_on2x.png → ...lk/BookmarkOn.imageset/bookmark_on@2x.png
View file
File renamed without changes
0 ...alk/BookmarkOn.imageset/bookmark_on3x.png → ...lk/BookmarkOn.imageset/bookmark_on@3x.png
View file
File renamed without changes
6 changes: 3 additions & 3 deletions PyConJP/Assets.xcassets/App/Icon/Talk/Clock.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "clock.png",
"filename" : "clock@1x.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "clock2x.png",
"filename" : "clock@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "clock3x.png",
"filename" : "clock@3x.png",
"scale" : "3x"
}
],
Expand Down
0 ...ts/App/Icon/Talk/Clock.imageset/clock.png → ...App/Icon/Talk/Clock.imageset/clock@1x.png
View file
File renamed without changes
0 .../App/Icon/Talk/Clock.imageset/clock2x.png → ...App/Icon/Talk/Clock.imageset/clock@2x.png
View file
File renamed without changes
0 .../App/Icon/Talk/Clock.imageset/clock3x.png → ...App/Icon/Talk/Clock.imageset/clock@3x.png
View file
File renamed without changes
6 changes: 3 additions & 3 deletions PyConJP/Assets.xcassets/App/Icon/Talk/Pin.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "place.png",
"filename" : "place@1x.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "place2x.png",
"filename" : "place@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "place3x.png",
"filename" : "place@3x.png",
"scale" : "3x"
}
],
Expand Down
0 ...sets/App/Icon/Talk/Pin.imageset/place.png → ...s/App/Icon/Talk/Pin.imageset/place@1x.png
View file
File renamed without changes
0 ...ts/App/Icon/Talk/Pin.imageset/place2x.png → ...s/App/Icon/Talk/Pin.imageset/place@2x.png
View file
File renamed without changes
0 ...ts/App/Icon/Talk/Pin.imageset/place3x.png → ...s/App/Icon/Talk/Pin.imageset/place@3x.png
View file
File renamed without changes
Loading

0 comments on commit 5232dbb

Please sign in to comment.