From 988fadc38eb31733e506b1c4824ceec952c37057 Mon Sep 17 00:00:00 2001 From: Pranav Pandey Date: Mon, 3 Feb 2020 12:07:01 +0530 Subject: [PATCH] Constraint layout 2.0.0-beta4 App compat 1.2.0-alpha02. --- build.gradle | 4 +- sample/build.gradle | 2 +- sample/src/main/res/xml/motion_scene.xml | 102 +++++++++++------------ 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/build.gradle b/build.gradle index 0d6c369..ac33efd 100644 --- a/build.gradle +++ b/build.gradle @@ -20,8 +20,8 @@ buildscript { 'minSdk' : 18, 'targetSdk' : 29, 'buildTools' : '29.0.3', - 'androidx' : '1.1.0-rc01', - 'constraintlayout': '2.0.0-alpha3', + 'appcompat' : '1.2.0-alpha02', + 'constraintlayout': '2.0.0-beta4', 'kotlin' : '1.3.61' ] diff --git a/sample/build.gradle b/sample/build.gradle index 615a779..450e63c 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -40,5 +40,5 @@ android { dependencies { implementation project(':dynamic-motion') - implementation "androidx.appcompat:appcompat:${versions.androidx}" + implementation "androidx.appcompat:appcompat:${versions.appcompat}" } diff --git a/sample/src/main/res/xml/motion_scene.xml b/sample/src/main/res/xml/motion_scene.xml index 83fe7b5..ffdd7e8 100644 --- a/sample/src/main/res/xml/motion_scene.xml +++ b/sample/src/main/res/xml/motion_scene.xml @@ -17,103 +17,103 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> + app:constraintSetEnd="@+id/end" + app:constraintSetStart="@+id/start"> + app:framePosition="0" + app:motionTarget="@+id/background"> + app:attributeName="backgroundColor" + app:customColorValue="#3F51B5" /> + app:framePosition="0" + app:motionTarget="@+id/image"> + app:attributeName="color" + app:customColorValue="#BFC5E6" /> + app:framePosition="33" + app:motionTarget="@+id/background"> + app:attributeName="backgroundColor" + app:customColorValue="#FFEB3B" /> + app:framePosition="33" + app:motionTarget="@+id/image"> + app:attributeName="color" + app:customColorValue="#544D13" /> + app:framePosition="66" + app:motionTarget="@+id/background"> + app:attributeName="backgroundColor" + app:customColorValue="#E91E63" /> + app:framePosition="66" + app:motionTarget="@+id/image"> + app:attributeName="color" + app:customColorValue="#F7B4CB" /> + app:framePosition="100" + app:motionTarget="@+id/background"> + app:attributeName="backgroundColor" + app:customColorValue="#03A9F4" /> + app:framePosition="100" + app:motionTarget="@+id/image"> + app:attributeName="color" + app:customColorValue="#003750" /> @@ -126,20 +126,20 @@ + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> @@ -148,20 +148,20 @@ + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" />