|
9 | 9 | import restudio.rebase.restudio.AuthStateListener; |
10 | 10 | import restudio.rebase.restudio.ReStudio; |
11 | 11 | import restudio.rebase.ui.screens.auth.ReStudioLoginScreen; |
| 12 | +import restudio.rebase.ui.screens.feedback.FeedbackBrowserScreen; |
| 13 | +import restudio.rebase.ui.screens.notification.InboxScreen; |
12 | 14 | import restudio.rebase.ui.worldmap.WorldMapScreen; |
13 | 15 | import restudio.rebase.Rebase; |
14 | 16 | import restudio.rebase.hosting.RemoteHost; |
@@ -79,7 +81,7 @@ public void init() { |
79 | 81 | ReStudio.getInstance().addListener(this); |
80 | 82 |
|
81 | 83 | int taskbarHeight = 28; |
82 | | - String displayName = ReStudio.getInstance().getDisplayName(); |
| 84 | + String displayName = ReStudio.getInstance().getFirstName(); |
83 | 85 | if (displayName == null || displayName.isBlank()) displayName = ReStudio.getInstance().getEmail(); |
84 | 86 | if (displayName == null) displayName = "Account"; |
85 | 87 |
|
@@ -127,7 +129,11 @@ public void init() { |
127 | 129 | } |
128 | 130 |
|
129 | 131 | 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 | + |
131 | 137 | showContextMenu(userButton.getX(), height - 35, builder); |
132 | 138 | } |
133 | 139 |
|
@@ -484,9 +490,7 @@ private void createAddServerPopup() { |
484 | 490 | } |
485 | 491 |
|
486 | 492 | 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()); |
490 | 494 |
|
491 | 495 | AnimatedButton deleteTrashBtn = new AnimatedButton.Builder() |
492 | 496 | .label(("Delete The Server")) |
|
0 commit comments