lightcordwarez
/
BetterDiscordApp-rauenzi
mirror of https://github.com/rauenzi/BetterDiscordApp.git
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Done 

• Code styling
• Improvements
This commit is contained in:
Mopsgamer 2022-10-13 15:49:54 +02:00
parent 1a76789c1d
commit 51d6a70b31
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
renderer/src/loading.js
View File

@ -1,13 +1,16 @@
/**The maximum number of status labels in the list at load time.*/
const maxLabels = 4;
/**Determines where the extra starts.*/
const extraLabels = 6;
const css = `/* BEGIN V2 LOADER */
/* =============== */
#bd-loading {
z-index: 2147483647;
position: absolute;
right: 5px;
bottom: 5px;
right: 0;
bottom: 0;
transition: 1s;
width: 100%;
height: 100%;
}
.theme-dark #bd-loading-icon {
@ -20,7 +23,6 @@ const css = `/* BEGIN V2 LOADER */
position: fixed;
bottom: 10px;
right: 5px;
z-index: 2147483646;
display: block;
width: 20px;
height: 20px;
@ -31,7 +33,6 @@ const css = `/* BEGIN V2 LOADER */
position: fixed;
bottom: 5px;
right: 5px;
z-index: 2147483647;
width: 20px;
height: 3px;
background-color: var(--header-primary);
@ -47,7 +48,6 @@ const css = `/* BEGIN V2 LOADER */
position: absolute;
bottom: 7px;
right: 30px;
z-index: 2147483645;
}
.bd-loading-status-container {
white-space: nowrap;
@ -56,12 +56,12 @@ const css = `/* BEGIN V2 LOADER */
color: var(--header-primary);
transition: 0.2s;
}
${
${// reduce labels opacity
(()=>{
/**if `maxLabels == 4`: `'2', '3', 'n+4'`*/
let opacityReduceNth = new Array(maxLabels - 1).fill('temp').map((_, i) => (i == maxLabels - 2 ? 'n+' : '') + (i + 2).toString())
let opacityReduceNth = new Array(extraLabels - 1).fill('temp').map((_, i) => (i == extraLabels - 2 ? 'n+' : '') + (i + 2).toString());
return opacityReduceNth.map((nth, i) => `.bd-loading-status-container:nth-last-child(${nth}) { opacity: ${1 - (i + 1) * (1 / maxLabels)}; }`).join('\n')
return opacityReduceNth.map((nth, i) => `.bd-loading-status-container:nth-last-child(${nth}) { opacity: ${1 - (i + 1) * (1 / extraLabels)}; }`).join('\n');
})()
}
@ -103,7 +103,7 @@ export default class {
* Sets the value of the progress bar, adds status to the list about status.
* @param {*} percent Doesn't change the progress if not a number.
* @param {string} status Doesn't add the label if not a string.
* @param {boolean} clear Previous labels will be deleted before adding a new one (`status`).
* @param {boolean} clear Previous labels will be deleted before adding a new one `status`.
* @returns
*/
static setInitStatus(percent = null, status = "", clear = false) {
@ -123,8 +123,8 @@ export default class {
StatusContainer.innerHTML = status;
StatusListContainer.append(StatusContainer);
if (StatusListContainer.childElementCount > 3) {
let Needless = StatusListContainer.querySelectorAll("#bd-loading-status-list > :nth-last-child(n+4)");
if (StatusListContainer.childElementCount > extraLabels - 1) {
let Needless = StatusListContainer.querySelectorAll(`#bd-loading-status-list > :nth-last-child(n+${extraLabels})`);
Needless.forEach(n => setTimeout(() => n?.remove?.(), 200));
}
};

26
renderer/src/modules/core.js
View File

@ -31,60 +31,60 @@ export default new class Core {
// Load css early
Logger.log("Startup", "Injecting BD Styles");
DOMManager.injectStyle("bd-stylesheet", Styles.toString());
await LoadingInterface.setInitStatus(1/stepsCount*100, "Injecting BD Styles");
DOMManager.injectStyle("bd-stylesheet", Styles.toString());
Logger.log("Startup", "Initializing DataStore");
await LoadingInterface.setInitStatus(2/stepsCount*100, "Initializing DataStore...");
DataStore.initialize();
await LoadingInterface.setInitStatus(2/stepsCount*100, "Initializing DataStore");
Logger.log("Startup", "Initializing LocaleManager");
await LoadingInterface.setInitStatus(3/stepsCount*100, "Initializing LocaleManager...");
LocaleManager.initialize();
await LoadingInterface.setInitStatus(3/stepsCount*100, "Initializing LocaleManager");
Logger.log("Startup", "Initializing Settings");
await LoadingInterface.setInitStatus(5/stepsCount*100, "Initializing Settings...");
Settings.initialize();
await LoadingInterface.setInitStatus(5/stepsCount*100, "Initializing Settings");
Logger.log("Startup", "Initializing DOMManager");
await LoadingInterface.setInitStatus(6/stepsCount*100, "Initializing DOMManager...");
DOMManager.initialize();
await LoadingInterface.setInitStatus(6/stepsCount*100, "Initializing DOMManager");
Logger.log("Startup", "Waiting for connection...");
await this.waitForConnection();
await LoadingInterface.setInitStatus(7/stepsCount*100, "Waiting for connection...");
await this.waitForConnection();
Logger.log("Startup", "Initializing Editor");
await LoadingInterface.setInitStatus(8/stepsCount*100, "Initializing Editor...");
await Editor.initialize();
await LoadingInterface.setInitStatus(8/stepsCount*100, "Initializing Editor");
Logger.log("Startup", "Initializing Builtins");
await LoadingInterface.setInitStatus(9/stepsCount*100, "Initializing Builtins...");
Modals.initialize();
for (const module in Builtins) {
Builtins[module].initialize();
}
await LoadingInterface.setInitStatus(9/stepsCount*100, "Initializing Builtins");
Logger.log("Startup", "Loading Plugins");
// const pluginErrors = [];
await LoadingInterface.setInitStatus(10/stepsCount*100, "Loading Plugins...");
const pluginErrors = PluginManager.initialize();
await LoadingInterface.setInitStatus(10/stepsCount*100, "Loading Plugins");
Logger.log("Startup", "Loading Themes");
// const themeErrors = [];
await LoadingInterface.setInitStatus(11/stepsCount*100, "Loading Themes...");
const themeErrors = ThemeManager.initialize();
await LoadingInterface.setInitStatus(11/stepsCount*100, "Loading Themes");
Logger.log("Startup", "Initializing Updater");
await LoadingInterface.setInitStatus(12/stepsCount*100, "Initializing Updater...");
Updater.initialize();
await LoadingInterface.setInitStatus(12/stepsCount*100, "Initializing Updater");
Logger.log("Startup", "Getting update information");
await LoadingInterface.setInitStatus(13/stepsCount*100, "Getting update information...");
CoreUpdater.checkForUpdate()
await LoadingInterface.setInitStatus(13/stepsCount*100, "Getting update information");
Logger.log("Startup", "Removing Loading Interface");
await LoadingInterface.setInitStatus(100, "Done");
await LoadingInterface.setInitStatus(100, "Done", true);
LoadingInterface.hide();
// Show loading errors