diff --git a/app/src/main/java/org/linphone/ui/MainActivity.kt b/app/src/main/java/org/linphone/ui/MainActivity.kt index aafa2c423..ade507308 100644 --- a/app/src/main/java/org/linphone/ui/MainActivity.kt +++ b/app/src/main/java/org/linphone/ui/MainActivity.kt @@ -22,7 +22,6 @@ package org.linphone.ui import android.Manifest import android.content.pm.PackageManager import android.os.Bundle -import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.core.view.WindowCompat @@ -110,12 +109,4 @@ class MainActivity : AppCompatActivity() { private fun getNavBar(): NavigationBarView? { return binding.mainNavView ?: binding.mainNavRail } - - fun hideNavBar() { - binding.mainNavView?.visibility = View.GONE - } - - fun showNavBar() { - binding.mainNavView?.visibility = View.VISIBLE - } } diff --git a/app/src/main/java/org/linphone/ui/conversations/ConversationsFragment.kt b/app/src/main/java/org/linphone/ui/conversations/ConversationsFragment.kt index 80a6e5d10..7262342a4 100644 --- a/app/src/main/java/org/linphone/ui/conversations/ConversationsFragment.kt +++ b/app/src/main/java/org/linphone/ui/conversations/ConversationsFragment.kt @@ -23,6 +23,8 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.view.animation.Animation +import android.view.animation.AnimationUtils import androidx.core.view.doOnPreDraw import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController @@ -31,7 +33,6 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import org.linphone.R import org.linphone.databinding.ConversationsFragmentBinding -import org.linphone.ui.MainActivity class ConversationsFragment : Fragment() { private lateinit var binding: ConversationsFragmentBinding @@ -56,6 +57,10 @@ class ConversationsFragment : Fragment() { } } + override fun onCreateAnimation(transit: Int, enter: Boolean, nextAnim: Int): Animation? { + return AnimationUtils.loadAnimation(activity, R.anim.hold) + } + override fun onDestroyView() { binding.conversationsList.adapter = null adapter.unregisterAdapterDataObserver(observer) @@ -107,7 +112,6 @@ class ConversationsFragment : Fragment() { (view.parent as? ViewGroup)?.doOnPreDraw { startPostponedEnterTransition() - (requireActivity() as MainActivity).showNavBar() } } diff --git a/app/src/main/java/org/linphone/ui/conversations/NewConversationFragment.kt b/app/src/main/java/org/linphone/ui/conversations/NewConversationFragment.kt index b608fee6c..bd32b4a09 100644 --- a/app/src/main/java/org/linphone/ui/conversations/NewConversationFragment.kt +++ b/app/src/main/java/org/linphone/ui/conversations/NewConversationFragment.kt @@ -30,7 +30,6 @@ import androidx.recyclerview.widget.LinearLayoutManager import org.linphone.R import org.linphone.contacts.ContactsSelectionAdapter import org.linphone.databinding.NewConversationFragmentBinding -import org.linphone.ui.MainActivity class NewConversationFragment : Fragment() { private lateinit var binding: NewConversationFragmentBinding @@ -70,7 +69,6 @@ class NewConversationFragment : Fragment() { (view.parent as? ViewGroup)?.doOnPreDraw { startPostponedEnterTransition() - (requireActivity() as MainActivity).hideNavBar() } } diff --git a/app/src/main/res/anim/hold.xml b/app/src/main/res/anim/hold.xml new file mode 100644 index 000000000..29ac2b671 --- /dev/null +++ b/app/src/main/res/anim/hold.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/app/src/main/res/anim/slide_in.xml b/app/src/main/res/anim/slide_in.xml new file mode 100644 index 000000000..85e113c70 --- /dev/null +++ b/app/src/main/res/anim/slide_in.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/app/src/main/res/anim/slide_out.xml b/app/src/main/res/anim/slide_out.xml new file mode 100644 index 000000000..b4a98178f --- /dev/null +++ b/app/src/main/res/anim/slide_out.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/app/src/main/res/navigation/main_nav_graph.xml b/app/src/main/res/navigation/main_nav_graph.xml index c619056d8..1a7cfb7db 100644 --- a/app/src/main/res/navigation/main_nav_graph.xml +++ b/app/src/main/res/navigation/main_nav_graph.xml @@ -12,7 +12,10 @@ tools:layout="@layout/conversations_fragment"> + app:destination="@id/newConversationFragment" + app:enterAnim="@anim/slide_in" + app:launchSingleTop="true" + app:popExitAnim="@anim/slide_out" />