Skip to content

Commit 988fadc

Browse files
committed
Constraint layout 2.0.0-beta4
App compat 1.2.0-alpha02.
1 parent 9285f5a commit 988fadc

File tree

3 files changed

+54
-54
lines changed

3 files changed

+54
-54
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ buildscript {
2020
'minSdk' : 18,
2121
'targetSdk' : 29,
2222
'buildTools' : '29.0.3',
23-
'androidx' : '1.1.0-rc01',
24-
'constraintlayout': '2.0.0-alpha3',
23+
'appcompat' : '1.2.0-alpha02',
24+
'constraintlayout': '2.0.0-beta4',
2525
'kotlin' : '1.3.61'
2626
]
2727

sample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ android {
4040

4141
dependencies {
4242
implementation project(':dynamic-motion')
43-
implementation "androidx.appcompat:appcompat:${versions.androidx}"
43+
implementation "androidx.appcompat:appcompat:${versions.appcompat}"
4444
}

sample/src/main/res/xml/motion_scene.xml

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -17,103 +17,103 @@
1717

1818
<MotionScene
1919
xmlns:android="http://schemas.android.com/apk/res/android"
20-
xmlns:motion="http://schemas.android.com/apk/res-auto">
20+
xmlns:app="http://schemas.android.com/apk/res-auto">
2121

2222
<Transition
23-
motion:constraintSetEnd="@+id/end"
24-
motion:constraintSetStart="@+id/start">
23+
app:constraintSetEnd="@+id/end"
24+
app:constraintSetStart="@+id/start">
2525

2626
<KeyFrameSet>
2727

2828
<KeyAttribute
29-
motion:framePosition="0"
30-
motion:target="@+id/background">
29+
app:framePosition="0"
30+
app:motionTarget="@+id/background">
3131

3232
<CustomAttribute
33-
motion:attributeName="backgroundColor"
34-
motion:customColorValue="#3F51B5" />
33+
app:attributeName="backgroundColor"
34+
app:customColorValue="#3F51B5" />
3535

3636
</KeyAttribute>
3737

3838
<KeyAttribute
39-
motion:framePosition="0"
4039
android:scaleX="1"
4140
android:scaleY="1"
4241
android:rotation="0"
43-
motion:target="@+id/image">
42+
app:framePosition="0"
43+
app:motionTarget="@+id/image">
4444

4545
<CustomAttribute
46-
motion:attributeName="color"
47-
motion:customColorValue="#BFC5E6" />
46+
app:attributeName="color"
47+
app:customColorValue="#BFC5E6" />
4848

4949
</KeyAttribute>
5050

5151
<KeyAttribute
52-
motion:framePosition="33"
53-
motion:target="@+id/background">
52+
app:framePosition="33"
53+
app:motionTarget="@+id/background">
5454

5555
<CustomAttribute
56-
motion:attributeName="backgroundColor"
57-
motion:customColorValue="#FFEB3B" />
56+
app:attributeName="backgroundColor"
57+
app:customColorValue="#FFEB3B" />
5858

5959
</KeyAttribute>
6060

6161
<KeyAttribute
62-
motion:framePosition="33"
6362
android:scaleX="1.3"
6463
android:scaleY="1.3"
6564
android:rotation="120"
66-
motion:target="@+id/image">
65+
app:framePosition="33"
66+
app:motionTarget="@+id/image">
6767

6868
<CustomAttribute
69-
motion:attributeName="color"
70-
motion:customColorValue="#544D13" />
69+
app:attributeName="color"
70+
app:customColorValue="#544D13" />
7171

7272
</KeyAttribute>
7373

7474
<KeyAttribute
75-
motion:framePosition="66"
76-
motion:target="@+id/background">
75+
app:framePosition="66"
76+
app:motionTarget="@+id/background">
7777

7878
<CustomAttribute
79-
motion:attributeName="backgroundColor"
80-
motion:customColorValue="#E91E63" />
79+
app:attributeName="backgroundColor"
80+
app:customColorValue="#E91E63" />
8181

8282
</KeyAttribute>
8383

8484
<KeyAttribute
85-
motion:framePosition="66"
8685
android:scaleX="1.6"
8786
android:scaleY="1.6"
8887
android:rotation="240"
89-
motion:target="@+id/image">
88+
app:framePosition="66"
89+
app:motionTarget="@+id/image">
9090

9191
<CustomAttribute
92-
motion:attributeName="color"
93-
motion:customColorValue="#F7B4CB" />
92+
app:attributeName="color"
93+
app:customColorValue="#F7B4CB" />
9494

9595
</KeyAttribute>
9696

9797
<KeyAttribute
98-
motion:framePosition="100"
99-
motion:target="@+id/background">
98+
app:framePosition="100"
99+
app:motionTarget="@+id/background">
100100

101101
<CustomAttribute
102-
motion:attributeName="backgroundColor"
103-
motion:customColorValue="#03A9F4" />
102+
app:attributeName="backgroundColor"
103+
app:customColorValue="#03A9F4" />
104104

105105
</KeyAttribute>
106106

107107
<KeyAttribute
108-
motion:framePosition="100"
109108
android:scaleX="1"
110109
android:scaleY="1"
111110
android:rotation="360"
112-
motion:target="@+id/image">
111+
app:framePosition="100"
112+
app:motionTarget="@+id/image">
113113

114114
<CustomAttribute
115-
motion:attributeName="color"
116-
motion:customColorValue="#003750" />
115+
app:attributeName="color"
116+
app:customColorValue="#003750" />
117117

118118
</KeyAttribute>
119119

@@ -126,20 +126,20 @@
126126

127127
<Constraint
128128
android:id="@+id/background"
129-
motion:layout_constraintBottom_toBottomOf="parent"
130-
motion:layout_constraintEnd_toEndOf="parent"
131-
motion:layout_constraintStart_toStartOf="parent"
132-
motion:layout_constraintTop_toTopOf="parent" />
129+
app:layout_constraintBottom_toBottomOf="parent"
130+
app:layout_constraintEnd_toEndOf="parent"
131+
app:layout_constraintStart_toStartOf="parent"
132+
app:layout_constraintTop_toTopOf="parent" />
133133

134134
<Constraint
135135
android:id="@+id/image"
136136
android:layout_width="196dp"
137137
android:layout_height="196dp"
138138
android:padding="16dp"
139-
motion:layout_constraintBottom_toBottomOf="parent"
140-
motion:layout_constraintEnd_toEndOf="parent"
141-
motion:layout_constraintStart_toStartOf="parent"
142-
motion:layout_constraintTop_toTopOf="parent" />
139+
app:layout_constraintBottom_toBottomOf="parent"
140+
app:layout_constraintEnd_toEndOf="parent"
141+
app:layout_constraintStart_toStartOf="parent"
142+
app:layout_constraintTop_toTopOf="parent" />
143143

144144
</ConstraintSet>
145145

@@ -148,20 +148,20 @@
148148

149149
<Constraint
150150
android:id="@+id/background"
151-
motion:layout_constraintBottom_toBottomOf="parent"
152-
motion:layout_constraintEnd_toEndOf="parent"
153-
motion:layout_constraintStart_toStartOf="parent"
154-
motion:layout_constraintTop_toTopOf="parent" />
151+
app:layout_constraintBottom_toBottomOf="parent"
152+
app:layout_constraintEnd_toEndOf="parent"
153+
app:layout_constraintStart_toStartOf="parent"
154+
app:layout_constraintTop_toTopOf="parent" />
155155

156156
<Constraint
157157
android:id="@+id/image"
158158
android:layout_width="196dp"
159159
android:layout_height="196dp"
160160
android:padding="16dp"
161-
motion:layout_constraintBottom_toBottomOf="parent"
162-
motion:layout_constraintEnd_toEndOf="parent"
163-
motion:layout_constraintStart_toStartOf="parent"
164-
motion:layout_constraintTop_toTopOf="parent" />
161+
app:layout_constraintBottom_toBottomOf="parent"
162+
app:layout_constraintEnd_toEndOf="parent"
163+
app:layout_constraintStart_toStartOf="parent"
164+
app:layout_constraintTop_toTopOf="parent" />
165165

166166
</ConstraintSet>
167167

0 commit comments

Comments
 (0)