filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue on animation

This commit is contained in:
Benoit Marty 2019-06-10 17:45:35 +02:00
parent 56f1c726b2
commit 90a011c4e4
2 changed files with 27 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vector/src/main/res/layout/motion_fab_menu_merge.xml
View File

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layoutDescription="@xml/motion_scene_fab_menu" app:layoutDescription="@xml/motion_scene_fab_menu"
tools:motionProgress="0.5" tools:motionProgress="0.65"
tools:parentTag="androidx.constraintlayout.motion.widget.MotionLayout" tools:parentTag="androidx.constraintlayout.motion.widget.MotionLayout"
tools:showPaths="true"> tools:showPaths="true">
@ -30,10 +30,11 @@
<TextView <TextView
android:id="@+id/createRoomItemGroupLabel" android:id="@+id/createRoomItemGroupLabel"
style="@style/VectorLabel" style="@style/VectorLabel"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:ellipsize="end"
android:text="@string/fab_menu_create_room" /> android:text="@string/fab_menu_create_room" />
<!-- Sub menu item 1 --> <!-- Sub menu item 1 -->
@ -51,10 +52,11 @@
<TextView <TextView
android:id="@+id/createRoomItemChatLabel" android:id="@+id/createRoomItemChatLabel"
style="@style/VectorLabel" style="@style/VectorLabel"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:ellipsize="end"
android:text="@string/fab_menu_create_chat" /> android:text="@string/fab_menu_create_chat" />
<!-- Menu --> <!-- Menu -->

76
vector/src/main/res/xml/motion_scene_fab_menu.xml
View File

@ -6,58 +6,22 @@
<Transition <Transition
motion:constraintSetEnd="@+id/constraint_set_fab_menu_open" motion:constraintSetEnd="@+id/constraint_set_fab_menu_open"
motion:constraintSetStart="@+id/constraint_set_fab_menu_close" motion:constraintSetStart="@+id/constraint_set_fab_menu_close"
motion:duration="1000"> motion:duration="200">
<OnClick <OnClick
motion:clickAction="toggle" motion:clickAction="toggle"
motion:targetId="@+id/createRoomButton" /> motion:targetId="@+id/createRoomButton" />
<KeyFrameSet>
<!-- Show elements directly at the beginning of the transition: FIXME It does not work as expected -->
<KeyAttribute
android:visibility="gone"
motion:framePosition="0"
motion:motionTarget="@id/createRoomItemGroup" />
<KeyAttribute
android:scaleX="1"
android:scaleY="1"
android:visibility="visible"
motion:framePosition="1"
motion:motionTarget="@id/createRoomItemGroup" />
<KeyAttribute
android:visibility="visible"
motion:framePosition="1"
motion:motionTarget="@id/createRoomItemGroupLabel" />
<KeyAttribute
android:visibility="visible"
motion:framePosition="1"
motion:motionTarget="@id/createRoomItemChat" />
<KeyAttribute
android:visibility="visible"
motion:framePosition="1"
motion:motionTarget="@id/createRoomItemChatLabel" />
</KeyFrameSet>
</Transition> </Transition>
<ConstraintSet android:id="@+id/constraint_set_fab_menu_close"> <ConstraintSet android:id="@+id/constraint_set_fab_menu_close" >
<Constraint <Constraint
android:id="@+id/createRoomTouchGuard" android:id="@+id/createRoomTouchGuard"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="match_parent"
android:background="?riotx_touch_guard_bg" android:background="?riotx_touch_guard_bg"
android:visibility="gone" android:visibility="invisible" />
motion:layout_constraintBottom_toBottomOf="@id/createRoomButton"
motion:layout_constraintEnd_toEndOf="@+id/createRoomButton"
motion:layout_constraintStart_toStartOf="@id/createRoomButton"
motion:layout_constraintTop_toTopOf="@+id/createRoomButton" />
<!-- Sub menu item 2 --> <!-- Sub menu item 2 -->
<Constraint <Constraint
@ -66,7 +30,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:src="@drawable/ic_fab_add_room" android:src="@drawable/ic_fab_add_room"
android:visibility="gone" android:visibility="invisible"
motion:backgroundTint="#FFFFFF" motion:backgroundTint="#FFFFFF"
motion:fabCustomSize="48dp" motion:fabCustomSize="48dp"
motion:layout_constraintBottom_toBottomOf="@+id/createRoomButton" motion:layout_constraintBottom_toBottomOf="@+id/createRoomButton"
@ -78,16 +42,15 @@
<Constraint <Constraint
android:id="@+id/createRoomItemGroupLabel" android:id="@+id/createRoomItemGroupLabel"
style="@style/VectorLabel" android:layout_width="wrap_content"
android:layout_width="0dp" android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:text="@string/fab_menu_create_room" android:text="@string/fab_menu_create_room"
android:visibility="gone" android:visibility="invisible"
motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemChat" motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemGroup"
motion:layout_constraintEnd_toEndOf="@+id/createRoomItemChat" motion:layout_constraintEnd_toEndOf="@+id/createRoomItemGroup"
motion:layout_constraintTop_toTopOf="@+id/createRoomItemChat" /> motion:layout_constraintTop_toTopOf="@+id/createRoomItemGroup" />
<!-- Sub menu item 1 --> <!-- Sub menu item 1 -->
<Constraint <Constraint
@ -96,7 +59,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:src="@drawable/ic_fab_add_chat" android:src="@drawable/ic_fab_add_chat"
android:visibility="gone" android:visibility="invisible"
motion:backgroundTint="#FFFFFF" motion:backgroundTint="#FFFFFF"
motion:fabCustomSize="48dp" motion:fabCustomSize="48dp"
motion:layout_constraintBottom_toBottomOf="@+id/createRoomButton" motion:layout_constraintBottom_toBottomOf="@+id/createRoomButton"
@ -108,13 +71,12 @@
<Constraint <Constraint
android:id="@+id/createRoomItemChatLabel" android:id="@+id/createRoomItemChatLabel"
style="@style/VectorLabel" android:layout_width="wrap_content"
android:layout_width="0dp" android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:text="@string/fab_menu_create_chat" android:text="@string/fab_menu_create_chat"
android:visibility="gone" android:visibility="invisible"
motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemChat" motion:layout_constraintBottom_toBottomOf="@+id/createRoomItemChat"
motion:layout_constraintEnd_toEndOf="@+id/createRoomItemChat" motion:layout_constraintEnd_toEndOf="@+id/createRoomItemChat"
motion:layout_constraintTop_toTopOf="@+id/createRoomItemChat" /> motion:layout_constraintTop_toTopOf="@+id/createRoomItemChat" />
@ -160,7 +122,8 @@
<Constraint <Constraint
android:id="@+id/createRoomItemGroupLabel" android:id="@+id/createRoomItemGroupLabel"
style="@style/VectorLabel" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:text="@string/fab_menu_create_room" android:text="@string/fab_menu_create_room"
@ -186,7 +149,8 @@
<Constraint <Constraint
android:id="@+id/createRoomItemChatLabel" android:id="@+id/createRoomItemChatLabel"
style="@style/VectorLabel" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:text="@string/fab_menu_create_chat" android:text="@string/fab_menu_create_chat"