mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated shape of FAB + updated chat icon in bottom nav bar

Browse source
This commit is contained in:
Sylvain Berfini 2023-10-26 11:40:56 +02:00
parent 85f97b86da
commit fadc6032fb
16 changed files with 13 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,7 @@
android:visibility="@{viewModel.hideConversations ? View.GONE : View.VISIBLE}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawableTop="@drawable/chat_text"
android:drawableTop="@drawable/chat_teardrop_text"
android:drawablePadding="10dp"
android:drawableTint="@{viewModel.conversationsSelected ? @color/orange_main_500 : @color/gray_main2_600, default=@color/gray_main2_600}"
android:onClick="@{onConversationsClicked}"

32
app/src/main/res/layout-land/chat_fragment.xml
View file

@ -1,32 +0,0 @@
<?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.slidingpanelayout.widget.SlidingPaneLayout
android:id="@+id/sliding_pane_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/conversations_list"
android:name="org.linphone.ui.main.chat.fragment.ConversationsListFragment"
android:layout_width="@dimen/sliding_pane_left_fragment_width"
android:layout_height="match_parent"
app:layout="@layout/chat_list_fragment"/>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/chat_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:defaultNavHost="false"
app:navGraph="@navigation/chat_nav_graph"/>
</androidx.slidingpanelayout.widget.SlidingPaneLayout>
</layout>

1
app/src/main/res/layout-land/chat_list_fragment.xml
View file

@ -108,6 +108,7 @@
android:src="@drawable/plus_circle"
app:tint="@color/gray_main2_700"
app:backgroundTint="@color/white"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />

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

@ -1,32 +0,0 @@
<?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.slidingpanelayout.widget.SlidingPaneLayout
android:id="@+id/sliding_pane_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/contacts_list"
android:name="org.linphone.ui.main.contacts.fragment.ContactsListFragment"
android:layout_width="@dimen/sliding_pane_left_fragment_width"
android:layout_height="match_parent"
app:layout="@layout/contacts_list_fragment"/>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/contacts_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:defaultNavHost="false"
app:navGraph="@navigation/contacts_nav_graph"/>
</androidx.slidingpanelayout.widget.SlidingPaneLayout>
</layout>

1
app/src/main/res/layout-land/contacts_list_fragment.xml
View file

@ -162,6 +162,7 @@
android:src="@drawable/user_plus"
app:tint="@color/gray_main2_700"
app:backgroundTint="@color/white"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />

32
app/src/main/res/layout-land/history_fragment.xml
View file

@ -1,32 +0,0 @@
<?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.slidingpanelayout.widget.SlidingPaneLayout
android:id="@+id/sliding_pane_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/history"
android:name="org.linphone.ui.main.history.fragment.HistoryListFragment"
android:layout_width="@dimen/sliding_pane_left_fragment_width"
android:layout_height="match_parent"
app:layout="@layout/history_list_fragment"/>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/history_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:defaultNavHost="false"
app:navGraph="@navigation/history_nav_graph"/>
</androidx.slidingpanelayout.widget.SlidingPaneLayout>
</layout>

1
app/src/main/res/layout-land/history_list_fragment.xml
View file

@ -126,6 +126,7 @@
android:src="@drawable/phone_plus"
app:tint="@color/gray_main2_700"
app:backgroundTint="@color/white"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />

32
app/src/main/res/layout-land/meetings_fragment.xml
View file

@ -1,32 +0,0 @@
<?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.slidingpanelayout.widget.SlidingPaneLayout
android:id="@+id/sliding_pane_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/meetings_list"
android:name="org.linphone.ui.main.meetings.fragment.MeetingsListFragment"
android:layout_width="@dimen/sliding_pane_left_fragment_width"
android:layout_height="match_parent"
app:layout="@layout/meetings_list_fragment"/>
<androidx.fragment.app.FragmentContainerView
android:id="@+id/meetings_nav_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:defaultNavHost="false"
app:navGraph="@navigation/meetings_nav_graph"/>
</androidx.slidingpanelayout.widget.SlidingPaneLayout>
</layout>

1
app/src/main/res/layout-land/meetings_list_fragment.xml
View file

@ -123,6 +123,7 @@
android:src="@drawable/plus_circle"
app:tint="@color/gray_main2_700"
app:backgroundTint="@color/white"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />

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

@ -94,7 +94,7 @@
android:layout_marginStart="18dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:drawableTop="@drawable/chat_text"
android:drawableTop="@drawable/chat_teardrop_text"
android:drawablePadding="10dp"
android:drawableTint="@{viewModel.conversationsSelected ? @color/orange_main_500 : @color/gray_main2_600, default=@color/gray_main2_600}"
android:text="@string/bottom_navigation_conversations_label"

1
app/src/main/res/layout/chat_list_fragment.xml
View file

@ -108,6 +108,7 @@
android:src="@drawable/plus_circle"
app:tint="@color/gray_main2_700"
app:backgroundTint="@color/white"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />

1
app/src/main/res/layout/contacts_list_fragment.xml
View file

@ -164,6 +164,7 @@
android:src="@drawable/user_plus"
app:tint="@color/gray_main2_700"
app:backgroundTint="@color/white"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />

1
app/src/main/res/layout/history_list_fragment.xml
View file

@ -126,6 +126,7 @@
android:src="@drawable/phone_plus"
app:tint="@color/gray_main2_700"
app:backgroundTint="@color/white"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />

1
app/src/main/res/layout/meetings_list_fragment.xml
View file

@ -123,6 +123,7 @@
android:src="@drawable/plus_circle"
app:tint="@color/gray_main2_700"
app:backgroundTint="@color/white"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />

2
app/src/main/res/values-land/dimen.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="sliding_pane_left_fragment_width">450dp</dimen>
<dimen name="sliding_pane_right_fragment_width">450dp</dimen>
<dimen name="sliding_pane_right_fragment_width">0dp</dimen>
<dimen name="call_main_actions_menu_height">110dp</dimen>
<dimen name="call_extra_actions_menu_height">125dp</dimen>

4
app/src/main/res/values/styles.xml
View file

@ -149,7 +149,7 @@
<item name="android:textColor">@color/gray_main2_600</item>
<item name="android:textSize">14sp</item>
</style>
<style name="ShapeAppearance.CircularBorder" parent="">
<style name="rounded">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">50%</item>
</style>
@ -158,7 +158,7 @@
<item name="android:background">@drawable/shape_circle_light_blue_background</item>
<item name="android:adjustViewBounds">true</item>
<item name="android:scaleType">centerCrop</item>
<item name="shapeAppearanceOverlay">@style/ShapeAppearance.CircularBorder</item>
<item name="shapeAppearanceOverlay">@style/rounded</item>
<item name="strokeColor">@color/transparent_color</item>
<item name="strokeWidth">0dp</item>
</style>