Renames and final touch ups for CL 2.0

zhouf · Aug 27, 2020 · 9741396 · 9741396
1 parent f05c424
commit 9741396
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/ConstraintLayoutExamples/build.gradle b/ConstraintLayoutExamples/build.gradle
@@ -27,7 +27,7 @@ buildscript {
         targetSdkVersion = 28
 
         appCompatVersion = '1.3.0-alpha01'
-        constraintLayoutVersion = '2.0.0'
+        constraintLayoutVersion = '2.0.1'
         glideVersion = '4.8.0'
         kotlinVersion = '1.4.0'
         lifeCycleVersion = '2.2.0'

diff --git a/...ain/res/drawable-xxhdpi/star_parallax.jpg → ...in/res/drawable-xxxhdpi/star_parallax.jpg b/...ain/res/drawable-xxhdpi/star_parallax.jpg → ...in/res/drawable-xxxhdpi/star_parallax.jpg
diff --git a/...youtExamples/motionlayoutintegrations/src/main/res/layout/activity_collapsing_toolbar.xml b/...youtExamples/motionlayoutintegrations/src/main/res/layout/activity_collapsing_toolbar.xml
@@ -39,7 +39,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:minHeight="100dp"
-            app:layoutDescription="@xml/collapsing_toolbar"
+            app:layoutDescription="@xml/activity_collapsing_toolbar_scene"
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
             <com.example.androidstudio.motionlayoutintegrations.CutoutImage

diff --git a/ConstraintLayoutExamples/motionlayoutintegrations/src/main/res/layout/activity_entrance.xml b/ConstraintLayoutExamples/motionlayoutintegrations/src/main/res/layout/activity_entrance.xml
@@ -29,7 +29,7 @@
     <ImageView
         android:id="@+id/scrolling_background"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="2000dp"
         android:scaleType="centerCrop"
         android:src="@drawable/star_parallax"
         app:layout_constraintBottom_toBottomOf="parent"

diff --git a/...Examples/motionlayoutintegrations/src/main/res/layout/activity_view_pager_integration.xml b/...Examples/motionlayoutintegrations/src/main/res/layout/activity_view_pager_integration.xml
@@ -27,8 +27,7 @@
         android:id="@+id/motion_layout"
         android:layout_width="match_parent"
         android:layout_height="100dp"
-        app:layoutDescription="@xml/viewpager"
-        >
+        app:layoutDescription="@xml/activity_view_pager_integration_scene">
 
         <ImageView
             android:id="@+id/background"
@@ -47,7 +46,7 @@
             android:textColor="?colorSecondary"
             android:rotation="30"/>
     </androidx.constraintlayout.motion.widget.MotionLayout>
-
+    
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabs"
         android:layout_width="match_parent"

diff --git a/...s/src/main/res/xml/collapsing_toolbar.xml → ...xml/activity_collapsing_toolbar_scene.xml b/...s/src/main/res/xml/collapsing_toolbar.xml → ...xml/activity_collapsing_toolbar_scene.xml
diff --git a/...raintLayoutExamples/motionlayoutintegrations/src/main/res/xml/activity_entrance_scene.xml b/...raintLayoutExamples/motionlayoutintegrations/src/main/res/xml/activity_entrance_scene.xml
@@ -45,7 +45,7 @@
             motion:layout_constraintStart_toStartOf="parent"
             motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="0dp"
-            android:layout_height="4478px"
+            android:layout_height="2000dp"
             android:translationY="100px"
             />
     </ConstraintSet>
@@ -60,7 +60,7 @@
             motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintVertical_bias="0.80"
             android:layout_width="0dp"
-            android:layout_height="4478px"
+            android:layout_height="2000dp"
             />
     </ConstraintSet>
     <ConstraintSet
@@ -135,7 +135,7 @@
             motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintVertical_bias="0.70"
             android:layout_width="0dp"
-            android:layout_height="4478px"
+            android:layout_height="2000dp"
             />
     </ConstraintSet>
     <ConstraintSet
@@ -147,7 +147,7 @@
             motion:layout_constraintStart_toStartOf="parent"
             motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="0dp"
-            android:layout_height="4478px"
+            android:layout_height="2000dp"
             />
         <Constraint
             android:id="@+id/card1"

diff --git a/...tegrations/src/main/res/xml/viewpager.xml → ...activity_view_pager_integration_scene.xml b/...tegrations/src/main/res/xml/viewpager.xml → ...activity_view_pager_integration_scene.xml