layouts: Replace layout test with responsive layouts

Signed-off-by: Tyler Nijmeh <[email protected]>

Fix compose activity being hidden due to E2E

Signed-off-by: Tyler Nijmeh <[email protected]>

Use default fit type for responsive layout

Signed-off-by: Tyler Nijmeh <[email protected]>

Fix animations not playing

Signed-off-by: Tyler Nijmeh <[email protected]>

Remove no longer needed riv file

Signed-off-by: Tyler Nijmeh <[email protected]>

Author: tytydraco

app/src/main/java/app/rive/runtime/example/LayoutActivity.kt

@@ -17,35 +17,49 @@ class LayoutActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.layout)
 
+        animationView.setRiveResource(R.raw.responsive_layouts, autoBind = true)
+        animationView.fit = Fit.LAYOUT
+
         // FIT BUTTONS
 
         findViewById<Button>(R.id.fit_layout).setOnClickListener {
             animationView.fit = Fit.LAYOUT
+            animationView.play()
         }
         findViewById<Button>(R.id.fit_fill).setOnClickListener {
             animationView.fit = Fit.FILL
+            animationView.play()
         }
         findViewById<Button>(R.id.fit_contain).setOnClickListener {
             animationView.fit = Fit.CONTAIN
+            animationView.play()
         }
         findViewById<Button>(R.id.fit_cover).setOnClickListener {
             animationView.fit = Fit.COVER
+            animationView.play()
         }
         findViewById<Button>(R.id.fit_fit_width).setOnClickListener {
             animationView.fit = Fit.FIT_WIDTH
+            animationView.play()
         }
         findViewById<Button>(R.id.fit_fit_height).setOnClickListener {
             animationView.fit = Fit.FIT_HEIGHT
+            animationView.play()
         }
         findViewById<Button>(R.id.fit_none).setOnClickListener {
             animationView.fit = Fit.NONE
+            animationView.play()
         }
         findViewById<Button>(R.id.fit_scale_down).setOnClickListener {
             animationView.fit = Fit.SCALE_DOWN
+            animationView.play()
         }
 
         // SCALE BUTTONS
+        val defaultScaleFactor = animationView.layoutScaleFactorAutomatic / 1.5f
+        val increment = 0.1f
 
+        animationView.layoutScaleFactor = defaultScaleFactor;
         findViewById<Button>(R.id.scale_up).setOnClickListener {
             if (animationView.fit != Fit.LAYOUT) {
                 return@setOnClickListener;
@@ -54,11 +68,11 @@ class LayoutActivity : AppCompatActivity() {
             if (animationView.layoutScaleFactor == null) {
                 // Auto layout scale factor is enabled
                 // Reset the view to the current auto value
-                animationView.layoutScaleFactor = animationView.layoutScaleFactorAutomatic
+                animationView.layoutScaleFactor = defaultScaleFactor
             }
 
-            animationView.layoutScaleFactor = animationView.layoutScaleFactor?.plus(1);
-
+            animationView.layoutScaleFactor = animationView.layoutScaleFactor?.plus(increment);
+            animationView.play()
         }
         findViewById<Button>(R.id.scale_down).setOnClickListener {
             if (animationView.fit != Fit.LAYOUT) {
@@ -68,48 +82,59 @@ class LayoutActivity : AppCompatActivity() {
             if (animationView.layoutScaleFactor == null) {
                 // Auto layout scale factor is enabled
                 // Reset the view to the current auto value
-                animationView.layoutScaleFactor = animationView.layoutScaleFactorAutomatic
+                animationView.layoutScaleFactor = defaultScaleFactor
             }
 
             if (animationView.layoutScaleFactor!! > 1) {
-                animationView.layoutScaleFactor = animationView.layoutScaleFactor?.minus(1);
+                animationView.layoutScaleFactor = animationView.layoutScaleFactor?.minus(increment);
             }
+            animationView.play()
         }
         findViewById<Button>(R.id.scale_auto).setOnClickListener {
             // Setting to -1 will use the device density as determined by Rive
-            animationView.layoutScaleFactor = null;
+            animationView.layoutScaleFactor = defaultScaleFactor
+            animationView.play()
         }
 
         // ALIGNMENT BUTTONS
 
         findViewById<Button>(R.id.alignment_top_left).setOnClickListener {
             animationView.alignment = Alignment.TOP_LEFT
+            animationView.play()
         }
         findViewById<Button>(R.id.alignment_top_center).setOnClickListener {
             animationView.alignment = Alignment.TOP_CENTER
+            animationView.play()
         }
         findViewById<Button>(R.id.alignment_top_right).setOnClickListener {
             animationView.alignment = Alignment.TOP_RIGHT
+            animationView.play()
         }
 
         findViewById<Button>(R.id.alignment_center_left).setOnClickListener {
             animationView.alignment = Alignment.CENTER_LEFT
+            animationView.play()
         }
         findViewById<Button>(R.id.alignment_center).setOnClickListener {
             animationView.alignment = Alignment.CENTER
+            animationView.play()
         }
         findViewById<Button>(R.id.alignment_center_right).setOnClickListener {
             animationView.alignment = Alignment.CENTER_RIGHT
+            animationView.play()
         }
 
         findViewById<Button>(R.id.alignment_bottom_left).setOnClickListener {
             animationView.alignment = Alignment.BOTTOM_LEFT
+            animationView.play()
         }
         findViewById<Button>(R.id.alignment_bottom_center).setOnClickListener {
             animationView.alignment = Alignment.BOTTOM_CENTER
+            animationView.play()
         }
         findViewById<Button>(R.id.alignment_bottom_right).setOnClickListener {
             animationView.alignment = Alignment.BOTTOM_RIGHT
+            animationView.play()
         }
     }
 }

app/src/main/res/layout/layout.xml

@@ -21,7 +21,7 @@
             android:layout_weight="2"
             app:riveStateMachine="State Machine 1"
             app:riveFit="LAYOUT"
-            app:riveResource="@raw/layout_test" />
+            app:riveResource="@raw/responsive_layouts" />
 
         <LinearLayout
             android:layout_width="fill_parent"

app/src/main/res/layout/main.xml

@@ -8,7 +8,10 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingVertical="8dp">
+        android:paddingVertical="8dp"
+        android:fitsSystemWindows="true"
+        android:id="@+id/stuff"
+        android:layout_marginTop="?attr/actionBarSize">
 
         <LinearLayout
             android:id="@+id/button_container"