From b93b53ffd0d024c71703108b3527bb99360e08e9 Mon Sep 17 00:00:00 2001
From: Nikita Krupin <krupin.nikita0110@gmail.com>
Date: Wed, 8 Jun 2022 16:15:15 -0400
Subject: [PATCH] better spacing, top controls grouped

---
 NUXT/components/Player/captions.vue        |   8 +-
 NUXT/components/Player/close.vue           |  11 +--
 NUXT/components/Player/index.vue           | 106 ++++++++++-----------
 NUXT/components/Player/loop.vue            |   8 +-
 NUXT/components/Player/minimize.vue        |   8 +-
 NUXT/components/Player/progressbar.vue     |   2 +-
 NUXT/components/Player/seekbar.vue         |   2 +-
 NUXT/components/Player/sponsorblock.vue    |   2 +-
 android/.idea/deploymentTargetDropDown.xml |   2 +-
 9 files changed, 62 insertions(+), 87 deletions(-)

diff --git a/NUXT/components/Player/captions.vue b/NUXT/components/Player/captions.vue
index c01ae1d..8645a52 100644
--- a/NUXT/components/Player/captions.vue
+++ b/NUXT/components/Player/captions.vue
@@ -1,11 +1,5 @@
 <template>
-  <v-btn
-    fab
-    text
-    small
-    disabled
-    style="position: absolute; top: 0.25rem; right: 3rem"
-  >
+  <v-btn fab text small disabled>
     <v-icon>mdi-closed-caption-outline</v-icon>
   </v-btn>
 </template>
diff --git a/NUXT/components/Player/close.vue b/NUXT/components/Player/close.vue
index 3f53584..fccab79 100644
--- a/NUXT/components/Player/close.vue
+++ b/NUXT/components/Player/close.vue
@@ -1,13 +1,6 @@
 <template>
-  <!-- TODO: change /home to $router.goBack() or $router.go(-1) -->
-  <v-btn
-    fab
-    text
-    small
-    style="position: absolute; top: 0.25rem; right: 0.25rem"
-    to="/home"
-    color="white"
-  >
+  <!-- // TODO: change /home to $router.goBack() or $router.go(-1) -->
+  <v-btn fab text small to="/home" color="white">
     <v-icon>mdi-close</v-icon>
   </v-btn>
 </template>
diff --git a/NUXT/components/Player/index.vue b/NUXT/components/Player/index.vue
index c2f966e..38bfec1 100644
--- a/NUXT/components/Player/index.vue
+++ b/NUXT/components/Player/index.vue
@@ -70,23 +70,21 @@
     >
       <!-- top controls row -->
       <div
-        v-if="isFullscreen"
-        style="
-          position: absolute;
-          width: calc(100% - 12rem);
-          left: 3rem;
-          top: 0.5rem;
-        "
+        class="d-flex justify-center px-2"
+        style="position: absolute; width: 100%; top: 0.25rem"
       >
-        <h4>{{ video.title }}</h4>
-        <div style="color: #aaa; font-size: 0.75rem">
-          {{ video.channelName }}
+        <minimize />
+        <div v-if="isFullscreen" class="pt-2">
+          <h4>{{ video.title }}</h4>
+          <div style="color: #aaa; font-size: 0.75rem">
+            {{ video.channelName }}
+          </div>
         </div>
+        <v-spacer />
+        <loop />
+        <captions class="mx-2" />
+        <close />
       </div>
-      <minimize />
-      <loop />
-      <captions />
-      <close />
       <!-- top controls row end -->
 
       <!-- center controls row -->
@@ -132,25 +130,47 @@
       </div>
       <!-- center controls row end -->
 
+      <!-- time & fullscreen row -->
+      <div
+        class="d-flex justify-between align-center pl-4 pr-2"
+        style="position: absolute; width: 100%"
+        :style="isFullscreen ? 'bottom: 4.25rem' : 'bottom: 0.5rem'"
+      >
+        <watchtime
+          v-if="$refs.player"
+          :current-time="$refs.player.currentTime"
+          :duration="$refs.player.duration"
+        />
+        <v-spacer />
+        <fullscreen
+          style="z-index: 2"
+          :fullscreen="isFullscreen"
+          @fullscreen="
+            (controls = $refs.player.paused), handleFullscreenChange()
+          "
+        />
+      </div>
+      <!-- time & fullscreen row end -->
+
       <!-- bottom controls row -->
       <div
-        class="d-flex justify-between align-center pa-2"
-        style="position: absolute; width: 100%; bottom: 0"
+        class="d-flex justify-between align-center px-2"
+        style="position: absolute; width: 100%; bottom: 0.5rem"
       >
         <div v-if="isFullscreen">
-          <v-btn fab text small outlined color="white" disabled @click.stop="">
+          <v-btn fab text small color="white" class="mr-2" disabled>
             <v-icon>mdi-thumb-up-outline</v-icon>
           </v-btn>
-          <v-btn fab text small outlined color="white" disabled @click.stop="">
+          <v-btn fab text small color="white" class="mr-2" disabled>
             <v-icon>mdi-thumb-down-outline</v-icon>
           </v-btn>
-          <v-btn fab text small outlined color="white" disabled @click.stop="">
+          <v-btn fab text small color="white" class="mr-2" disabled>
             <v-icon>mdi-share-outline</v-icon>
           </v-btn>
-          <v-btn fab text small outlined color="white" disabled @click.stop="">
+          <v-btn fab text small color="white" class="mr-2" disabled>
             <v-icon>mdi-plus-box-multiple-outline</v-icon>
           </v-btn>
-          <v-btn fab text small outlined color="white" disabled @click.stop="">
+          <v-btn fab text small color="white" class="mr-2" disabled>
             <v-icon>mdi-comment-text-outline</v-icon>
           </v-btn>
         </div>
@@ -164,37 +184,17 @@
         />
         <speed
           v-if="$refs.player"
+          class="mx-2"
           :current-speed="$refs.player.playbackRate"
           @speed="$refs.player.playbackRate = $event"
         />
         <v-btn v-if="isFullscreen" fab text small disabled @click.stop="">
           <v-icon>mdi-cards-outline</v-icon>
         </v-btn>
-        <!-- placeholder for moving fullscreen button below -->
+        <!-- placeholder for moving fullscreen button above -->
         <v-btn v-else fab text small disabled> </v-btn>
       </div>
       <!-- bottom controls row -->
-
-      <!-- time & fullscreen row -->
-      <div
-        class="d-flex justify-between align-center pl-4 pr-2 py-2"
-        style="position: absolute; width: 100%"
-        :style="isFullscreen ? 'bottom: 3.5rem' : 'bottom: 0'"
-      >
-        <watchtime
-          v-if="$refs.player"
-          :current-time="$refs.player.currentTime"
-          :duration="$refs.player.duration"
-        />
-        <v-spacer />
-        <fullscreen
-          :fullscreen="isFullscreen"
-          @fullscreen="
-            (controls = $refs.player.paused), handleFullscreenChange()
-          "
-        />
-      </div>
-      <!-- time & fullscreen row end -->
     </div>
     <!-- controls container end -->
 
@@ -208,6 +208,15 @@
       :seeking="seeking"
     />
 
+    <sponsorblock
+      v-if="$refs.player && blocks.length > 0"
+      :duration="$refs.player.duration"
+      :fullscreen="isFullscreen"
+      :controls="controls"
+      :seeking="seeking"
+      :blocks="blocks"
+    />
+
     <seekbar
       v-if="$refs.player"
       v-show="!isFullscreen || controls"
@@ -225,15 +234,6 @@
         }
       "
     />
-
-    <sponsorblock
-      v-if="$refs.player && blocks.length > 0"
-      :duration="$refs.player.duration"
-      :fullscreen="isFullscreen"
-      :controls="controls"
-      :seeking="seeking"
-      :blocks="blocks"
-    />
   </div>
 </template>
 
@@ -388,7 +388,7 @@ export default {
 
 <style>
 .dim {
-  filter: brightness(42%);
+  filter: brightness(33%);
 }
 .invisible {
   opacity: 0;
diff --git a/NUXT/components/Player/loop.vue b/NUXT/components/Player/loop.vue
index dbf3cf9..c735f46 100644
--- a/NUXT/components/Player/loop.vue
+++ b/NUXT/components/Player/loop.vue
@@ -1,11 +1,5 @@
 <template>
-  <v-btn
-    fab
-    text
-    small
-    disabled
-    style="position: absolute; top: 0.25rem; right: 6rem"
-  >
+  <v-btn fab text small disabled>
     <v-icon>mdi-sync</v-icon>
   </v-btn>
 </template>
diff --git a/NUXT/components/Player/minimize.vue b/NUXT/components/Player/minimize.vue
index a09e89f..ac7b0fc 100644
--- a/NUXT/components/Player/minimize.vue
+++ b/NUXT/components/Player/minimize.vue
@@ -1,11 +1,5 @@
 <template>
-  <v-btn
-    fab
-    text
-    small
-    disabled
-    style="position: absolute; top: 0.25rem; left: 0.25rem"
-  >
+  <v-btn fab text small disabled>
     <v-icon>mdi-chevron-down</v-icon>
   </v-btn>
 </template>
diff --git a/NUXT/components/Player/progressbar.vue b/NUXT/components/Player/progressbar.vue
index 15c43b8..19515e8 100644
--- a/NUXT/components/Player/progressbar.vue
+++ b/NUXT/components/Player/progressbar.vue
@@ -15,7 +15,7 @@
     :height="seeking ? 4 : 2"
     :style="
       fullscreen
-        ? 'width: calc(100% - 2rem); left: 1rem; bottom: 3.25rem;'
+        ? 'width: calc(100% - 2rem); left: 1rem; bottom: 3.5rem;'
         : 'width: 100%; left: 0; bottom: 1px;'
     "
   />
diff --git a/NUXT/components/Player/seekbar.vue b/NUXT/components/Player/seekbar.vue
index 743eff0..c892713 100644
--- a/NUXT/components/Player/seekbar.vue
+++ b/NUXT/components/Player/seekbar.vue
@@ -20,7 +20,7 @@
       style="position: absolute; z-index: 4"
       :style="
         fullscreen
-          ? 'width: calc(100% - 2rem); left: 1rem; bottom: 51px;'
+          ? 'width: calc(100% - 2rem); left: 1rem; bottom: 55px;'
           : 'width: calc(100% - 0.5rem); left: 0.25rem; bottom: 0;'
       "
       :thumb-size="0"
diff --git a/NUXT/components/Player/sponsorblock.vue b/NUXT/components/Player/sponsorblock.vue
index 51632d4..051322d 100644
--- a/NUXT/components/Player/sponsorblock.vue
+++ b/NUXT/components/Player/sponsorblock.vue
@@ -19,7 +19,7 @@
       :height="seeking ? 4 : 2"
       :style="
         fullscreen
-          ? 'width: calc(100% - 2rem); left: 1rem; bottom: 3.25rem;'
+          ? 'width: calc(100% - 2rem); left: 1rem; bottom: 3.5rem;'
           : 'width: 100%; left: 0; bottom: 1px;'
       "
     />
diff --git a/android/.idea/deploymentTargetDropDown.xml b/android/.idea/deploymentTargetDropDown.xml
index 7c97d1b..58a507a 100644
--- a/android/.idea/deploymentTargetDropDown.xml
+++ b/android/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-06-07T16:21:41.251850Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-06-08T20:06:18.658538Z" />
   </component>
 </project>
\ No newline at end of file