diff --git a/KanjiRyokucha.xcodeproj/project.pbxproj b/KanjiRyokucha.xcodeproj/project.pbxproj index 6e40357..cb3fb31 100644 --- a/KanjiRyokucha.xcodeproj/project.pbxproj +++ b/KanjiRyokucha.xcodeproj/project.pbxproj @@ -3,11 +3,10 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ - C402B4CA2774D0EE007745A9 /* UIColorHexSwift in Embed Frameworks */ = {isa = PBXBuildFile; productRef = C48646AA27712603007775FE /* UIColorHexSwift */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; C409A19D1E86011E006EEE77 /* Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4603DF21E6B27C800A56C9A /* Database.swift */; }; C409A19E1E86011E006EEE77 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4758A031DF395F00019AF57 /* Colors.swift */; }; C409A19F1E86011E006EEE77 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F213B71DEA532900EF5214 /* AppDelegate.swift */; }; @@ -103,6 +102,7 @@ C43DCC3D1E552ED8006F2C0C /* StudyEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43DCC3C1E552ED8006F2C0C /* StudyEntry.swift */; }; C43DCC421E57D6B4006F2C0C /* StudyPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43DCC401E57D6B3006F2C0C /* StudyPageViewController.swift */; }; C43DCC461E57E4C1006F2C0C /* StudyCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C43DCC441E57E4C1006F2C0C /* StudyCell.swift */; }; + C43E80C52AD1BB4B001640B2 /* UIColorHexSwift in Frameworks */ = {isa = PBXBuildFile; productRef = C43E80C42AD1BB4B001640B2 /* UIColorHexSwift */; }; C44D2ACD1DF33BFE00EB935F /* LoginRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44D2ACC1DF33BFE00EB935F /* LoginRequest.swift */; }; C44D2ACF1DF3475E00EB935F /* GetStatusRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44D2ACE1DF3475D00EB935F /* GetStatusRequest.swift */; }; C44F752B1E8DDEDE00E00AD9 /* StudyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44F75291E8DDEDE00E00AD9 /* StudyViewController.swift */; }; @@ -183,7 +183,6 @@ C47589FE1DF3659C0019AF57 /* SRSViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C47589FC1DF3659C0019AF57 /* SRSViewController.xib */; }; C4758A041DF395F00019AF57 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4758A031DF395F00019AF57 /* Colors.swift */; }; C4758A071DF63F8D0019AF57 /* Global.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4758A061DF63F8D0019AF57 /* Global.swift */; }; - C48646AB27712603007775FE /* UIColorHexSwift in Frameworks */ = {isa = PBXBuildFile; productRef = C48646AA27712603007775FE /* UIColorHexSwift */; settings = {ATTRIBUTES = (Required, ); }; }; C48A85DA1EB4DCEE00778445 /* AccountInfoRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48A85D91EB4DCED00778445 /* AccountInfoRequest.swift */; }; C48A85DB1EB4DCEE00778445 /* AccountInfoRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48A85D91EB4DCED00778445 /* AccountInfoRequest.swift */; }; C48A85DC1EB4DCEE00778445 /* AccountInfoRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C48A85D91EB4DCED00778445 /* AccountInfoRequest.swift */; }; @@ -272,7 +271,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - C402B4CA2774D0EE007745A9 /* UIColorHexSwift in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -398,7 +396,7 @@ buildActionMask = 2147483647; files = ( C4735D7627712A3D00F2A927 /* RealmSwift in Frameworks */, - C48646AB27712603007775FE /* UIColorHexSwift in Frameworks */, + C43E80C52AD1BB4B001640B2 /* UIColorHexSwift in Frameworks */, C4735D702771275700F2A927 /* PKHUD in Frameworks */, C4735D732771280200F2A927 /* SwiftRater in Frameworks */, C4735D7927712B2E00F2A927 /* ReactiveCocoa in Frameworks */, @@ -668,11 +666,11 @@ ); name = KanjiRyokucha; packageProductDependencies = ( - C48646AA27712603007775FE /* UIColorHexSwift */, C4735D6F2771275700F2A927 /* PKHUD */, C4735D722771280200F2A927 /* SwiftRater */, C4735D7527712A3D00F2A927 /* RealmSwift */, C4735D7827712B2E00F2A927 /* ReactiveCocoa */, + C43E80C42AD1BB4B001640B2 /* UIColorHexSwift */, ); productName = KanjiRyokucha; productReference = C4F213B41DEA532900EF5214 /* KanjiRyokucha.app */; @@ -1107,12 +1105,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = UHVS3L828Q; INFOPLIST_FILE = "$(SRCROOT)/KanjiRyokucha/DEV-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.5.2; + MARKETING_VERSION = 4.0; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DDEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.gbuela.KanjiRyokuchaDEV; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1127,12 +1125,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = UHVS3L828Q; INFOPLIST_FILE = "$(SRCROOT)/KanjiRyokucha/DEV-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.5.2; + MARKETING_VERSION = 4.0; PRODUCT_BUNDLE_IDENTIFIER = com.gbuela.KanjiRyokuchaDEV; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1205,12 +1203,12 @@ CURRENT_PROJECT_VERSION = 58; DEVELOPMENT_TEAM = UHVS3L828Q; INFOPLIST_FILE = KanjiRyokucha/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.5.2; + MARKETING_VERSION = 4.0; PRODUCT_BUNDLE_IDENTIFIER = com.gbuela.KanjiRyokucha; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1227,12 +1225,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = UHVS3L828Q; INFOPLIST_FILE = "$(SRCROOT)/KanjiRyokucha/DEV-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.5.2; + MARKETING_VERSION = 4.0; PRODUCT_BUNDLE_IDENTIFIER = com.gbuela.KanjiRyokuchaDEV; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1248,12 +1246,12 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = UHVS3L828Q; INFOPLIST_FILE = "$(SRCROOT)/KanjiRyokucha/Staging-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.5.2; + MARKETING_VERSION = 4.0; PRODUCT_BUNDLE_IDENTIFIER = com.gbuela.KanjiRyokuchaSTAGING; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1307,12 +1305,12 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = UHVS3L828Q; INFOPLIST_FILE = "$(SRCROOT)/KanjiRyokucha/Staging-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.5.2; + MARKETING_VERSION = 4.0; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DDEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.gbuela.KanjiRyokuchaSTAGING; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1330,12 +1328,12 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = UHVS3L828Q; INFOPLIST_FILE = "$(SRCROOT)/KanjiRyokucha/Staging-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.5.2; + MARKETING_VERSION = 4.0; PRODUCT_BUNDLE_IDENTIFIER = com.gbuela.KanjiRyokuchaSTAGING; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1509,12 +1507,12 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = UHVS3L828Q; INFOPLIST_FILE = KanjiRyokucha/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.5.2; + MARKETING_VERSION = 4.0; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DDEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.gbuela.KanjiRyokucha; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1537,12 +1535,12 @@ CURRENT_PROJECT_VERSION = 58; DEVELOPMENT_TEAM = UHVS3L828Q; INFOPLIST_FILE = KanjiRyokucha/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.5.2; + MARKETING_VERSION = 4.0; PRODUCT_BUNDLE_IDENTIFIER = com.gbuela.KanjiRyokucha; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1697,6 +1695,11 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + C43E80C42AD1BB4B001640B2 /* UIColorHexSwift */ = { + isa = XCSwiftPackageProductDependency; + package = C48646A927712603007775FE /* XCRemoteSwiftPackageReference "UIColor-Hex-Swift" */; + productName = UIColorHexSwift; + }; C4735D6F2771275700F2A927 /* PKHUD */ = { isa = XCSwiftPackageProductDependency; package = C4735D6E2771275700F2A927 /* XCRemoteSwiftPackageReference "PKHUD" */; @@ -1717,11 +1720,6 @@ package = C4735D7727712B2E00F2A927 /* XCRemoteSwiftPackageReference "ReactiveCocoa" */; productName = ReactiveCocoa; }; - C48646AA27712603007775FE /* UIColorHexSwift */ = { - isa = XCSwiftPackageProductDependency; - package = C48646A927712603007775FE /* XCRemoteSwiftPackageReference "UIColor-Hex-Swift" */; - productName = UIColorHexSwift; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = C4F213AC1DEA532900EF5214 /* Project object */; diff --git a/KanjiRyokucha.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/KanjiRyokucha.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5316925..2395906 100644 --- a/KanjiRyokucha.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/KanjiRyokucha.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,70 +1,68 @@ { - "object": { - "pins": [ - { - "package": "PKHUD", - "repositoryURL": "https://github.com/pkluz/PKHUD", - "state": { - "branch": null, - "revision": "8fd26f23057c6bebd6695524b1c3e05e93aba571", - "version": "5.4.0" - } - }, - { - "package": "ReactiveCocoa", - "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveCocoa", - "state": { - "branch": "master", - "revision": "8a5b07b18c6abb8e12fb845bf742675dc4914ed8", - "version": null - } - }, - { - "package": "ReactiveSwift", - "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift", - "state": { - "branch": null, - "revision": "efb2f0a6f6c8739cce8fb14148a5bd3c83f2f91d", - "version": "7.0.0" - } - }, - { - "package": "RealmDatabase", - "repositoryURL": "https://github.com/realm/realm-core", - "state": { - "branch": null, - "revision": "6b81f1a7a2d421f9e0b9e7f04e76bcf736a54409", - "version": "11.9.0" - } - }, - { - "package": "Realm", - "repositoryURL": "https://github.com/realm/realm-swift", - "state": { - "branch": null, - "revision": "9dff9f2862240d521ad6ad599541269177ddb993", - "version": "10.22.0" - } - }, - { - "package": "SwiftRater", - "repositoryURL": "https://github.com/takecian/SwiftRater", - "state": { - "branch": null, - "revision": "3002392aab212ab5e68c80ba9f8d5c0ef035c260", - "version": "1.9.1" - } - }, - { - "package": "UIColorHexSwift", - "repositoryURL": "https://github.com/yeahdongcn/UIColor-Hex-Swift", - "state": { - "branch": null, - "revision": "304ae671f4db4208a13999bbe026b1869ad614de", - "version": "5.1.7" - } + "pins" : [ + { + "identity" : "pkhud", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pkluz/PKHUD", + "state" : { + "revision" : "8fd26f23057c6bebd6695524b1c3e05e93aba571", + "version" : "5.4.0" } - ] - }, - "version": 1 + }, + { + "identity" : "reactivecocoa", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ReactiveCocoa/ReactiveCocoa", + "state" : { + "branch" : "master", + "revision" : "1b014240bad02886b6954796f949765e34327212" + } + }, + { + "identity" : "reactiveswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ReactiveCocoa/ReactiveSwift", + "state" : { + "revision" : "40c465af19b993344e84355c00669ba2022ca3cd", + "version" : "7.1.1" + } + }, + { + "identity" : "realm-core", + "kind" : "remoteSourceControl", + "location" : "https://github.com/realm/realm-core.git", + "state" : { + "revision" : "e836317e8238bd32f06086dd7ce6768ef574beb6", + "version" : "13.22.0" + } + }, + { + "identity" : "realm-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/realm/realm-swift", + "state" : { + "revision" : "8249489f28d36f9f37ed076c95029059c60b556d", + "version" : "10.43.0" + } + }, + { + "identity" : "swiftrater", + "kind" : "remoteSourceControl", + "location" : "https://github.com/takecian/SwiftRater", + "state" : { + "revision" : "3002392aab212ab5e68c80ba9f8d5c0ef035c260", + "version" : "1.9.1" + } + }, + { + "identity" : "uicolor-hex-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/yeahdongcn/UIColor-Hex-Swift", + "state" : { + "revision" : "f37f97bc1a5b545b39ab5330e133e56fa4f38cff", + "version" : "5.1.9" + } + } + ], + "version" : 2 } diff --git a/KanjiRyokucha/Assets.xcassets/promoBanner.imageset/Contents.json b/KanjiRyokucha/Assets.xcassets/promoBanner.imageset/Contents.json new file mode 100644 index 0000000..51a9a05 --- /dev/null +++ b/KanjiRyokucha/Assets.xcassets/promoBanner.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "banner-english.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/KanjiRyokucha/Assets.xcassets/promoBanner.imageset/banner-english.png b/KanjiRyokucha/Assets.xcassets/promoBanner.imageset/banner-english.png new file mode 100644 index 0000000..e191585 Binary files /dev/null and b/KanjiRyokucha/Assets.xcassets/promoBanner.imageset/banner-english.png differ diff --git a/KanjiRyokucha/SRSViewController.xib b/KanjiRyokucha/SRSViewController.xib index 742352b..9c62ab1 100644 --- a/KanjiRyokucha/SRSViewController.xib +++ b/KanjiRyokucha/SRSViewController.xib @@ -1,8 +1,9 @@ - - + + - + + @@ -32,73 +33,32 @@ - + - - - - - + + - - - - - - - - - - - - - - + - - - - - - - - + + + - - - - + - + @@ -109,7 +69,7 @@ for iPhone and iPad @@ -145,7 +105,7 @@ for iPhone and iPad - + @@ -157,7 +117,7 @@ for iPhone and iPad @@ -193,7 +153,7 @@ for iPhone and iPad - + @@ -204,7 +164,7 @@ for iPhone and iPad @@ -247,7 +207,7 @@ for iPhone and iPad - + @@ -299,7 +267,6 @@ for iPhone and iPad - @@ -314,6 +281,7 @@ for iPhone and iPad + @@ -331,10 +299,10 @@ for iPhone and iPad + - @@ -350,26 +318,26 @@ for iPhone and iPad + - - - + + - + - + - +