mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-04-19 16:08:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Started slidingpanel

Browse source
This commit is contained in:
Sylvain Berfini 2023-08-03 12:10:12 +02:00
parent 3bceafef80
commit 7e46fb8720
9 changed files with 430 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/build.gradle
View file

@ -53,17 +53,18 @@ android {
dependencies { dependencies {
implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.appcompat:appcompat:1.7.0-alpha02' implementation 'androidx.appcompat:appcompat:1.7.0-alpha03'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.navigation:navigation-ui-ktx:2.6.0' implementation 'androidx.navigation:navigation-ui-ktx:2.6.0'
implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.3.1-rc01' implementation 'androidx.recyclerview:recyclerview:1.3.1'
implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
def nav_version = "2.6.0" def nav_version = "2.6.0"
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
def emoji_version = "1.4.0-beta05" def emoji_version = "1.4.0-rc01"
implementation "androidx.emoji2:emoji2:$emoji_version" implementation "androidx.emoji2:emoji2:$emoji_version"
implementation "androidx.emoji2:emoji2-emojipicker:$emoji_version" implementation "androidx.emoji2:emoji2-emojipicker:$emoji_version"

60
app/src/main/java/org/linphone/ui/EmptyFragment.kt Normal file
View file

@ -0,0 +1,60 @@
/*
* Copyright (c) 2010-2023 Belledonne Communications SARL.
*
* This file is part of linphone-android
* (see https://www.linphone.org).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.linphone.ui
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.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import androidx.transition.AutoTransition
import org.linphone.R
import org.linphone.databinding.EmptyFragmentBinding
class EmptyFragment : Fragment() {
private lateinit var binding: EmptyFragmentBinding
override fun onCreateAnimation(transit: Int, enter: Boolean, nextAnim: Int): Animation? {
if (findNavController().currentDestination?.id == R.id.newContactFragment) {
// Holds fragment in place while new contact fragment slides over it
return AnimationUtils.loadAnimation(activity, R.anim.hold)
}
return super.onCreateAnimation(transit, enter, nextAnim)
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
binding = EmptyFragmentBinding.inflate(layoutInflater)
sharedElementEnterTransition = AutoTransition()
return binding.root
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
binding.lifecycleOwner = viewLifecycleOwner
}
}

5
app/src/main/java/org/linphone/ui/contacts/ContactsFragment.kt
View file

@ -19,6 +19,7 @@
*/ */
package org.linphone.ui.contacts package org.linphone.ui.contacts
import android.content.res.Configuration
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -69,8 +70,8 @@ class ContactsFragment : Fragment() {
binding.viewModel = listViewModel binding.viewModel = listViewModel
binding.root.setKeyboardInsetListener { keyboardVisible -> binding.root.setKeyboardInsetListener { keyboardVisible ->
// val portraitOrientation = resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE val portraitOrientation = resources.configuration.orientation != Configuration.ORIENTATION_LANDSCAPE
listViewModel.bottomNavBarVisible.value = !keyboardVisible listViewModel.bottomNavBarVisible.value = !portraitOrientation || !keyboardVisible
} }
// postponeEnterTransition() // postponeEnterTransition()

108
app/src/main/res/layout-land/bottom_nav_bar.xml Normal file
View file

@ -0,0 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="onContactsClicked"
type="View.OnClickListener" />
<variable
name="onConversationsClicked"
type="View.OnClickListener" />
<variable
name="contactsSelected"
type="Boolean" />
<variable
name="callsSelected"
type="Boolean" />
<variable
name="conversationsSelected"
type="Boolean" />
<variable
name="meetingsSelected"
type="Boolean" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bottom_nav_bar"
android:layout_width="75dp"
android:layout_height="match_parent"
android:transitionName="bottom_nav_bar"
android:background="@color/white">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/contacts"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawableTop="@drawable/contacts"
android:drawablePadding="10dp"
android:drawableTint="@{contactsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}"
android:gravity="center"
android:onClick="@{onContactsClicked}"
android:text="Contacts"
android:textColor="@color/gray_9"
android:textSize="11sp"
android:textStyle="@{contactsSelected ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintBottom_toTopOf="@id/calls"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/calls"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawableTop="@drawable/calls"
android:drawablePadding="10dp"
android:drawableTint="@{callsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}"
android:gravity="center"
android:text="Calls"
android:textColor="@color/gray_9"
android:textSize="11sp"
android:textStyle="@{callsSelected ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintBottom_toTopOf="@id/conversations"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/contacts" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/conversations"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawableTop="@drawable/conversations"
android:drawablePadding="10dp"
android:drawableTint="@{conversationsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}"
android:gravity="center"
android:onClick="@{onConversationsClicked}"
android:text="Conversations"
android:textColor="@color/gray_9"
android:textSize="11sp"
android:textStyle="@{conversationsSelected ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintBottom_toTopOf="@id/meetings"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/calls" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/meetings"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawableTop="@drawable/meetings"
android:drawablePadding="10dp"
android:drawableTint="@{meetingsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}"
android:gravity="center"
android:text="Meetings"
android:textColor="@color/gray_9"
android:textSize="11sp"
android:textStyle="@{meetingsSelected ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/conversations" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

130
app/src/main/res/layout-land/contacts_fragment.xml Normal file
View file

@ -0,0 +1,130 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:bind="http://schemas.android.com/tools">
<data>
<import type="android.view.View" />
<variable
name="onAvatarClickListener"
type="View.OnClickListener" />
<variable
name="onNewContactClicked"
type="View.OnClickListener" />
<variable
name="onConversationsClicked"
type="View.OnClickListener" />
<variable
name="viewModel"
type="org.linphone.ui.contacts.viewmodel.ContactsListViewModel" />
</data>
<androidx.slidingpanelayout.widget.SlidingPaneLayout
android:id="@+id/sliding_pane_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="355dp"
android:layout_height="match_parent"
android:background="@color/primary_color">
<include
android:id="@+id/top_bar"
bind:viewModel="@{viewModel}"
bind:onAvatarClickListener="@{onAvatarClickListener}"
layout="@layout/top_search_bar"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/background"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="17dp"
android:src="@drawable/shape_white_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintTop_toBottomOf="@id/top_bar" />
<ImageView
android:id="@+id/no_contacts_image"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/illu"
android:layout_margin="10dp"
app:layout_constraintHeight_max="200dp"
app:layout_constraintBottom_toTopOf="@id/no_contacts_label"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintTop_toBottomOf="@id/background" />
<TextView
android:id="@+id/no_contacts_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="No contacts for the moment..."
android:textColor="@color/gray_9"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintTop_toBottomOf="@id/no_contacts_image" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/contactsList"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/background"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
<include
bind:onConversationsClicked="@{onConversationsClicked}"
bind:contactsSelected="@{true}"
android:visibility="@{viewModel.bottomNavBarVisible ? View.VISIBLE : View.GONE}"
android:id="@+id/bottom_nav_bar"
layout="@layout/bottom_nav_bar"
android:layout_width="75dp"
android:layout_height="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/new_contact"
android:onClick="@{onNewContactClicked}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/add"
app:tint="@color/gray_8"
app:backgroundTint="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/contacts_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="300dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:defaultNavHost="false"
app:navGraph="@navigation/chat_nav_graph"/>
</androidx.slidingpanelayout.widget.SlidingPaneLayout>
</layout>

3
app/src/main/res/layout/bottom_nav_bar.xml
View file

@ -30,7 +30,8 @@
android:transitionName="bottom_nav_bar" android:transitionName="bottom_nav_bar"
android:id="@+id/bottom_nav_bar" android:id="@+id/bottom_nav_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:background="@color/white">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:onClick="@{onContactsClicked}" android:onClick="@{onContactsClicked}"

169
app/src/main/res/layout/contacts_fragment.xml
View file

@ -19,90 +19,107 @@
type="org.linphone.ui.contacts.viewmodel.ContactsListViewModel" /> type="org.linphone.ui.contacts.viewmodel.ContactsListViewModel" />
</data> </data>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.slidingpanelayout.widget.SlidingPaneLayout
android:id="@+id/sliding_pane_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="@color/primary_color">
<include <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/top_bar" android:layout_width="280dp"
bind:viewModel="@{viewModel}" android:layout_height="match_parent"
bind:onAvatarClickListener="@{onAvatarClickListener}" android:background="@color/primary_color">
layout="@layout/top_search_bar" />
<ImageView <include
android:id="@+id/background" android:id="@+id/top_bar"
android:layout_width="0dp" bind:viewModel="@{viewModel}"
android:layout_height="0dp" bind:onAvatarClickListener="@{onAvatarClickListener}"
android:layout_marginTop="17dp" layout="@layout/top_search_bar" />
android:src="@drawable/shape_white_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/top_bar" />
<ImageView <ImageView
android:id="@+id/no_contacts_image" android:id="@+id/background"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:src="@drawable/illu" android:layout_marginTop="17dp"
android:layout_margin="10dp" android:src="@drawable/shape_white_background"
app:layout_constraintBottom_toTopOf="@id/no_contacts_label" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/top_bar" />
app:layout_constraintTop_toBottomOf="@id/background" />
<TextView <ImageView
android:id="@+id/no_contacts_label" android:id="@+id/no_contacts_image"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="No contacts for the moment..." android:src="@drawable/illu"
android:textColor="@color/gray_9" android:layout_margin="10dp"
android:textSize="16sp" app:layout_constraintHeight_max="200dp"
android:textStyle="bold" app:layout_constraintBottom_toTopOf="@id/no_contacts_label"
app:layout_constraintBottom_toTopOf="@id/background" app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_contacts_image" /> app:layout_constraintTop_toBottomOf="@id/background" />
<androidx.recyclerview.widget.RecyclerView <TextView
android:id="@+id/contactsList" android:id="@+id/no_contacts_label"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:text="No contacts for the moment..."
android:layout_marginStart="10dp" android:textColor="@color/gray_9"
android:layout_marginEnd="10dp" android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@id/background"
app:layout_constraintTop_toTopOf="@id/background" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_contacts_image" />
<include <androidx.recyclerview.widget.RecyclerView
bind:onConversationsClicked="@{onConversationsClicked}" android:id="@+id/contactsList"
bind:contactsSelected="@{true}" android:layout_width="0dp"
android:visibility="@{viewModel.bottomNavBarVisible ? View.VISIBLE : View.GONE}" android:layout_height="0dp"
android:id="@+id/bottom_nav_bar" android:layout_marginTop="20dp"
layout="@layout/bottom_nav_bar" android:layout_marginStart="10dp"
android:layout_width="0dp" android:layout_marginEnd="10dp"
android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/background"
app:layout_constraintBottom_toBottomOf="parent"/> app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <include
android:id="@+id/new_contact" bind:onConversationsClicked="@{onConversationsClicked}"
android:onClick="@{onNewContactClicked}" bind:contactsSelected="@{true}"
android:layout_width="wrap_content" android:visibility="@{viewModel.bottomNavBarVisible ? View.VISIBLE : View.GONE}"
android:layout_height="wrap_content" android:id="@+id/bottom_nav_bar"
android:layout_gravity="end|bottom" layout="@layout/bottom_nav_bar"
android:layout_margin="16dp" android:layout_width="0dp"
android:src="@drawable/add" android:layout_height="wrap_content"
app:tint="@color/gray_8" app:layout_constraintStart_toStartOf="parent"
app:backgroundTint="@color/white" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
</androidx.constraintlayout.widget.ConstraintLayout> <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/new_contact"
android:onClick="@{onNewContactClicked}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/add"
app:tint="@color/gray_8"
app:backgroundTint="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/contacts_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="300dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:defaultNavHost="false"
app:navGraph="@navigation/chat_nav_graph"/>
</androidx.slidingpanelayout.widget.SlidingPaneLayout>
</layout> </layout>

17
app/src/main/res/layout/empty_fragment.xml Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

13
app/src/main/res/navigation/chat_nav_graph.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/chat_nav_graph"
app:startDestination="@id/emptyFragment">
<fragment
android:id="@+id/emptyFragment"
android:name="org.linphone.ui.EmptyFragment"
android:label="EmptyFragment"
tools:layout="@layout/empty_fragment" />
</navigation>