diff --git a/.tx/config b/.tx/config index 45513ba7d..f03144b01 100644 --- a/.tx/config +++ b/.tx/config @@ -97,11 +97,6 @@ source_lang = en file_filter = Classes/.lproj/ImageView.strings source_file = Classes/Base.lproj/ImageView.strings -[linphone-ios.launchscreenstrings] -source_lang = en -file_filter = Classes/.lproj/LaunchScreen.strings -source_file = Classes/Base.lproj/LaunchScreen.strings - [linphone-ios.settingsviewstrings] source_lang = en file_filter = Classes/.lproj/SettingsView.strings diff --git a/Classes/Base.lproj/LaunchScreen.strings b/Classes/Base.lproj/LaunchScreen.strings deleted file mode 100644 index d20f77ce5..000000000 Binary files a/Classes/Base.lproj/LaunchScreen.strings and /dev/null differ diff --git a/Classes/Base.lproj/LaunchScreen.xib b/Classes/Base.lproj/LaunchScreen.xib deleted file mode 100644 index 7704de7e7..000000000 --- a/Classes/Base.lproj/LaunchScreen.xib +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Classes/fr.lproj/LaunchScreen.strings b/Classes/fr.lproj/LaunchScreen.strings deleted file mode 100644 index d20f77ce5..000000000 Binary files a/Classes/fr.lproj/LaunchScreen.strings and /dev/null differ diff --git a/Classes/sv.lproj/LaunchScreen.strings b/Classes/sv.lproj/LaunchScreen.strings deleted file mode 100644 index d20f77ce5..000000000 Binary files a/Classes/sv.lproj/LaunchScreen.strings and /dev/null differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json b/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json index 017cb7d4d..1fa7fb5b8 100644 --- a/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/Resources/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -3,9 +3,9 @@ { "orientation" : "portrait", "idiom" : "iphone", + "filename" : "linphone_splashscreen@2x.png", "extent" : "full-screen", "minimum-system-version" : "7.0", - "filename" : "linphone_splashscreen@2x.png", "scale" : "2x" }, { @@ -20,6 +20,7 @@ { "orientation" : "portrait", "idiom" : "ipad", + "filename" : "linphone_splashscreen~ipad.png", "extent" : "full-screen", "minimum-system-version" : "7.0", "scale" : "1x" @@ -27,6 +28,7 @@ { "orientation" : "landscape", "idiom" : "ipad", + "filename" : "linphone_splashscreen-Landscape~ipad.png", "extent" : "full-screen", "minimum-system-version" : "7.0", "scale" : "1x" @@ -34,6 +36,7 @@ { "orientation" : "portrait", "idiom" : "ipad", + "filename" : "linphone_splashscreen~ipad@2x.png", "extent" : "full-screen", "minimum-system-version" : "7.0", "scale" : "2x" @@ -41,6 +44,7 @@ { "orientation" : "landscape", "idiom" : "ipad", + "filename" : "linphone_splashscreen-Landscape~ipad@2x.png", "extent" : "full-screen", "minimum-system-version" : "7.0", "scale" : "2x" @@ -48,51 +52,51 @@ { "orientation" : "portrait", "idiom" : "iphone", - "extent" : "full-screen", "filename" : "linphone_splashscreen.png", + "extent" : "full-screen", "scale" : "1x" }, { "orientation" : "portrait", "idiom" : "iphone", - "extent" : "full-screen", "filename" : "linphone_splashscreenios6@2x.png", + "extent" : "full-screen", "scale" : "2x" }, { "orientation" : "portrait", "idiom" : "iphone", - "extent" : "full-screen", "filename" : "linphone_splashscreen-568hios6@2x.png", + "extent" : "full-screen", "subtype" : "retina4", "scale" : "2x" }, { "orientation" : "portrait", "idiom" : "ipad", - "extent" : "to-status-bar", "filename" : "linphone_splashscreen-Portrait.png", + "extent" : "to-status-bar", "scale" : "1x" }, { "orientation" : "landscape", "idiom" : "ipad", - "extent" : "to-status-bar", "filename" : "linphone_splashscreen-Landscape.png", + "extent" : "to-status-bar", "scale" : "1x" }, { "orientation" : "portrait", "idiom" : "ipad", - "extent" : "to-status-bar", "filename" : "linphone_splashscreen-Portrait@2x.png", + "extent" : "to-status-bar", "scale" : "2x" }, { "orientation" : "landscape", "idiom" : "ipad", - "extent" : "to-status-bar", "filename" : "linphone_splashscreen-Landscape@2x.png", + "extent" : "to-status-bar", "scale" : "2x" } ], @@ -100,4 +104,4 @@ "version" : 1, "author" : "xcode" } -} \ No newline at end of file +} diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-568h@2x.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-568h@2x.png index 5a133eb4b..f9315dd0d 100644 Binary files a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-568h@2x.png and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-568h@2x.png differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-568hios6@2x.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-568hios6@2x.png index 5a133eb4b..f9315dd0d 100644 Binary files a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-568hios6@2x.png and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-568hios6@2x.png differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape.png index 83897cb2f..72e61006d 100644 Binary files a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape.png and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape.png differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape@2x.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape@2x.png index c7d7ee588..2ea69dff8 100644 Binary files a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape@2x.png and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape@2x.png differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape~ipad.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape~ipad.png new file mode 100644 index 000000000..222e04730 Binary files /dev/null and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape~ipad.png differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape~ipad@2x.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape~ipad@2x.png new file mode 100644 index 000000000..45fa4f871 Binary files /dev/null and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape~ipad@2x.png differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Portrait.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Portrait.png index e3b3e9a06..494aa19bd 100644 Binary files a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Portrait.png and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Portrait.png differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Portrait@2x.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Portrait@2x.png index e9c4329da..08c6f4977 100644 Binary files a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Portrait@2x.png and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Portrait@2x.png differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen.png index 9c311c35e..295e4db61 100644 Binary files a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen.png and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen.png differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen@2x.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen@2x.png index 3d756f901..90875f7d4 100644 Binary files a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen@2x.png and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen@2x.png differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreenios6@2x.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreenios6@2x.png index 3d756f901..90875f7d4 100644 Binary files a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreenios6@2x.png and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreenios6@2x.png differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen~ipad.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen~ipad.png new file mode 100644 index 000000000..7e1bd7c23 Binary files /dev/null and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen~ipad.png differ diff --git a/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen~ipad@2x.png b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen~ipad@2x.png new file mode 100644 index 000000000..108071dbf Binary files /dev/null and b/Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen~ipad@2x.png differ diff --git a/linphone-Info.plist b/linphone-Info.plist index a929e264d..e046cb71e 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -66,8 +66,6 @@ UILaunchImageFile~iphone linphone_splashscreen - UILaunchStoryboardName - LaunchScreen UIMainStoryboardFile MainStoryboard UIRequiredDeviceCapabilities @@ -75,6 +73,8 @@ wifi microphone + UIRequiresFullScreen + UIRequiresPersistentWiFi UIStatusBarStyle diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 2ee45c40f..d520b4b21 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -477,7 +477,6 @@ 639CEB091A1DF4FA004DE38F /* UIChatCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB0B1A1DF4FA004DE38F /* UIChatCell.xib */; }; 639E9C801C0DB13D00019A75 /* UICheckBoxTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 639E9C7F1C0DB13D00019A75 /* UICheckBoxTableView.m */; }; 639E9C931C0DB7BE00019A75 /* FirstLoginView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639E9C951C0DB7BE00019A75 /* FirstLoginView.xib */; }; - 639E9C9A1C0DB7D300019A75 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639E9C9C1C0DB7D300019A75 /* LaunchScreen.xib */; }; 639E9C9D1C0DB7DF00019A75 /* UICallPausedCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639E9C9F1C0DB7DF00019A75 /* UICallPausedCell.xib */; }; 639E9CA01C0DB7E500019A75 /* UIChatBubblePhotoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639E9CA21C0DB7E500019A75 /* UIChatBubblePhotoCell.xib */; }; 639E9CA31C0DB7EA00019A75 /* UIChatBubbleTextCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639E9CA51C0DB7EA00019A75 /* UIChatBubbleTextCell.xib */; }; @@ -1301,7 +1300,6 @@ 639E9C7E1C0DB13D00019A75 /* UICheckBoxTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICheckBoxTableView.h; sourceTree = ""; }; 639E9C7F1C0DB13D00019A75 /* UICheckBoxTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICheckBoxTableView.m; sourceTree = ""; }; 639E9C941C0DB7BE00019A75 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/FirstLoginView.xib; sourceTree = ""; }; - 639E9C9B1C0DB7D300019A75 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 639E9C9E1C0DB7DF00019A75 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UICallPausedCell.xib; sourceTree = ""; }; 639E9CA11C0DB7E500019A75 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIChatBubblePhotoCell.xib; sourceTree = ""; }; 639E9CA41C0DB7EA00019A75 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIChatBubbleTextCell.xib; sourceTree = ""; }; @@ -1797,7 +1795,6 @@ D37EE11016035793003608A6 /* ImageView.xib */, 63E59A3D1ADE6ECB00646FB3 /* InAppProductsManager.h */, 63E59A3E1ADE70D900646FB3 /* InAppProductsManager.m */, - 639E9C9C1C0DB7D300019A75 /* LaunchScreen.xib */, 1D3623240D0F684500981E51 /* LinphoneAppDelegate.h */, 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */, D37DC6BF1594AE1800B2A5EB /* LinphoneCoreSettingsStore.h */, @@ -3260,7 +3257,6 @@ 636B993D1C298401003BA37C /* speaker_disabled.png in Resources */, 636B98A51C298401003BA37C /* history_all_default@2x.png in Resources */, 636B98311C298401003BA37C /* camera_default@2x.png in Resources */, - 639E9C9A1C0DB7D300019A75 /* LaunchScreen.xib in Resources */, 636B99201C298401003BA37C /* route_earpiece_default@2x.png in Resources */, 636B986C1C298401003BA37C /* contact_add_disabled.png in Resources */, 636B98501C298401003BA37C /* chat_send_over.png in Resources */, @@ -3722,14 +3718,6 @@ name = FirstLoginView.xib; sourceTree = ""; }; - 639E9C9C1C0DB7D300019A75 /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - 639E9C9B1C0DB7D300019A75 /* Base */, - ); - name = LaunchScreen.xib; - sourceTree = ""; - }; 639E9C9F1C0DB7DF00019A75 /* UICallPausedCell.xib */ = { isa = PBXVariantGroup; children = (