Merge branch 'veranda' of https://github.com/WideChat/Rocket.Chat.And…

…roid into veranda
WideChat · Mar 21, 2019 · f28ef89 · f28ef89
2 parents 1a738a4 + bc03b5b
commit f28ef89
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 14 deletions.
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
@@ -330,6 +330,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
                     val newFragment = SettingsFragment()
                     val fragmentManager = fragmentManager
                     val fragmentTransaction = fragmentManager!!.beginTransaction()
+                    fragmentTransaction?.setCustomAnimations(R.anim.enter_from_right, R.anim.exit_to_left, R.anim.enter_from_left, R.anim.exit_to_right);
                     fragmentTransaction.replace(R.id.fragment_container, newFragment)
                     fragmentTransaction.addToBackStack(null)
                     fragmentTransaction.commit()
@@ -506,6 +507,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
                     val newFragment = ProfileFragment()
                     val fragmentManager = fragmentManager
                     val fragmentTransaction = fragmentManager!!.beginTransaction()
+                    fragmentTransaction?.setCustomAnimations(R.anim.enter_from_right, R.anim.exit_to_left, R.anim.enter_from_left, R.anim.exit_to_right);
                     fragmentTransaction.replace(R.id.fragment_container, newFragment)
                     fragmentTransaction.addToBackStack(null)
                     fragmentTransaction.commit()
@@ -544,10 +546,10 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
         create_new_channel_fab.setOnClickListener { view ->
             currentUserStatusIcon?.isGone = true
             val contactsFragment = ContactsFragment()
-            val transaction = activity?.supportFragmentManager?.beginTransaction();
-            transaction?.setCustomAnimations(R.anim.enter_from_right, R.anim.exit_to_left, R.anim.enter_from_left, R.anim.exit_to_right);
-            transaction?.replace(this.id, contactsFragment, "contactsFragment");
-            transaction?.addToBackStack("contactsFragment")?.commit();
+            val transaction = activity?.supportFragmentManager?.beginTransaction()
+            transaction?.setCustomAnimations(R.anim.enter_from_right, R.anim.exit_to_left, R.anim.enter_from_left, R.anim.exit_to_right)
+            transaction?.replace(this.id, contactsFragment, "contactsFragment")
+            transaction?.addToBackStack("contactsFragment")?.commit()
         }
     }
 

diff --git a/app/src/main/res/anim/close_enter.xml b/app/src/main/res/anim/close_enter.xml
@@ -8,13 +8,13 @@
     android:zAdjustment="top">
 
     <alpha
-        android:duration="100"
+        android:duration="200"
         android:fromAlpha="0.2"
         android:interpolator="@anim/accelerate_cubic"
         android:toAlpha="1.0" />
 
     <scale
-        android:duration="100"
+        android:duration="200"
         android:fromXScale="0.9"
         android:fromYScale="0.9"
         android:interpolator="@anim/accelerate_cubic"

diff --git a/app/src/main/res/anim/close_exit.xml b/app/src/main/res/anim/close_exit.xml
@@ -3,7 +3,7 @@
     android:zAdjustment="top">
 
     <translate
-        android:duration="100"
+        android:duration="200"
         android:fromXDelta="0.0%p"
         android:interpolator="@anim/accelerate_cubic"
         android:toXDelta="100.0%p" />

diff --git a/app/src/main/res/anim/enter_from_left.xml b/app/src/main/res/anim/enter_from_left.xml
@@ -2,7 +2,7 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:shareInterpolator="false">
     <translate
-        android:duration="@android:integer/config_mediumAnimTime"
+        android:duration="200"
         android:fromXDelta="-100%"
         android:fromYDelta="0%"
         android:toXDelta="0%"

diff --git a/app/src/main/res/anim/enter_from_right.xml b/app/src/main/res/anim/enter_from_right.xml
@@ -2,7 +2,7 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:shareInterpolator="false">
     <translate
-        android:duration="@android:integer/config_mediumAnimTime"
+        android:duration="200"
         android:fromXDelta="100%"
         android:fromYDelta="0%"
         android:toXDelta="0%"

diff --git a/app/src/main/res/anim/exit_to_left.xml b/app/src/main/res/anim/exit_to_left.xml
@@ -2,7 +2,7 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:shareInterpolator="false">
     <translate
-        android:duration="@android:integer/config_mediumAnimTime"
+        android:duration="200"
         android:fromXDelta="0%"
         android:fromYDelta="0%"
         android:toXDelta="-100%"

diff --git a/app/src/main/res/anim/exit_to_right.xml b/app/src/main/res/anim/exit_to_right.xml
@@ -2,7 +2,7 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
     android:shareInterpolator="false">
     <translate
-        android:duration="@android:integer/config_mediumAnimTime"
+        android:duration="200"
         android:fromXDelta="0%"
         android:fromYDelta="0%"
         android:toXDelta="100%"

diff --git a/app/src/main/res/anim/open_enter.xml b/app/src/main/res/anim/open_enter.xml
@@ -3,7 +3,7 @@
     android:zAdjustment="top">
 
     <translate
-        android:duration="100"
+        android:duration="200"
         android:fromXDelta="100.0%p"
         android:interpolator="@anim/decelerate_cubic"
         android:toXDelta="0.0%p" />

diff --git a/app/src/main/res/anim/open_exit.xml b/app/src/main/res/anim/open_exit.xml
@@ -8,13 +8,13 @@
     android:zAdjustment="normal">
 
     <alpha
-        android:duration="100"
+        android:duration="200"
         android:fromAlpha="1.0"
         android:interpolator="@anim/decelerate_cubic"
         android:toAlpha="0.2" />
 
     <scale
-        android:duration="100"
+        android:duration="200"
         android:fromXScale="1.0"
         android:fromYScale="1.0"
         android:interpolator="@anim/decelerate_cubic"