Skip to content
This repository has been archived by the owner on Nov 20, 2024. It is now read-only.

Commit

Permalink
Update discover home
Browse files Browse the repository at this point in the history
  • Loading branch information
@danieldieeins
danieldieeins committed Aug 14, 2024
1 parent 6759a69 commit 0d8906e
Show file tree
Hide file tree
Showing 21 changed files with 405 additions and 113 deletions.
3 changes: 2 additions & 1 deletion application-main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
</parent>

<artifactId>application-main</artifactId>
<version>2024.8-beta.1</version>
<version>2024.8.1-beta.1</version>
<name>Solus Lupus (2.0.0-beta367)</name>

<properties>
<maven.compiler.source>17</maven.compiler.source>
Expand Down
Binary file modified application-main/src/deb/icon.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.
75 changes: 38 additions & 37 deletions application-main/src/main/java/com/zyneonstudios/application/frame/FrameConnector.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.zyneonstudios.application.frame;

import com.zyneonstudios.application.frame.web.ApplicationFrame;
import com.zyneonstudios.application.main.ApplicationConfig;
import com.zyneonstudios.application.main.ApplicationStorage;
import com.zyneonstudios.application.main.NexusApplication;
import com.zyneonstudios.application.modules.ApplicationModule;
import com.zyneonstudios.application.modules.search.ModuleSearch;
Expand All @@ -26,7 +26,7 @@ public FrameConnector(ApplicationFrame frame,NexusApplication application) {
}

public void resolveRequest(String request) {
if(ApplicationConfig.test) {
if(ApplicationStorage.test) {
NexusApplication.getLogger().error("[CONNECTOR] (Request-Reader) resolving "+request+"...");
} else {
NexusApplication.getLogger().debug("[CONNECTOR] (Request-Reader) resolving "+request+"...");
Expand Down Expand Up @@ -64,21 +64,22 @@ private void open(String request) {
private void load(String request) {
switch (request) {
case "drive" ->
frame.getBrowser().loadURL("https://drive.zyneonstudios.com/app/?theme=" + ApplicationConfig.theme + "&language=" + ApplicationConfig.language);
frame.getBrowser().loadURL("https://drive.zyneonstudios.com/app/?theme=" + ApplicationStorage.theme + "&language=" + ApplicationStorage.language);
case "discover" ->
frame.getBrowser().loadURL(ApplicationConfig.urlBase + ApplicationConfig.language + "/discover.html");
frame.getBrowser().loadURL(ApplicationStorage.urlBase + ApplicationStorage.language + "/discover.html");
case "downloads" ->
frame.getBrowser().loadURL(ApplicationConfig.urlBase + ApplicationConfig.language + "/downloads.html");
frame.getBrowser().loadURL(ApplicationStorage.urlBase + ApplicationStorage.language + "/downloads.html");
case "library" ->
frame.getBrowser().loadURL(ApplicationConfig.urlBase + ApplicationConfig.language + "/library.html");
frame.getBrowser().loadURL(ApplicationStorage.urlBase + ApplicationStorage.language + "/library.html");
case "settings" ->
frame.getBrowser().loadURL(ApplicationConfig.urlBase + ApplicationConfig.language + "/settings.html");
frame.getBrowser().loadURL(ApplicationStorage.urlBase + ApplicationStorage.language + "/settings.html");
}
}

private void init(String request) {
frame.executeJavaScript("syncDesktop();");
if(request.equals("discover")) {
frame.executeJavaScript("setMenuPanel('','"+ ApplicationStorage.getApplicationVersion()+"','"+ ApplicationStorage.getApplicationName()+"',true);");
if(frame.getBrowser().getURL().contains("&l=search")) {
frame.executeJavaScript("deactivateMenu('menu',true);");
} else {
Expand All @@ -88,15 +89,15 @@ private void init(String request) {
frame.executeJavaScript("deactivateMenu('menu',true);");
}
if(request.equals("settings")) {
frame.executeJavaScript("syncVersion(\""+ApplicationConfig.getApplicationVersion().replace("\"","''")+"\");");
frame.executeJavaScript("syncVersion(\""+ ApplicationStorage.getApplicationVersion().replace("\"","''")+"\");");
} else if(request.equals("downloads")) {

}
}

private void sync(String request) {
if(request.startsWith("title.")) {
if(ApplicationConfig.hasDriveAccess()) {
if(ApplicationStorage.hasDriveAccess()) {
frame.executeJavaScript("document.getElementById('drive-button').style.display = 'flex';");
}
String[] request_ = request.replace("title.","").split("-.-",2);
Expand Down Expand Up @@ -126,88 +127,88 @@ private void sync(String request) {
background = Color.decode("#0a0310");
foreground = Color.white;
}
if(!ApplicationConfig.theme.equalsIgnoreCase(fReq)) {
ApplicationConfig.theme = fReq;
ApplicationConfig.getSettings().set("settings.theme", ApplicationConfig.theme);
if(!ApplicationStorage.theme.equalsIgnoreCase(fReq)) {
ApplicationStorage.theme = fReq;
ApplicationStorage.getSettings().set("settings.theme", ApplicationStorage.theme);
}
String title = request_[1];
frame.setTitlebar(title,background,foreground);
} else if(request.startsWith("firstrun.")) {
request = request.replaceFirst("firstrun.","");
if(request.equals("theme")) {
frame.executeJavaScript("initThemeWizard();");
if(ApplicationConfig.getOS().startsWith("Linux")) {
if(ApplicationStorage.getOS().startsWith("Linux")) {
boolean customFrame = true;
if(ApplicationConfig.getSettings().get("settings.linux.customFrame")!=null) {
if(ApplicationStorage.getSettings().get("settings.linux.customFrame")!=null) {
try {
customFrame = ApplicationConfig.getSettings().getBool("settings.linux.customFrame");
customFrame = ApplicationStorage.getSettings().getBool("settings.linux.customFrame");
} catch (Exception ignore) {}
}
frame.executeJavaScript("initLinuxWizard('"+customFrame+"');");
}
} else if(request.startsWith("linuxFrame.")) {
request = request.replace("linuxFrame.","");
boolean frame = request.equals("on");
ApplicationConfig.getSettings().set("settings.linux.customFrame",frame);
ApplicationConfig.getSettings().set("cache.restartPage","firstrun.html?theme.colors="+ApplicationConfig.theme+"#linux");
ApplicationStorage.getSettings().set("settings.linux.customFrame",frame);
ApplicationStorage.getSettings().set("cache.restartPage","firstrun.html?theme.colors="+ ApplicationStorage.theme+"#linux");
application.restart(true);
} else if(request.equals("finished")) {
ApplicationConfig.getSettings().set("settings.setupFinished",true);
ApplicationStorage.getSettings().set("settings.setupFinished",true);
}
} else if(request.equals("exit")) {
NexusApplication.stop();
} else if(request.equals("refresh")) {
frame.getBrowser().loadURL(ApplicationConfig.urlBase+ApplicationConfig.language+"/"+ApplicationConfig.startPage);
frame.getBrowser().loadURL(ApplicationStorage.urlBase+ ApplicationStorage.language+"/"+ ApplicationStorage.startPage);
} else if(request.equals("restart")) {
application.restart(false);
} else if(request.startsWith("settings.")) {
syncSettings(request.replaceFirst("settings.",""));
} else if(request.startsWith("autoUpdates.")) {
request = request.replace("autoUpdates.","");
boolean update = request.equals("on");
ApplicationConfig.getUpdateSettings().set("updater.settings.autoUpdate",update);
ApplicationStorage.getUpdateSettings().set("updater.settings.autoUpdate",update);
frame.executeJavaScript("document.getElementById('updater-settings-enable-updates').checked = "+update+";");
} else if(request.startsWith("linuxFrame.")) {
request = request.replace("linuxFrame.","");
boolean frame = request.equals("on");
ApplicationConfig.getSettings().set("settings.linux.customFrame",frame);
ApplicationConfig.getSettings().set("cache.restartPage","settings.html");
ApplicationStorage.getSettings().set("settings.linux.customFrame",frame);
ApplicationStorage.getSettings().set("cache.restartPage","settings.html");
application.restart(true);
} else if(request.startsWith("discover.")) {
syncDiscover(request.replaceFirst("discover.",""));
} else if(request.startsWith("updateChannel.")) {
request = request.replace("updateChannel.","");
ApplicationConfig.getUpdateSettings().set("updater.settings.updateChannel",request);
ApplicationStorage.getUpdateSettings().set("updater.settings.updateChannel",request);
} else if(request.startsWith("startPage.")) {
request = request.replaceFirst("startPage.","");
ApplicationConfig.startPage = request;
ApplicationConfig.getSettings().set("settings.startPage",request);
ApplicationStorage.startPage = request;
ApplicationStorage.getSettings().set("settings.startPage",request);
} else if(request.startsWith("language.")) {
request = request.replaceFirst("language.","");
ApplicationConfig.language = request;
ApplicationConfig.getSettings().set("settings.language",request);
ApplicationStorage.language = request;
ApplicationStorage.getSettings().set("settings.language",request);
}
}

private void syncSettings(String request) {
if(request.equals("general")) {
String channel = "experimental"; boolean autoUpdate = false;
if(ApplicationConfig.getUpdateSettings().getBoolean("updater.settings.autoUpdate")!=null) {
autoUpdate = ApplicationConfig.getUpdateSettings().getBool("updater.settings.autoUpdate");
if(ApplicationStorage.getUpdateSettings().getBoolean("updater.settings.autoUpdate")!=null) {
autoUpdate = ApplicationStorage.getUpdateSettings().getBool("updater.settings.autoUpdate");
}
if(ApplicationConfig.getUpdateSettings().getString("updater.settings.updateChannel")!=null) {
channel = ApplicationConfig.getUpdateSettings().getString("updater.settings.updateChannel");
if(ApplicationStorage.getUpdateSettings().getString("updater.settings.updateChannel")!=null) {
channel = ApplicationStorage.getUpdateSettings().getString("updater.settings.updateChannel");
}
if(ApplicationConfig.getOS().startsWith("Linux")) {
if(ApplicationStorage.getOS().startsWith("Linux")) {
boolean linuxCustomFrame = true;
if (ApplicationConfig.getSettings().get("settings.linux.customFrame") != null) {
linuxCustomFrame = ApplicationConfig.getSettings().getBool("settings.linux.customFrame");
if (ApplicationStorage.getSettings().get("settings.linux.customFrame") != null) {
linuxCustomFrame = ApplicationStorage.getSettings().getBool("settings.linux.customFrame");
}
frame.executeJavaScript("document.getElementById('linux-settings-custom-frame').style.display = 'inherit'; linuxFrame = "+linuxCustomFrame+"; document.getElementById('linux-settings-enable-custom-frame').checked = linuxFrame;");
}
frame.executeJavaScript("updates = "+autoUpdate+"; document.getElementById('updater-settings-enable-updates').checked = updates; document.getElementById('updater-settings-update-channel').value = \""+channel+"\"; document.getElementById('updater-settings').style.display = 'inherit'; document.getElementById('general-settings-start-page').value = '"+ApplicationConfig.startPage+"'; document.getElementById('updater-settings').style.display = 'inherit';");
frame.executeJavaScript("updates = "+autoUpdate+"; document.getElementById('updater-settings-enable-updates').checked = updates; document.getElementById('updater-settings-update-channel').value = \""+channel+"\"; document.getElementById('updater-settings').style.display = 'inherit'; document.getElementById('general-settings-start-page').value = '"+ ApplicationStorage.startPage+"'; document.getElementById('updater-settings').style.display = 'inherit';");
} else if(request.equals("about")) {
frame.executeJavaScript("document.getElementById('settings-global-application-version').innerText = \""+ApplicationConfig.getApplicationVersion()+"\"");
frame.executeJavaScript("document.getElementById('settings-global-application-version').innerText = \""+ ApplicationStorage.getApplicationVersion()+"\"");
}
}

Expand Down Expand Up @@ -262,7 +263,7 @@ private void syncDiscover(String request) {

@SuppressWarnings("all")
public static String initDetails(String name, String id, String type, String version, String summary, String authors, boolean isHidden, String tags, String description, String changelog, String versions, String customInfoHTML, String customInfoCardHTML, String background, String icon, String logo, String thumbnail) {
String url = ApplicationConfig.urlBase+ApplicationConfig.language+"/sub-details.html";
String url = ApplicationStorage.urlBase+ ApplicationStorage.language+"/sub-details.html";
if(name!=null) {
url = url+"?name="+formatForDetails(name);
}
Expand Down
7 changes: 4 additions & 3 deletions application-main/src/main/java/com/zyneonstudios/application/frame/web/ApplicationFrame.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.zyneonstudios.application.frame.web;

import com.zyneonstudios.application.frame.FrameConnector;
import com.zyneonstudios.application.main.ApplicationConfig;
import com.zyneonstudios.application.main.ApplicationStorage;
import com.zyneonstudios.application.main.NexusApplication;
import org.cef.CefSettings;
import org.cef.browser.CefBrowser;
Expand Down Expand Up @@ -40,7 +40,8 @@ public boolean onConsoleMessage(CefBrowser browser, CefSettings.LogSeverity leve
}

public void setTitlebar(String title, Color background, Color foreground) {
setTitle("Zyneon Application ("+title+", v"+ApplicationConfig.getApplicationVersion()+", "+ ApplicationConfig.getOS()+")");
//setTitle("Zyneon Application ("+title+", v"+ ApplicationStorage.getApplicationVersion()+", "+ ApplicationStorage.getOS()+")");
setTitle("Zyneon Application");
setTitleBackground(background);
setTitleForeground(foreground);
}
Expand All @@ -59,6 +60,6 @@ public void executeJavaScript(String command) {
}

public void openCustomPage(String title, String pageId, String url) {
getBrowser().loadURL(ApplicationConfig.urlBase+ApplicationConfig.language+"/custom.html?title="+title+"&id="+pageId+"&url="+url);
getBrowser().loadURL(ApplicationStorage.urlBase+ ApplicationStorage.language+"/custom.html?title="+title+"&id="+pageId+"&url="+url);
}
}
4 changes: 2 additions & 2 deletions ...on-main/src/main/java/com/zyneonstudios/application/frame/web/CustomApplicationFrame.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.zyneonstudios.application.frame.web;

import com.zyneonstudios.application.main.ApplicationConfig;
import com.zyneonstudios.application.main.ApplicationStorage;
import com.zyneonstudios.application.main.NexusApplication;

import javax.swing.*;
Expand All @@ -18,7 +18,7 @@ public class CustomApplicationFrame extends ApplicationFrame {
public CustomApplicationFrame(NexusApplication application, String url, String jcefPath) {
super(application,url,jcefPath);
setUndecorated(true);
title = " Zyneon Application (v"+ApplicationConfig.getApplicationVersion()+", "+ApplicationConfig.getOS()+")";
title = " Zyneon Application (v"+ ApplicationStorage.getApplicationVersion()+", "+ ApplicationStorage.getOS()+")";
JPanel customTitleBar = createCustomTitleBar();
getContentPane().add(customTitleBar, BorderLayout.NORTH);
addDragAndDropFunctionality();
Expand Down
4 changes: 2 additions & 2 deletions application-main/src/main/java/com/zyneonstudios/application/frame/web/WebFrame.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.zyneonstudios.application.frame.web;

import com.zyneonstudios.application.main.ApplicationConfig;
import com.zyneonstudios.application.main.ApplicationStorage;
import com.zyneonstudios.application.main.NexusApplication;
import live.nerotv.shademebaby.ShadeMeBaby;
import me.friwi.jcefmaven.CefAppBuilder;
Expand Down Expand Up @@ -71,7 +71,7 @@ public void stateHasChanged(CefApp.CefAppState state) {
if (state == CefApp.CefAppState.TERMINATED) {
NexusApplication.stop();
}
if(!ApplicationConfig.getOS().startsWith("Windows")) {
if(!ApplicationStorage.getOS().startsWith("Windows")) {
if(state == CefApp.CefAppState.SHUTTING_DOWN) {
NexusApplication.stop();
}
Expand Down
4 changes: 2 additions & 2 deletions application-main/src/main/java/com/zyneonstudios/application/main/ApplicationRunner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class ApplicationRunner {

private UUID downloading = null;

private final String version = ApplicationConfig.getApplicationVersion();
private final String version = ApplicationStorage.getApplicationVersion();
//TODO private final String motd_id = "";

public ApplicationRunner(NexusApplication app) {
Expand Down Expand Up @@ -120,7 +120,7 @@ protected void run() {
}

private boolean runUpdateCheck(JsonObject json) {
if (!ApplicationConfig.test) {
if (!ApplicationStorage.test) {
NexusApplication.getLogger().debug("[RUNNER] Checking for Updates...");
NexusApplication.getLogger().debug("[RUNNER] Parsed JSON Data...");
String v = json.get("info").getAsJsonObject().get("version").getAsString();
Expand Down
Loading

0 comments on commit 0d8906e

Please sign in to comment.