Skip to content

Commit

Permalink
launchscreen: remove from resources/ folder
Browse files Browse the repository at this point in the history
  • Loading branch information
@bagage
bagage committed Jan 11, 2016
1 parent f4d2574 commit 3102b37
Show file tree
Hide file tree
Showing 21 changed files with 15 additions and 101 deletions.
5 changes: 0 additions & 5 deletions .tx/config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,6 @@ source_lang = en
file_filter = Classes/<lang>.lproj/ImageView.strings
source_file = Classes/Base.lproj/ImageView.strings

[linphone-ios.launchscreenstrings]
source_lang = en
file_filter = Classes/<lang>.lproj/LaunchScreen.strings
source_file = Classes/Base.lproj/LaunchScreen.strings

[linphone-ios.settingsviewstrings]
source_lang = en
file_filter = Classes/<lang>.lproj/SettingsView.strings
Expand Down
Binary file removed Classes/Base.lproj/LaunchScreen.strings
View file
Binary file not shown.
73 changes: 0 additions & 73 deletions Classes/Base.lproj/LaunchScreen.xib
View file

This file was deleted.

Binary file removed Classes/fr.lproj/LaunchScreen.strings
View file
Binary file not shown.
Binary file removed Classes/sv.lproj/LaunchScreen.strings
View file
Binary file not shown.
22 changes: 13 additions & 9 deletions Resources/Images.xcassets/LaunchImage.launchimage/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand All @@ -20,84 +20,88 @@
{
"orientation" : "portrait",
"idiom" : "ipad",
"filename" : "linphone_splashscreen~ipad.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"filename" : "linphone_splashscreen-Landscape~ipad.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"filename" : "linphone_splashscreen~ipad@2x.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"filename" : "linphone_splashscreen-Landscape~ipad@2x.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"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"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
}
Binary file modified ...urces/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-568h@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-568hios6@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ces/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...mages.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape~ipad.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...es.xcassets/LaunchImage.launchimage/linphone_splashscreen-Landscape~ipad@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...rces/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Portrait.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen-Portrait@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreenios6@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen~ipad.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...urces/Images.xcassets/LaunchImage.launchimage/linphone_splashscreen~ipad@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions linphone-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@
</array>
<key>UILaunchImageFile~iphone</key>
<string>linphone_splashscreen</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>MainStoryboard</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>wifi</string>
<string>microphone</string>
</array>
<key>UIRequiresFullScreen</key>
<true/>
<key>UIRequiresPersistentWiFi</key>
<true/>
<key>UIStatusBarStyle</key>
Expand Down
12 changes: 0 additions & 12 deletions linphone.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -1301,7 +1300,6 @@
639E9C7E1C0DB13D00019A75 /* UICheckBoxTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICheckBoxTableView.h; sourceTree = "<group>"; };
639E9C7F1C0DB13D00019A75 /* UICheckBoxTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICheckBoxTableView.m; sourceTree = "<group>"; };
639E9C941C0DB7BE00019A75 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/FirstLoginView.xib; sourceTree = "<group>"; };
639E9C9B1C0DB7D300019A75 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
639E9C9E1C0DB7DF00019A75 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UICallPausedCell.xib; sourceTree = "<group>"; };
639E9CA11C0DB7E500019A75 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIChatBubblePhotoCell.xib; sourceTree = "<group>"; };
639E9CA41C0DB7EA00019A75 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIChatBubbleTextCell.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -3722,14 +3718,6 @@
name = FirstLoginView.xib;
sourceTree = "<group>";
};
639E9C9C1C0DB7D300019A75 /* LaunchScreen.xib */ = {
isa = PBXVariantGroup;
children = (
639E9C9B1C0DB7D300019A75 /* Base */,
);
name = LaunchScreen.xib;
sourceTree = "<group>";
};
639E9C9F1C0DB7DF00019A75 /* UICallPausedCell.xib */ = {
isa = PBXVariantGroup;
children = (
Expand Down

0 comments on commit 3102b37

Please sign in to comment.