From f975156a283862f52114aae225a8e0beee80f698 Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Thu, 14 Oct 2021 01:22:42 +1300
Subject: [PATCH] Prefix apple platforms

---
 app/config/platforms.php                      |  54 ++----------------
 app/controllers/api/projects.php              |   2 +-
 app/views/console/home/index.phtml            |  32 +++++++----
 .../images/clients/{ios.png => apple-ios.png} | Bin
 .../clients/{macos.png => apple-macos.png}    | Bin
 .../clients/{tvos.png => apple-tvos.png}      | Bin
 .../{watchos.png => apple-watchos.png}        | Bin
 7 files changed, 25 insertions(+), 63 deletions(-)
 rename public/images/clients/{ios.png => apple-ios.png} (100%)
 rename public/images/clients/{macos.png => apple-macos.png} (100%)
 rename public/images/clients/{tvos.png => apple-tvos.png} (100%)
 rename public/images/clients/{watchos.png => apple-watchos.png} (100%)

diff --git a/app/config/platforms.php b/app/config/platforms.php
index 219b00a70..1ae2c7c2d 100644
--- a/app/config/platforms.php
+++ b/app/config/platforms.php
@@ -77,56 +77,9 @@ return [
                 'gitUserName' => 'appwrite',
             ],
             [
-                'key' => 'ios',
-                'name' => 'iOS',
-                'url' => 'https://github.com/appwrite/sdk-for-apple',
-                'package' => 'https://github.com/appwrite/sdk-for-apple',
-                'enabled' => true,
-                'beta' => false,
-                'dev' => true,
-                'hidden' => false,
-                'family' => APP_PLATFORM_CLIENT,
-                'prism' => 'swift',
-                'source' => \realpath(__DIR__ . '/../sdks/client-apple'),
-                'gitUrl' => 'git@github.com:appwrite/sdk-for-apple.git',
-                'gitRepoName' => 'sdk-for-apple',
-                'gitUserName' => 'appwrite',
-            ],
-            [
-                'key' => 'macos',
-                'name' => 'macOS',
-                'url' => 'https://github.com/appwrite/sdk-for-apple',
-                'package' => 'https://github.com/appwrite/sdk-for-apple',
-                'enabled' => true,
-                'beta' => false,
-                'dev' => true,
-                'hidden' => false,
-                'family' => APP_PLATFORM_CLIENT,
-                'prism' => 'swift',
-                'source' => \realpath(__DIR__ . '/../sdks/client-apple'),
-                'gitUrl' => 'git@github.com:appwrite/sdk-for-apple.git',
-                'gitRepoName' => 'sdk-for-apple',
-                'gitUserName' => 'appwrite',
-            ],
-            [
-                'key' => 'watchos',
-                'name' => 'watchOS',
-                'url' => 'https://github.com/appwrite/sdk-for-apple',
-                'package' => 'https://github.com/appwrite/sdk-for-apple',
-                'enabled' => true,
-                'beta' => false,
-                'dev' => true,
-                'hidden' => false,
-                'family' => APP_PLATFORM_CLIENT,
-                'prism' => 'swift',
-                'source' => \realpath(__DIR__ . '/../sdks/client-apple'),
-                'gitUrl' => 'git@github.com:appwrite/sdk-for-apple.git',
-                'gitRepoName' => 'sdk-for-apple',
-                'gitUserName' => 'appwrite',
-            ],
-            [
-                'key' => 'tvos',
-                'name' => 'tvOS',
+                'key' => 'apple',
+                'name' => 'Apple',
+                'version' => '0.0.1',
                 'url' => 'https://github.com/appwrite/sdk-for-apple',
                 'package' => 'https://github.com/appwrite/sdk-for-apple',
                 'enabled' => true,
@@ -422,6 +375,7 @@ return [
             [
                 'key' => 'swift',
                 'name' => 'Swift',
+                'version' => '0.0.1',
                 'url' => 'https://github.com/appwrite/sdk-for-swift',
                 'package' => 'https://github.com/appwrite/sdk-for-swift',
                 'enabled' => true,
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index 996c99967..ba2108103 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -1314,7 +1314,7 @@ App::post('/v1/projects/:projectId/platforms')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PLATFORM)
     ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('type', null, new WhiteList(['web', 'flutter-ios', 'flutter-android', 'flutter-linux', 'flutter-macos', 'flutter-windows', 'ios', 'macos', 'watchos', 'tvos', 'android', 'unity'], true), 'Platform type.')
+    ->param('type', null, new WhiteList(['web', 'flutter-ios', 'flutter-android', 'flutter-linux', 'flutter-macos', 'flutter-windows', 'apple-ios', 'apple-macos', 'apple-watchos', 'apple-tvos', 'android', 'unity'], true), 'Platform type.')
     ->param('name', null, new Text(128), 'Platform name. Max length: 128 chars.')
     ->param('key', '', new Text(256), 'Package name for Android or bundle ID for iOS or macOS. Max length: 256 chars.', true)
     ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true)
diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml
index d9e047293..aa2cfc987 100644
--- a/app/views/console/home/index.phtml
+++ b/app/views/console/home/index.phtml
@@ -243,16 +243,16 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                 <div class="link android-new"><img src="/images/clients/android.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Android Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New Android App</div>
             </li>
             <li>
-                <div class="link ios-new"><img src="/images/clients/ios.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="iOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New iOS App</div>
+                <div class="link ios-new"><img src="/images/clients/apple-ios.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="iOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New iOS App</div>
             </li>
             <li>
-                <div class="link macos-new"><img src="/images/clients/macos.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="macOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New macOS App</div>
+                <div class="link macos-new"><img src="/images/clients/apple-macos.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="macOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New macOS App</div>
             </li>
             <li>
-                <div class="link watchos-new"><img src="/images/clients/watchos.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="watchOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New watchOS App</div>
+                <div class="link watchos-new"><img src="/images/clients/apple-watchos.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="watchOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New watchOS App</div>
             </li>
             <li>
-                <div class="link tvos-new"><img src="/images/clients/tvos.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="tvOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New tvOS App</div>
+                <div class="link tvos-new"><img src="/images/clients/apple-tvos.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="tvOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New tvOS App</div>
             </li>
             <li class="disabled">
                 <div class="link unity-new"><img src="/images/clients/unity.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Unity Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New Unity Game  <span class="text-fade text-size-small">(soon)</span></div>
@@ -395,7 +395,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             data-failure-param-alert-classname="error">
 
         <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
-        <input type="hidden" name="type" data-ls-bind="ios" />
+        <input type="hidden" name="type" data-ls-bind="apple-ios" />
 
         <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
         <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My iOS App" maxlength="128" />
@@ -431,7 +431,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             data-failure-param-alert-classname="error">
 
         <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
-        <input type="hidden" name="type" data-ls-bind="macos" />
+        <input type="hidden" name="type" data-ls-bind="apple-macos" />
 
         <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
         <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My macOS App" maxlength="128" />
@@ -467,7 +467,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             data-failure-param-alert-classname="error">
 
         <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
-        <input type="hidden" name="type" data-ls-bind="watchos" />
+        <input type="hidden" name="type" data-ls-bind="apple-watchos" />
 
         <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
         <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My watchOS App" maxlength="128" />
@@ -503,7 +503,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             data-failure-param-alert-classname="error">
 
         <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
-        <input type="hidden" name="type" data-ls-bind="tvos" />
+        <input type="hidden" name="type" data-ls-bind="apple-tvos" />
 
         <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
         <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My tvOS App" maxlength="128" />
@@ -745,7 +745,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
         <input type="hidden" name="platformId" data-ls-bind="{{platform.$id}}" />
 
         <label data-ls-attrs="for=name-{{platform.$id}}">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
-        <input type="text" class="full-width" data-ls-attrs="id=name-{{platform.$id}}" name="name" required autocomplete="off" data-ls-bind="{{platform.name}}" placeholder="My iOS App" maxlength="128" />
+        <input type="text" class="full-width" data-ls-attrs="id=name-{{platform.$id}}" name="name" required autocomplete="off" data-ls-bind="{{platform.name}}" placeholder="My macOS App" maxlength="128" />
 
         <label data-ls-attrs="for=key-{{platform.$id}}">Bundle ID <span class="tooltip large" data-tooltip="You can find your Bundle Identifier in the General tab for your app's primary target in Xcode."><i class="icon-question"></i></span></label>
         <input name="key" type="text" class="margin-bottom" autocomplete="off" placeholder="com.company.appname" data-ls-bind="{{platform.key}}" required />
@@ -787,7 +787,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
     </form>
 </script>
 
-<script type="text/html" id="template-watchos-update">
+<script type="text/html" id="template-apple-watchos-update">
     <form
             data-analytics
             data-analytics-activity
@@ -819,7 +819,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
     </form>
 </script>
 
-<script type="text/html" id="template-tvos-update">
+<script type="text/html" id="template-apple-tvos-update">
     <form
             data-analytics
             data-analytics-activity
@@ -861,4 +861,12 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
 <script type="text/html" id="template-flutter-macos-update">
     <div data-ls-template="template-macos-update" data-type="script"></div>
-</script>
\ No newline at end of file
+</script>
+
+<script type="text/html" id="template-apple-ios-update">
+    <div data-ls-template="template-ios-update" data-type="script"></div>
+</script>
+
+<script type="text/html" id="template-apple-macos-update">
+    <div data-ls-template="template-macos-update" data-type="script"></div>
+</script>
diff --git a/public/images/clients/ios.png b/public/images/clients/apple-ios.png
similarity index 100%
rename from public/images/clients/ios.png
rename to public/images/clients/apple-ios.png
diff --git a/public/images/clients/macos.png b/public/images/clients/apple-macos.png
similarity index 100%
rename from public/images/clients/macos.png
rename to public/images/clients/apple-macos.png
diff --git a/public/images/clients/tvos.png b/public/images/clients/apple-tvos.png
similarity index 100%
rename from public/images/clients/tvos.png
rename to public/images/clients/apple-tvos.png
diff --git a/public/images/clients/watchos.png b/public/images/clients/apple-watchos.png
similarity index 100%
rename from public/images/clients/watchos.png
rename to public/images/clients/apple-watchos.png