Skip to content
This repository was archived by the owner on Dec 27, 2024. It is now read-only.

Commit 0fa6dce

Browse files
jafu888jafu888
authored
clean up formatting (#760)
1 parent 8b5051f commit 0fa6dce

File tree

3 files changed

+31
-38
lines changed

3 files changed

+31
-38
lines changed

‎demoProjects/ExamplesRecyclerView/app/src/main/res/layout/recycler_to_detail.xml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.motion.widget.MotionLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
34
xmlns:app="http://schemas.android.com/apk/res-auto"
45
xmlns:tools="http://schemas.android.com/tools"
6+
android:id="@+id/base_motionLayout"
57
android:layout_width="match_parent"
68
android:layout_height="match_parent"
79
android:background="#1E0A1E"
810
app:layoutDescription="@xml/recycler_to_detail_scene"
9-
android:id="@+id/base_motionLayout"
1011
tools:context=".MainActivity">
1112

1213
<androidx.recyclerview.widget.RecyclerView
@@ -19,17 +20,10 @@
1920
app:layout_constraintStart_toStartOf="parent"
2021
app:layout_constraintTop_toTopOf="parent" />
2122

22-
<!-- <FrameLayout-->
23-
<!-- android:id="@+id/frameLayout"-->
24-
<!-- android:layout_width="wrap_content"-->
25-
<!-- android:layout_height="wrap_content"-->
26-
27-
<!-- android:visibility="invisible"-->
28-
<!-- app:layout_constraintStart_toStartOf="parent"-->
29-
<!-- app:layout_constraintTop_toTopOf="parent">-->
30-
31-
<include layout="@layout/recycler_to_detail_item" android:id="@+id/detail" android:layout_width="match_parent"
32-
android:layout_height="100dp" />
33-
<!-- </FrameLayout>-->
23+
<include
24+
android:id="@+id/detail"
25+
layout="@layout/recycler_to_detail_item"
26+
android:layout_width="match_parent"
27+
android:layout_height="100dp" />
3428

3529
</androidx.constraintlayout.motion.widget.MotionLayout>

‎demoProjects/ExamplesRecyclerView/app/src/main/res/xml/recycler_to_detail_item_scene.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@
44

55
<Transition
66
motion:constraintSetEnd="@+id/end"
7-
motion:constraintSetStart="@id/start" >
7+
motion:constraintSetStart="@id/start">
88
<KeyFrameSet>
99
<KeyAttribute
1010
android:rotation="45"
1111
motion:framePosition="20"
12-
motion:motionTarget="@+id/button" />
12+
motion:motionTarget="@+id/button" />
1313
<KeyAttribute
1414
android:rotation="45"
1515
motion:framePosition="80"
16-
motion:motionTarget="@+id/button" />
17-
16+
motion:motionTarget="@+id/button" />
1817
</KeyFrameSet>
1918
</Transition>
2019

2120
<ConstraintSet android:id="@+id/start">
22-
2321
<ConstraintOverride android:id="@+id/backdrop">
2422
<CustomAttribute
2523
motion:attributeName="backgroundColor"
@@ -28,7 +26,6 @@
2826
</ConstraintSet>
2927

3028
<ConstraintSet android:id="@+id/end">
31-
3229
<Constraint
3330
android:id="@+id/backdrop"
3431
android:layout_width="match_parent"
@@ -37,7 +34,6 @@
3734
motion:attributeName="backgroundColor"
3835
motion:customColorValue="#040404" />
3936
</Constraint>
40-
4137
<Constraint
4238
android:id="@+id/button"
4339
android:layout_width="50dp"
@@ -47,7 +43,6 @@
4743
motion:layout_constraintHorizontal_bias="0.5"
4844
motion:layout_constraintStart_toStartOf="parent"
4945
motion:layout_constraintTop_toTopOf="parent" />
50-
5146
<Constraint
5247
android:id="@+id/image"
5348
android:layout_width="0dp"

‎demoProjects/ExamplesRecyclerView/app/src/main/res/xml/recycler_to_detail_scene.xml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,57 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<MotionScene
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:motion="http://schemas.android.com/apk/res-auto">
54

65
<Transition
76
motion:constraintSetEnd="@+id/end"
87
motion:constraintSetStart="@id/start"
98
motion:duration="2000">
10-
<KeyFrameSet>
11-
<KeyAttribute motion:motionTarget="@+id/detail" android:alpha="1" motion:framePosition="1"/>
12-
<KeyAttribute motion:motionTarget="@+id/detail" motion:motionProgress="0" motion:framePosition="30"/>
13-
</KeyFrameSet>
9+
<KeyFrameSet>
10+
<KeyAttribute
11+
android:alpha="1"
12+
motion:framePosition="1"
13+
motion:motionTarget="@+id/detail" />
14+
<KeyAttribute
15+
motion:framePosition="30"
16+
motion:motionProgress="0"
17+
motion:motionTarget="@+id/detail" />
18+
</KeyFrameSet>
1419
</Transition>
1520

1621
<ConstraintSet android:id="@+id/start">
1722
<Constraint
1823
android:id="@+id/recyclerView"
19-
motion:layout_constraintEnd_toEndOf="parent"
2024
android:layout_width="match_parent"
2125
android:layout_height="match_parent"
2226
motion:layout_constraintBottom_toBottomOf="parent"
23-
motion:layout_constraintTop_toTopOf="parent"
24-
motion:layout_constraintStart_toStartOf="parent" />
27+
motion:layout_constraintEnd_toEndOf="parent"
28+
motion:layout_constraintStart_toStartOf="parent"
29+
motion:layout_constraintTop_toTopOf="parent" />
2530
<Constraint
2631
android:id="@+id/detail"
2732
android:layout_width="wrap_content"
2833
android:layout_height="100dp"
2934
android:visibility="invisible"
30-
motion:motionProgress="0"
35+
motion:layout_constraintStart_toStartOf="parent"
3136
motion:layout_constraintTop_toTopOf="parent"
32-
motion:layout_constraintStart_toStartOf="parent" />
37+
motion:motionProgress="0" />
3338
</ConstraintSet>
3439

3540
<ConstraintSet android:id="@+id/end">
3641
<Constraint
3742
android:id="@+id/recyclerView"
38-
motion:layout_constraintEnd_toEndOf="parent"
3943
android:layout_width="match_parent"
4044
android:layout_height="match_parent"
4145
motion:layout_constraintBottom_toBottomOf="parent"
42-
motion:layout_constraintTop_toTopOf="parent"
46+
motion:layout_constraintEnd_toEndOf="parent"
4347
motion:layout_constraintStart_toStartOf="parent"
44-
/>
48+
motion:layout_constraintTop_toTopOf="parent" />
4549
<Constraint
4650
android:id="@+id/detail"
4751
android:layout_width="match_parent"
4852
android:layout_height="match_parent"
49-
motion:motionProgress="1"
53+
motion:layout_constraintStart_toStartOf="parent"
5054
motion:layout_constraintTop_toTopOf="parent"
51-
motion:layout_constraintStart_toStartOf="parent" />
55+
motion:motionProgress="1" />
5256
</ConstraintSet>
5357
</MotionScene>

0 commit comments

Comments
 (0)