diff --git a/NUXT/components/Player/index.vue b/NUXT/components/Player/index.vue index e631ab4..0d68411 100644 --- a/NUXT/components/Player/index.vue +++ b/NUXT/components/Player/index.vue @@ -155,6 +155,7 @@ @@ -22,6 +27,10 @@ export default { type: Object, required: true, }, + seeking: { + type: Boolean, + required: true, + }, fullscreen: { type: Boolean, required: true, diff --git a/NUXT/components/Player/seekbar.vue b/NUXT/components/Player/seekbar.vue index 8e4ad8b..cf731fc 100644 --- a/NUXT/components/Player/seekbar.vue +++ b/NUXT/components/Player/seekbar.vue @@ -13,12 +13,14 @@ hide-details height="2" dense + color="transparent" + thumb-color="primary" track-color="transparent" :class="!controls && !fullscreen && !scrubbing ? 'invisible' : ''" - style="position: absolute; z-index: 3" + style="position: absolute; z-index: 4" :style=" fullscreen - ? 'width: calc(100% - 2rem); left: 1rem; bottom: 3rem;' + ? 'width: calc(100% - 2rem); left: 1rem; bottom: 51px;' : 'width: calc(100% - 0.8rem); left: 0.4rem; bottom: 0;' " :thumb-size="0" diff --git a/NUXT/components/Player/sponsorblock.vue b/NUXT/components/Player/sponsorblock.vue index 3ebe449..c2c36df 100644 --- a/NUXT/components/Player/sponsorblock.vue +++ b/NUXT/components/Player/sponsorblock.vue @@ -6,20 +6,21 @@ :buffer-value="(block.segment[1] / video.duration) * 100" :value="(block.segment[0] / video.duration) * 100" style=" - z-index: 4; - width: 100%; - background: transparent; + z-index: 3; + position: absolute; pointer-events: none; + background: transparent; + transform: translateY(50%); " :class="!fullscreen || controls ? '' : 'invisible'" background-color="white" background-opacity="1" color="transparent" - height="2" + :height="seeking ? 4 : 2" :style=" fullscreen - ? 'width: calc(100% - 2rem); left: 1rem; position: absolute; bottom: 3rem;' - : 'width: 100%; left: 0; position: absolute; bottom: 0;' + ? 'width: calc(100% - 2rem); left: 1rem; bottom: 3.25rem;' + : 'width: 100%; left: 0; bottom: 1px;' " /> @@ -32,6 +33,10 @@ export default { type: Object, required: true, }, + seeking: { + type: Boolean, + required: true, + }, videoid: { type: String, required: true, @@ -70,7 +75,7 @@ export default { vidTime <= sponsor.segment[1] ) { console.log("Skipping the sponsor"); - this.$youtube.showToast("Skipped sponsor") + this.$youtube.showToast("Skipped sponsor"); vid.currentTime = sponsor.segment[1] + 1; } }); diff --git a/NUXT/components/UtilRenderers/slimVideoDescriptionRenderer.vue b/NUXT/components/UtilRenderers/slimVideoDescriptionRenderer.vue index 32c7bc9..faf7ecf 100644 --- a/NUXT/components/UtilRenderers/slimVideoDescriptionRenderer.vue +++ b/NUXT/components/UtilRenderers/slimVideoDescriptionRenderer.vue @@ -8,6 +8,7 @@ diff --git a/NUXT/pages/watch.vue b/NUXT/pages/watch.vue index 148c6df..07a5d70 100644 --- a/NUXT/pages/watch.vue +++ b/NUXT/pages/watch.vue @@ -22,7 +22,7 @@
@@ -164,7 +164,7 @@
-
+
diff --git a/NUXT/plugins/vuetube.js b/NUXT/plugins/vuetube.js index ba23fdd..461aef2 100644 --- a/NUXT/plugins/vuetube.js +++ b/NUXT/plugins/vuetube.js @@ -141,31 +141,11 @@ const module = { Math.floor((((seconds % 31536000) % 86400) % 3600) % 60), //Seconds ]; levels = levels.filter((level) => level !== null); - for (let i = 1; i < levels.length; i++) { levels[i] = levels[i].toString().padStart(2, "0"); } - // join the array into a string with : as a separator let returntext = levels.join(":"); - - console.log("Human Time:", returntext); - // while (returntext.startsWith(":00")) { - // returntext = returntext.substring(3); - // } // Remove Prepending 0s (eg. 00:00:00:01:00) - // if (returntext.startsWith(":0")) { - // returntext = returntext.substring(2); - // } else { - // returntext = returntext.substring(1); - // } // Prevent Time Starting With 0 (eg. 01:00) - - // if (!returntext.includes(":")) { - // if (returntext.length == 1) { - // returntext = "0" + returntext; // Make tens digit in seconds always visible (eg. 0:09) - // } - // returntext = "0:" + returntext; // Make minutes visible as 0 when sub 60 seconds (eg. 0:51) - // } - return returntext; }, //--- End Convert Time To Human Readable String ---// diff --git a/android/.idea/deploymentTargetDropDown.xml b/android/.idea/deploymentTargetDropDown.xml index 007b8a4..7c97d1b 100644 --- a/android/.idea/deploymentTargetDropDown.xml +++ b/android/.idea/deploymentTargetDropDown.xml @@ -1,17 +1,17 @@ - + - + - - + + - - + + \ No newline at end of file