Skip to content

Commit

Permalink
Replace motion xmlns with app
Browse files Browse the repository at this point in the history
  • Loading branch information
egorikftp committed Jul 30, 2020
1 parent 08f5e7a commit 43da43e
Show file tree
Hide file tree
Showing 32 changed files with 1,466 additions and 1,466 deletions.
24 changes: 12 additions & 12 deletions app/src/main/res/xml/basic_click.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:motion="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">

<Transition
motion:constraintSetEnd="@id/end"
motion:constraintSetStart="@id/start"
motion:duration="300">
app:constraintSetEnd="@id/end"
app:constraintSetStart="@id/start"
app:duration="300">

<OnClick
motion:clickAction="toggle"
motion:targetId="@id/catImage" />
app:clickAction="toggle"
app:targetId="@id/catImage" />
</Transition>

<ConstraintSet android:id="@+id/start">
<Constraint android:id="@+id/catImage">
<Layout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintRight_toRightOf="parent"
motion:layout_constraintTop_toTopOf="parent" />
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</Constraint>
</ConstraintSet>

Expand All @@ -28,9 +28,9 @@
<Layout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintRight_toRightOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
</Constraint>
</ConstraintSet>
</MotionScene>
48 changes: 24 additions & 24 deletions app/src/main/res/xml/basic_custom_attribute.xml
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:motion="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">

<Transition
motion:constraintSetEnd="@id/end"
motion:constraintSetStart="@id/start"
motion:duration="700">
app:constraintSetEnd="@id/end"
app:constraintSetStart="@id/start"
app:duration="700">

<OnClick
motion:clickAction="toggle"
motion:targetId="@id/catImage" />
app:clickAction="toggle"
app:targetId="@id/catImage" />
</Transition>

<ConstraintSet android:id="@+id/start">
<Constraint android:id="@+id/catImage">
<Layout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintRight_toRightOf="parent"
motion:layout_constraintTop_toTopOf="parent" />
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</Constraint>

<Constraint android:id="@+id/catText">
<Layout
android:layout_width="150dp"
android:layout_height="50dp"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintRight_toRightOf="parent"
motion:layout_constraintTop_toTopOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<CustomAttribute
motion:attributeName="textSize"
motion:customFloatValue="20" />
app:attributeName="textSize"
app:customFloatValue="20" />
</Constraint>

</ConstraintSet>
Expand All @@ -43,9 +43,9 @@
<Layout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintRight_toRightOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />

<Transform android:rotation="360" />
</Constraint>
Expand All @@ -54,14 +54,14 @@
<Layout
android:layout_width="150dp"
android:layout_height="50dp"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintRight_toRightOf="parent"
motion:layout_constraintTop_toTopOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<CustomAttribute
motion:attributeName="textSize"
motion:customFloatValue="32" />
app:attributeName="textSize"
app:customFloatValue="32" />
</Constraint>
</ConstraintSet>
</MotionScene>
32 changes: 16 additions & 16 deletions app/src/main/res/xml/basic_imagefilter.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:motion="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">

<Transition
motion:constraintSetEnd="@id/end"
motion:constraintSetStart="@id/start"
motion:duration="300">
app:constraintSetEnd="@id/end"
app:constraintSetStart="@id/start"
app:duration="300">

<OnSwipe
motion:dragDirection="dragDown"
motion:touchAnchorId="@id/catImage" />
app:dragDirection="dragDown"
app:touchAnchorId="@id/catImage" />
</Transition>

<ConstraintSet android:id="@+id/start">
<Constraint android:id="@+id/catImage">
<Layout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintRight_toRightOf="parent"
motion:layout_constraintTop_toTopOf="parent" />
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<CustomAttribute
motion:attributeName="crossfade"
motion:customFloatValue="1" />
app:attributeName="crossfade"
app:customFloatValue="1" />
</Constraint>
</ConstraintSet>

Expand All @@ -32,13 +32,13 @@
<Layout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintRight_toRightOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />

<CustomAttribute
motion:attributeName="crossfade"
motion:customFloatValue="0" />
app:attributeName="crossfade"
app:customFloatValue="0" />
</Constraint>
</ConstraintSet>
</MotionScene>
32 changes: 16 additions & 16 deletions app/src/main/res/xml/basic_imagefilter_saturation.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:motion="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">

<Transition
motion:constraintSetEnd="@id/end"
motion:constraintSetStart="@id/start"
motion:duration="300">
app:constraintSetEnd="@id/end"
app:constraintSetStart="@id/start"
app:duration="300">

<OnSwipe
motion:dragDirection="dragDown"
motion:touchAnchorId="@id/catImage" />
app:dragDirection="dragDown"
app:touchAnchorId="@id/catImage" />
</Transition>

<ConstraintSet android:id="@+id/start">
<Constraint android:id="@+id/catImage">
<Layout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintRight_toRightOf="parent"
motion:layout_constraintTop_toTopOf="parent" />
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<CustomAttribute
motion:attributeName="saturation"
motion:customFloatValue="1" />
app:attributeName="saturation"
app:customFloatValue="1" />
</Constraint>
</ConstraintSet>

Expand All @@ -32,13 +32,13 @@
<Layout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintRight_toRightOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />

<CustomAttribute
motion:attributeName="saturation"
motion:customFloatValue="0" />
app:attributeName="saturation"
app:customFloatValue="0" />
</Constraint>
</ConstraintSet>
</MotionScene>
30 changes: 15 additions & 15 deletions app/src/main/res/xml/basic_key_cycle.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:motion="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">

<Transition
motion:constraintSetEnd="@id/end"
motion:constraintSetStart="@id/start"
motion:duration="2600">
app:constraintSetEnd="@id/end"
app:constraintSetStart="@id/start"
app:duration="2600">

<OnClick
motion:clickAction="toggle"
motion:targetId="@id/catImage" />
app:clickAction="toggle"
app:targetId="@id/catImage" />

<KeyFrameSet>
<KeyCycle
android:rotation="25"
motion:framePosition="50"
motion:motionTarget="@id/catImage"
motion:wavePeriod="1"
motion:waveShape="sin" />
app:framePosition="50"
app:motionTarget="@id/catImage"
app:wavePeriod="1"
app:waveShape="sin" />
</KeyFrameSet>
</Transition>

Expand All @@ -26,10 +26,10 @@
<Layout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintTop_toTopOf="parent" />
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<Motion motion:pathMotionArc="startVertical" />
<Motion app:pathMotionArc="startVertical" />
</Constraint>
</ConstraintSet>

Expand All @@ -38,8 +38,8 @@
<Layout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintRight_toRightOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
</Constraint>
</ConstraintSet>
</MotionScene>
30 changes: 15 additions & 15 deletions app/src/main/res/xml/basic_key_time_cycle.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:motion="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">

<Transition
motion:constraintSetEnd="@id/end"
motion:constraintSetStart="@id/start"
motion:duration="2600">
app:constraintSetEnd="@id/end"
app:constraintSetStart="@id/start"
app:duration="2600">

<OnClick
motion:clickAction="toggle"
motion:targetId="@id/catImage" />
app:clickAction="toggle"
app:targetId="@id/catImage" />

<KeyFrameSet>
<KeyTimeCycle
android:rotation="25"
motion:framePosition="50"
motion:motionTarget="@id/catImage"
motion:wavePeriod="1"
motion:waveShape="sin" />
app:framePosition="50"
app:motionTarget="@id/catImage"
app:wavePeriod="1"
app:waveShape="sin" />
</KeyFrameSet>
</Transition>

Expand All @@ -26,10 +26,10 @@
<Layout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
motion:layout_constraintLeft_toLeftOf="parent"
motion:layout_constraintTop_toTopOf="parent" />
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<Motion motion:pathMotionArc="startVertical" />
<Motion app:pathMotionArc="startVertical" />
</Constraint>
</ConstraintSet>

Expand All @@ -38,8 +38,8 @@
<Layout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
motion:layout_constraintBottom_toBottomOf="parent"
motion:layout_constraintRight_toRightOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
</Constraint>
</ConstraintSet>
</MotionScene>
Loading

0 comments on commit 43da43e

Please sign in to comment.