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

Commit

Permalink
Update to new maven repo
Browse files Browse the repository at this point in the history
  • Loading branch information
@danieldieeins
danieldieeins committed Aug 18, 2024
1 parent 25ee73e commit fe83d13
Show file tree
Hide file tree
Showing 17 changed files with 517 additions and 40 deletions.
6 changes: 3 additions & 3 deletions application-main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</parent>

<artifactId>application-main</artifactId>
<version>2024.8.1-beta.4</version>
<name>Solus Lupus (2.0.0-build371)</name>
<version>2024.8.2-beta.1</version>
<name>Solus Lupus (2.0.0-build372)</name>

<properties>
<maven.compiler.source>17</maven.compiler.source>
Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>com.zyneonstudios</groupId>
<artifactId>nexus-zyndex</artifactId>
<version>2024.7.5</version>
<version>2024.8</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 4 additions & 2 deletions application-main/src/main/java/com/zyneonstudios/application/frame/FrameConnector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ private void sync(String request) {
request = request.replace("autoUpdates.","");
boolean update = request.equals("on");
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");
Expand Down Expand Up @@ -208,7 +207,10 @@ private void syncSettings(String request) {
}
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 = '"+ ApplicationStorage.startPage+"'; document.getElementById('updater-settings').style.display = 'inherit';");
if(autoUpdate) {
frame.executeJavaScript("document.getElementById('updater-settings-enable-updates').classList.add('active');");
}
frame.executeJavaScript("updates = "+autoUpdate+"; 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 = \""+ ApplicationStorage.getApplicationVersion()+"\"");
}
Expand Down
2 changes: 2 additions & 0 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
Expand Up @@ -32,6 +32,8 @@ public boolean onConsoleMessage(CefBrowser browser, CefSettings.LogSeverity leve
NexusApplication.getLogger().error(message.replace("[ERR] ",""));
} else if (message.startsWith("[DEB] ")) {
NexusApplication.getLogger().debug(message.replace("[DEB] ",""));
} else {
NexusApplication.getLogger().debug("[FRAME] (Console) "+message);
}
return super.onConsoleMessage(browser, level, message, source, line);
}
Expand Down
3 changes: 1 addition & 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 @@ -35,7 +35,7 @@ public ScheduledExecutorService getExecutor() {

public void start() {
executor = Executors.newScheduledThreadPool(1);
executor.scheduleAtFixedRate(() -> CompletableFuture.runAsync(this::run), 0, 1, TimeUnit.SECONDS);
executor.scheduleAtFixedRate(this::run, 0, 1, TimeUnit.SECONDS);
}

int c = 0;
Expand Down Expand Up @@ -148,7 +148,6 @@ private void checkVersion(JsonObject json) {
NexusApplication.getLogger().debug("[RUNNER] Sending notification...");
//TODO: Application.getFrame().sendNotification("Update available!", "Version " + v + " has been released!", "<a onclick=\"callJavaMethod('button.exit');\" class='button'>Install</a><a onclick=\"callJavaMethod('button.online');\" class='button'>Dynamic update</a>", v, true);
}
;
}
}
}
2 changes: 1 addition & 1 deletion application-ui/content/assets/application/css/app-discover.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@
position: fixed;
top: 0; bottom: 0;
left: 0; right: 0;
backdrop-filter: blur(4px);
background: linear-gradient(180deg, #00000000, var(--background));
z-index: 0;
}
Expand All @@ -366,6 +365,7 @@
}

#discover-home {
border-top-left-radius: 1.5rem;
background: url("../images/background/discover-home.png") no-repeat center;
background-size: cover;

Expand Down
208 changes: 202 additions & 6 deletions application-ui/content/assets/application/css/app-library.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,28 @@ body {

.library .library-content .title-menu-card .flex .title-options {
position: absolute;
right: 0; top: 0;
right: -0.6rem; top: -0.15rem;
padding: 0.7rem 1.2rem 0.7rem 0.25rem;
font-size: 1.3rem;
background: var(--background2);
display: none;

h3 {
transition: all 0.25s ease;
padding: 0.2rem 0.45rem 0 0.4rem;
border-radius: 0.5rem;
}

h3:hover, h3.active {
color: var(--background5);
background: var(--highlight);
box-shadow: 0 0 0.3rem var(--highlight);
animation: wiggle 2s infinite;
cursor: pointer;

i {
animation: rotate 10s infinite;
}
}
}

.library .library-content .title-menu-card .flex .title-options .options-transition {
Expand Down Expand Up @@ -214,7 +231,7 @@ body {
transition: all 0.25s ease;
font-family: MPLUS1p-ExtraBold, sans-serif;
position: absolute;
bottom: 1rem; right: 0;
bottom: 1.75rem; right: 0.85rem;
padding: 1rem;
background: var(--background2);
border: 2px solid var(--background3);
Expand All @@ -241,8 +258,8 @@ body {
}

#view-launch.active {
background: var(--accent2);
border: 2px solid var(--accent);
background: var(--accent);
border: 2px solid var(--accent2);
}

#view-launch.active:hover {
Expand All @@ -251,5 +268,184 @@ body {
background: var(--accent);
border: 2px solid var(--accent2);
box-shadow: 0 0 0.4rem var(--accent);
animation: inherit !important;
animation: wiggle 2s infinite !important;
}

#library-overlay {
z-index: 1;
width: calc(100% - 2rem - 4px);
height: calc(100% - 3rem - 4px);
display: none;
font-family: OpenSans, sans-serif;
overflow: hidden;
overflow-y: auto;

.overlay-tabs {
width: 100%;
border-radius: 0.5rem;
box-shadow: 0 0 0.4rem var(--shadow3);

h4 {
overflow: hidden;
text-align: center;
width: 100%;
padding: 0.5rem;
background: var(--foreground2);
color: var(--background5);
white-space: nowrap;
text-overflow: ellipsis;
}

h4:hover {
background: var(--highlight);
box-shadow: 0 0 0.8rem var(--highlight);
color: var(--background5);
z-index: 1;
cursor: pointer;
transition: all 0.25s ease;
}

h4.active {
background: linear-gradient(90deg, var(--accent), var(--accent2));
box-shadow: 0 0 0.8rem var(--accent);
color: var(--highlight);
z-index: 2;
cursor: unset;
}
}

.overlay-tabs.alt {
box-shadow: none;
margin-bottom: 1rem;

h4 {
background: var(--background);
color: var(--foreground2);
box-shadow: none;
}

h4:hover {
background: var(--background3);
}

h4.active {
color: var(--background5);
background: var(--highlight);
}
}

.overlay-group {
margin-top: 1rem;
display: none;

h3.option {
position: relative;
background: var(--background3);
border: 2px solid var(--border2) !important;
padding: 0.125rem 0.5rem 0.25rem 0.5rem;
border-radius: 0.5rem;
transition: all 0.25s ease;
margin: 0 0.5rem 0.75rem 0.5rem;
color: var(--foreground);

select {
position: absolute;
right: 0.25rem; top: 0.2rem;
font-size: 1.25rem;
color: var(--foreground2);
font-weight: 500;

option {
background: var(--background1);
}

option:checked {
text-align: right;
}
}

.value-option {
font-weight: 500;
color: var(--foreground2);
position: absolute;
right: 2rem;

i {
position: absolute;
right: -1.8rem;
top: 0;
font-size: 1rem;
border-radius: 0.4rem;
padding: 0.2rem;
border: 2px solid var(--border) !important;
background: var(--background2);
color: var(--foreground2);
transition: all 0.25s ease;
}
}
}

h3.option:hover {
.value-option {
i {
border: 2px solid var(--border1) !important;
background: var(--background3);
}

i:hover {
border: 2px solid var(--highlight) !important;
background: var(--highlight);
color: var(--background5);
cursor: pointer;
}
}

background: var(--border2);
}

h4.option {
color: var(--foreground2);
font-size: 1rem;
margin: 0.4rem 0 0.25rem 0.75rem;
}

.option-group {
transition: background-color 0.25s ease !important;
padding: 0.5rem 0 0.5rem 0;
border-radius: 0.5rem;

h3.option {
transition: background-color 0.25s ease !important;
margin: 0 0.5rem 0.5rem 0.5rem;
}
}

.option-group:hover {
background: var(--background);
padding: 0.5rem;

h3.option {
margin: 0 0 0.5rem 0;
}

h4.option {
margin: 0.4rem 0 0.25rem 0.25rem;
}
}

h3.option.disabled {
opacity: 0.5;
border-color: var(--border) !important;
background: var(--background2);
cursor: not-allowed;
}
}

.overlay-group.active {
display: inherit;
}
}

#library-overlay.active {
display: inherit;
}
59 changes: 59 additions & 0 deletions application-ui/content/assets/application/css/app-settings.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,43 @@
.settings {
.settings-content {
h3 {
.toggle {
position: absolute;
top: 0; right: 0;
margin: 0.3rem;
width: 2.75rem;
height: 1.5rem;
transition: all 0.25s ease;
background: var(--background2);
border-radius: 0.75rem;

.toggle-slider {
position: absolute;
background: var(--foreground2);
opacity: 0.75;
width: 1rem;
height: 1rem;
margin: 0.25rem;
border-radius: 0.5rem;
transition: all 0.15s ease;
animation: toggleSlideLeft 0.15s ease-in-out;
animation-fill-mode: forwards;
}
}

.toggle:hover {
cursor: pointer;
}

.toggle.active {
.toggle-slider {
opacity: 1;
background: var(--highlight);
animation: toggleSlideRight 0.15s ease-in-out;
animation-fill-mode: forwards;
}
}

.value {
.setting-button {
position: absolute;
Expand All @@ -150,6 +187,10 @@
}

h3:hover {
.toggle {
background: var(--background3);
}

.setting-button {
border: 2px solid var(--border1) !important;
background: var(--background3);
Expand Down Expand Up @@ -196,4 +237,22 @@
position: absolute;
width: calc(100% - 1rem); height: calc(100% - 1rem);
border-radius: 0.5rem;
}

@keyframes toggleSlideRight {
0% {
transform: translateX(0);
}
100% {
transform: translateX(1.25rem);
}
}

@keyframes toggleSlideLeft {
0% {
transform: translateX(1.25rem);
}
100% {
transform: translateX(0);
}
}
Loading

0 comments on commit fe83d13

Please sign in to comment.