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

Using font and fontWeight in style

Browse source
This commit is contained in:
Sylvain Berfini 2023-08-09 10:31:52 +02:00
parent 6c8216d360
commit d8a6bf08cb
28 changed files with 122 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/res/font/noto_sans.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:fontStyle="normal"
android:font="@font/noto_sans_regular" />
</font-family>

6
app/src/main/res/font/noto_sans_300.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:fontStyle="normal"
android:font="@font/noto_sans_light" />
</font-family>

6
app/src/main/res/font/noto_sans_600.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:fontStyle="normal"
android:font="@font/noto_sans_semi_bold" />
</font-family>

6
app/src/main/res/font/noto_sans_700.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:fontStyle="normal"
android:font="@font/noto_sans_bold" />
</font-family>

6
app/src/main/res/font/noto_sans_800.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:fontStyle="normal"
android:font="@font/noto_sans_extra_bold" />
</font-family>

BIN
app/src/main/res/font/noto_sans_bold.ttf Normal file
View file

Binary file not shown.

BIN
app/src/main/res/font/noto_sans_extra_bold.ttf Normal file
View file

Binary file not shown.

BIN
app/src/main/res/font/noto_sans_light.ttf Normal file
View file

Binary file not shown.

BIN
app/src/main/res/font/noto_sans_regular.ttf Normal file
View file

Binary file not shown.

BIN
app/src/main/res/font/noto_sans_semi_bold.ttf Normal file
View file

Binary file not shown.

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

@ -39,19 +39,15 @@
android:background="@color/white">
<androidx.appcompat.widget.AppCompatTextView
style="@style/bottom_nav_bar_label_style"
android:id="@+id/contacts"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawableTop="@drawable/contacts"
android:drawablePadding="10dp"
android:drawableTint="@{contactsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}"
android:gravity="center"
android:onClick="@{onContactsClicked}"
android:text="Contacts"
android:maxLines="1"
android:ellipsize="end"
android:textColor="@color/gray_9"
android:textSize="11sp"
android:textStyle="@{contactsSelected ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintBottom_toTopOf="@id/calls"
app:layout_constraintStart_toStartOf="parent"
@ -59,19 +55,14 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/bottom_nav_bar_label_style"
android:onClick="@{onCallsClicked}"
android:id="@+id/calls"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawableTop="@drawable/calls"
android:drawablePadding="10dp"
android:drawableTint="@{callsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}"
android:gravity="center"
android:text="Calls"
android:maxLines="1"
android:ellipsize="end"
android:textColor="@color/gray_9"
android:textSize="11sp"
android:textStyle="@{callsSelected ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintBottom_toTopOf="@id/conversations"
app:layout_constraintStart_toStartOf="parent"
@ -79,6 +70,7 @@
app:layout_constraintTop_toBottomOf="@id/contacts" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/bottom_nav_bar_label_style"
android:id="@+id/conversations"
android:enabled="false"
android:layout_width="0dp"
@ -86,13 +78,8 @@
android:drawableTop="@drawable/conversations"
android:drawablePadding="10dp"
android:drawableTint="@{conversationsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}"
android:gravity="center"
android:onClick="@{onConversationsClicked}"
android:text="Conversations"
android:maxLines="1"
android:ellipsize="end"
android:textColor="@color/gray_9"
android:textSize="11sp"
android:textStyle="@{conversationsSelected ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintBottom_toTopOf="@id/meetings"
app:layout_constraintStart_toStartOf="parent"
@ -100,6 +87,7 @@
app:layout_constraintTop_toBottomOf="@id/calls" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/bottom_nav_bar_label_style"
android:onClick="@{onMeetingsClicked}"
android:id="@+id/meetings"
android:layout_width="0dp"
@ -107,12 +95,7 @@
android:drawableTop="@drawable/meetings"
android:drawablePadding="10dp"
android:drawableTint="@{meetingsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}"
android:gravity="center"
android:text="Meetings"
android:maxLines="1"
android:ellipsize="end"
android:textColor="@color/gray_9"
android:textSize="11sp"
android:textStyle="@{meetingsSelected ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"

11
app/src/main/res/layout-land/contacts_list_fragment.xml
View file

@ -81,20 +81,20 @@
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintTop_toBottomOf="@id/background" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/no_contacts_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="No contacts for the moment..."
android:textColor="@color/gray_9"
android:textSize="16sp"
android:textStyle="bold"
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_contacts_image" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/favourites_label"
android:visibility="@{viewModel.searchFilter.length() == 0 ? View.VISIBLE : View.GONE}"
onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
@ -107,8 +107,6 @@
android:drawableEnd="@drawable/collapse"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="@color/gray_9"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/background"/>
@ -126,6 +124,7 @@
app:layout_constraintTop_toBottomOf="@id/favourites_label" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/all_contacts_label"
android:visibility="@{viewModel.searchFilter.length() == 0 ? View.VISIBLE : View.GONE}"
android:layout_width="0dp"
@ -135,8 +134,6 @@
android:layout_marginTop="16dp"
android:text="All contacts"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="@color/gray_9"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/favourites_contacts_list"/>

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

@ -39,6 +39,7 @@
android:background="@color/white">
<androidx.appcompat.widget.AppCompatTextView
style="@style/bottom_nav_bar_label_style"
android:onClick="@{onContactsClicked}"
android:id="@+id/contacts"
android:layout_width="0dp"
@ -48,11 +49,6 @@
android:drawableTop="@drawable/contacts"
android:drawablePadding="10dp"
android:text="Contacts"
android:maxLines="1"
android:ellipsize="end"
android:textSize="11sp"
android:gravity="center"
android:textColor="@color/gray_9"
android:drawableTint="@{contactsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}"
android:textStyle="@{contactsSelected ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintBottom_toBottomOf="parent"
@ -61,6 +57,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/bottom_nav_bar_label_style"
android:onClick="@{onCallsClicked}"
android:id="@+id/calls"
android:layout_width="0dp"
@ -71,11 +68,6 @@
android:drawableTop="@drawable/calls"
android:drawablePadding="10dp"
android:text="Calls"
android:maxLines="1"
android:ellipsize="end"
android:textSize="11sp"
android:gravity="center"
android:textColor="@color/gray_9"
android:drawableTint="@{callsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}"
android:textStyle="@{callsSelected ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintBottom_toBottomOf="parent"
@ -84,6 +76,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/bottom_nav_bar_label_style"
android:onClick="@{onConversationsClicked}"
android:enabled="false"
android:id="@+id/conversations"
@ -95,11 +88,6 @@
android:drawableTop="@drawable/conversations"
android:drawablePadding="10dp"
android:text="Conversations"
android:maxLines="1"
android:ellipsize="end"
android:textSize="11sp"
android:gravity="center"
android:textColor="@color/gray_9"
android:drawableTint="@{conversationsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}"
android:textStyle="@{conversationsSelected ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintBottom_toBottomOf="parent"
@ -108,6 +96,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/bottom_nav_bar_label_style"
android:onClick="@{onMeetingsClicked}"
android:id="@+id/meetings"
android:layout_width="0dp"
@ -118,11 +107,6 @@
android:drawableTop="@drawable/meetings"
android:drawablePadding="10dp"
android:text="Meetings"
android:maxLines="1"
android:ellipsize="end"
android:textSize="11sp"
android:gravity="center"
android:textColor="@color/gray_9"
android:drawableTint="@{meetingsSelected ? @color/primary_color : @color/gray_9, default=@color/gray_9}"
android:textStyle="@{meetingsSelected ? Typeface.BOLD : Typeface.NORMAL}"
app:layout_constraintBottom_toBottomOf="parent"

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

@ -26,12 +26,12 @@
app:barrierDirection="start" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/device_name"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="10dp"
android:text="@{model.name, default=`Pixel 6 Pro de Sylvain`}"
android:textColor="@color/gray_9"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"
@ -53,6 +53,7 @@
app:layout_constraintEnd_toEndOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_600"
android:id="@+id/verify_device"
android:visibility="@{model.trusted ? View.GONE : View.VISIBLE}"
android:layout_width="wrap_content"
@ -68,7 +69,7 @@
android:drawablePadding="8dp"
android:text="Vérifier l'appareil"
android:textColor="@color/primary_color"
android:textSize="12sp"
android:textSize="13sp"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintEnd_toEndOf="parent"

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

@ -47,6 +47,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/name"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -54,7 +55,6 @@
android:gravity="center"
android:text="@{model.name, default=`John Doe`}"
android:textSize="14sp"
android:textColor="@color/gray_9"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintStart_toStartOf="@id/avatar"

46
app/src/main/res/layout/contact_fragment.xml
View file

@ -104,6 +104,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -116,6 +117,7 @@
app:layout_constraintTop_toBottomOf="@id/avatar" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_300"
android:id="@+id/status"
android:visibility="@{viewModel.contact.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE}"
android:layout_width="wrap_content"
@ -142,13 +144,13 @@
app:layout_constraintTop_toBottomOf="@id/status" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:onClick="@{() -> viewModel.startAudioCall()}"
android:id="@+id/call_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Call"
android:textColor="@color/gray_9"
android:textSize="14sp"
app:layout_constraintTop_toBottomOf="@id/call"
app:layout_constraintStart_toStartOf="@id/call"
@ -169,13 +171,13 @@
app:layout_constraintTop_toBottomOf="@id/status" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:onClick="@{() -> viewModel.sendMessage()}"
android:id="@+id/chat_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Message"
android:textColor="@color/gray_9"
android:textSize="14sp"
app:layout_constraintTop_toBottomOf="@id/chat"
app:layout_constraintStart_toStartOf="@id/chat"
@ -196,19 +198,20 @@
app:layout_constraintTop_toBottomOf="@id/status" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:onClick="@{() -> viewModel.startVideoCall()}"
android:id="@+id/video_call_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Video Call"
android:textColor="@color/gray_9"
android:textSize="14sp"
app:layout_constraintTop_toBottomOf="@id/video_call"
app:layout_constraintStart_toStartOf="@id/video_call"
app:layout_constraintEnd_toEndOf="@id/video_call"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:onClick="@{() -> viewModel.toggleNumbersAndAddressesVisibility()}"
android:id="@+id/numbers_and_addresses_label"
android:layout_width="0dp"
@ -221,8 +224,6 @@
android:drawableEnd="@{viewModel.showNumbersAndAddresses ? @drawable/collapse : @drawable/expand, default=@drawable/collapse}"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="@color/gray_9"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/call_label"/>
@ -258,6 +259,7 @@
app:layout_constraintBottom_toBottomOf="@id/company_label"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
android:id="@+id/company_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -265,8 +267,6 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="Company : "
android:textColor="@color/gray_9"
android:textStyle="bold"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"
@ -274,13 +274,13 @@
app:layout_constraintTop_toTopOf="@id/info_background"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/company"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@{viewModel.company, default=`Belledonne Comm`}"
android:textColor="@color/gray_9"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"
@ -288,6 +288,7 @@
app:layout_constraintTop_toTopOf="@id/info_background"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:onClick="@{() -> viewModel.toggleDevicesTrustVisibility()}"
android:id="@+id/trust_label"
android:layout_width="0dp"
@ -300,8 +301,6 @@
android:drawableEnd="@{viewModel.showDevicesTrust ? @drawable/collapse : @drawable/expand, default=@drawable/collapse}"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="@color/gray_9"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/info_background"/>
@ -320,6 +319,7 @@
app:layout_constraintBottom_toBottomOf="@id/devices"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
android:id="@+id/trusted_devices_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -327,7 +327,6 @@
android:layout_marginEnd="17dp"
android:layout_marginTop="20dp"
android:textSize="14sp"
android:textStyle="bold"
android:text="Nombre d'appareils vérifiés :"
app:layout_constraintStart_toStartOf="@id/trust_background"
app:layout_constraintEnd_toEndOf="@id/trust_background"
@ -351,13 +350,13 @@
app:layout_constraintTop_toBottomOf="@id/trusted_devices_count"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
android:id="@+id/trusted_devices_progress_label"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="75%"
android:textColor="@color/white"
android:textSize="12sp"
android:textStyle="bold"
android:gravity="center"
app:layout_constraintStart_toStartOf="@id/trusted_devices_progress"
app:layout_constraintEnd_toEndOf="@id/trusted_devices_progress"
@ -379,6 +378,7 @@
app:layout_constraintTop_toBottomOf="@id/trusted_devices_progress" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/actions"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -388,8 +388,6 @@
android:layout_marginTop="32dp"
android:text="Other actions"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="@color/gray_9"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/trust_background"/>
@ -414,8 +412,8 @@
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:text="Edit"
style="@style/context_menu_action_label"
android:drawableLeft="@drawable/edit"
style="@style/context_menu_action_label_style"
android:drawableStart="@drawable/edit"
app:layout_constraintTop_toTopOf="@id/actions_background"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -437,8 +435,8 @@
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:text="Add to favourites"
style="@style/context_menu_action_label"
android:drawableLeft="@drawable/favorite"
style="@style/context_menu_action_label_style"
android:drawableStart="@drawable/favorite"
app:layout_constraintTop_toBottomOf="@id/action_edit"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -460,8 +458,8 @@
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:text="Share"
style="@style/context_menu_action_label"
android:drawableLeft="@drawable/share"
style="@style/context_menu_action_label_style"
android:drawableStart="@drawable/share"
app:layout_constraintTop_toBottomOf="@id/action_favorite"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -483,8 +481,8 @@
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:text="Invite"
style="@style/context_menu_action_label"
android:drawableLeft="@drawable/invite"
style="@style/context_menu_action_label_style"
android:drawableStart="@drawable/invite"
app:layout_constraintTop_toBottomOf="@id/action_share"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -506,8 +504,8 @@
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:text="Delete"
style="@style/context_menu_danger_action_label"
android:drawableLeft="@drawable/delete"
style="@style/context_menu_danger_action_label_style"
android:drawableStart="@drawable/delete"
app:layout_constraintTop_toBottomOf="@id/action_invite"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

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

@ -34,7 +34,6 @@
android:visibility="@{model.showFirstLetter ? View.VISIBLE : View.INVISIBLE, default=invisible}"
android:textColor="@color/gray_10"
android:textSize="20sp"
android:textStyle="bold"
android:layout_marginStart="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@ -66,12 +65,12 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{model.name, default=`John Doe`}"
android:textSize="14sp"
android:textColor="@color/gray_9"
android:layout_marginStart="10dp"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="parent"

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

@ -19,14 +19,13 @@
android:background="@drawable/cell_background">
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
android:id="@+id/header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:text="@{model.sip ? `SIP address` : `Phone (` + model.label + `)`, default=`Phone (Home)`}"
android:textColor="@color/gray_9"
android:textStyle="bold"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"
@ -34,12 +33,12 @@
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/number_or_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@{model.displayedValue, default=`sip:johndoe@sip.linphone.org`}"
android:textColor="@color/gray_9"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"

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

@ -20,10 +20,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Copier le numéro"
style="@style/context_menu_action_label"
style="@style/context_menu_action_label_style"
android:background="@color/gray_2"
android:layout_marginBottom="1dp"
android:drawableLeft="@drawable/copy"
android:drawableStart="@drawable/copy"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

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

@ -29,6 +29,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

11
app/src/main/res/layout/contacts_list_fragment.xml
View file

@ -63,20 +63,20 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/background" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/no_contacts_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="No contacts for the moment..."
android:textColor="@color/gray_9"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_contacts_image" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/favourites_label"
android:visibility="@{viewModel.searchFilter.length() == 0 ? View.VISIBLE : View.GONE}"
onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
@ -90,8 +90,6 @@
android:drawableEnd="@{viewModel.showFavourites ? @drawable/collapse : @drawable/expand, default=@drawable/collapse}"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="@color/gray_9"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/background"/>
@ -109,6 +107,7 @@
app:layout_constraintTop_toBottomOf="@id/favourites_label" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/all_contacts_label"
android:visibility="@{viewModel.searchFilter.length() == 0 ? View.VISIBLE : View.GONE}"
android:layout_width="0dp"
@ -119,8 +118,6 @@
android:layout_marginTop="20dp"
android:text="All contacts"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="@color/gray_9"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/favourites_contacts_list"/>

16
app/src/main/res/layout/contacts_list_long_press_menu.xml
View file

@ -29,10 +29,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Mettre en favoris"
style="@style/context_menu_action_label"
style="@style/context_menu_action_label_style"
android:background="@color/gray_2"
android:layout_marginBottom="1dp"
android:drawableLeft="@drawable/favorite"
android:drawableStart="@drawable/favorite"
app:layout_constraintBottom_toTopOf="@id/share"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -43,10 +43,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Partager"
style="@style/context_menu_action_label"
style="@style/context_menu_action_label_style"
android:background="@color/gray_2"
android:layout_marginBottom="1dp"
android:drawableLeft="@drawable/share"
android:drawableStart="@drawable/share"
app:layout_constraintBottom_toTopOf="@id/invite"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
@ -57,10 +57,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Inviter"
style="@style/context_menu_action_label"
style="@style/context_menu_action_label_style"
android:background="@color/gray_2"
android:layout_marginBottom="1dp"
android:drawableLeft="@drawable/invite"
android:drawableStart="@drawable/invite"
app:layout_constraintBottom_toTopOf="@id/delete"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
@ -71,10 +71,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Supprimer"
style="@style/context_menu_danger_action_label"
style="@style/context_menu_danger_action_label_style"
android:background="@color/gray_2"
android:layout_marginBottom="1dp"
android:drawableLeft="@drawable/delete"
android:drawableStart="@drawable/delete"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

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

@ -19,14 +19,13 @@
android:background="@drawable/cell_background">
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
android:id="@+id/header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:text="@{model.sip ? `SIP address` : `Phone (` + model.label + `)`, default=`Phone (Home)`}"
android:textColor="@color/gray_9"
android:textStyle="bold"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"
@ -34,12 +33,12 @@
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/number_or_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@{model.displayedValue, default=`sip:johndoe@sip.linphone.org`}"
android:textColor="@color/gray_9"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"

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

@ -42,15 +42,14 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:paddingTop="25dp"
android:text="Which canal do you choose?"
android:textColor="@color/gray_9"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/numbers_and_addresses"
app:layout_constraintStart_toStartOf="@id/dialog_background"

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

@ -39,7 +39,6 @@
android:text="New contact"
android:textColor="#FFFFFF"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/save"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent" />

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

@ -64,7 +64,6 @@
android:text="Nouvelle conversation"
android:textSize="18sp"
android:textColor="@color/black"
android:textStyle="bold"
android:layout_marginTop="22dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -119,7 +118,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Créer un nouveau groupe"
android:textStyle="bold"
android:textSize="16sp"
android:padding="5dp"
android:layout_marginStart="7dp"

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

@ -62,6 +62,7 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="35dp"
@ -72,7 +73,6 @@
android:text="@{viewModel.title, default=`Title`}"
android:textColor="#FFFFFF"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/search_toggle"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="parent" />
@ -125,7 +125,6 @@
android:layout_height="match_parent"
android:textCursorDrawable="@null"
android:textColor="@color/gray_6"
android:textStyle="bold"
android:textSize="16sp"
android:inputType="text"
android:paddingVertical="1dp"

34
app/src/main/res/values/styles.xml
View file

@ -1,6 +1,35 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<style name="context_menu_action_label">
<style name="default_text_style_300">
<item name="android:fontFamily">@font/noto_sans_300</item>
<item name="android:textColor">@color/gray_9</item>
</style>
<style name="default_text_style">
<item name="android:fontFamily">@font/noto_sans</item>
<item name="android:textColor">@color/gray_9</item>
</style>
<style name="default_text_style_600">
<item name="android:fontFamily">@font/noto_sans_600</item>
<item name="android:textColor">@color/gray_9</item>
</style>
<style name="default_text_style_700">
<item name="android:fontFamily">@font/noto_sans_700</item>
<item name="android:textColor">@color/gray_9</item>
</style>
<style name="default_text_style_800">
<item name="android:fontFamily">@font/noto_sans_800</item>
<item name="android:textColor">@color/gray_9</item>
</style>
<style name="bottom_nav_bar_label_style">
<item name="android:fontFamily">@font/noto_sans</item>
<item name="android:textSize">11sp</item>
<item name="android:textColor">@color/gray_9</item>
<item name="android:gravity">center</item>
<item name="maxLines">1</item>
<item name="android:ellipsize">end</item>
</style>
<style name="context_menu_action_label_style">
<item name="android:fontFamily">@font/noto_sans</item>
<item name="android:textSize">17sp</item>
<item name="android:textColor">@color/gray_1</item>
<item name="android:gravity">start</item>
@ -8,7 +37,8 @@
<item name="android:drawableTint">@color/gray_9</item>
<item name="android:drawablePadding">8dp</item>
</style>
<style name="context_menu_danger_action_label">
<style name="context_menu_danger_action_label_style">
<item name="android:fontFamily">@font/noto_sans</item>
<item name="android:textSize">17sp</item>
<item name="android:textColor">@color/red_danger</item>
<item name="android:gravity">start</item>