aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmake/scripts/darwin_embedded/Install.cmake2
-rw-r--r--media/applaunch_screen.pngbin0 -> 10687 bytes
-rw-r--r--media/splash_webOS.pngbin834147 -> 0 bytes
-rw-r--r--tools/android/packaging/Makefile.in8
-rw-r--r--tools/android/packaging/xbmc/res/layout/activity_splash.xml2
-rw-r--r--tools/webOS/packaging/appinfo.json.in2
-rw-r--r--xbmc/platform/darwin/ios/LaunchScreen.storyboard4
-rw-r--r--xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/.gitignore2
-rw-r--r--xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/Contents.json32
l---------xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/applaunch_screen.png1
l---------xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/splash.jpg1
11 files changed, 27 insertions, 27 deletions
diff --git a/cmake/scripts/darwin_embedded/Install.cmake b/cmake/scripts/darwin_embedded/Install.cmake
index fb05a1528a..724fad1259 100644
--- a/cmake/scripts/darwin_embedded/Install.cmake
+++ b/cmake/scripts/darwin_embedded/Install.cmake
@@ -20,7 +20,7 @@ if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${ENTITLEMENTS_OUT_PATH})
else()
- set(BUNDLE_RESOURCES ${CMAKE_SOURCE_DIR}/media/splash.jpg
+ set(BUNDLE_RESOURCES ${CMAKE_SOURCE_DIR}/media/applaunch_screen.png
${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29.png
${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29@2x.png
${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon40x40.png
diff --git a/media/applaunch_screen.png b/media/applaunch_screen.png
new file mode 100644
index 0000000000..91717c358b
--- /dev/null
+++ b/media/applaunch_screen.png
Binary files differ
diff --git a/media/splash_webOS.png b/media/splash_webOS.png
deleted file mode 100644
index 2406c718e9..0000000000
--- a/media/splash_webOS.png
+++ /dev/null
Binary files differ
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
index 514b655efb..78728dd4f4 100644
--- a/tools/android/packaging/Makefile.in
+++ b/tools/android/packaging/Makefile.in
@@ -62,13 +62,13 @@ python: | xbmc/assets
res:
mkdir -p xbmc/res xbmc/res/raw xbmc/res/values images
@echo "native_arch=$(CPU)" > xbmc/res/raw/xbmc.properties
- cp -fp $(CMAKE_SOURCE_DIR)/media/splash.* xbmc/res/drawable/
+ cp -fp $(CMAKE_SOURCE_DIR)/media/applaunch_screen.png xbmc/res/drawable/
cp -fp media/drawable-hdpi/ic_launcher.png xbmc/res/drawable-hdpi/ic_launcher.png
cp -fp media/drawable-ldpi/ic_launcher.png xbmc/res/drawable-ldpi/ic_launcher.png
cp -fp media/drawable-mdpi/ic_launcher.png xbmc/res/drawable-mdpi/ic_launcher.png
cp -fp media/drawable-xhdpi/ic_launcher.png xbmc/res/drawable-xhdpi/ic_launcher.png
cp -fp media/drawable-xxhdpi/ic_launcher.png xbmc/res/drawable-xxhdpi/ic_launcher.png
- cp -fp $(CMAKE_SOURCE_DIR)/media/splash.* xbmc/res/drawable-xxxhdpi/
+ cp -fp $(CMAKE_SOURCE_DIR)/media/applaunch_screen.png xbmc/res/drawable-xxxhdpi/
cp -fp media/drawable-xxxhdpi/ic_launcher.png xbmc/res/drawable-xxxhdpi/ic_launcher.png
cp -fp media/drawable-xhdpi/banner.png xbmc/res/drawable-xhdpi/banner.png
cp -fp $(CMAKE_SOURCE_DIR)/media/icon80x80.png xbmc/res/drawable/ic_recommendation_80dp.png
@@ -116,8 +116,8 @@ apk-clean:
rm -rf xbmc/obj
rm -rf xbmc/res/raw
rm -rf xbmc/res/values
- rm -f xbmc/res/drawable/splash.*
- rm -f xbmc/res/drawable-xxxhdpi/splash.*
+ rm -f xbmc/res/drawable/applaunch_screen.png
+ rm -f xbmc/res/drawable-xxxhdpi/applaunch_screen.png
rm -rf assets
.PHONY: force libs assets python sharedapk res package
diff --git a/tools/android/packaging/xbmc/res/layout/activity_splash.xml b/tools/android/packaging/xbmc/res/layout/activity_splash.xml
index eedd3a4668..42e2e29333 100644
--- a/tools/android/packaging/xbmc/res/layout/activity_splash.xml
+++ b/tools/android/packaging/xbmc/res/layout/activity_splash.xml
@@ -11,7 +11,7 @@
android:adjustViewBounds="true"
android:layout_alignParentTop="true"
android:scaleType="centerCrop"
- android:src="@drawable/splash" />
+ android:src="@drawable/applaunch_screen" />
<RelativeLayout
android:layout_width="wrap_content"
diff --git a/tools/webOS/packaging/appinfo.json.in b/tools/webOS/packaging/appinfo.json.in
index 8bedf6b640..72c7629403 100644
--- a/tools/webOS/packaging/appinfo.json.in
+++ b/tools/webOS/packaging/appinfo.json.in
@@ -7,7 +7,7 @@
"title": "@APP_NAME@",
"icon": "icon.png",
"largeIcon": "largeIcon.png",
- "splashBackground": "media/splash_webOS.png",
+ "splashBackground": "media/applaunch_screen.png",
"spinnerOnLaunch": false,
"handlesRelaunch": true,
"nativeLifeCycleInterfaceVersion": 2,
diff --git a/xbmc/platform/darwin/ios/LaunchScreen.storyboard b/xbmc/platform/darwin/ios/LaunchScreen.storyboard
index 35cdcde4f1..0674915722 100644
--- a/xbmc/platform/darwin/ios/LaunchScreen.storyboard
+++ b/xbmc/platform/darwin/ios/LaunchScreen.storyboard
@@ -18,7 +18,7 @@
<rect key="frame" x="0.0" y="0.0" width="667" height="375"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splash.jpg" translatesAutoresizingMaskIntoConstraints="NO" id="kmc-Cc-145">
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="applaunch_screen.png" translatesAutoresizingMaskIntoConstraints="NO" id="kmc-Cc-145">
<rect key="frame" x="0.0" y="0.0" width="667" height="375"/>
</imageView>
</subviews>
@@ -38,6 +38,6 @@
</scene>
</scenes>
<resources>
- <image name="splash.jpg" width="1920" height="1080"/>
+ <image name="applaunch_screen.png" width="1920" height="1080"/>
</resources>
</document>
diff --git a/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/.gitignore b/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/.gitignore
index 93140602aa..a7eae87e67 100644
--- a/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/.gitignore
+++ b/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/.gitignore
@@ -1 +1 @@
-splash@2x.jpg
+applaunch_screen@2x.png
diff --git a/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/Contents.json b/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/Contents.json
index 053b4a34bb..58afd02e59 100644
--- a/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ b/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -1,24 +1,24 @@
{
- "images" : [
+ "images": [
{
- "orientation" : "landscape",
- "idiom" : "tv",
- "filename" : "splash.jpg",
- "extent" : "full-screen",
- "minimum-system-version" : "9.0",
- "scale" : "1x"
+ "orientation": "landscape",
+ "idiom": "tv",
+ "filename": "applaunch_screen.png",
+ "extent": "full-screen",
+ "minimum-system-version": "9.0",
+ "scale": "1x"
},
{
- "orientation" : "landscape",
- "idiom" : "tv",
- "filename" : "splash@2x.jpg",
- "extent" : "full-screen",
- "minimum-system-version" : "11.0",
- "scale" : "2x"
+ "orientation": "landscape",
+ "idiom": "tv",
+ "filename": "applaunch_screen@2x.png",
+ "extent": "full-screen",
+ "minimum-system-version": "11.0",
+ "scale": "2x"
}
],
- "info" : {
- "version" : 1,
- "author" : "xcode"
+ "info": {
+ "version": 1,
+ "author": "xcode"
}
}
diff --git a/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/applaunch_screen.png b/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/applaunch_screen.png
new file mode 120000
index 0000000000..bf4c72d343
--- /dev/null
+++ b/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/applaunch_screen.png
@@ -0,0 +1 @@
+../../../../../../media/applaunch_screen.png \ No newline at end of file
diff --git a/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/splash.jpg b/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/splash.jpg
deleted file mode 120000
index 38457c1d9a..0000000000
--- a/xbmc/platform/darwin/tvos/Assets.xcassets/LaunchImage.launchimage/splash.jpg
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../media/splash.jpg \ No newline at end of file
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-22 06:24:31 +0000