diff --git a/app/src/main/res/font/noto_sans.xml b/app/src/main/res/font/noto_sans.xml new file mode 100644 index 000000000..a8a753d54 --- /dev/null +++ b/app/src/main/res/font/noto_sans.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/font/noto_sans_300.xml b/app/src/main/res/font/noto_sans_300.xml new file mode 100644 index 000000000..85dbb8a08 --- /dev/null +++ b/app/src/main/res/font/noto_sans_300.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/font/noto_sans_600.xml b/app/src/main/res/font/noto_sans_600.xml new file mode 100644 index 000000000..033420ab2 --- /dev/null +++ b/app/src/main/res/font/noto_sans_600.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/font/noto_sans_700.xml b/app/src/main/res/font/noto_sans_700.xml new file mode 100644 index 000000000..dae6ef6db --- /dev/null +++ b/app/src/main/res/font/noto_sans_700.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/font/noto_sans_800.xml b/app/src/main/res/font/noto_sans_800.xml new file mode 100644 index 000000000..c4a60ee64 --- /dev/null +++ b/app/src/main/res/font/noto_sans_800.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/font/noto_sans_bold.ttf b/app/src/main/res/font/noto_sans_bold.ttf new file mode 100644 index 000000000..0d1906839 Binary files /dev/null and b/app/src/main/res/font/noto_sans_bold.ttf differ diff --git a/app/src/main/res/font/noto_sans_extra_bold.ttf b/app/src/main/res/font/noto_sans_extra_bold.ttf new file mode 100644 index 000000000..a74c69ab1 Binary files /dev/null and b/app/src/main/res/font/noto_sans_extra_bold.ttf differ diff --git a/app/src/main/res/font/noto_sans_light.ttf b/app/src/main/res/font/noto_sans_light.ttf new file mode 100644 index 000000000..8fde66280 Binary files /dev/null and b/app/src/main/res/font/noto_sans_light.ttf differ diff --git a/app/src/main/res/font/noto_sans_regular.ttf b/app/src/main/res/font/noto_sans_regular.ttf new file mode 100644 index 000000000..7552fbe80 Binary files /dev/null and b/app/src/main/res/font/noto_sans_regular.ttf differ diff --git a/app/src/main/res/font/noto_sans_semi_bold.ttf b/app/src/main/res/font/noto_sans_semi_bold.ttf new file mode 100644 index 000000000..b460754c5 Binary files /dev/null and b/app/src/main/res/font/noto_sans_semi_bold.ttf differ diff --git a/app/src/main/res/layout-land/bottom_nav_bar.xml b/app/src/main/res/layout-land/bottom_nav_bar.xml index 69ae0f009..44a4897d1 100644 --- a/app/src/main/res/layout-land/bottom_nav_bar.xml +++ b/app/src/main/res/layout-land/bottom_nav_bar.xml @@ -39,19 +39,15 @@ android:background="@color/white"> - @@ -126,6 +124,7 @@ app:layout_constraintTop_toBottomOf="@id/favourites_label" /> diff --git a/app/src/main/res/layout/bottom_nav_bar.xml b/app/src/main/res/layout/bottom_nav_bar.xml index 49d63284f..52d927a28 100644 --- a/app/src/main/res/layout/bottom_nav_bar.xml +++ b/app/src/main/res/layout/bottom_nav_bar.xml @@ -39,6 +39,7 @@ android:background="@color/white"> @@ -258,6 +259,7 @@ app:layout_constraintBottom_toBottomOf="@id/company_label"/> @@ -320,6 +319,7 @@ app:layout_constraintBottom_toBottomOf="@id/devices"/> @@ -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"/> diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml index 71e37a24f..90d4dac07 100644 --- a/app/src/main/res/layout/contact_list_cell.xml +++ b/app/src/main/res/layout/contact_list_cell.xml @@ -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" /> diff --git a/app/src/main/res/layout/contact_selection_cell.xml b/app/src/main/res/layout/contact_selection_cell.xml index 2a374b673..e5a49ad09 100644 --- a/app/src/main/res/layout/contact_selection_cell.xml +++ b/app/src/main/res/layout/contact_selection_cell.xml @@ -29,6 +29,7 @@ app:layout_constraintTop_toTopOf="parent" /> - @@ -109,6 +107,7 @@ app:layout_constraintTop_toBottomOf="@id/favourites_label" /> diff --git a/app/src/main/res/layout/contacts_list_long_press_menu.xml b/app/src/main/res/layout/contacts_list_long_press_menu.xml index b3a57fc73..a1adbb4f6 100644 --- a/app/src/main/res/layout/contacts_list_long_press_menu.xml +++ b/app/src/main/res/layout/contacts_list_long_press_menu.xml @@ -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"/> diff --git a/app/src/main/res/layout/dialog_number_address_list_cell.xml b/app/src/main/res/layout/dialog_number_address_list_cell.xml index 3d24ad645..6ba820194 100644 --- a/app/src/main/res/layout/dialog_number_address_list_cell.xml +++ b/app/src/main/res/layout/dialog_number_address_list_cell.xml @@ -19,14 +19,13 @@ android:background="@drawable/cell_background"> diff --git a/app/src/main/res/layout/new_conversation_fragment.xml b/app/src/main/res/layout/new_conversation_fragment.xml index 61ef2419f..cb515d262 100644 --- a/app/src/main/res/layout/new_conversation_fragment.xml +++ b/app/src/main/res/layout/new_conversation_fragment.xml @@ -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" diff --git a/app/src/main/res/layout/top_search_bar.xml b/app/src/main/res/layout/top_search_bar.xml index b6e19ae5c..120c057d5 100644 --- a/app/src/main/res/layout/top_search_bar.xml +++ b/app/src/main/res/layout/top_search_bar.xml @@ -62,6 +62,7 @@ app:layout_constraintTop_toTopOf="@id/title" /> @@ -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" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d7997d667..bb05aedcf 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,6 +1,35 @@ - + + + + + + -