From 91162d3d8f7debaeea41f794048bbcb6e3ece697 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 30 Jun 2021 13:20:34 +0200
Subject: [PATCH] use RotateTranslation isntead of custom Animation

---
 .../ui/controls/FontAwesome5Spinner.java      | 61 +++++++------------
 1 file changed, 21 insertions(+), 40 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/controls/FontAwesome5Spinner.java b/src/main/java/org/cryptomator/ui/controls/FontAwesome5Spinner.java
index 6313bec16..7b9a29375 100644
--- a/src/main/java/org/cryptomator/ui/controls/FontAwesome5Spinner.java
+++ b/src/main/java/org/cryptomator/ui/controls/FontAwesome5Spinner.java
@@ -2,11 +2,12 @@ package org.cryptomator.ui.controls;
 
 import com.tobiasdiez.easybind.EasyBind;
 
-import javafx.animation.AnimationTimer;
+import javafx.animation.Interpolator;
+import javafx.animation.RotateTransition;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.scene.control.ProgressIndicator;
-import java.time.Duration;
+import javafx.util.Duration;
 
 /**
  * A progress indicator in the shape of {@link FontAwesome5Icon#SPINNER}. The single spinner segements are defined in the css in the `progress-indicator` class.
@@ -17,27 +18,38 @@ public class FontAwesome5Spinner extends ProgressIndicator {
 
 	private static final double DEFAULT_GLYPH_SIZE = 12.0;
 
-	private final Animator animation;
+	private final RotateTransition animation;
 	private DoubleProperty glyphSize = new SimpleDoubleProperty(this, "glyphSize", DEFAULT_GLYPH_SIZE);
 
 	public FontAwesome5Spinner() {
-		this.animation = new Animator(this);
-		EasyBind.subscribe(this.visibleProperty(), this::startStopAnimation);
+		this.animation = new RotateTransition(Duration.millis(100), this);
+		animation.setInterpolator(Interpolator.DISCRETE);
+		animation.setByAngle(45);
+		animation.setCycleCount(1);
+		animation.setOnFinished(event -> {
+			double currentAngle = this.getRotate();
+			animation.setFromAngle(currentAngle);
+			animation.play();
+		});
+
+		EasyBind.subscribe(this.visibleProperty(), this::reset);
 		EasyBind.subscribe(glyphSize, this::shrinkToGlyphSize);
 	}
 
 	private void shrinkToGlyphSize(Number newValue) {
-		double sizeInPx	= newValue.doubleValue() * 1.333;
-		setMaxSize(sizeInPx,sizeInPx);
+		double sizeInPx = newValue.doubleValue() * 1.333;
+		setMaxSize(sizeInPx, sizeInPx);
 	}
 
-	private void startStopAnimation(boolean flag) {
+	private void reset(boolean flag) {
 		if (flag) {
-			animation.start();
+			setRotate(0);
+			animation.playFromStart();
 		} else {
 			animation.stop();
 		}
 	}
+
 	public DoubleProperty glyphSizeProperty() {
 		return glyphSize;
 	}
@@ -50,35 +62,4 @@ public class FontAwesome5Spinner extends ProgressIndicator {
 		this.glyphSize.set(glyphSize);
 	}
 
-	private static class Animator extends AnimationTimer {
-
-		private static final long STATIC_TIMEFRAME = Duration.ofMillis(100).toNanos();
-		//defined in css!
-		private static int SEGMENT_COUNT = 8;
-		private static final int ROTATION_ANGLE = 360 / SEGMENT_COUNT;
-
-		private final ProgressIndicator toRotate;
-
-		private long lastChange = 0;
-		private int rotation_count = 0;
-
-		Animator(ProgressIndicator toRotate) {
-			this.toRotate = toRotate;
-		}
-
-		@Override
-		public void handle(long now) {
-			if (now - lastChange > STATIC_TIMEFRAME) {
-				lastChange = now;
-
-				toRotate.setRotate(ROTATION_ANGLE * rotation_count);
-
-				rotation_count++;
-				if (rotation_count == SEGMENT_COUNT) {
-					rotation_count = 0;
-				}
-			}
-		}
-	}
-
 }