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

Added more space around list cells

Browse source
This commit is contained in:
Sylvain Berfini 2024-08-06 10:25:37 +02:00
parent 9e3a7055fe
commit bc38ff19b6
45 changed files with 92 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/org/linphone/ui/NotoSansFont.kt Normal file
View file

@ -0,0 +1,32 @@
/*
* Copyright (c) 2010-2024 Belledonne Communications SARL.
*
* This file is part of linphone-android
* (see https://www.linphone.org).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.linphone.ui
import androidx.annotation.FontRes
import org.linphone.R
enum class NotoSansFont(@FontRes val fontRes: Int) {
NotoSansLight(R.font.noto_sans_light), // 300
NotoSansRegular(R.font.noto_sans_regular), // 400
NotoSansMedium(R.font.noto_sans_medium), // 500
NotoSansSemiBold(R.font.noto_sans_semi_bold), // 600
NotoSansBold(R.font.noto_sans_bold), // 700
NotoSansExtraBold(R.font.noto_sans_extra_bold) // 800
}

12
app/src/main/java/org/linphone/utils/DataBindingUtils.kt
View file

@ -41,6 +41,7 @@ import androidx.appcompat.widget.AppCompatEditText
import androidx.appcompat.widget.AppCompatTextView
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.constraintlayout.widget.ConstraintSet
import androidx.core.content.res.ResourcesCompat
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.doOnLayout
@ -63,6 +64,7 @@ import org.linphone.contacts.AbstractAvatarModel
import org.linphone.contacts.AvatarGenerator
import org.linphone.core.ConsolidatedPresence
import org.linphone.core.tools.Log
import org.linphone.ui.NotoSansFont
import org.linphone.ui.call.conference.model.ConferenceParticipantDeviceModel
import org.linphone.ui.call.view.RoundCornersTextureView
@ -236,6 +238,16 @@ fun AppCompatTextView.setDrawableTint(@ColorInt color: Int) {
}
}
@UiThread
@BindingAdapter("textFont")
fun AppCompatTextView.font(type: NotoSansFont) {
try {
typeface = ResourcesCompat.getFont(context, type.fontRes)
} catch (e: Exception) {
Log.e("$TAG Can't load font: $e")
}
}
@UiThread
@BindingAdapter("presenceIcon")
fun ImageView.setPresenceIcon(presence: ConsolidatedPresence?) {

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

@ -5,7 +5,7 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<import type="org.linphone.ui.NotoSansFont" />
<variable
name="viewModel"
type="org.linphone.ui.main.viewmodel.AbstractMainViewModel" />
@ -27,7 +27,7 @@
android:drawablePadding="10dp"
android:drawableTint="@{viewModel.contactsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
android:text="@string/bottom_navigation_contacts_label"
android:textStyle="@{viewModel.contactsSelected ? Typeface.BOLD : Typeface.NORMAL}"
textFont="@{viewModel.contactsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
app:layout_constraintBottom_toTopOf="@id/calls"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -43,7 +43,7 @@
android:drawableTint="@{viewModel.callsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
android:drawablePadding="10dp"
android:text="@string/bottom_navigation_calls_label"
android:textStyle="@{viewModel.callsSelected ? Typeface.BOLD : Typeface.NORMAL}"
textFont="@{viewModel.callsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
app:layout_constraintBottom_toTopOf="@id/conversations"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -73,8 +73,8 @@
android:drawablePadding="10dp"
android:drawableTint="@{viewModel.conversationsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
android:text="@string/bottom_navigation_conversations_label"
android:textStyle="@{viewModel.conversationsSelected ? Typeface.BOLD : Typeface.NORMAL}"
android:visibility="@{viewModel.hideConversations ? View.GONE : View.VISIBLE}"
textFont="@{viewModel.conversationsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
app:layout_constraintBottom_toTopOf="@id/meetings"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -105,8 +105,8 @@
android:drawablePadding="10dp"
android:drawableTint="@{viewModel.meetingsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
android:text="@string/bottom_navigation_meetings_label"
android:textStyle="@{viewModel.meetingsSelected ? Typeface.BOLD : Typeface.NORMAL}"
android:visibility="@{viewModel.hideMeetings ? View.GONE : View.VISIBLE}"
textFont="@{viewModel.meetingsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.call.model.ZrtpSasConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.call.model.ZrtpAlertDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<import type="org.linphone.core.RegistrationState" />
<variable
name="model"

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="manageProfileClickListener"
type="View.OnClickListener" />

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

@ -5,7 +5,7 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<import type="org.linphone.ui.NotoSansFont" />
<variable
name="viewModel"
type="org.linphone.ui.main.viewmodel.AbstractMainViewModel" />
@ -30,7 +30,7 @@
android:drawablePadding="10dp"
android:drawableTint="@{viewModel.contactsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
android:text="@string/bottom_navigation_contacts_label"
android:textStyle="@{viewModel.contactsSelected ? Typeface.BOLD : Typeface.NORMAL}"
textFont="@{viewModel.contactsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/calls"
app:layout_constraintStart_toStartOf="parent"
@ -49,7 +49,7 @@
android:drawablePadding="10dp"
android:drawableTint="@{viewModel.callsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
android:text="@string/bottom_navigation_calls_label"
android:textStyle="@{viewModel.callsSelected ? Typeface.BOLD : Typeface.NORMAL}"
textFont="@{viewModel.callsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/conversations"
app:layout_constraintStart_toEndOf="@id/contacts"
@ -86,8 +86,8 @@
android:drawablePadding="10dp"
android:drawableTint="@{viewModel.conversationsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
android:text="@string/bottom_navigation_conversations_label"
android:textStyle="@{viewModel.conversationsSelected ? Typeface.BOLD : Typeface.NORMAL}"
android:visibility="@{viewModel.hideConversations ? View.GONE : View.VISIBLE}"
textFont="@{viewModel.conversationsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/meetings"
app:layout_constraintStart_toEndOf="@id/calls"
@ -124,8 +124,8 @@
android:drawablePadding="10dp"
android:drawableTint="@{viewModel.meetingsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
android:text="@string/bottom_navigation_meetings_label"
android:textStyle="@{viewModel.meetingsSelected ? Typeface.BOLD : Typeface.NORMAL}"
android:visibility="@{viewModel.hideMeetings ? View.GONE : View.VISIBLE}"
textFont="@{viewModel.meetingsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/conversations"

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="goToInfoClickListener"
type="View.OnClickListener" />

31
app/src/main/res/layout/chat_list_cell.xml
View file

@ -5,7 +5,7 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<import type="org.linphone.ui.NotoSansFont" />
<variable
name="model"
type="org.linphone.ui.main.chat.model.ConversationModel" />
@ -22,8 +22,8 @@
android:onLongClickListener="@{onLongClickListener}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:background="@drawable/primary_cell_background">
@ -33,6 +33,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
layout="@layout/contact_avatar"
bind:model="@{model.avatarModel}"
app:layout_constraintBottom_toBottomOf="parent"
@ -61,18 +63,18 @@
app:constraint_referenced_ids="notifications_count, warning_not_secured, ephemeral, muted, date_time, last_sent_message_status" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/name"
style="@style/default_text_style_500"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginStart="10dp"
android:maxLines="1"
android:ellipsize="end"
android:text="@{model.isGroup ? model.subject : model.avatarModel.name, default=`John Doe`}"
android:textSize="14sp"
android:textColor="?attr/color_main2_800"
android:textStyle="@{model.unreadMessageCount > 0 ? Typeface.BOLD : Typeface.NORMAL}"
textFont="@{model.unreadMessageCount > 0 ? NotoSansFont.NotoSansExtraBold : NotoSansFont.NotoSansMedium}"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintEnd_toStartOf="@id/right_border"
app:layout_constraintTop_toTopOf="parent"
@ -83,17 +85,16 @@
android:id="@+id/last_message_or_composing"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:gravity="center_vertical|start"
android:maxLines="2"
android:maxLines="1"
android:ellipsize="end"
android:text="@{model.isBeingDeleted ? @string/conversations_list_is_being_removed_label : model.isComposing ? model.composingLabel : model.lastMessageText, default=`Hello there!`}"
android:textSize="14sp"
android:textColor="?attr/color_main2_400"
android:textStyle="@{model.isBeingDeleted || model.unreadMessageCount > 0 || model.isComposing ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintStart_toStartOf="@id/name"
textFont="@{model.isBeingDeleted || model.unreadMessageCount > 0 || model.isComposing ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
app:layout_constraintStart_toStartOf="@id/title"
app:layout_constraintEnd_toStartOf="@id/right_border"
app:layout_constraintTop_toBottomOf="@id/name"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintBottom_toTopOf="@id/separator" />
<androidx.appcompat.widget.AppCompatTextView
@ -106,8 +107,8 @@
android:textSize="12sp"
android:textColor="?attr/color_main2_500"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/name"
app:layout_constraintBottom_toBottomOf="@id/name" />
app:layout_constraintTop_toTopOf="@id/title"
app:layout_constraintBottom_toBottomOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
@ -185,7 +186,7 @@
android:layout_marginEnd="10dp"
android:background="?attr/color_main2_200"
android:visibility="gone"
app:layout_constraintStart_toStartOf="@id/name"
app:layout_constraintStart_toStartOf="@id/title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="removeParticipantClickListener"
type="View.OnClickListener" />

4
app/src/main/res/layout/chat_participant_list_cell.xml
View file

@ -16,7 +16,9 @@
android:layout_height="wrap_content"
android:background="?attr/color_main2_000"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
android:layout_marginEnd="16dp"
android:paddingTop="5dp"
android:paddingBottom="5dp">
<include
android:id="@+id/avatar"

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="model"
type="org.linphone.ui.main.contacts.model.ContactDeviceModel" />

3
app/src/main/res/layout/contact_list_cell.xml
View file

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="model"
type="org.linphone.ui.main.contacts.model.ContactAvatarModel" />
@ -25,6 +24,8 @@
android:onLongClick="@{onLongClickListener}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="16dp">

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<import type="android.text.InputType" />
<variable
name="model"

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="model"
type="org.linphone.ui.main.contacts.model.ContactNumberOrAddressModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="noFilterClickListener"
type="View.OnClickListener" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="model"
type="org.linphone.ui.main.contacts.model.ContactNumberOrAddressModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.contacts.model.NumberOrAddressPickerDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.fragment.GroupSetOrEditSubjectDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<import type="android.text.InputType" />
<variable
name="viewModel"

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.call.model.ZrtpSasConfirmationDialogModel" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.call.model.ZrtpAlertDialogModel" />

5
app/src/main/res/layout/generic_address_picker_contact_list_cell.xml
View file

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="onClickListener"
type="View.OnClickListener" />
@ -22,7 +21,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="16dp">
android:layout_marginEnd="16dp"
android:paddingTop="5dp"
android:paddingBottom="5dp">
<ImageView
android:id="@+id/background"

5
app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml
View file

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="onClickListener"
type="View.OnClickListener" />
@ -19,7 +18,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="16dp">
android:layout_marginEnd="16dp"
android:paddingTop="5dp"
android:paddingBottom="5dp">
<ImageView
android:id="@+id/background"

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

@ -19,6 +19,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:background="@drawable/primary_cell_background">
<ImageView

3
app/src/main/res/layout/history_call_list_cell.xml
View file

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="model"
type="org.linphone.ui.main.history.model.CallLogHistoryModel" />
@ -35,6 +34,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginBottom="5dp"
android:text="@{model.isOutgoing() ? @string/call_outgoing : @string/call_incoming, default=@string/call_outgoing}"
android:textSize="14sp"
android:textColor="?attr/color_main2_700"
@ -47,7 +47,6 @@
android:id="@+id/date_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:gravity="center"
android:text="@{model.dateTime, default=`August 13th 2023 | 07:47 PM`}"
android:textSize="12sp"

10
app/src/main/res/layout/history_list_cell.xml
View file

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="model"
type="org.linphone.ui.main.history.model.CallLogModel" />
@ -25,6 +24,8 @@
android:onLongClickListener="@{onLongClickListener}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:background="@drawable/primary_cell_background">
@ -47,7 +48,6 @@
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginStart="10dp"
android:text="@{model.avatarModel.name, default=`John Doe`}"
android:textSize="14sp"
@ -60,19 +60,17 @@
android:id="@+id/call_status"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginBottom="10dp"
android:src="@{model.iconResId, default=@drawable/outgoing_call}"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="@id/name"
app:layout_constraintTop_toBottomOf="@id/name"
app:layout_constraintBottom_toTopOf="@id/separator" />
app:layout_constraintTop_toTopOf="@id/date_time"
app:layout_constraintBottom_toBottomOf="@id/date_time" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_300"
android:id="@+id/date_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginStart="5dp"
android:gravity="center"
android:text="@{model.dateTime, default=`13 aout 2023`}"

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="deleteAllHistoryClickListener"
type="View.OnClickListener" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="addToContactsListener"
type="View.OnClickListener" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="deleteClickListener"
type="View.OnClickListener" />

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

@ -5,7 +5,6 @@
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="icon"
type="Integer" />

4
app/src/main/res/values-fr/strings.xml
View file

@ -286,7 +286,7 @@
<string name="manage_account_device_remove">Supprimer</string>
<string name="manage_account_device_last_connection">Dernière connexion :</string>
<string name="manage_account_dialog_remove_account_title">Supprimer %s ?</string>
<string name="manage_account_dialog_remove_account_message">Vous pouvez vous reconnecter à tout moment en cliquant sur "Ajouter un compte".Cependant toutes les informations stockées sur ce périphérique seront supprimées.</string>
<string name="manage_account_dialog_remove_account_message">Vous pouvez vous reconnecter à tout moment en cliquant sur \"Ajouter un compte\" dans le menu latéral.\nCependant toutes les informations stockées sur ce périphérique seront supprimées.</string>
<string name="account_settings_title">Paramètres de compte</string>
<string name="account_settings_push_notification_title">Autoriser les notifications poussées</string>
@ -302,7 +302,7 @@
<string name="account_settings_audio_video_conference_factory_uri_title">URI de l\'usine à réunions</string>
<string name="account_settings_lime_server_url_title">URL du serveur d\'échange de clés de chiffrement</string>
<string name="account_settings_bundle_mode_title">Mode "bundle"</string>
<string name="account_settings_cpim_in_basic_conversations_title">Utiliser CPIM dans les conversations "basiques"</string>
<string name="account_settings_cpim_in_basic_conversations_title">Utiliser CPIM dans les conversations \"basiques\"</string>
<string name="account_settings_mwi_uri_title">URI du serveur de messagerie vocale</string>
<string name="account_settings_dialog_invalid_password_title">Autentification requise</string>

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

@ -323,7 +323,7 @@
<string name="manage_account_device_remove">Remove</string>
<string name="manage_account_device_last_connection">Last connection:</string>
<string name="manage_account_dialog_remove_account_title">Delete %s?</string>
<string name="manage_account_dialog_remove_account_message">You can reconnect at any time by clicking “Add an account”. However, all data on this phone will be deleted.</string>
<string name="manage_account_dialog_remove_account_message">You can reconnect at any time by clicking \“Add an account\”.\nHowever, all data on this phone will be deleted.</string>
<string name="account_settings_title">Account settings</string>
<string name="account_settings_push_notification_title">Allow push notifications</string>
@ -339,7 +339,7 @@
<string name="account_settings_audio_video_conference_factory_uri_title">Audio/video conference factory URI</string>
<string name="account_settings_lime_server_url_title">E2E encryption keys server URL</string>
<string name="account_settings_bundle_mode_title">Bundle mode</string>
<string name="account_settings_cpim_in_basic_conversations_title">Use CPIM in "basic" conversations</string>
<string name="account_settings_cpim_in_basic_conversations_title">Use CPIM in \"basic\" conversations</string>
<string name="account_settings_mwi_uri_title">Voicemail URI</string>
<string name="account_settings_dialog_invalid_password_title">Authentication needed</string>