From 297eb71ff75eb867bbd353c16791676fea20f473 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 16 Nov 2023 12:52:30 +0100
Subject: [PATCH] Various UI fixes

---
 .../ui/main/history/model/CallLogHistoryModel.kt       |  2 +-
 .../org/linphone/ui/main/history/model/CallLogModel.kt | 10 +++++-----
 app/src/main/java/org/linphone/utils/TimestampUtils.kt |  5 ++++-
 .../contact_number_or_address_long_press_menu.xml      |  2 +-
 .../res/layout/start_call_suggestion_list_cell.xml     |  2 ++
 app/src/main/res/values/strings.xml                    |  1 +
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/history/model/CallLogHistoryModel.kt b/app/src/main/java/org/linphone/ui/main/history/model/CallLogHistoryModel.kt
index 804ab2c0f..946d0aee8 100644
--- a/app/src/main/java/org/linphone/ui/main/history/model/CallLogHistoryModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/model/CallLogHistoryModel.kt
@@ -34,7 +34,7 @@ class CallLogHistoryModel @WorkerThread constructor(val callLog: CallLog) {
         } else if (TimestampUtils.isYesterday(startDate)) {
             AppUtils.getString(R.string.yesterday)
         } else {
-            TimestampUtils.dateToString(callLog.startDate)
+            TimestampUtils.toString(startDate, onlyDate = true, shortDate = false, hideYear = true)
         }
         val time = TimestampUtils.timeToString(startDate)
         dateTime.postValue("$date | $time")
diff --git a/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt b/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt
index 0bed2b85d..5adde47ce 100644
--- a/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt
@@ -41,15 +41,15 @@ class CallLogModel @WorkerThread constructor(private val callLog: CallLog) {
     var friendExists: Boolean = false
 
     init {
-        val timestamp = timestamp
-        val displayedDate = if (TimestampUtils.isToday(timestamp)) {
-            TimestampUtils.timeToString(timestamp)
+        val date = if (TimestampUtils.isToday(timestamp)) {
+            AppUtils.getString(R.string.today)
         } else if (TimestampUtils.isYesterday(timestamp)) {
             AppUtils.getString(R.string.yesterday)
         } else {
-            TimestampUtils.dateToString(timestamp)
+            TimestampUtils.toString(timestamp, onlyDate = true, shortDate = true, hideYear = true)
         }
-        dateTime.postValue(displayedDate)
+        val time = TimestampUtils.timeToString(timestamp)
+        dateTime.postValue("$date | $time")
 
         if (callLog.wasConference()) {
 
diff --git a/app/src/main/java/org/linphone/utils/TimestampUtils.kt b/app/src/main/java/org/linphone/utils/TimestampUtils.kt
index 4f0b045fc..3f4ed28c8 100644
--- a/app/src/main/java/org/linphone/utils/TimestampUtils.kt
+++ b/app/src/main/java/org/linphone/utils/TimestampUtils.kt
@@ -173,7 +173,10 @@ class TimestampUtils {
                 }
             } as SimpleDateFormat
 
-            if (hideYear) {
+            val cal = Calendar.getInstance()
+            cal.timeInMillis = if (timestampInSecs) timestamp * 1000 else timestamp
+            val now = Calendar.getInstance()
+            if (hideYear && isSameYear(cal, now)) {
                 // Remove the year part of the format
                 dateFormat.applyPattern(
                     dateFormat.toPattern().replace(
diff --git a/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml b/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml
index fc5281300..0e2124edc 100644
--- a/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml
+++ b/app/src/main/res/layout/contact_number_or_address_long_press_menu.xml
@@ -29,7 +29,7 @@
             android:id="@+id/copy"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/menu_copy_sip_address"
+            android:text="@{isSip ? @string/menu_copy_sip_address : @string/menu_copy_phone_number, default=@string/menu_copy_sip_address}"
             android:background="@drawable/menu_item_background"
             android:layout_marginBottom="1dp"
             android:drawableStart="@drawable/copy"
diff --git a/app/src/main/res/layout/start_call_suggestion_list_cell.xml b/app/src/main/res/layout/start_call_suggestion_list_cell.xml
index ada17b53d..e3dec781a 100644
--- a/app/src/main/res/layout/start_call_suggestion_list_cell.xml
+++ b/app/src/main/res/layout/start_call_suggestion_list_cell.xml
@@ -46,10 +46,12 @@
             app:layout_constraintBottom_toBottomOf="parent"/>
 
         <View
+            android:id="@+id/separator"
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_marginEnd="10dp"
             android:background="@color/gray_main2_200"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="@id/name"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 905e49fed..03afe2024 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -289,6 +289,7 @@
     <string name="menu_add_address_to_contacts">Add to contacts</string>
     <string name="menu_see_existing_contact">See contact</string>
     <string name="menu_copy_sip_address">Copy SIP address</string>
+    <string name="menu_copy_phone_number">Copy phone number</string>
     <string name="menu_delete_history">Delete history</string>
     <string name="menu_delete_selected_item">Delete</string>
     <string name="menu_invite">Invite</string>