feat: animation on step state changed

aikrq · Dec 4, 2024 · cf9f835 · cf9f835
1 parent ea20f86
commit cf9f835
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/app/src/main/java/mod/remaker/activity/projectwizard/model/WizardLayout.java b/app/src/main/java/mod/remaker/activity/projectwizard/model/WizardLayout.java
@@ -5,6 +5,10 @@
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.transition.TransitionManager;
+
+import com.google.android.material.transition.MaterialSharedAxis;
+
 import mod.remaker.activity.projectwizard.ProjectWizardActivity;
 
 import pro.sketchware.R;
@@ -50,6 +54,8 @@ public boolean presentStep(IWizardLayout.WizardParams params) {
         wrappedView.setLayoutParams(new LayoutParams(-1, -1));
         steps.add(step);
 
+        buildLayoutAnimation(true);
+
         FrameLayout temp = containerView;
         containerView = containerViewBack;
         containerViewBack = temp;
@@ -116,6 +122,8 @@ public boolean closeLastStep() {
                 stepView = previousStep.onCreateView(activity);
             }
 
+            buildLayoutAnimation(false);
+
             containerView.setVisibility(View.VISIBLE);
             removeViewFromParent(stepView);
             containerView.addView(stepView);
@@ -205,10 +213,7 @@ public void bringToFront(int position) {
     }
 
     public WizardStep getLastStep() {
-        if (steps.isEmpty()) {
-            return null;
-        }
-        return steps.get(steps.size() - 1);
+        return !steps.isEmpty() ? steps.get(steps.size() - 1) : null;
     }
 
     private void presentStepInternalRemoveOld(boolean removeLast, WizardStep step) {
@@ -286,4 +291,9 @@ private void checkStepViewBackground(View view) {
             view.setBackgroundColor(ThemeUtils.getColor(view, R.attr.colorSurface));
         }
     }
+
+    private void buildLayoutAnimation(final boolean open) {
+        MaterialSharedAxis transition = new MaterialSharedAxis(MaterialSharedAxis.X, open);
+        TransitionManager.beginDelayedTransition(this, transition);
+    }
 }
diff --git a/app/src/main/java/mod/remaker/activity/projectwizard/model/WizardStep.java b/app/src/main/java/mod/remaker/activity/projectwizard/model/WizardStep.java
@@ -89,10 +89,7 @@ public boolean onBackPressed() {
     }
 
     public Activity getParentActivity() {
-        if (parentLayout != null) {
-            return parentLayout.getParentActivity();
-        }
-        return null;
+        return parentLayout != null ? parentLayout.getParentActivity() : null;
     }
 
     public Context getContext() {

diff --git a/app/src/main/res/layout/wizard_step.xml b/app/src/main/res/layout/wizard_step.xml
@@ -1,8 +1,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:transitionGroup="true">
+    android:layout_height="match_parent">
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
@@ -21,10 +20,10 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="24dp"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="64dp"
+        android:layout_marginTop="52dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="?attr/textAppearanceHeadlineMedium"
+        android:textAppearance="@style/TextAppearance.SketchwarePro.CollapsingToolbar.Expanded"
         android:textColor="?attr/colorOnSurface"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/wizard_step_additional.xml b/app/src/main/res/layout/wizard_step_additional.xml
@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingEnd="24dp"
-    android:paddingStart="24dp">
+    android:paddingStart="24dp"
+    android:transitionGroup="true">
 
     <TextView
         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/wizard_step_basic.xml b/app/src/main/res/layout/wizard_step_basic.xml
@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingEnd="24dp"
-    android:paddingStart="24dp">
+    android:paddingStart="24dp"
+    android:transitionGroup="true">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/til_app_name"