stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Loading circle, better loading colors.

Browse Source
This commit is contained in:
lieght
2025-12-03 23:55:12 +01:00
parent 8ca2399e6a
commit f60df73b66
7 changed files with 115 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/toop/app/App.java
View File

@@ -83,7 +83,7 @@ public final class App extends Application {
AppSettings.applySettings();
LoadingWidget loading = new LoadingWidget(Primitive.text(
"Loading...", false), 0, 0, Integer.MAX_VALUE, false // Just set a high default
"Loading...", false), 0, 0, Integer.MAX_VALUE, false, false // Just set a high default
);
WidgetContainer.setCurrentView(loading);

2
app/src/main/java/org/toop/app/Server.java
View File

@@ -86,7 +86,7 @@ public final class Server {
final int reconnectAttempts = 10;
LoadingWidget loading = new LoadingWidget(
Primitive.text("connecting"), 0, 0, reconnectAttempts, true
Primitive.text("connecting"), 0, 0, reconnectAttempts, true, true
);
WidgetContainer.getCurrentView().transitionNext(loading);

19
app/src/main/java/org/toop/app/widget/complex/LoadingWidget.java
View File

@@ -2,7 +2,9 @@ package org.toop.app.widget.complex;
import javafx.application.Platform;
import javafx.geometry.Pos;
import javafx.scene.control.Control;
import javafx.scene.control.ProgressBar;
import javafx.scene.control.ProgressIndicator;
import javafx.scene.layout.VBox;
import javafx.scene.text.Text;
import org.toop.app.widget.Primitive;
@@ -12,7 +14,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class LoadingWidget extends ViewWidget implements Update { // TODO make of widget type
private final Text loadingText; // TODO Make changeable
private final ProgressBar progressBar;
private final ProgressIndicator progressBar;
private final AtomicBoolean successTriggered = new AtomicBoolean(false);
private final AtomicBoolean failureTriggered = new AtomicBoolean(false);
@@ -25,7 +27,7 @@ public class LoadingWidget extends ViewWidget implements Update { // TODO make o
private Callable<Boolean> failureTrigger = () -> (amount < minAmount);
private float percentage = 0.0f;
private boolean isInfiniteBar = false;
private boolean isInfinite = false;
/**
*
@@ -36,17 +38,18 @@ public class LoadingWidget extends ViewWidget implements Update { // TODO make o
* @param startAmount The starting amount.
* @param maxAmount The max amount.
*/
public LoadingWidget(Text loadingText, int minAmount, int startAmount, int maxAmount, boolean infiniteBar) {
isInfiniteBar = infiniteBar;
public LoadingWidget(Text loadingText, int minAmount, int startAmount, int maxAmount, boolean infinite, boolean circle) {
isInfinite = infinite;
this.maxAmount = maxAmount;
this.minAmount = minAmount;
amount = startAmount;
this.loadingText = loadingText;
progressBar = new ProgressBar();
progressBar = circle ? new ProgressIndicator() : new ProgressBar();
VBox box = Primitive.vbox(this.loadingText, progressBar);
progressBar.getStyleClass().add("loading-progress-bar");
add(Pos.CENTER, box);
}
@@ -75,6 +78,10 @@ public class LoadingWidget extends ViewWidget implements Update { // TODO make o
return (failureTriggered.get() || successTriggered.get());
}
public ProgressIndicator getProgressBar() {
return progressBar;
}
/**
* What to do when success is triggered.
* @param onSuccess The lambda that gets run on success.
@@ -148,7 +155,7 @@ public class LoadingWidget extends ViewWidget implements Update { // TODO make o
if (maxAmount != 0) {
percentage = (float) amount / maxAmount;
}
if (!isInfiniteBar) {
if (!isInfinite) {
progressBar.setProgress(percentage);
}
}

2
app/src/main/java/org/toop/app/widget/display/SongDisplay.java
View File

@@ -33,7 +33,7 @@ public class SongDisplay extends VBox implements Widget {
songTitle.getStyleClass().add("song-title");
progressBar = new ProgressBar(0);
progressBar.getStyleClass().add("progress-bar");
progressBar.getStyleClass().add("loading-progress-bar");
progressText = new Text("0:00/0:00");
progressText.getStyleClass().add("progress-text");