From c2dd4e758e6227204995bf383862c601c16e2da1 Mon Sep 17 00:00:00 2001 From: Deniz Duezgoeren Date: Wed, 17 Jul 2019 22:58:15 +0200 Subject: [PATCH] Localised app name, TODO: user-customisable course colours --- AvH Plan.xcodeproj/project.pbxproj | 32 +++++++++-- .../LaunchImage.launchimage/Contents.json | 49 ++++++++++++++++ AvH Plan/Base.lproj/Info.plist | 57 +++++++++++++++++++ AvH Plan/{ => en.lproj}/Info.plist | 0 AvH Plan/en.lproj/InfoPlist.strings | 11 ++++ AvH PlanTests/Info.plist | 11 ++++ 6 files changed, 156 insertions(+), 4 deletions(-) create mode 100644 AvH Plan/Assets.xcassets/LaunchImage.launchimage/Contents.json create mode 100644 AvH Plan/Base.lproj/Info.plist rename AvH Plan/{ => en.lproj}/Info.plist (100%) create mode 100644 AvH Plan/en.lproj/InfoPlist.strings diff --git a/AvH Plan.xcodeproj/project.pbxproj b/AvH Plan.xcodeproj/project.pbxproj index c7f74b0..fb5f496 100644 --- a/AvH Plan.xcodeproj/project.pbxproj +++ b/AvH Plan.xcodeproj/project.pbxproj @@ -22,6 +22,7 @@ A96133B0229986DF00B541D4 /* CollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96133AF229986DF00B541D4 /* CollectionViewCell.swift */; }; A96D4CC822DDE01A006BAB34 /* GeneralPlanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96D4CC722DDE01A006BAB34 /* GeneralPlanViewController.swift */; }; A96D4CCA22DDE184006BAB34 /* PersonalPlanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96D4CC922DDE184006BAB34 /* PersonalPlanViewController.swift */; }; + A996BFF922E05AAB00E7BE42 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A996BFFB22E05AAB00E7BE42 /* InfoPlist.strings */; }; A9A3496C22D4859200F35AE0 /* SubstModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9A3496B22D4859200F35AE0 /* SubstModel.swift */; }; A9C1D2FE22D656A400139043 /* InfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C1D2FD22D656A400139043 /* InfoViewController.swift */; }; A9C1D30022D656DD00139043 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9C1D2FF22D656DD00139043 /* MenuViewController.swift */; }; @@ -63,7 +64,6 @@ A96133862299867400B541D4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; A96133882299867A00B541D4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; A961338B2299867A00B541D4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - A961338D2299867A00B541D4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A96133922299867A00B541D4 /* AvH PlanTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AvH PlanTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; A96133962299867A00B541D4 /* AvH_PlanTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvH_PlanTests.swift; sourceTree = ""; }; A96133982299867A00B541D4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -73,6 +73,9 @@ A96133AF229986DF00B541D4 /* CollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionViewCell.swift; sourceTree = ""; }; A96D4CC722DDE01A006BAB34 /* GeneralPlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralPlanViewController.swift; sourceTree = ""; }; A96D4CC922DDE184006BAB34 /* PersonalPlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalPlanViewController.swift; sourceTree = ""; }; + A996BFF322E05AAB00E7BE42 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Base; path = Base.lproj/Info.plist; sourceTree = ""; }; + A996BFFC22E05AAB00E7BE42 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + A996BFFD22E05AAB00E7BE42 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = ""; }; A9A3496B22D4859200F35AE0 /* SubstModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubstModel.swift; sourceTree = ""; }; A9C1D2FD22D656A400139043 /* InfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoViewController.swift; sourceTree = ""; }; A9C1D2FF22D656DD00139043 /* MenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = ""; }; @@ -170,7 +173,7 @@ A96133852299867400B541D4 /* Main.storyboard */, A96133882299867A00B541D4 /* Assets.xcassets */, A961338A2299867A00B541D4 /* LaunchScreen.storyboard */, - A961338D2299867A00B541D4 /* Info.plist */, + A996BFED22E0586500E7BE42 /* Info.plist */, A96133AF229986DF00B541D4 /* CollectionViewCell.swift */, A9A3496B22D4859200F35AE0 /* SubstModel.swift */, A9C1D30122D7237200139043 /* DataFetcher.swift */, @@ -181,6 +184,7 @@ A96D4CC722DDE01A006BAB34 /* GeneralPlanViewController.swift */, A96D4CC922DDE184006BAB34 /* PersonalPlanViewController.swift */, A958A92422DF5388007052B0 /* Localizable.strings */, + A996BFFB22E05AAB00E7BE42 /* InfoPlist.strings */, ); path = "AvH Plan"; sourceTree = ""; @@ -315,6 +319,7 @@ A961338C2299867A00B541D4 /* LaunchScreen.storyboard in Resources */, A958A92222DF5388007052B0 /* Localizable.strings in Resources */, A957A75222DDC15500E0A2ED /* MenuViewCell.xib in Resources */, + A996BFF922E05AAB00E7BE42 /* InfoPlist.strings in Resources */, A96133892299867A00B541D4 /* Assets.xcassets in Resources */, A96133872299867400B541D4 /* Main.storyboard in Resources */, A9D830A822DE258C00D7EA05 /* PlanViewCell.xib in Resources */, @@ -513,6 +518,23 @@ name = LaunchScreen.storyboard; sourceTree = ""; }; + A996BFED22E0586500E7BE42 /* Info.plist */ = { + isa = PBXVariantGroup; + children = ( + A996BFF322E05AAB00E7BE42 /* Base */, + ); + name = Info.plist; + sourceTree = ""; + }; + A996BFFB22E05AAB00E7BE42 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + A996BFFC22E05AAB00E7BE42 /* en */, + A996BFFD22E05AAB00E7BE42 /* de */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -639,8 +661,9 @@ baseConfigurationReference = E596AED9E99670CBF1B6F49E /* Pods-AvH Plan.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = "AvH Plan/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/AvH PlanTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -657,8 +680,9 @@ baseConfigurationReference = C6EC6ACE7893F2BB0A157817 /* Pods-AvH Plan.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = "AvH Plan/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/AvH PlanTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/AvH Plan/Assets.xcassets/LaunchImage.launchimage/Contents.json b/AvH Plan/Assets.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 0000000..5a29666 --- /dev/null +++ b/AvH Plan/Assets.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,49 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "minimum-system-version" : "7.0", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Base.lproj/Info.plist b/AvH Plan/Base.lproj/Info.plist new file mode 100644 index 0000000..3cd084d --- /dev/null +++ b/AvH Plan/Base.lproj/Info.plist @@ -0,0 +1,57 @@ + + + + + CFBundleDisplayName + $(PRODUCT_NAME) + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UIStatusBarTintParameters + + UINavigationBar + + Style + UIBarStyleDefault + Translucent + + + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/AvH Plan/Info.plist b/AvH Plan/en.lproj/Info.plist similarity index 100% rename from AvH Plan/Info.plist rename to AvH Plan/en.lproj/Info.plist diff --git a/AvH Plan/en.lproj/InfoPlist.strings b/AvH Plan/en.lproj/InfoPlist.strings new file mode 100644 index 0000000..4fd45f3 --- /dev/null +++ b/AvH Plan/en.lproj/InfoPlist.strings @@ -0,0 +1,11 @@ +/* + InfoPList.strings + AvH Plan + + Created by Deniz Duezgoeren on 17.07.19. + Copyright © 2019 Deniz Duezgoeren. All rights reserved. +*/ + + +CFBundleDisplayName = "AvH Plan"; +CFBundleName = "AvH Plan"; diff --git a/AvH PlanTests/Info.plist b/AvH PlanTests/Info.plist index 6c40a6c..300feab 100644 --- a/AvH PlanTests/Info.plist +++ b/AvH PlanTests/Info.plist @@ -18,5 +18,16 @@ 1.0 CFBundleVersion 1 + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight +