version 1.0.66

Dreamlinerm · Oct 31, 2023 · bf6d074 · bf6d074
1 parent 7a34724
commit bf6d074
Show file tree

Hide file tree

Showing 13 changed files with 231 additions and 140 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file.
           <h2>Changelog</h2>
           <div>
             <div class="line flex">
-              <h2>1.0.65</h2>
+              <h2>1.0.66</h2>
               <ul>
                 <li>fixed Netflix ad skip: skips too far</li>
                 <li>added IMDB rating to Disney</li>

diff --git a/chrome/cr.js b/chrome/cr.js
@@ -1,7 +1,7 @@
 const defaultSettings = {
   settings: {
     Amazon: { skipIntro: true, skipCredits: true, watchCredits: false, skipAd: true, blockFreevee: true, speedSlider: true, filterPaid: false, showRating: true, streamLinks: true },
-    Netflix: { skipIntro: true, skipRecap: true, skipCredits: true, watchCredits: false, skipBlocked: true, NetflixAds: true, speedSlider: true, profile: true, showRating: true },
+    Netflix: { skipIntro: true, skipRecap: true, skipCredits: true, watchCredits: false, skipBlocked: true, skipAd: true, speedSlider: true, profile: true, showRating: true },
     Disney: { skipIntro: true, skipCredits: true, watchCredits: false, speedSlider: true, showRating: true },
     Crunchyroll: { skipIntro: true, speedSlider: true, releaseCalendar: true },
     Video: { playOnFullScreen: true },

diff --git a/chrome/manifest.json b/chrome/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "1.0.65",
+  "version": "1.0.66",
 
   "homepage_url": "https://github.com/Dreamlinerm/Netflix-Prime-Auto-Skip",
   "icons": {
@@ -36,7 +36,6 @@
     }
   ],
   "permissions": ["storage"],
-  "host_permissions": ["https://apis.justwatch.com/*"],
   "action": {
     "default_icon": {
       "16": "icons/NetflixAmazon Auto-Skip--16.png",

diff --git a/chrome/popup/popup.html b/chrome/popup/popup.html
@@ -29,7 +29,7 @@
           <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" />
           <div class="flex-center flex-col">
             <h2 class="title" i18n>pageTitle</h2>
-            <p style="color: grey; font-size: 1em">v.1.0.65</p>
+            <p style="color: grey; font-size: 1em">v.1.0.66</p>
           </div>
         </div>
         <a
@@ -267,6 +267,43 @@ <h2 id="openDisneySettings" i18n>PageSpecificTitle;Disney+</h2>
         <!-- show on click -->
         <div id="DisneySettings" style="display: none"></div>
       </div>
+      <div class="categoryCrunchyroll">
+        <div id="openCrunchyrollSettings" class="flex flex-between" style="padding: 5px 5px">
+          <h2 id="openCrunchyrollSettings" i18n>PageSpecificTitle;Crunchyroll</h2>
+          <div class="flex">
+            <div class="line flex-align" id="openCrunchyrollSettings">
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 20" height="1em" id="openCrunchyrollSettings" class="CrunchyrollDownArrow">
+                <path d="M0 0 40 0 20 20 0 0" fill="white" id="openCrunchyrollSettings" />
+              </svg>
+              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 20" height="1em" id="openCrunchyrollSettings" class="CrunchyrollUpArrow hidden">
+                <path d="M20 0 40 20 0 20 20 0" fill="white" id="openCrunchyrollSettings" />
+              </svg>
+            </div>
+            <label class="switch">
+              <input type="checkbox" id="CrunchyrollSkips" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+        </div>
+
+        <!-- show on click -->
+        <div id="CrunchyrollSettings" style="display: none">
+          <div class="line flex">
+            <p i18n>IntroSwitch</p>
+            <label class="switch">
+              <input type="checkbox" id="CrunchyrollSkipIntro" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+          <div class="line flex">
+            <p i18n>ReleaseCalendarSwitch</p>
+            <label class="switch">
+              <input type="checkbox" id="CrunchyrollReleaseCalendar" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+        </div>
+      </div>
       <div class="flex flex-between flex-align" id="openStatistics">
         <h2 id="openStatistics" style="margin-left: 10px" i18n>StatisticPageTitle</h2>
         <div class="flex" style="margin-right: 75px">

diff --git a/chrome/popup/settings.css b/chrome/popup/settings.css
@@ -149,9 +149,13 @@ p {
 .categoryDisney {
   background-color: #000c7d;
 }
+.categoryCrunchyroll {
+  background-color: #f78b24;
+}
 .categoryPrime,
 .categoryNetflix,
-.categoryDisney {
+.categoryDisney,
+.categoryCrunchyroll {
   margin-top: 5px;
   margin-left: 5px;
   margin-right: 5px;

diff --git a/chrome/popup/settings.html b/chrome/popup/settings.html
@@ -29,7 +29,7 @@
           <img class="Logo" src="../icons/NetflixAmazon Auto-Skip.svg" />
           <div class="flex-center flex-col">
             <h2 class="title" i18n>pageTitle</h2>
-            <p style="font-size: 1em">v.1.0.65</p>
+            <p style="font-size: 1em">v.1.0.66</p>
           </div>
         </div>
         <a
@@ -75,6 +75,20 @@ <h2 class="title" i18n>pageTitle</h2>
           </svg>
           Disney+
         </a>
+        <a id="MenuCrunchyroll" href="#Crunchyroll" class="menuButton flex">
+          <svg id="MenuCrunchyroll" class="icon" viewBox="1.8 1.581 247.263 220" xmlns="http://www.w3.org/2000/svg">
+            <!-- #f78b24 -->
+            <g fill="white">
+              <path
+                d="m115.377 209.8c-3.54-.33-12.852-1.943-16.306-2.825-29.863-7.625-55.154-28.074-68.537-55.418-7.337-14.99-10.395-28.396-10.383-45.52.012-17.144 3.117-30.818 10.335-45.52 5.406-11.01 11.625-19.636 20.453-28.37 16.513-16.336 37.43-26.45 61.124-29.552 7.746-1.014 24.143-.684 31.377.631 15.045 2.737 28.553 8.112 40.658 16.178 25.149 16.76 41.461 42.39 45.714 71.828.91 6.303 1.437 19.42.824 20.515-.335.598-.508-.028-.727-2.62-1.086-12.843-6.642-28.373-14.307-39.991-23.298-35.313-66.767-50.295-107.013-36.883-31.064 10.352-54.41 36.615-60.818 68.416-3.169 15.725-2.218 31.139 2.86 46.355 8.953 26.836 30.382 48.274 57.558 57.584 6.41 2.196 14.64 4.026 20.068 4.461 6.5.522 4.861 1.018-3.157.956-4.376-.033-8.75-.135-9.723-.225z"
+              />
+              <path
+                d="m137.695 196.826c-33.594-2.447-61.427-27.495-67.236-60.507-1.057-6.008-1.261-17.24-.413-22.769 5.036-32.827 30.288-57.733 63.23-62.362 6.676-.938 18.574-.61 24.969.69 5.562 1.13 11.728 3.138 16.572 5.394l3.757 1.75-3.536 1.669c-12.758 6.025-20.633 20.118-18.784 33.619 1.851 13.52 11.2 24.13 24.622 27.945 4.832 1.374 12.22 1.373 17.054 0 6.25-1.777 11.152-4.682 15.613-9.254 1.506-1.544 2.835-2.648 2.954-2.455.119.194.463 2.322.765 4.73.745 5.939.308 17.238-.886 22.88-3.803 17.967-13.386 33.049-28.08 44.192-13.907 10.546-32.305 15.81-50.601 14.478z"
+              />
+            </g>
+          </svg>
+          Crunchyroll
+        </a>
         <a id="MenuOther" href="#Other" class="menuButton flex">
           <svg id="MenuOther" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon">
             <path
@@ -173,6 +187,7 @@ <h2 i18n>SharedPageTitle</h2>
               <th>Netflix</th>
               <th>Prime</th>
               <th>Disney+</th>
+              <th>Crunchyroll</th>
             </tr>
             <tr>
               <td>
@@ -193,6 +208,12 @@ <h2 i18n>SharedPageTitle</h2>
                   <span class="slider round"></span>
                 </label>
               </td>
+              <td>
+                <label class="switch">
+                  <input type="checkbox" id="CrunchyrollSkipIntro" />
+                  <span class="slider round"></span>
+                </label>
+              </td>
             </tr>
           </table>
           <p class="description" i18n>SharedIntroDescription</p>
@@ -284,7 +305,7 @@ <h2 i18n>SharedPageTitle</h2>
             <tr>
               <td>
                 <label class="switch">
-                  <input type="checkbox" id="NetflixNetflixAds" />
+                  <input type="checkbox" id="NetflixSkipAd" />
                   <span class="slider round"></span>
                 </label>
               </td>
@@ -341,6 +362,7 @@ <h2 i18n>SharedPageTitle</h2>
               <th>Netflix</th>
               <th>Prime</th>
               <th>Disney+</th>
+              <th>Crunchyroll</th>
             </tr>
             <tr>
               <td>
@@ -361,6 +383,12 @@ <h2 i18n>SharedPageTitle</h2>
                   <span class="slider round"></span>
                 </label>
               </td>
+              <td>
+                <label class="switch">
+                  <input type="checkbox" id="CrunchyrollSpeedSlider" />
+                  <span class="slider round"></span>
+                </label>
+              </td>
             </tr>
           </table>
           <p class="description" i18n>SliderSwitchDescription</p>
@@ -550,7 +578,7 @@ <h2 i18n>PageSpecificTitle;Netflix</h2>
                 <div class="line flex">
                   <p i18n>AdsSwitch</p>
                   <label class="switch">
-                    <input type="checkbox" id="NetflixNetflixAds" />
+                    <input type="checkbox" id="NetflixSkipAd" />
                     <span class="slider round"></span>
                   </label>
                 </div>
@@ -604,6 +632,32 @@ <h2 i18n>PageSpecificTitle;Disney+</h2>
                   </label>
                 </div> -->
         </div>
+        <div class="categoryCrunchyroll hidden" style="margin-top: 0; background-color: unset" id="CrunchyrollSettings">
+          <div class="flex flex-between" style="padding: 5px 5px; color: #f78b24">
+            <h2 i18n>PageSpecificTitle;Crunchyroll</h2>
+            <label class="switch">
+              <input type="checkbox" id="CrunchyrollSkips" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+          <hr />
+          <div class="line flex">
+            <p i18n>IntroSwitch</p>
+            <label class="switch">
+              <input type="checkbox" id="CrunchyrollSkipIntro" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+          <hr />
+          <div class="line flex">
+            <p i18n>ReleaseCalendarSwitch</p>
+            <label class="switch">
+              <input type="checkbox" id="CrunchyrollReleaseCalendar" />
+              <span class="slider round"></span>
+            </label>
+          </div>
+          <p class="description" i18n>ReleaseCalendarDescription</p>
+        </div>
         <div id="StatisticsSettings" class="hidden">
           <h2 i18n>SkippedTime</h2>
           <div class="line flex flex-between">
@@ -653,7 +707,16 @@ <h2 i18n>ImportSettings</h2>
           <h2>Changelog</h2>
           <div>
             <div class="line flex">
-              <h2>1.0.65</h2>
+              <h2>1.0.66</h2>
+              <ul>
+                <li>added Streaming Service Crunchyroll</li>
+                <li>fixed Netflix SpeedSlider was conflicting with netflix ad Skip</li>
+                <li>added Portuguese (BR) as a Language</li>
+                <li>simplified Code substantially(min. 600 LOC less)</li>
+              </ul>
+            </div>
+            <div class="line flex">
+              <p>1.0.65</p>
               <ul>
                 <li>fixed Netflix SpeedSlider was conflicting with netflix ad Skip</li>
                 <li>added Portuguese (BR) as a Language</li>