Commit 49059d6b authored by Sylvain Berfini's avatar Sylvain Berfini :cow:
Browse files

Added back round corners to main lists in portrait mode (keep round top bar in...

Added back round corners to main lists in portrait mode (keep round top bar in landscape) + increased space at the bottom of the avatar in top main bar
Showing with 223 additions and 121 deletions
......@@ -119,6 +119,7 @@ class ConversationsListFragment : AbstractMainFragment() {
binding.conversationsList.setHasFixedSize(true)
binding.conversationsList.layoutManager = LinearLayoutManager(requireContext())
binding.conversationsList.clipToOutline = true
adapter.conversationLongClickedEvent.observe(viewLifecycleOwner) {
it.consume { model ->
......
......@@ -106,6 +106,7 @@ class HistoryListFragment : AbstractMainFragment() {
binding.historyList.setHasFixedSize(true)
binding.historyList.layoutManager = LinearLayoutManager(requireContext())
binding.historyList.clipToOutline = true
adapter.callLogLongClickedEvent.observe(viewLifecycleOwner) {
it.consume { model ->
......
......@@ -118,6 +118,7 @@ class MeetingsListFragment : AbstractMainFragment() {
val headerItemDecoration = RecyclerViewHeaderDecoration(requireContext(), adapter)
binding.meetingsList.addItemDecoration(headerItemDecoration)
binding.meetingsList.clipToOutline = true
binding.setNewMeetingClicked {
if (findNavController().currentDestination?.id == R.id.meetingsListFragment) {
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:topLeftRadius="20dp" android:topRightRadius="20dp" />
<solid android:color="?attr/color_main2_000"/>
</shape>
\ No newline at end of file
......@@ -55,11 +55,11 @@
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
<View
android:id="@+id/background"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="?attr/color_main2_000"
android:background="?attr/color_main2_000"
android:contentDescription="@null"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -96,7 +96,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/top_bar_height"
android:layout_marginStart="@dimen/landscape_nav_bar_width" />
android:layout_marginStart="@dimen/landscape_nav_bar_width"/>
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/fetch_in_progress"
......
......@@ -65,11 +65,11 @@
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
<View
android:id="@+id/background"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="?attr/color_main2_000"
android:background="?attr/color_main2_000"
android:contentDescription="@null"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......
<?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="enableExtraAction"
type="Boolean" />
<variable
name="extraActionClickListener"
type="View.OnClickListener" />
<variable
name="extraActionIcon"
type="android.graphics.drawable.Drawable" />
<variable
name="extraActionContentDescription"
type="String" />
<variable
name="viewModel"
type="org.linphone.ui.main.viewmodel.AbstractMainViewModel" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/top_bar_height"
android:background="@drawable/shape_squircle_main1_500_r10_bottom">
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="avatar, title, search_toggle"
android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}" />
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="cancel_search, search, clear_field"
android:visibility="@{viewModel.searchBarVisible ? View.VISIBLE : View.GONE, default=gone}" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/background_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="title, search"
app:barrierDirection="bottom" />
<include
android:id="@+id/avatar"
android:onClick="@{() -> viewModel.openDrawerMenu()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="2dp"
layout="@layout/contact_avatar"
bind:model="@{viewModel.account}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical"
android:text="@{viewModel.title, default=`Title`}"
android:textColor="?attr/color_on_main"
android:textSize="20sp"
app:layout_constraintEnd_toStartOf="@id/search_toggle"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="@id/avatar"
app:layout_constraintBottom_toBottomOf="@id/avatar"/>
<ImageView
android:id="@+id/search_toggle"
android:onClick="@{() -> viewModel.openSearchBar()}"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginEnd="5dp"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:src="@drawable/magnifying_glass"
android:contentDescription="@string/content_description_open_filter"
app:layout_constraintBottom_toBottomOf="@id/title"
app:layout_constraintEnd_toStartOf="@id/extra_action"
app:layout_constraintTop_toTopOf="@id/title"
app:tint="?attr/color_on_main" />
<ImageView
android:id="@+id/extra_action"
android:onClick="@{extraActionClickListener}"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginEnd="5dp"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:src="@{extraActionIcon, default=@drawable/dots_three_vertical}"
android:contentDescription="@{extraActionContentDescription}"
android:visibility="@{enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintBottom_toBottomOf="@id/title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/title"
app:tint="?attr/color_on_main" />
<ImageView
android:id="@+id/cancel_search"
android:onClick="@{() -> viewModel.closeSearchBar()}"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginStart="5dp"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:src="@drawable/caret_left"
android:contentDescription="@string/content_description_cancel_filter"
app:layout_constraintBottom_toBottomOf="@id/search"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/search"
app:tint="?attr/color_on_main" />
<com.google.android.material.textfield.TextInputLayout
style="?attr/textInputFilledStyle"
android:id="@+id/search"
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:textColorHint="?attr/color_grey_200"
app:hintEnabled="false"
app:hintAnimationEnabled="false"
app:hintTextColor="?attr/color_grey_200"
app:boxStrokeWidth="0dp"
app:boxStrokeWidthFocused="0dp"
app:layout_constraintEnd_toStartOf="@id/clear_field"
app:layout_constraintStart_toEndOf="@id/cancel_search"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textCursorDrawable="@null"
android:textColor="?attr/color_on_main"
android:textSize="16sp"
android:inputType="text"
android:paddingVertical="1dp"
android:imeOptions="actionSearch"
android:text="@={viewModel.searchFilter}"
android:background="@android:color/transparent" />
</com.google.android.material.textfield.TextInputLayout>
<ImageView
android:id="@+id/clear_field"
android:onClick="@{() -> viewModel.clearFilter()}"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginEnd="5dp"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:src="@drawable/x"
android:contentDescription="@string/content_description_clear_filter"
app:layout_constraintBottom_toBottomOf="@id/search"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/search"
app:tint="?attr/color_on_main" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
......@@ -62,42 +62,17 @@
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
<View
android:id="@+id/background"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="?attr/color_main2_000"
android:background="?attr/color_main2_000"
android:contentDescription="@null"
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_meeting_image"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:src="@drawable/illu"
android:contentDescription="@null"
app:layout_constraintHeight_max="200dp"
app:layout_constraintBottom_toTopOf="@id/no_meeting_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" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/section_header_style"
android:id="@+id/no_meeting_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewModel.isFilterEmpty ? @string/meetings_list_empty : @string/list_filter_no_result_found, default=@string/meetings_list_empty}"
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_meeting_image" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/meetings_list"
android:layout_width="match_parent"
......
......@@ -27,7 +27,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="?attr/color_main1_500">
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
......@@ -45,16 +46,14 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
android:id="@+id/background"
android:layout_width="0dp"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/conversations_list"
android:background="@drawable/shape_squircle_white_r20_top_background"
android:layout_width="match_parent"
android:layout_height="0dp"
android:src="?attr/color_main2_000"
android:contentDescription="@null"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/top_bar" />
android:layout_marginTop="@dimen/top_bar_height"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
<ImageView
android:id="@+id/no_conversation_image"
......@@ -64,11 +63,12 @@
android:src="@drawable/illu"
android:contentDescription="@null"
app:layout_constraintHeight_max="200dp"
app:layout_constraintBottom_toTopOf="@id/no_conversation_label"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/background" />
app:layout_constraintTop_toTopOf="@id/conversations_list"
app:layout_constraintBottom_toTopOf="@id/no_conversation_label" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/section_header_style"
......@@ -76,18 +76,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewModel.isFilterEmpty ? @string/conversations_list_empty : @string/list_filter_no_result_found, default=@string/conversations_list_empty}"
app:layout_constraintBottom_toTopOf="@id/background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_conversation_image" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/conversations_list"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/top_bar_height"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
app:layout_constraintTop_toBottomOf="@id/no_conversation_image"
app:layout_constraintBottom_toBottomOf="@id/conversations_list"/>
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/fetch_in_progress"
......
......@@ -27,7 +27,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="?attr/color_main1_500">
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
......@@ -55,7 +56,7 @@
android:layout_height="0dp"
android:layout_marginTop="@dimen/top_bar_height"
android:orientation="vertical"
android:background="?attr/color_main2_000"
android:background="@drawable/shape_squircle_white_r20_top_background"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......
......@@ -33,7 +33,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="?attr/color_main1_500">
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
......@@ -55,16 +56,14 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
android:id="@+id/background"
android:layout_width="0dp"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/history_list"
android:background="@drawable/shape_squircle_white_r20_top_background"
android:layout_width="match_parent"
android:layout_height="0dp"
android:src="?attr/color_main2_000"
android:contentDescription="@null"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/top_bar" />
android:layout_marginTop="@dimen/top_bar_height"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
<ImageView
android:id="@+id/no_calls_image"
......@@ -74,11 +73,12 @@
android:src="@drawable/illu"
android:contentDescription="@null"
app:layout_constraintHeight_max="200dp"
app:layout_constraintBottom_toTopOf="@id/no_calls_label"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/background" />
app:layout_constraintTop_toTopOf="@id/history_list"
app:layout_constraintBottom_toTopOf="@id/no_calls_label" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/section_header_style"
......@@ -86,18 +86,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewModel.isFilterEmpty ? @string/history_list_empty_history : @string/list_filter_no_result_found, default=@string/history_list_empty_history}"
app:layout_constraintBottom_toTopOf="@id/background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_calls_image" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/history_list"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/top_bar_height"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar" />
app:layout_constraintTop_toBottomOf="@id/no_calls_image"
app:layout_constraintBottom_toBottomOf="@id/history_list" />
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/fetch_in_progress"
......
......@@ -25,7 +25,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/top_bar_height"
android:background="@drawable/shape_squircle_main1_500">
android:background="?attr/color_main1_500">
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
......@@ -52,11 +52,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="2dp"
layout="@layout/contact_avatar"
bind:model="@{viewModel.account}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
......
......@@ -16,8 +16,6 @@
android:paddingEnd="20dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="October"
android:gravity="center_vertical"
tools:ignore="HardcodedText" />
android:gravity="center_vertical" />
</layout>
\ No newline at end of file
......@@ -30,7 +30,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="?attr/color_main1_500">
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
......@@ -52,45 +53,10 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
android:id="@+id/background"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="?attr/color_main2_000"
android:contentDescription="@null"
app:layout_constraintBottom_toTopOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/top_bar" />
<ImageView
android:id="@+id/no_meeting_image"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:src="@drawable/illu"
android:contentDescription="@null"
app:layout_constraintHeight_max="200dp"
app:layout_constraintBottom_toTopOf="@id/no_meeting_label"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/background" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/section_header_style"
android:id="@+id/no_meeting_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewModel.isFilterEmpty ? @string/meetings_list_empty : @string/list_filter_no_result_found, default=@string/meetings_list_empty}"
app:layout_constraintBottom_toTopOf="@id/background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_meeting_image" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/meetings_list"
android:layout_width="match_parent"
android:background="@drawable/shape_squircle_white_r20_top_background"
android:layout_height="0dp"
android:layout_marginTop="@dimen/top_bar_height"
app:layout_constraintTop_toTopOf="parent"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment