From ffad872bcabdbbde59ba5c0608232ba1d9d851eb Mon Sep 17 00:00:00 2001
From: Nikita Krupin <krupin.nikita0110@gmail.com>
Date: Fri, 25 Mar 2022 14:50:18 -0400
Subject: [PATCH] ios fixes added, unused theme property removed, splash screen
 colors changed

---
 NUXT/components/bottomNavigation.vue             |  1 +
 NUXT/components/topNavigation.vue                |  5 +++--
 NUXT/layouts/default.vue                         |  2 ++
 NUXT/nuxt.config.js                              |  3 ++-
 NUXT/pages/index.vue                             |  2 +-
 NUXT/pages/mods/theme.vue                        |  1 -
 .../app/src/main/assets/capacitor.config.json    |  7 +++++--
 capacitor.config.json                            |  8 ++++++--
 ios/App/App/capacitor.config.json                |  7 +++++--
 ios/App/Podfile                                  | 16 ++++++++--------
 10 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/NUXT/components/bottomNavigation.vue b/NUXT/components/bottomNavigation.vue
index c60c474..98d08d5 100644
--- a/NUXT/components/bottomNavigation.vue
+++ b/NUXT/components/bottomNavigation.vue
@@ -59,6 +59,7 @@ export default {
   box-shadow: none !important;
   height: 4rem !important;
   position: fixed;
+  /* bottom: env(safe-area-inset-bottom) !important; */
   bottom: 0;
   padding: 0 !important;
   z-index: 99999;
diff --git a/NUXT/components/topNavigation.vue b/NUXT/components/topNavigation.vue
index ceaa8bb..2e07c22 100644
--- a/NUXT/components/topNavigation.vue
+++ b/NUXT/components/topNavigation.vue
@@ -2,7 +2,7 @@
   <v-card
     style="height: 4rem !important; display: flex; box-shadow: none !important"
     color="accent"
-    class="topNav rounded-0 pa-3"
+    class="rounded-0 pa-3 topNav"
   >
     <h3 v-show="!search" class="my-auto ml-4" v-text="page" />
 
@@ -92,8 +92,9 @@ export default {
 <style scoped>
 .topNav {
   position: fixed;
-  width: 100%;
+  /* top: env(safe-area-inset-top); */
   top: 0;
+  width: 100%;
   z-index: 999;
   /*border-radius: 0 0 1em 1em !important;*/
 }
diff --git a/NUXT/layouts/default.vue b/NUXT/layouts/default.vue
index d6cf39c..4b3ebd9 100644
--- a/NUXT/layouts/default.vue
+++ b/NUXT/layouts/default.vue
@@ -171,6 +171,8 @@ export default {
 }
 html,
 body {
+  /* padding: env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left) !important;
+  margin: env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left) !important; */
   background: black;
   overflow: hidden;
 }
diff --git a/NUXT/nuxt.config.js b/NUXT/nuxt.config.js
index 13c5b9e..e3ad2af 100644
--- a/NUXT/nuxt.config.js
+++ b/NUXT/nuxt.config.js
@@ -36,7 +36,8 @@ export default {
     },
     meta: [
       { charset: "utf-8" },
-      { name: "viewport", content: "width=device-width, initial-scale=1" },
+      // { name: "viewport", content: "width=device-width, initial-scale=1" },
+      { name: "viewport", content: "width=device-width, initial-scale=1.0, viewport-fit=cover" },
       { name: "format-detection", content: "telephone=no" },
     ],
   },
diff --git a/NUXT/pages/index.vue b/NUXT/pages/index.vue
index 2af18ee..55c0589 100644
--- a/NUXT/pages/index.vue
+++ b/NUXT/pages/index.vue
@@ -12,7 +12,7 @@
 
 <script>
 export default {
-  layout: "empty",  
+  layout: "empty",
 
   //---   Hide Splash Screen   ---//
   async beforeCreate() {
diff --git a/NUXT/pages/mods/theme.vue b/NUXT/pages/mods/theme.vue
index a1a5b73..641060e 100644
--- a/NUXT/pages/mods/theme.vue
+++ b/NUXT/pages/mods/theme.vue
@@ -87,7 +87,6 @@ export default {
 
   mounted() {
     this.accentColor = this.$vuetify.theme.themes.dark.primary.base;
-    this.roblox = localStorage.getItem("roblox") === "true";
   },
 
   methods: {
diff --git a/android/app/src/main/assets/capacitor.config.json b/android/app/src/main/assets/capacitor.config.json
index ebff9a0..48a2f82 100644
--- a/android/app/src/main/assets/capacitor.config.json
+++ b/android/app/src/main/assets/capacitor.config.json
@@ -7,16 +7,19 @@
 		"hostname": "youtube.com",
 		"androidScheme": "https"
 	},
+	"android": {
+		"backgroundColor": "#000000"
+	},
 	"plugins": {
 		"SplashScreen": {
 			"launchShowDuration": 0,
 			"launchAutoHide": true,
-			"backgroundColor": "#111111",
+			"backgroundColor": "#000000",
 			"androidSplashResourceName": "splash",
 			"androidScaleType": "CENTER_CROP",
 			"androidSpinnerStyle": "large",
 			"iosSpinnerStyle": "small",
-			"spinnerColor": "#999999",
+			"spinnerColor": "#000000",
 			"showSpinner": false,
 			"splashFullScreen": false,
 			"splashImmersive": false
diff --git a/capacitor.config.json b/capacitor.config.json
index 8d24d20..fa17f90 100644
--- a/capacitor.config.json
+++ b/capacitor.config.json
@@ -9,16 +9,20 @@
     "androidScheme": "https"
   },
 
+  "android": {
+    "backgroundColor": "#000000"
+  },
+
   "plugins": {
     "SplashScreen": {
       "launchShowDuration": 0,
       "launchAutoHide": true,
-      "backgroundColor": "#111111",
+      "backgroundColor": "#000000",
       "androidSplashResourceName": "splash",
       "androidScaleType": "CENTER_CROP",
       "androidSpinnerStyle": "large",
       "iosSpinnerStyle": "small",
-      "spinnerColor": "#999999",
+      "spinnerColor": "#000000",
       "showSpinner": false,
       "splashFullScreen": false,
       "splashImmersive": false
diff --git a/ios/App/App/capacitor.config.json b/ios/App/App/capacitor.config.json
index ebff9a0..48a2f82 100644
--- a/ios/App/App/capacitor.config.json
+++ b/ios/App/App/capacitor.config.json
@@ -7,16 +7,19 @@
 		"hostname": "youtube.com",
 		"androidScheme": "https"
 	},
+	"android": {
+		"backgroundColor": "#000000"
+	},
 	"plugins": {
 		"SplashScreen": {
 			"launchShowDuration": 0,
 			"launchAutoHide": true,
-			"backgroundColor": "#111111",
+			"backgroundColor": "#000000",
 			"androidSplashResourceName": "splash",
 			"androidScaleType": "CENTER_CROP",
 			"androidSpinnerStyle": "large",
 			"iosSpinnerStyle": "small",
-			"spinnerColor": "#999999",
+			"spinnerColor": "#000000",
 			"showSpinner": false,
 			"splashFullScreen": false,
 			"splashImmersive": false
diff --git a/ios/App/Podfile b/ios/App/Podfile
index 7420800..a80b0b5 100644
--- a/ios/App/Podfile
+++ b/ios/App/Podfile
@@ -9,14 +9,14 @@ install! 'cocoapods', :disable_input_output_paths => true
 def capacitor_pods
   pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
-  pod 'CapacitorCommunityHttp', :path => '..\..\node_modules\@capacitor-community\http'
-  pod 'CapacitorApp', :path => '..\..\node_modules\@capacitor\app'
-  pod 'CapacitorBrowser', :path => '..\..\node_modules\@capacitor\browser'
-  pod 'CapacitorDevice', :path => '..\..\node_modules\@capacitor\device'
-  pod 'CapacitorShare', :path => '..\..\node_modules\@capacitor\share'
-  pod 'CapacitorSplashScreen', :path => '..\..\node_modules\@capacitor\splash-screen'
-  pod 'CapacitorStatusBar', :path => '..\..\node_modules\@capacitor\status-bar'
-  pod 'HugotomaziCapacitorNavigationBar', :path => '..\..\node_modules\@hugotomazi\capacitor-navigation-bar'
+  pod 'CapacitorCommunityHttp', :path => '../../node_modules/@capacitor-community/http'
+  pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
+  pod 'CapacitorBrowser', :path => '../../node_modules/@capacitor/browser'
+  pod 'CapacitorDevice', :path => '../../node_modules/@capacitor/device'
+  pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share'
+  pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen'
+  pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
+  pod 'HugotomaziCapacitorNavigationBar', :path => '../../node_modules/@hugotomazi/capacitor-navigation-bar'
 end
 
 target 'App' do