From 489c025840906fb4780684d7d006bed74b3a3ea1 Mon Sep 17 00:00:00 2001
From: jaco <jcrucesdeveloper@gmail.com>
Date: Tue, 16 Aug 2022 12:46:47 -0400
Subject: [PATCH] feat(animation): animation implemented with ScrollView

---
 .idea/deploymentTargetDropDown.xml            |  4 +-
 .idea/misc.xml                                |  8 +++
 .../activities/PlayGameActivity.java          | 49 ++++++++++++++-----
 .../drawable/ic_mediamodifier_design_2_.xml   | 25 ++++++++++
 .../drawable/ic_mediamodifier_design_5_.xml   | 25 ++++++++++
 .../main/res/layout/activity_play_game.xml    | 32 +++++++-----
 app/src/main/res/layout/station_layout.xml    | 43 +++++++++++-----
 7 files changed, 146 insertions(+), 40 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_mediamodifier_design_2_.xml
 create mode 100644 app/src/main/res/drawable/ic_mediamodifier_design_5_.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 4d37d12..1db15b2 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Nexus_5X_API_30_2.avd" />
+            <value value="$USER_HOME$/.android/avd/Pixel_3a_API_30.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-08-15T02:21:34.996636Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-08-16T16:27:40.898302Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 26b7f87..c375646 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,14 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="../../../../layout/custom_preview.xml" value="0.43498049414824447" />
+        <entry key="app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.2935" />
+        <entry key="app/src/main/res/drawable/ic_baseline_circle_24.xml" value="0.2935" />
+        <entry key="app/src/main/res/drawable/ic_launcher_background.xml" value="0.2935" />
+        <entry key="app/src/main/res/drawable/ic_mediamodifier_design.xml" value="0.2935" />
+        <entry key="app/src/main/res/drawable/ic_mediamodifier_design_2_.xml" value="0.2935" />
+        <entry key="app/src/main/res/drawable/ic_mediamodifier_design_5_.xml" value="0.2935" />
+        <entry key="app/src/main/res/drawable/metro_svg.xml" value="0.2935" />
+        <entry key="app/src/main/res/drawable/metro_svg_foreground.xml" value="0.2935" />
         <entry key="app/src/main/res/layout/activity_info.xml" value="0.2496793501496366" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.18802083333333333" />
         <entry key="app/src/main/res/layout/activity_menu_metro.xml" value="0.22" />
diff --git a/app/src/main/java/com/jorgecruces/metrometro/activities/PlayGameActivity.java b/app/src/main/java/com/jorgecruces/metrometro/activities/PlayGameActivity.java
index 0fe12e3..2f8aa95 100644
--- a/app/src/main/java/com/jorgecruces/metrometro/activities/PlayGameActivity.java
+++ b/app/src/main/java/com/jorgecruces/metrometro/activities/PlayGameActivity.java
@@ -5,12 +5,14 @@
 
 import android.animation.ObjectAnimator;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -22,6 +24,8 @@
 import com.jorgecruces.metrometro.model.Metro;
 import com.jorgecruces.metrometro.model.Station;
 
+import org.w3c.dom.Text;
+
 import java.util.ArrayList;
 import java.util.Collections;
 
@@ -51,20 +55,42 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void testMethod() {
-        LinearLayout linearLayout = findViewById(R.id.gameLayout);
+        RelativeLayout linearLayout = findViewById(R.id.gameLayout);
+        TextView textView = new TextView(this);
+        textView.setText("HOLa");
+        textView.setId(View.generateViewId());
+        linearLayout.addView(textView);
+
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
+                RelativeLayout.LayoutParams.WRAP_CONTENT,
+                RelativeLayout.LayoutParams.WRAP_CONTENT
+        );
+        layoutParams.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE);
+
+        Resources r = this.getResources();
+        int px = (int) TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP,
+                285,
+                r.getDisplayMetrics()
+        );
+
+        layoutParams.setMarginStart(px);
+
         StationView stationView = new StationView(this);
-        stationView.setLayoutParams(new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.MATCH_PARENT
-                ));
+        stationView.setLayoutParams(layoutParams);
         linearLayout.addView(stationView);
 
 
         StationView stationView2 = new StationView(this);
-        stationView2.setLayoutParams(new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.MATCH_PARENT
-        ));
+        stationView2.setId(View.generateViewId());
+
+        RelativeLayout.LayoutParams layoutParams2 = new RelativeLayout.LayoutParams(
+                RelativeLayout.LayoutParams.WRAP_CONTENT,
+                RelativeLayout.LayoutParams.WRAP_CONTENT
+        );
+        layoutParams2.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE);
+
+        stationView2.setLayoutParams(layoutParams2);
         linearLayout.addView(stationView2);
 
         DisplayMetrics displayMetrics = new DisplayMetrics();
@@ -72,10 +98,7 @@ private void testMethod() {
         int height = displayMetrics.heightPixels;
         int width = displayMetrics.widthPixels;
 
-//        ObjectAnimator animation = ObjectAnimator.ofFloat(stationView, "translationX", -(width/2));
-//        animation.setDuration(3000);
-//        animation.start();
-
+        stationView.animate().translationX(-1000f).setDuration(3000);
 
     }
 
diff --git a/app/src/main/res/drawable/ic_mediamodifier_design_2_.xml b/app/src/main/res/drawable/ic_mediamodifier_design_2_.xml
new file mode 100644
index 0000000..a09f282
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mediamodifier_design_2_.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1080dp"
+    android:height="1080dp"
+    android:viewportWidth="1080"
+    android:viewportHeight="1080">
+  <path
+      android:pathData="M0,0h1080v1080h-1080z"/>
+
+  <path
+      android:pathData="M0,0h1080v1080h-1080z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFF"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M378.38,108.53l1101.73,0l0,777.5l-1101.73,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0"
+      android:fillColor="#FF0101"
+      android:fillType="nonZero"
+      android:strokeColor="#000000"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_mediamodifier_design_5_.xml b/app/src/main/res/drawable/ic_mediamodifier_design_5_.xml
new file mode 100644
index 0000000..36dd78d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mediamodifier_design_5_.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1080dp"
+    android:height="1080dp"
+    android:viewportWidth="1080"
+    android:viewportHeight="1080">
+  <path
+      android:pathData="M0,0h1080v1080h-1080z"
+      />
+  <path
+      android:pathData="M0,0h1080v1080h-1080z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFF"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M-390.87,-122.37l1788.58,0l0,1262.52l-1788.58,0z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0"
+      android:fillColor="#FF0101"
+      android:fillType="nonZero"
+      android:strokeColor="#000000"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_play_game.xml b/app/src/main/res/layout/activity_play_game.xml
index 8ae6231..772ea65 100644
--- a/app/src/main/res/layout/activity_play_game.xml
+++ b/app/src/main/res/layout/activity_play_game.xml
@@ -79,13 +79,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="180dp"
-        android:layout_marginTop="8dp"
         android:layout_marginEnd="181dp"
+        android:layout_marginBottom="8dp"
         android:orientation="horizontal"
+        app:layout_constraintBottom_toTopOf="@+id/textViewAlternative1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/gameLayout">
+        app:layout_constraintStart_toStartOf="parent">
 
         <TextView
             android:id="@+id/textViewCurrentNumberQuestion"
@@ -124,21 +124,27 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/textViewAlternative1" />
 
-    <LinearLayout
-        android:id="@+id/gameLayout"
+    <HorizontalScrollView
         android:layout_width="0dp"
-        android:layout_height="300dp"
-        android:layout_marginTop="8dp"
-        android:background="@android:drawable/edit_text"
-        android:gravity="clip_horizontal|clip_vertical|center_horizontal|center_vertical"
-        android:orientation="horizontal"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/linearLayout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textViewTitle"
+        app:layout_constraintTop_toBottomOf="@+id/textViewTitle">
 
-        >
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
 
-    </LinearLayout>
+            <RelativeLayout
+                android:id="@+id/gameLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent">
+
+            </RelativeLayout>
+        </LinearLayout>
+    </HorizontalScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/station_layout.xml b/app/src/main/res/layout/station_layout.xml
index fd74483..2b3d7ff 100644
--- a/app/src/main/res/layout/station_layout.xml
+++ b/app/src/main/res/layout/station_layout.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="300dp"
     android:layout_height="wrap_content"
-    android:gravity="center_horizontal|center_vertical"
+    android:layout_centerVertical="true"
+    android:animateLayoutChanges="true"
+    android:gravity="start|center_horizontal|center_vertical"
     android:orientation="vertical">
 
     <RelativeLayout
@@ -12,27 +15,43 @@
         android:layout_weight="1">
 
         <ImageView
-            android:id="@+id/imageView2"
-            android:layout_width="match_parent"
+            android:id="@+id/imageView8"
+            android:layout_width="120dp"
             android:layout_height="120dp"
-            android:layout_centerInParent="true"
-            android:backgroundTint="#FF0000"
+            android:layout_marginStart="-10dp"
             app:srcCompat="@drawable/metro_svg" />
 
         <ImageView
-            android:id="@+id/imageView3"
-            android:layout_width="match_parent"
+            android:id="@+id/imageView9"
+            android:layout_width="80dp"
             android:layout_height="80dp"
-            android:layout_centerInParent="true"
-            app:srcCompat="@drawable/ic_baseline_circle_24" />
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="10dp"
+            app:srcCompat="@drawable/ic_baseline_circle_24"
+            tools:layout_centerVertical="true" />
+
+        <ImageView
+            android:id="@+id/imageView10"
+            android:layout_width="120dp"
+            android:layout_height="42dp"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="0dp"
+            android:layout_toEndOf="@+id/imageView9"
+            android:adjustViewBounds="false"
+            android:scaleType="centerCrop"
+            app:srcCompat="@drawable/ic_mediamodifier_design_5_" />
     </RelativeLayout>
 
     <TextView
         android:id="@+id/textViewStationName"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="30dp"
         android:layout_weight="1"
         android:text="TextView"
-        android:textAlignment="center" />
+        android:textAlignment="viewStart" />
 
 </LinearLayout>
\ No newline at end of file