From cfd11a40ec4b623c61f7e703e4a273697eec1e2a Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 29 Jun 2020 15:55:43 +0200 Subject: [PATCH] Fixed header issue in recordings + improved layout --- .../main/recordings/adapters/RecordingsListAdapter.kt | 4 +--- app/src/main/java/org/linphone/utils/TimestampUtils.kt | 2 +- app/src/main/res/layout/recording_list_cell.xml | 7 +++++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt index 9bd2ffe22..ddf47cf20 100644 --- a/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt +++ b/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt @@ -87,9 +87,7 @@ class RecordingsListAdapter(val selectionViewModel: ListTopBarViewModel) : Lifec return if (previousPosition >= 0) { val previousItemDate = getItem(previousPosition).date !TimestampUtils.isSameDay(date, previousItemDate) - } else { - true - } + } else true } override fun getHeaderViewForPosition(context: Context, position: Int): View { diff --git a/app/src/main/java/org/linphone/utils/TimestampUtils.kt b/app/src/main/java/org/linphone/utils/TimestampUtils.kt index 4f9237255..38b9b252d 100644 --- a/app/src/main/java/org/linphone/utils/TimestampUtils.kt +++ b/app/src/main/java/org/linphone/utils/TimestampUtils.kt @@ -51,7 +51,7 @@ class TimestampUtils { cal1: Date, cal2: Date ): Boolean { - return isSameDay(cal1.time, cal2.time) + return isSameDay(cal1.time, cal2.time, false) } private fun isSameYear(timestamp: Long, timestampInSecs: Boolean = true): Boolean { diff --git a/app/src/main/res/layout/recording_list_cell.xml b/app/src/main/res/layout/recording_list_cell.xml index a31c0e9ac..41de1c6c0 100644 --- a/app/src/main/res/layout/recording_list_cell.xml +++ b/app/src/main/res/layout/recording_list_cell.xml @@ -20,8 +20,11 @@ + android:layout_height="50dp" + android:paddingTop="5dp" + android:paddingBottom="5dp" + android:layout_marginLeft="5dp" + android:layout_marginRight="5dp">