From 3bceafef80c95a4240b64af381b545a35398f976 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 3 Aug 2023 11:33:01 +0200 Subject: [PATCH] Use AppCompatTextView + only one bottom nav bar layout --- .../org/linphone/utils/DataBindingUtils.kt | 11 ++- ...av_bar_contacts.xml => bottom_nav_bar.xml} | 38 +++++-- .../layout/bottom_nav_bar_conversations.xml | 98 ------------------- .../main/res/layout/chat_bubble_incoming.xml | 2 +- .../main/res/layout/chat_bubble_outgoing.xml | 2 +- app/src/main/res/layout/chat_event.xml | 2 +- .../main/res/layout/chat_room_list_cell.xml | 8 +- app/src/main/res/layout/chat_room_menu.xml | 12 +-- .../res/layout/contact_selection_cell.xml | 2 +- app/src/main/res/layout/contacts_fragment.xml | 3 +- .../main/res/layout/conversation_fragment.xml | 8 +- .../res/layout/conversations_fragment.xml | 3 +- .../main/res/layout/new_contact_fragment.xml | 2 +- .../res/layout/new_conversation_fragment.xml | 10 +- app/src/main/res/layout/top_search_bar.xml | 2 +- 15 files changed, 67 insertions(+), 136 deletions(-) rename app/src/main/res/layout/{bottom_nav_bar_contacts.xml => bottom_nav_bar.xml} (69%) delete mode 100644 app/src/main/res/layout/bottom_nav_bar_conversations.xml diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt index 17ef5e422..3b906161f 100644 --- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt +++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt @@ -24,7 +24,7 @@ import android.view.View import android.view.Window import android.view.inputmethod.InputMethodManager import android.widget.ImageView -import android.widget.TextView +import androidx.appcompat.widget.AppCompatTextView import androidx.core.view.ViewCompat import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat @@ -81,10 +81,17 @@ fun ImageView.setSourceImageResource(resource: Int) { } @BindingAdapter("android:textStyle") -fun TextView.setTypeface(typeface: Int) { +fun AppCompatTextView.setTypeface(typeface: Int) { this.setTypeface(null, typeface) } +@BindingAdapter("android:drawableTint") +fun AppCompatTextView.setDrawableTint(color: Int) { + for (drawable in compoundDrawablesRelative) { + drawable?.setTint(color) + } +} + @BindingAdapter("coilContact") fun loadContactPictureWithCoil(imageView: ImageView, contact: ContactData?) { if (contact == null) { diff --git a/app/src/main/res/layout/bottom_nav_bar_contacts.xml b/app/src/main/res/layout/bottom_nav_bar.xml similarity index 69% rename from app/src/main/res/layout/bottom_nav_bar_contacts.xml rename to app/src/main/res/layout/bottom_nav_bar.xml index 75ac3326f..7e7b67552 100644 --- a/app/src/main/res/layout/bottom_nav_bar_contacts.xml +++ b/app/src/main/res/layout/bottom_nav_bar.xml @@ -5,9 +5,25 @@ + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml index fe1d39841..502b39cbb 100644 --- a/app/src/main/res/layout/chat_bubble_incoming.xml +++ b/app/src/main/res/layout/chat_bubble_incoming.xml @@ -59,7 +59,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toEndOf="@id/avatar"/> - - - - - - - - - - - - - - - - - - - - - - - - -