Skip to content

Commit 444820d

Browse files
committed
Finished Up ReStudio Integrations.
1 parent 3659989 commit 444820d

6 files changed

Lines changed: 20 additions & 10 deletions

File tree

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
group = "redxax.oxy"
8-
version = "2.0.0"
8+
version = "2.0.0a"
99

1010
application {
1111
mainClass.set("redxax.oxy.remotely.RemotelyInit")
@@ -90,7 +90,7 @@ tasks.register<Exec>("createInstaller") {
9090
val outputDir = layout.buildDirectory.dir("dist").get().asFile.absolutePath
9191
val jarName = "Remotely-App.jar"
9292
val iconPath = "C:/Users/redxa/Downloads/Remotely.ico"
93-
val cleanVersion = version.toString().split("-")[0]
93+
val cleanVersion = version.toString().split("-")[0].replace(Regex("[^0-9.]"), "")
9494

9595
doFirst {
9696
println("--------------------------------------------------")
@@ -130,7 +130,7 @@ tasks.register<Exec>("createInstaller") {
130130
"--win-menu",
131131
"--win-menu-group", "ReStudio",
132132
"--win-dir-chooser",
133-
"--win-console",
133+
// "--win-console",
134134
"--java-options", "-Dfile.encoding=UTF-8 -Xmx4G"
135135
)
136136
}

libs/ReScreen-1.0.jar

1.07 KB
Binary file not shown.

libs/Rebase-1.0-SNAPSHOT.jar

36.4 KB
Binary file not shown.

src/main/java/redxax/oxy/remotely/RemotelyEntry.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import restudio.rescreen.ReStudioEntry;
99
import restudio.rescreen.config.Config;
1010
import restudio.rescreen.ui.core.ScreenManager;
11+
import restudio.rescreen.util.Identifier;
1112

1213
import static redxax.oxy.remotely.config.Config.remotelyDir;
1314

@@ -29,7 +30,12 @@ public void init() {
2930

3031
@Override
3132
public String getIconResourcePath() {
32-
return "";
33+
return "assets/restudio/logos/Reemotely.png";
34+
}
35+
36+
@Override
37+
public Identifier getIconIdentifier() {
38+
return Identifier.of("restudio", "logos/Reemotely.png");
3339
}
3440

3541
@Override

src/main/java/redxax/oxy/remotely/ui/server/ServerDetailsScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ private static class StreamDataParser implements BiConsumer<Integer, String> {
590590
private final Pattern endPattern = Pattern.compile("\\[FILE_END:(.+)]");
591591
private boolean isReading = false;
592592
private String currentFile = null;
593-
private StringBuilder buffer = new StringBuilder();
593+
private final StringBuilder buffer = new StringBuilder();
594594

595595
public StreamDataParser(PlayerManagerController controller) {
596596
this.controller = controller;

src/main/java/redxax/oxy/remotely/ui/server/ServerManagerScreen.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import restudio.rebase.restudio.AuthStateListener;
1010
import restudio.rebase.restudio.ReStudio;
1111
import restudio.rebase.ui.screens.auth.ReStudioLoginScreen;
12+
import restudio.rebase.ui.screens.feedback.FeedbackBrowserScreen;
13+
import restudio.rebase.ui.screens.notification.InboxScreen;
1214
import restudio.rebase.ui.worldmap.WorldMapScreen;
1315
import restudio.rebase.Rebase;
1416
import restudio.rebase.hosting.RemoteHost;
@@ -79,7 +81,7 @@ public void init() {
7981
ReStudio.getInstance().addListener(this);
8082

8183
int taskbarHeight = 28;
82-
String displayName = ReStudio.getInstance().getDisplayName();
84+
String displayName = ReStudio.getInstance().getFirstName();
8385
if (displayName == null || displayName.isBlank()) displayName = ReStudio.getInstance().getEmail();
8486
if (displayName == null) displayName = "Account";
8587

@@ -127,7 +129,11 @@ public void init() {
127129
}
128130

129131
private void showUserMenu() {
130-
ContextMenuWidget.Builder builder = new ContextMenuWidget.Builder(this).addHeaderButton("close.png", () -> ReStudio.getInstance().logout(), "Log Out", ThemeManager.getAccent("danger"));
132+
ContextMenuWidget.Builder builder = new ContextMenuWidget.Builder(this)
133+
.addHeaderButton("chat.png", () -> ScreenManager.getInstance().setScreen(new InboxScreen(this)), "Inbox")
134+
.addHeaderButton("report.png", () -> ScreenManager.getInstance().setScreen(new FeedbackBrowserScreen(this, "Remotely")), "Reports And Feedback")
135+
.addHeaderButton("close.png", () -> ReStudio.getInstance().logout(), "Log Out", ThemeManager.getAccent("danger"));
136+
131137
showContextMenu(userButton.getX(), height - 35, builder);
132138
}
133139

@@ -484,9 +490,7 @@ private void createAddServerPopup() {
484490
}
485491

486492
private void createDeleteServerPopup() {
487-
PopupWidget.Builder builder = new PopupWidget.Builder("Are You Sure?")
488-
.size(260, 140)
489-
.onClose(() -> deleteServerPopup.hide());
493+
PopupWidget.Builder builder = new PopupWidget.Builder("Are You Sure?").size(260, 140).onClose(() -> deleteServerPopup.hide());
490494

491495
AnimatedButton deleteTrashBtn = new AnimatedButton.Builder()
492496
.label(("Delete The Server"))

0 commit comments

Comments
 (0)