🔖 Version 11.9.1

⬆️ Upgrade MFXCore to version 11.3.0 to avoid conflicts with older versions in which the module was still called "MFXCore" (changed to "mfx.core") ⬆️ Upgrade MFXResources to version 11.3.2 ➕ Added MFXEffects as animations were moved from core to this 🐛 GridRow: typo, rIndex must be oIndex when processing reusable cells (thanks to Alexander-Ploskin #11) Signed-off-by: palexdev <alessandro.parisi406@gmail.com>
palexdev · Apr 8, 2023 · a7cc6c7 · a7cc6c7
1 parent b20e31c
commit a7cc6c7
Show file tree

Hide file tree

Showing 27 changed files with 857 additions and 809 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,22 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - **Removed** for now removed features.
 - **Fixed** for any bug fixes.
 
+## [11.9.1] - 08-04-2023
+
+## Added
+
+- Added MFXEffects as animations were moved from core to this
+
+## Changed
+
+- Upgrade MFXCore to version 11.3.0 to avoid conflicts with older versions in which the module was still called "
+  MFXCore" (changed to "mfx.core")
+- Upgrade MFXResources to version 11.3.2
+
+## Fixed
+
+- GridRow: typo, rIndex must be oIndex when processing reusable cells (thanks to Alexander-Ploskin #11)
+
 ## [11.9.0] - 16-03-2023
 
 ## Changed

diff --git a/README.md b/README.md
@@ -127,7 +127,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'io.github.palexdev:virtualizedfx:11.9.0'
+  implementation 'io.github.palexdev:virtualizedfx:11.9.1'
 }
 ```
 
@@ -138,7 +138,7 @@ dependencies {
 <dependency>
     <groupId>io.github.palexdev</groupId>
   <artifactId>virtualizedfx</artifactId>
-  <version>11.9.0</version>
+  <version>11.9.1</version>
 </dependency>
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -42,6 +42,7 @@ dependencies {
     testImplementation name: "materialfx"
 
     api "io.github.palexdev:mfxcore:$mfxcore"
+    api "io.github.palexdev:mfxeffects:$mfxeffects"
     api "io.github.palexdev:mfxresources:$mfxresources"
 }
 
@@ -106,8 +107,8 @@ compileTestJava {
     moduleOptions {
         compileOnClasspath = true
     }
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = "$testJdk"
+    targetCompatibility = "$testJdk"
 }
 
 test {

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 #--------------------------------------#
 GROUP=io.github.palexdev
 POM_ARTIFACT_ID=virtualizedfx
-VERSION_NAME=11.9.0
+VERSION_NAME=11.9.1
 
 POM_NAME=virtualizedfx
 POM_DESCRIPTION=Alternative VirtualFlows for JavaFX
@@ -25,20 +25,19 @@ POM_PACKAGING=jar
 #--------------------------------------#
 # Versions                             #
 #--------------------------------------#
-virtualizedfxVersion=11.9.0
+virtualizedfxVersion=11.9.1
 jdk=11
-
+testJdk=17
 # Plugins
 jfxPlugin=0.0.13
 mavenPublishPlugin=0.19.0
 bndPlugin=6.2.0
 modularityPlugin=1.8.10
-
 # Dependencies
 jfx=19
-mfxcore=11.1.5
-mfxresources=11.2.0
-
+mfxcore=11.3.0
+mfxeffects=11.0.5
+mfxresources=11.3.2
 # Test Dependencies
 junit=5.9.1
 testfx=4.0.16-alpha

diff --git a/src/main/java/io/github/palexdev/virtualizedfx/controls/behavior/MFXScrollBarBehavior.java b/src/main/java/io/github/palexdev/virtualizedfx/controls/behavior/MFXScrollBarBehavior.java
@@ -18,15 +18,14 @@
 
 package io.github.palexdev.virtualizedfx.controls.behavior;
 
-import io.github.palexdev.mfxcore.animations.Animations.KeyFrames;
-import io.github.palexdev.mfxcore.animations.Animations.PauseBuilder;
-import io.github.palexdev.mfxcore.animations.Animations.TimelineBuilder;
-import io.github.palexdev.mfxcore.animations.BezierEasing;
-import io.github.palexdev.mfxcore.animations.Interpolators;
-import io.github.palexdev.mfxcore.animations.MomentumTransition;
 import io.github.palexdev.mfxcore.base.beans.range.DoubleRange;
 import io.github.palexdev.mfxcore.utils.NumberUtils;
 import io.github.palexdev.mfxcore.utils.fx.ScrollUtils.ScrollDirection;
+import io.github.palexdev.mfxeffects.animations.Animations.KeyFrames;
+import io.github.palexdev.mfxeffects.animations.Animations.PauseBuilder;
+import io.github.palexdev.mfxeffects.animations.Animations.TimelineBuilder;
+import io.github.palexdev.mfxeffects.animations.MomentumTransition;
+import io.github.palexdev.mfxeffects.animations.base.Curve;
 import io.github.palexdev.virtualizedfx.controls.MFXScrollBar;
 import io.github.palexdev.virtualizedfx.controls.behavior.base.BehaviorBase;
 import javafx.animation.Animation;
@@ -190,7 +189,7 @@ public void trackPressed(MouseEvent me) {
 
 		double newVal = sb.getValue() + sb.getTrackIncrement() * mul;
 		Animation firstTick = TimelineBuilder.build()
-				.add(KeyFrames.of(300, sb.valueProperty(), newVal, Interpolators.EASE_OUT_SINE))
+				.add(KeyFrames.of(300, sb.valueProperty(), newVal, Curve.EASE_OUT))
 				.getAnimation();
 
 		holdAnimation = PauseBuilder.build()
@@ -211,7 +210,7 @@ public void trackPressed(MouseEvent me) {
 						double clamped = increment ? Math.min(val, target) : Math.max(val, target);
 						sb.setValue(clamped);
 					});
-					mt.setInterpolator(Interpolators.EASE_IN_OUT_SINE);
+					mt.setInterpolator(Curve.EASE_BOTH);
 					scrollAnimation = mt;
 					scrollAnimation.play();
 				}).getAnimation();
@@ -262,7 +261,7 @@ public void trackReleased(MouseEvent me) {
 				double clamp = increment ? Math.min(val, target) : Math.max(val, target);
 				sb.setValue(clamp);
 			});
-			mt.setInterpolator(Interpolators.EASE_IN_OUT_SINE);
+			mt.setInterpolator(Curve.EASE_BOTH);
 			scrollAnimation = mt;
 			scrollAnimation.play();
 		}
@@ -294,7 +293,7 @@ public void decPressed() {
 		MFXScrollBar sb = getNode();
 		double newVal = sb.getValue() - sb.getUnitIncrement();
 		Animation firstTick = TimelineBuilder.build()
-				.add(KeyFrames.of(50, sb.valueProperty(), newVal, Interpolators.EASE_IN_OUT_SINE))
+				.add(KeyFrames.of(50, sb.valueProperty(), newVal, Curve.EASE_BOTH))
 				.getAnimation();
 
 		holdAnimation = PauseBuilder.build()
@@ -336,7 +335,7 @@ public void incPressed() {
 		MFXScrollBar sb = getNode();
 		double newVal = NumberUtils.clamp(sb.getValue() + sb.getUnitIncrement(), sb.getMin(), sb.getMax());
 		Animation firstTick = TimelineBuilder.build()
-				.add(KeyFrames.of(50, sb.valueProperty(), newVal, Interpolators.EASE_IN_OUT_SINE))
+				.add(KeyFrames.of(50, sb.valueProperty(), newVal, Curve.EASE_BOTH))
 				.getAnimation();
 
 		holdAnimation = PauseBuilder.build()
@@ -370,7 +369,7 @@ public void smoothScroll(int direction) {
 		double target = sb.getValue() + sb.getUnitIncrement() * direction;
 		double delta = Math.abs(sb.getValue() - target);
 		MomentumTransition mt = MomentumTransition.fromTime(delta, 530);
-		mt.setInterpolator(BezierEasing.EASE);
+		mt.setInterpolator(Curve.EASE_BOTH);
 		mt.setOnUpdate(upd -> sb.setValue(sb.getValue() + upd * direction));
 		mt.setOnFinished(event -> smoothScrollAnimations.remove(mt));
 		smoothScrollAnimations.add(mt);

diff --git a/src/main/java/io/github/palexdev/virtualizedfx/controls/skins/MFXScrollBarSkin.java b/src/main/java/io/github/palexdev/virtualizedfx/controls/skins/MFXScrollBarSkin.java
@@ -4,12 +4,12 @@
 import io.github.palexdev.mfxcore.base.beans.range.DoubleRange;
 import io.github.palexdev.mfxcore.builders.bindings.BooleanBindingBuilder;
 import io.github.palexdev.mfxcore.builders.bindings.DoubleBindingBuilder;
-import io.github.palexdev.mfxcore.builders.nodes.IconWrapperBuilder;
-import io.github.palexdev.mfxcore.controls.MFXIconWrapper;
 import io.github.palexdev.mfxcore.observables.When;
 import io.github.palexdev.mfxcore.utils.NumberUtils;
 import io.github.palexdev.mfxcore.utils.fx.LayoutUtils;
 import io.github.palexdev.mfxresources.builders.IconBuilder;
+import io.github.palexdev.mfxresources.builders.IconWrapperBuilder;
+import io.github.palexdev.mfxresources.fonts.MFXIconWrapper;
 import io.github.palexdev.virtualizedfx.controls.MFXScrollBar;
 import io.github.palexdev.virtualizedfx.controls.behavior.MFXScrollBarBehavior;
 import javafx.beans.InvalidationListener;
@@ -63,14 +63,14 @@ public MFXScrollBarSkin(MFXScrollBar scrollBar) {
 
 		decIcon = IconWrapperBuilder.build()
 				.setIcon(IconBuilder.build().get())
-				.addRippleGenerator()
+				.enableRippleGenerator(true)
 				.addStyleClasses("decrement-icon")
-				.getNode();
+				.get();
 		incIcon = IconWrapperBuilder.build()
 				.setIcon(IconBuilder.build().get())
-				.addRippleGenerator()
+				.enableRippleGenerator(true)
 				.addStyleClasses("increment-icon")
-				.getNode();
+				.get();
 
 		thumbPos = DoubleBindingBuilder.build()
 				.setMapper(() -> valToPos(scrollBar.getValue()))

diff --git a/src/main/java/io/github/palexdev/virtualizedfx/controls/skins/VirtualScrollPaneSkin.java b/src/main/java/io/github/palexdev/virtualizedfx/controls/skins/VirtualScrollPaneSkin.java
@@ -18,9 +18,6 @@
 
 package io.github.palexdev.virtualizedfx.controls.skins;
 
-import io.github.palexdev.mfxcore.animations.Animations;
-import io.github.palexdev.mfxcore.animations.Animations.KeyFrames;
-import io.github.palexdev.mfxcore.animations.Animations.TimelineBuilder;
 import io.github.palexdev.mfxcore.base.beans.Position;
 import io.github.palexdev.mfxcore.base.beans.range.DoubleRange;
 import io.github.palexdev.mfxcore.builders.bindings.BooleanBindingBuilder;
@@ -30,6 +27,9 @@
 import io.github.palexdev.mfxcore.utils.NumberUtils;
 import io.github.palexdev.mfxcore.utils.fx.LayoutUtils;
 import io.github.palexdev.mfxcore.utils.fx.NodeUtils;
+import io.github.palexdev.mfxeffects.animations.Animations;
+import io.github.palexdev.mfxeffects.animations.Animations.KeyFrames;
+import io.github.palexdev.mfxeffects.animations.Animations.TimelineBuilder;
 import io.github.palexdev.virtualizedfx.controls.MFXScrollBar;
 import io.github.palexdev.virtualizedfx.controls.VirtualScrollPane;
 import io.github.palexdev.virtualizedfx.controls.behavior.MFXScrollBarBehavior;