diff --git a/admin/package.json b/admin/package.json index 841dcdc..0521277 100644 --- a/admin/package.json +++ b/admin/package.json @@ -1,6 +1,6 @@ { "name": "watch-party-admin", - "version": "1.7.4", + "version": "1.7.5", "private": true, "dependencies": { "@ant-design/icons": "^4.2.2", diff --git a/app/package.json b/app/package.json index 0982445..ffe3492 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "watch-party-crx", - "version": "1.7.4", + "version": "1.7.5", "private": true, "dependencies": {}, "scripts": { diff --git a/app/public/background.js b/app/public/background.js index 734f5d0..0ed06f3 100644 --- a/app/public/background.js +++ b/app/public/background.js @@ -26,7 +26,7 @@ try { console.info('CHROME ENV'); } -const APP_VERSION = '1.7.4'; +const APP_VERSION = '1.7.5'; const APP_VERSION_STRING = APP_VERSION.replace(/\./g, ''); const firebaseConfig = { @@ -96,10 +96,12 @@ CHROME_OR_BROWSER.runtime.onInstalled.addListener((details) => { if (details.reason === 'install') { if (window.localStorage.getItem('watchPartyVersion')) { if (window.localStorage.getItem('watchPartyVersion') !== APP_VERSION) { - CHROME_OR_BROWSER.tabs.create({ - url: `http://www.${BASE_URL}.com/changes/v${APP_VERSION}`, - active: true, - }); + if (window.localStorage.getItem('showChangelog') === true) { + CHROME_OR_BROWSER.tabs.create({ + url: `http://www.${BASE_URL}.com/changes/v${APP_VERSION}`, + active: true, + }); + } window.localStorage.setItem('watchPartyVersion', APP_VERSION); } } else { @@ -112,17 +114,21 @@ CHROME_OR_BROWSER.runtime.onInstalled.addListener((details) => { } else if (details.reason === 'update') { if (window.localStorage.getItem('watchPartyVersion')) { if (window.localStorage.getItem('watchPartyVersion') !== APP_VERSION) { + if (window.localStorage.getItem('showChangelog') === true) { + CHROME_OR_BROWSER.tabs.create({ + url: `http://www.${BASE_URL}.com/changes/v${APP_VERSION}`, + active: true, + }); + } + window.localStorage.setItem('watchPartyVersion', APP_VERSION); + } + } else { + if (window.localStorage.getItem('showChangelog') === true) { CHROME_OR_BROWSER.tabs.create({ url: `http://www.${BASE_URL}.com/changes/v${APP_VERSION}`, active: true, }); - window.localStorage.setItem('watchPartyVersion', APP_VERSION); } - } else { - CHROME_OR_BROWSER.tabs.create({ - url: `http://www.${BASE_URL}.com/changes/v${APP_VERSION}`, - active: true, - }); window.localStorage.setItem('watchPartyVersion', APP_VERSION); } } diff --git a/app/public/fonts/glacialindifference-bold-webfont.woff b/app/public/fonts/glacialindifference-bold-webfont.woff new file mode 100644 index 0000000..0b2a375 Binary files /dev/null and b/app/public/fonts/glacialindifference-bold-webfont.woff differ diff --git a/app/public/fonts/glacialindifference-bold-webfont.woff2 b/app/public/fonts/glacialindifference-bold-webfont.woff2 new file mode 100644 index 0000000..452055e Binary files /dev/null and b/app/public/fonts/glacialindifference-bold-webfont.woff2 differ diff --git a/app/public/fonts/glacialindifference-italic-webfont.woff b/app/public/fonts/glacialindifference-italic-webfont.woff new file mode 100644 index 0000000..ac14a23 Binary files /dev/null and b/app/public/fonts/glacialindifference-italic-webfont.woff differ diff --git a/app/public/fonts/glacialindifference-italic-webfont.woff2 b/app/public/fonts/glacialindifference-italic-webfont.woff2 new file mode 100644 index 0000000..d1317b3 Binary files /dev/null and b/app/public/fonts/glacialindifference-italic-webfont.woff2 differ diff --git a/app/public/fonts/glacialindifference-regular-webfont.woff b/app/public/fonts/glacialindifference-regular-webfont.woff new file mode 100644 index 0000000..64b9726 Binary files /dev/null and b/app/public/fonts/glacialindifference-regular-webfont.woff differ diff --git a/app/public/fonts/glacialindifference-regular-webfont.woff2 b/app/public/fonts/glacialindifference-regular-webfont.woff2 new file mode 100644 index 0000000..f663610 Binary files /dev/null and b/app/public/fonts/glacialindifference-regular-webfont.woff2 differ diff --git a/app/public/manifest.json b/app/public/manifest.json index b668f81..21d77c9 100644 --- a/app/public/manifest.json +++ b/app/public/manifest.json @@ -1,7 +1,7 @@ { "name": "Watch Party", "short_name": "WP", - "version": "1.7.4", + "version": "1.7.5", "description": "Watch streamed content together.", "background": { "page": "background.html" diff --git a/app/public/popup.html b/app/public/popup.html index 18963b7..b3d7a0b 100644 --- a/app/public/popup.html +++ b/app/public/popup.html @@ -13,9 +13,74 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. + + + + + + @@ -111,28 +203,8 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -
- WATCH PARTY -
-

- To use Watch Party, head on over to any supported website. -

+
WATCH PARTY
+

To use Watch Party, head on over to any supported website.

@@ -165,33 +237,44 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION.
-
+
- + Currently showing Watch Party button +
Refresh page after changing show/hide status.
-
- Refresh page after changing show/hide status. +
+ +
+
+
+
+
+
+ +
+
+
+ + Will open changelog on Watch Party update +
diff --git a/app/public/popup.js b/app/public/popup.js index 8095cf4..e0d9f37 100644 --- a/app/public/popup.js +++ b/app/public/popup.js @@ -11,40 +11,75 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. ************************************************************************/ window.onload = function () { const MDCSwitch = mdc.switchControl.MDCSwitch; - const switchControl = new MDCSwitch(document.querySelector('.mdc-switch')); + const showToggleControl = new MDCSwitch(document.querySelector('.mdc-switch#show-toggle')); + const changelogToggleControl = new MDCSwitch( + document.querySelector('.mdc-switch#changelog-toggle') + ); function clearLocal() { window.localStorage.removeItem('parties'); return 0; } + function setShowWPButton(v) { window.localStorage.setItem('showWPButton', v); } + function setShowChangelog(v) { + window.localStorage.setItem('showChangelog', v); + } + function getShowWPButton() { return window.localStorage.getItem('showWPButton') ? JSON.parse(window.localStorage.getItem('showWPButton')) : true; } + function getShowChangelog() { + return window.localStorage.getItem('showChangelog') + ? JSON.parse(window.localStorage.getItem('showChangelog')) + : false; + } + function toggleShowWPButton() { const currentStatus = getShowWPButton(); setShowWPButton(!currentStatus); - switchControl.checked = !currentStatus; + showToggleControl.checked = !currentStatus; changeShowWPButtonDescription(); } + function toggleShowChangelog() { + const currentStatus = getShowChangelog(); + setShowChangelog(!currentStatus); + changelogToggleControl.checked = !currentStatus; + changeShowChangelogDescription(); + } + function changeShowWPButtonDescription() { const currentStatus = getShowWPButton(); if (currentStatus === true) { - document.querySelector('.switch-wrapper span').innerText = + document.querySelector('#show-toggle + .label-container span').innerText = 'Currently showing Watch Party button'; } else { - document.querySelector('.switch-wrapper span').innerText = + document.querySelector('#show-toggle + .label-container span').innerText = 'Watch Party button is currently hidden'; } } + function changeShowChangelogDescription() { + const currentStatus = getShowChangelog(); + if (currentStatus === true) { + document.querySelector('#changelog-toggle + .label-container span').innerText = + 'Will open changelog on Watch Party update'; + } else { + document.querySelector('#changelog-toggle + .label-container span').innerText = + 'Will not open changelog on Watch Party update'; + } + } - switchControl.checked = getShowWPButton(); + showToggleControl.checked = getShowWPButton(); changeShowWPButtonDescription(); - document.querySelector('.mdc-switch').onchange = toggleShowWPButton; + document.querySelector('.mdc-switch#show-toggle').onchange = toggleShowWPButton; + + changelogToggleControl.checked = getShowChangelog(); + changeShowChangelogDescription(); + document.querySelector('.mdc-switch#changelog-toggle').onchange = toggleShowChangelog; mdc.ripple.MDCRipple.attachTo(document.getElementById('clear-button')); document.getElementById('clear-button').onclick = clearLocal; diff --git a/app/src/App.js b/app/src/App.js index f4060db..65611bc 100644 --- a/app/src/App.js +++ b/app/src/App.js @@ -27,7 +27,7 @@ import { } from './Api'; import Tutorial from './Tutorial'; -const APP_VERSION = '1.7.4'; +const APP_VERSION = '1.7.5'; const APP_VERSION_STRING = APP_VERSION.replace(/\./g, ''); const darkTheme = createMuiTheme({ diff --git a/functions/package.json b/functions/package.json index 308d5a8..3f34c04 100644 --- a/functions/package.json +++ b/functions/package.json @@ -1,6 +1,6 @@ { "name": "watch-party-api", - "version": "1.7.4", + "version": "1.7.5", "description": "Cloud Functions for Watch Party", "scripts": { "lint": "eslint .", diff --git a/package.json b/package.json index bbd4b3c..9bf8c2a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "watch-party", - "version": "1.7.4", + "version": "1.7.5", "description": "Watch Party", "scripts": { "start": "firebase emulators:start",