Skip to content

Commit

Permalink
Independent selection of PDF themes, bugfix for default preference va…
Browse files Browse the repository at this point in the history 
…lues from dictionaries
  • Loading branch information
@fjwillemsen
fjwillemsen committed Jul 13, 2023
1 parent 7c8cb3f commit d1ef4a3
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 45 deletions.
Binary file added Assets/showcase/preferences/preferences_pane_theme_selection_pdf.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Scripts/appversion.js
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
const appversion = "1.8.1";
const appversion = "1.9.0";
20 changes: 11 additions & 9 deletions Scripts/colormode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ const overallThemeToOverleaf = {
};

function switchColorModePDF() {
if (up_colormode_switching_pdf == true) {
if (current_colorscheme_preference == "dark") {
$(".pdf-viewer .pdfjs-viewer .page").addClass("conditional-invert-colors");
} else if (current_colorscheme_preference == "light") {
$(".pdf-viewer .pdfjs-viewer .page").removeClass("conditional-invert-colors");
}
current_pdfcolor = current_colorscheme_preference == "dark" ? up_pdftheme_dark : up_pdftheme_light;
if (current_pdfcolor == "dark") {
$(".pdf-viewer .pdfjs-viewer .page").addClass("conditional-invert-colors");
} else if (current_pdfcolor == "light") {
$(".pdf-viewer .pdfjs-viewer .page").removeClass("conditional-invert-colors");
} else {
console.error(`current pdfcolor preference ${current_pdfcolor} is not a valid value`);
}
}

Expand All @@ -26,7 +27,7 @@ function switchColorMode() {
scope.settings["overallTheme"] = overallThemeToOverleaf[up_overalltheme_light];
scope.settings["editorTheme"] = up_editortheme_light;
} else {
console.err(`current colorscheme preference ${current_colorscheme_preference} is not a valid value`);
console.error(`current colorscheme preference ${current_colorscheme_preference} is not a valid value`);
}
scope.$apply();
switchColorModePDF();
Expand All @@ -44,7 +45,7 @@ async function setupColormode() {
// listen to when the colorscheme changes
colorscheme.addEventListener("change", autoChangeColorMode, true);
}
if (up_colormode_switching_pdf == true && (await waitUntilPDFCompiled()) != false) {
if ((await waitUntilPDFCompiled()) != false) {
// apply the color mode directly
switchColorModePDF();
// when the PDF is changed, apply the color mode
Expand All @@ -70,11 +71,12 @@ async function setupColormode() {
}
}
function destructColormode() {
// remove the eventlistener for changes to the system theme
if (colorscheme !== undefined && up_colormode_switching == false) {
colorscheme.removeEventListener("change", autoChangeColorMode, true);
}
// no longer listen for when the PDF changes
if (up_colormode_switching_pdf == false && pdf_change_observer !== undefined) {
if (pdf_change_observer !== undefined) {
pdf_change_observer.disconnect();
$(".pdf-viewer .pdfjs-viewer .page").removeClass("conditional-invert-colors");
}
Expand Down
8 changes: 4 additions & 4 deletions Scripts/css.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ function setCSS() {
.history-labels-list, .history-labels-list-compare {
background-color: #fff;
}
.conditional-invert-colors {
filter: invert(100%) hue-rotate(180deg);
}
@media (prefers-color-scheme: dark) {
body {
Expand Down Expand Up @@ -159,10 +163,6 @@ function setCSS() {
background-color: #485263;
}
.conditional-invert-colors {
filter: invert(100%) hue-rotate(180deg);
}
#review-panel {
background-color: #485263 !important;
color: white !important;
Expand Down
72 changes: 42 additions & 30 deletions Scripts/preferences.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ const editorThemes_light = {
overleaf: "Overleaf",
eclipse: "Eclipse",
};
const pdfThemes_dark = {
dark: "Inverted",
};
const pdfThemes_light = {
light: "Standard",
};

// user preferences (abbreviated UP)
let up_notifications_comments = localStorage.getObject("notifications_comment", true);
Expand All @@ -26,11 +32,12 @@ let up_notifications_tracked_changes_created = localStorage.getObject("notificat
let up_notifications_tracked_changes_updated = localStorage.getObject("notifications_tracked_changes_updated", true);
let up_notifications_tracked_changes_resolved = localStorage.getObject("notifications_tracked_changes_resolved", true);
let up_colormode_switching = localStorage.getObject("colormode_switching", true);
let up_colormode_switching_pdf = localStorage.getObject("colormode_switching_pdf");
let up_overalltheme_dark = localStorage.getObject("overalltheme_dark", overallThemes_dark[0]);
let up_overalltheme_light = localStorage.getObject("overalltheme_light", overallThemes_light[0]);
let up_editortheme_dark = localStorage.getObject("editortheme_dark", editorThemes_dark[0]);
let up_editortheme_light = localStorage.getObject("editortheme_light", editorThemes_light[0]);
let up_overalltheme_dark = localStorage.getObject("overalltheme_dark", Object.keys(overallThemes_dark)[0]);
let up_overalltheme_light = localStorage.getObject("overalltheme_light", Object.keys(overallThemes_light)[0]);
let up_editortheme_dark = localStorage.getObject("editortheme_dark", Object.keys(editorThemes_dark)[0]);
let up_editortheme_light = localStorage.getObject("editortheme_light", Object.keys(editorThemes_light)[0]);
let up_pdftheme_dark = localStorage.getObject("pdftheme_dark", Object.keys(pdfThemes_dark)[0]);
let up_pdftheme_light = localStorage.getObject("pdftheme_light", Object.keys(pdfThemes_light)[0]);
let up_wordcount_tracking = localStorage.getObject("wordcount_tracking", true); // whether wordcount tracking is enabled
let up_wordcount_dailytarget = localStorage.getObject("wordcount_dailytarget", 200); // net number of words that must be produced daily
let up_wordcount_notificationhour = localStorage.getObject("wordcount_notificationhour", 18); // hour of the day at which the user is notified whether they have achieved their goal
Expand Down Expand Up @@ -122,13 +129,6 @@ function setupPreferencesPane() {
<div class="settings-toggle-switch"></div>
<span class="settings-toggle-label">Follow system</span>
</label>
<label class="settings-toggle">
<input id="colormode_switching_pdf" class="settings-toggle-checkbox" type="checkbox">
<div class="settings-toggle-switch"></div>
<span class="settings-toggle-label">Include PDF</span>
</label>
<br/>
<i>This option forces the PDF viewer to inverted colors. This does not change the PDF file itself.</i>
<br/>
<br/>
<b>Dark Mode</b>
Expand All @@ -142,6 +142,11 @@ function setupPreferencesPane() {
<select id="editortheme_dark">
${getFormSelectHTML([editorThemes_dark, editorThemes_light], ["dark", "light"])}
</select>
<br/>
<label for="pdftheme_dark">PDF viewer</label>
<select id="pdftheme_dark">
${getFormSelectHTML([pdfThemes_dark, pdfThemes_light], ["dark", "light"])}
</select>
<br/>
<br/>
<b>Light Mode</b>
Expand All @@ -155,6 +160,15 @@ function setupPreferencesPane() {
<select id="editortheme_light">
${getFormSelectHTML([editorThemes_light, editorThemes_dark], ["light", "dark"])}
</select>
<br/>
<label for="pdftheme_light">PDF viewer</label>
<select id="pdftheme_light">
${getFormSelectHTML([pdfThemes_light, pdfThemes_dark], ["light", "dark"])}
</select>
<br/>
<br/>
<i>The PDF option "inverted" forces the PDF viewer to inverted colors. This does not change the PDF file itself.</i>
<br/>
<hr/>
<h6>Wordcount Tracking</h6>
<p>When the document is recompiled, this keeps track of the number of words, allowing you to see your progress.</p>
Expand Down Expand Up @@ -196,22 +210,24 @@ function setupPreferencesPane() {
settings_form.querySelector("#notifications_tracked_changes_resolved").checked =
up_notifications_tracked_changes_resolved;
settings_form.querySelector("#colormode_switching").checked = up_colormode_switching;
settings_form.querySelector("#colormode_switching_pdf").checked = up_colormode_switching_pdf;
settings_form.querySelector("#overalltheme_dark").value = up_overalltheme_dark;
settings_form.querySelector("#overalltheme_light").value = up_overalltheme_light;
settings_form.querySelector("#editortheme_dark").value = up_editortheme_dark;
settings_form.querySelector("#editortheme_light").value = up_editortheme_light;
settings_form.querySelector("#pdftheme_dark").value = up_pdftheme_dark;
settings_form.querySelector("#pdftheme_light").value = up_pdftheme_light;
settings_form.querySelector("#wordcount_tracking").checked = up_wordcount_tracking;
settings_form.querySelector("#wordcount_dailytarget").value = up_wordcount_dailytarget;
settings_form.querySelector("#wordcount_notificationhour").value = up_wordcount_notificationhour;
settings_form.querySelector("#editor_font_family").value = up_editor_font_family;

// set the disabled values where necessary
settings_form.querySelector("#colormode_switching_pdf").disabled = !up_colormode_switching;
settings_form.querySelector("#overalltheme_dark").disabled = !up_colormode_switching;
settings_form.querySelector("#overalltheme_light").disabled = !up_colormode_switching;
settings_form.querySelector("#editortheme_dark").disabled = !up_colormode_switching;
settings_form.querySelector("#editortheme_light").disabled = !up_colormode_switching;
settings_form.querySelector("#pdftheme_dark").disabled = !up_colormode_switching;
settings_form.querySelector("#pdftheme_light").disabled = !up_colormode_switching;
settings_form.querySelector("#wordcount_dailytarget").disabled = !up_wordcount_tracking;
settings_form.querySelector("#wordcount_notificationhour").disabled = !up_wordcount_tracking;

Expand Down Expand Up @@ -252,11 +268,12 @@ const settings_handler = {
notifications_tracked_changes_updated: set_notifications_tracked_changes_updated,
notifications_tracked_changes_resolved: set_notifications_tracked_changes_resolved,
colormode_switching: set_colormode_switching,
colormode_switching_pdf: set_colormode_switching_pdf,
overalltheme_dark: set_overalltheme_dark,
overalltheme_light: set_overalltheme_light,
editortheme_dark: set_editortheme_dark,
editortheme_light: set_editortheme_light,
pdftheme_dark: set_pdftheme_dark,
pdftheme_light: set_pdftheme_light,
wordcount_tracking: set_wordcount_tracking,
wordcount_dailytarget: set_wordcount_dailytarget,
wordcount_notificationhour: set_wordcount_notificationhour,
Expand Down Expand Up @@ -411,11 +428,12 @@ function set_colormode_switching(key, value) {
if (value.checked != up_colormode_switching) {
up_colormode_switching = value.checked;
localStorage.setObject(key, value.checked);
settings_form.querySelector("#colormode_switching_pdf").disabled = !up_colormode_switching;
settings_form.querySelector("#overalltheme_dark").disabled = !up_colormode_switching;
settings_form.querySelector("#overalltheme_light").disabled = !up_colormode_switching;
settings_form.querySelector("#editortheme_dark").disabled = !up_colormode_switching;
settings_form.querySelector("#editortheme_light").disabled = !up_colormode_switching;
settings_form.querySelector("#pdftheme_dark").disabled = !up_colormode_switching;
settings_form.querySelector("#pdftheme_light").disabled = !up_colormode_switching;
if (up_colormode_switching == true) {
// register the event listener again
setupColormode();
Expand All @@ -426,20 +444,6 @@ function set_colormode_switching(key, value) {
}
}

function set_colormode_switching_pdf(key, value) {
if (value.checked != up_colormode_switching_pdf) {
up_colormode_switching_pdf = value.checked;
localStorage.setObject(key, value.checked);
if (up_colormode_switching_pdf == true) {
// register the event listener again
setupColormode();
} else {
// remove the event listener
destructColormode();
}
}
}

function themesetter(user_preference_variable_name, key, value) {
const user_preference_variable = eval(user_preference_variable_name);
localStorage.setObject(key, value.value);
Expand All @@ -465,3 +469,11 @@ function set_editortheme_dark(key, value) {
function set_editortheme_light(key, value) {
themesetter("up_editortheme_light", key, value);
}

function set_pdftheme_dark(key, value) {
themesetter("up_pdftheme_dark", key, value);
}

function set_pdftheme_light(key, value) {
themesetter("up_pdftheme_light", key, value);
}
2 changes: 1 addition & 1 deletion bundled_script.js
View file

Large diffs are not rendered by default.

0 comments on commit d1ef4a3

Please sign in to comment.