diff --git a/app/src/main/java/org/linphone/ui/main/MainActivity.kt b/app/src/main/java/org/linphone/ui/main/MainActivity.kt index 0b2b95934..d88a2e0bb 100644 --- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt +++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt @@ -75,6 +75,13 @@ class MainActivity : AppCompatActivity() { drawerMenuViewModel.startAssistantEvent.observe(this) { it.consume { startActivity(Intent(baseContext, AssistantActivity::class.java)) + binding.sideMenu.close() + } + } + + drawerMenuViewModel.closeDrawerEvent.observe(this) { + it.consume { + binding.sideMenu.close() } } } diff --git a/app/src/main/java/org/linphone/ui/main/calls/model/CallLogModel.kt b/app/src/main/java/org/linphone/ui/main/calls/model/CallLogModel.kt index 27da0d50f..e91a6a95e 100644 --- a/app/src/main/java/org/linphone/ui/main/calls/model/CallLogModel.kt +++ b/app/src/main/java/org/linphone/ui/main/calls/model/CallLogModel.kt @@ -22,9 +22,15 @@ class CallLogModel(val callLog: CallLog) { // Core thread isOutgoing.postValue(callLog.dir == Dir.Outgoing) - dateTime.postValue( - TimestampUtils.toString(callLog.startDate, shortDate = false, hideYear = false) - ) + val timestamp = callLog.startDate + val displayedDate = if (TimestampUtils.isToday(timestamp)) { + TimestampUtils.timeToString(timestamp) + } else if (TimestampUtils.isYesterday(timestamp)) { + "Hier" + } else { + TimestampUtils.dateToString(timestamp) + } + dateTime.postValue(displayedDate) val friend = coreContext.core.findFriend(address) if (friend != null) { diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt index 11b24ab3b..4feef1108 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt @@ -29,6 +29,15 @@ class DrawerMenuViewModel : ViewModel() { MutableLiveData>() } + val closeDrawerEvent: MutableLiveData> by lazy { + MutableLiveData>() + } + + fun closeDrawerMenu() { + // UI thread + closeDrawerEvent.value = Event(true) + } + fun addAccount() { // UI thread startAssistantEvent.value = Event(true) diff --git a/app/src/main/res/font/noto_sans_500.xml b/app/src/main/res/font/noto_sans_500.xml new file mode 100644 index 000000000..ccc875b45 --- /dev/null +++ b/app/src/main/res/font/noto_sans_500.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/font/noto_sans_medium.ttf b/app/src/main/res/font/noto_sans_medium.ttf new file mode 100644 index 000000000..faf167c91 Binary files /dev/null and b/app/src/main/res/font/noto_sans_medium.ttf differ diff --git a/app/src/main/res/layout/call_fragment.xml b/app/src/main/res/layout/call_fragment.xml index 4e67b9aff..fd749aecc 100644 --- a/app/src/main/res/layout/call_fragment.xml +++ b/app/src/main/res/layout/call_fragment.xml @@ -200,6 +200,7 @@ android:layout_marginTop="45dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" + android:paddingBottom="16dp" android:background="@drawable/shape_round_white_background" android:orientation="vertical" entries="@{viewModel.historyCallLogs}" diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml index d89ceb5f2..e006826f0 100644 --- a/app/src/main/res/layout/contact_list_cell.xml +++ b/app/src/main/res/layout/contact_list_cell.xml @@ -25,11 +25,12 @@ android:background="@drawable/cell_background"> @color/primary_color - @android:color/transparent + @color/primary_color true diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 83bcb19c8..1b7939621 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -8,6 +8,10 @@ @font/noto_sans @color/gray_9 +