From 6484c52ca3ba63502dfa4c13488cd631140940f6 Mon Sep 17 00:00:00 2001
From: Alexis THOMAS <fr.alexisthomas@gmail.com>
Date: Sun, 13 Dec 2020 00:50:17 +0100
Subject: [PATCH 1/2] match platforms dirs and folders relatively to cordova
 project root

---
 index.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/index.js b/index.js
index 6dc359a..c44deb8 100644
--- a/index.js
+++ b/index.js
@@ -38,16 +38,22 @@ var initSettings = function (options = {}) {
 var getPlatforms = function (projectName) {
   var deferred = Q.defer();
   var platforms = [];
-  var xcodeFolder = '/Images.xcassets/LaunchImage.launchimage/';
+  var cordovaProjectRoot = path.dirname(settings.CONFIG_FILE);
+  var xcodeFolder = 'Images.xcassets/LaunchImage.launchimage';
+  var androidFolder = 'app/src/main/res';
+  var windowsFolder = 'images';
 
   if (settings.OLD_XCODE_PATH) {
-    xcodeFolder = '/Resources/splash/';
+    xcodeFolder = 'Resources/splash';
+  }
+  if (settings.OLD_ANDROID_PATH) {
+    androidFolder = 'res';
   }
 
   platforms.push({
     name: 'ios',
-    isAdded: fs.existsSync('platforms/ios'),
-    splashPath: 'platforms/ios/' + projectName + xcodeFolder,
+    isAdded: fs.existsSync(path.join(cordovaProjectRoot, 'platforms/ios')),
+    splashPath: path.join(cordovaProjectRoot, 'platforms/ios', projectName, xcodeFolder),
     splash: [
       // iPhone
       { name: 'Default~iphone.png',            width: 320,  height: 480  },
@@ -71,8 +77,8 @@ var getPlatforms = function (projectName) {
   });
   platforms.push({
     name: 'android',
-    isAdded: fs.existsSync('platforms/android'),
-    splashPath: settings.OLD_ANDROID_PATH ? 'platforms/android/res/' : 'platforms/android/app/src/main/res/',
+    isAdded: fs.existsSync(path.join(cordovaProjectRoot, 'platforms/android')),
+    splashPath: path.join(cordovaProjectRoot, 'platforms/android', androidFolder),
     splash: [
       // Landscape
       { name: 'drawable-land-ldpi/screen.png',    width: 320,  height: 200  },
@@ -92,8 +98,8 @@ var getPlatforms = function (projectName) {
   });
   platforms.push({
     name: 'windows',
-    isAdded: fs.existsSync('platforms/windows'),
-    splashPath: 'platforms/windows/images/',
+    isAdded: fs.existsSync(path.join(cordovaProjectRoot, 'platforms/windows')),
+    splashPath: path.join(cordovaProjectRoot, 'platforms/windows', windowsFolder),
     splash: [
       // Landscape
       { name: 'SplashScreen.scale-100.png', width: 620,  height: 300  },
@@ -171,7 +177,7 @@ var generateSplash = function (platform, splash) {
   if (fs.existsSync(platformPath)) {
     srcPath = platformPath;
   }
-  var dstPath = platform.splashPath + splash.name;
+  var dstPath = path.join(platform.splashPath, splash.name);
   var dst = path.dirname(dstPath);
   if (!fs.existsSync(dst)) {
     fs.mkdirsSync(dst);

From 57b87e1d38793b881b04d0e4e91c35a39b2ab961 Mon Sep 17 00:00:00 2001
From: Alexis THOMAS <fr.alexisthomas@gmail.com>
Date: Sun, 13 Dec 2020 01:34:48 +0100
Subject: [PATCH 2/2] rename splash array for each platform object

---
 index.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/index.js b/index.js
index c44deb8..7344c69 100644
--- a/index.js
+++ b/index.js
@@ -54,7 +54,7 @@ var getPlatforms = function (projectName) {
     name: 'ios',
     isAdded: fs.existsSync(path.join(cordovaProjectRoot, 'platforms/ios')),
     splashPath: path.join(cordovaProjectRoot, 'platforms/ios', projectName, xcodeFolder),
-    splash: [
+    splashes: [
       // iPhone
       { name: 'Default~iphone.png',            width: 320,  height: 480  },
       { name: 'Default@2x~iphone.png',         width: 640,  height: 960  },
@@ -79,7 +79,7 @@ var getPlatforms = function (projectName) {
     name: 'android',
     isAdded: fs.existsSync(path.join(cordovaProjectRoot, 'platforms/android')),
     splashPath: path.join(cordovaProjectRoot, 'platforms/android', androidFolder),
-    splash: [
+    splashes: [
       // Landscape
       { name: 'drawable-land-ldpi/screen.png',    width: 320,  height: 200  },
       { name: 'drawable-land-mdpi/screen.png',    width: 480,  height: 320  },
@@ -100,7 +100,7 @@ var getPlatforms = function (projectName) {
     name: 'windows',
     isAdded: fs.existsSync(path.join(cordovaProjectRoot, 'platforms/windows')),
     splashPath: path.join(cordovaProjectRoot, 'platforms/windows', windowsFolder),
-    splash: [
+    splashes: [
       // Landscape
       { name: 'SplashScreen.scale-100.png', width: 620,  height: 300  },
       { name: 'SplashScreen.scale-125.png', width: 775,  height: 375  },
@@ -210,8 +210,7 @@ var generateSplashForPlatform = function (platform) {
   var deferred = Q.defer();
   display.header('Generating splash screen for ' + platform.name);
   var all = [];
-  var splashes = platform.splash;
-  splashes.forEach(function (splash) {
+  platform.splashes.forEach(function (splash) {
     all.push(generateSplash(platform, splash));
   });
   Q.all(all).then(function () {