Added pressed background color to chat message popup menu + updated translations + minor changes

This commit is contained in:
Sylvain Berfini 2021-06-02 09:32:32 +02:00
parent 9a4600196a
commit ee1cdd69d4
18 changed files with 66 additions and 19 deletions

View file

@ -19,6 +19,7 @@
*/ */
package org.linphone package org.linphone
import android.annotation.SuppressLint
import android.app.Application import android.app.Application
import android.content.Context import android.content.Context
import org.linphone.core.CoreContext import org.linphone.core.CoreContext
@ -29,7 +30,9 @@ import org.linphone.core.tools.Log
class LinphoneApplication : Application() { class LinphoneApplication : Application() {
companion object { companion object {
@SuppressLint("StaticFieldLeak")
lateinit var corePreferences: CorePreferences lateinit var corePreferences: CorePreferences
@SuppressLint("StaticFieldLeak")
lateinit var coreContext: CoreContext lateinit var coreContext: CoreContext
fun ensureCoreExists(context: Context, pushReceived: Boolean = false) { fun ensureCoreExists(context: Context, pushReceived: Boolean = false) {

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/menu_pressed_background_color" />
<item
android:drawable="@drawable/menu_background_color" />
</selector>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="?attr/backgroundColor"/>
<size
android:width="@dimen/chat_message_popup_width"
android:height="@dimen/chat_message_popup_item_height" />
</shape>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="?attr/dividerColor"/>
<size
android:width="@dimen/chat_message_popup_width"
android:height="@dimen/chat_message_popup_item_height" />
</shape>

View file

@ -117,7 +117,7 @@
android:visibility="@{viewModel.sharingPending ? View.VISIBLE : View.GONE, default=gone}" android:visibility="@{viewModel.sharingPending ? View.VISIBLE : View.GONE, default=gone}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/backgroundContastColor" android:background="?attr/backgroundContrastColor"
android:textColor="?attr/secondaryTextColor" android:textColor="?attr/secondaryTextColor"
android:padding="10dp" android:padding="10dp"
android:text="@string/chat_room_choose_conversation_for_file_sharing" /> android:text="@string/chat_room_choose_conversation_for_file_sharing" />
@ -126,7 +126,7 @@
android:visibility="@{viewModel.forwardPending ? View.VISIBLE : View.GONE, default=gone}" android:visibility="@{viewModel.forwardPending ? View.VISIBLE : View.GONE, default=gone}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/backgroundContastColor" android:background="?attr/backgroundContrastColor"
android:textColor="?attr/secondaryTextColor" android:textColor="?attr/secondaryTextColor"
android:padding="10dp" android:padding="10dp"
android:text="@string/chat_room_choose_conversation_for_message_forward" /> android:text="@string/chat_room_choose_conversation_for_message_forward" />

View file

@ -44,6 +44,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/chat_message_popup_item_height" android:layout_height="@dimen/chat_message_popup_item_height"
android:background="@drawable/menu_background"
android:visibility="@{resendHidden ? View.GONE : View.VISIBLE}" android:visibility="@{resendHidden ? View.GONE : View.VISIBLE}"
android:onClick="@{resendClickListener}" android:onClick="@{resendClickListener}"
android:drawableRight="@drawable/chat_send_message" android:drawableRight="@drawable/chat_send_message"
@ -53,6 +54,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/chat_message_popup_item_height" android:layout_height="@dimen/chat_message_popup_item_height"
android:background="@drawable/menu_background"
android:visibility="@{copyTextHidden ? View.GONE : View.VISIBLE}" android:visibility="@{copyTextHidden ? View.GONE : View.VISIBLE}"
android:onClick="@{copyTextClickListener}" android:onClick="@{copyTextClickListener}"
android:drawableRight="@drawable/menu_copy_text" android:drawableRight="@drawable/menu_copy_text"
@ -62,6 +64,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/chat_message_popup_item_height" android:layout_height="@dimen/chat_message_popup_item_height"
android:background="@drawable/menu_background"
android:onClick="@{forwardClickListener}" android:onClick="@{forwardClickListener}"
android:drawableRight="@drawable/menu_forward" android:drawableRight="@drawable/menu_forward"
style="@style/popup_item_font" style="@style/popup_item_font"
@ -70,6 +73,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/chat_message_popup_item_height" android:layout_height="@dimen/chat_message_popup_item_height"
android:background="@drawable/menu_background"
android:visibility="@{imdnHidden ? View.GONE : View.VISIBLE}" android:visibility="@{imdnHidden ? View.GONE : View.VISIBLE}"
android:onClick="@{imdnClickListener}" android:onClick="@{imdnClickListener}"
android:drawableRight="@drawable/menu_imdn_info" android:drawableRight="@drawable/menu_imdn_info"
@ -79,6 +83,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/chat_message_popup_item_height" android:layout_height="@dimen/chat_message_popup_item_height"
android:background="@drawable/menu_background"
android:visibility="@{addToContactsHidden ? View.GONE : View.VISIBLE}" android:visibility="@{addToContactsHidden ? View.GONE : View.VISIBLE}"
android:onClick="@{addToContactsClickListener}" android:onClick="@{addToContactsClickListener}"
android:drawableRight="@drawable/menu_add_contact" android:drawableRight="@drawable/menu_add_contact"
@ -88,6 +93,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/chat_message_popup_item_height" android:layout_height="@dimen/chat_message_popup_item_height"
android:background="@drawable/menu_background"
android:onClick="@{deleteClickListener}" android:onClick="@{deleteClickListener}"
android:drawableRight="@drawable/menu_delete" android:drawableRight="@drawable/menu_delete"
style="@style/popup_item_font" style="@style/popup_item_font"

View file

@ -146,6 +146,7 @@
android:padding="10dp" android:padding="10dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:src="@drawable/forward_message_default" android:src="@drawable/forward_message_default"
android:contentDescription="@string/content_description_forward_message"
android:background="@drawable/background_round_secondary_color" /> android:background="@drawable/background_round_secondary_color" />
</LinearLayout> </LinearLayout>

View file

@ -106,7 +106,7 @@
android:visibility="@{viewModel.sharingPending ? View.VISIBLE : View.GONE, default=gone}" android:visibility="@{viewModel.sharingPending ? View.VISIBLE : View.GONE, default=gone}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/backgroundContastColor" android:background="?attr/backgroundContrastColor"
android:textColor="?attr/secondaryTextColor" android:textColor="?attr/secondaryTextColor"
android:padding="10dp" android:padding="10dp"
android:text="@string/chat_room_choose_conversation_for_file_sharing" /> android:text="@string/chat_room_choose_conversation_for_file_sharing" />
@ -115,7 +115,7 @@
android:visibility="@{viewModel.forwardPending ? View.VISIBLE : View.GONE, default=gone}" android:visibility="@{viewModel.forwardPending ? View.VISIBLE : View.GONE, default=gone}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/backgroundContastColor" android:background="?attr/backgroundContrastColor"
android:textColor="?attr/secondaryTextColor" android:textColor="?attr/secondaryTextColor"
android:padding="10dp" android:padding="10dp"
android:text="@string/chat_room_choose_conversation_for_message_forward" /> android:text="@string/chat_room_choose_conversation_for_message_forward" />

View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [ <!DOCTYPE resources [
<!ENTITY appName "Linphone"> <!ENTITY appName "Linphone">
]> ]>
<resources> <resources>
<string name="service_name">&appName; Servicio</string> <string name="service_name">&appName; Servicio</string>
<string name="service_auto_start_description">&appName; se ha iniciado automáticamente</string> <string name="service_auto_start_description">&appName; se ha iniciado automáticamente</string>

View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [ <!DOCTYPE resources [
<!ENTITY appName "Linphone"> <!ENTITY appName "Linphone">
]> ]>
<resources> <resources>
<string name="call_stats_video">Vidéo</string> <string name="call_stats_video">Vidéo</string>
<string name="assistant_remote_provisioning_failure">Erreur durant le téléchargement ou l\'application de la configuration distante…</string> <string name="assistant_remote_provisioning_failure">Erreur durant le téléchargement ou l\'application de la configuration distante…</string>

View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [ <!DOCTYPE resources [
<!ENTITY appName "Linphone"> <!ENTITY appName "Linphone">
]> ]>
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<string name="logs_upload_failure">Nem sikerült feltölteni a naplókat!</string> <string name="logs_upload_failure">Nem sikerült feltölteni a naplókat!</string>
<string name="logs_reset_complete">A naplók törlésre kerültek</string> <string name="logs_reset_complete">A naplók törlésre kerültek</string>
@ -595,4 +597,9 @@
<string name="call_settings_redirect_to_voice_mail_declined_calls_title">Az elutasított hívások átirányítása a hangposta URI-ra</string> <string name="call_settings_redirect_to_voice_mail_declined_calls_title">Az elutasított hívások átirányítása a hangposta URI-ra</string>
<string name="content_description_show_call_details">Ugrás a hívás részleteire</string> <string name="content_description_show_call_details">Ugrás a hívás részleteire</string>
<string name="content_description_unselect_all">A lista összes elemének kijelölése megszüntetése</string> <string name="content_description_unselect_all">A lista összes elemének kijelölése megszüntetése</string>
<string name="call_settings_pause_calls_lost_audio_focus_title">Hívás szüneteltetése, ha a hang bemenet vagy kimenet megszűnése esetén</string>
<string name="content_description_cancel_sharing">Megosztás leállítása</string>
<string name="chat_room_choose_conversation_for_message_forward">Beszélgetés kiválasztása vagy új létrehozása</string>
<string name="chat_room_choose_conversation_for_file_sharing">Beszélgetés kiválasztása vagy új létrehozása</string>
<string name="content_description_cancel_forward">Az üzenet továbbításának visszavonása</string>
</resources> </resources>

View file

@ -28,7 +28,7 @@
<item name="backgroundColor">@color/dark_grey_color</item> <item name="backgroundColor">@color/dark_grey_color</item>
<item name="backgroundColor2">@color/grey_color</item> <item name="backgroundColor2">@color/grey_color</item>
<item name="backgroundContastColor">@color/white_color</item> <item name="backgroundContrastColor">@color/white_color</item>
<item name="dividerColor">@color/light_grey_color</item> <item name="dividerColor">@color/light_grey_color</item>
<item name="drawableTintColor">@color/white_color</item> <item name="drawableTintColor">@color/white_color</item>

View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [ <!DOCTYPE resources [
<!ENTITY appName "Linphone"> <!ENTITY appName "Linphone">
]> ]>
<resources> <resources>
<string name="transport">传输</string> <string name="transport">传输</string>
<string name="transport_udp">UDP 用户数据报协议</string> <string name="transport_udp">UDP 用户数据报协议</string>

View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [ <!DOCTYPE resources [
<!ENTITY appName "Linphone"> <!ENTITY appName "Linphone">
]> ]>
<resources> <resources>
<string name="service_name">&appName;服務</string> <string name="service_name">&appName;服務</string>
<string name="service_description">若要在後台可接聽電話,這是必選項</string> <string name="service_description">若要在後台可接聽電話,這是必選項</string>

View file

@ -13,7 +13,7 @@
<attr name="backgroundColor" format="color"/> <attr name="backgroundColor" format="color"/>
<attr name="backgroundColor2" format="color"/> <attr name="backgroundColor2" format="color"/>
<attr name="backgroundContastColor" format="color"/> <attr name="backgroundContrastColor" format="color"/>
<attr name="dividerColor" format="color"/> <attr name="dividerColor" format="color"/>
<attr name="drawableTintColor" format="color"/> <attr name="drawableTintColor" format="color"/>

View file

@ -620,6 +620,7 @@
<string name="content_description_downloaded_file_transfer">Attached file</string> <string name="content_description_downloaded_file_transfer">Attached file</string>
<string name="content_description_delivery_status">Message delivery status</string> <string name="content_description_delivery_status">Message delivery status</string>
<string name="content_description_forwarded_message">Message has been forwarded</string> <string name="content_description_forwarded_message">Message has been forwarded</string>
<string name="content_description_forward_message">Forward message in this conversation</string>
<string name="content_description_ephemeral_message">Message is ephemeral</string> <string name="content_description_ephemeral_message">Message is ephemeral</string>
<string name="content_description_linphone_user">Contact is a &appName; user</string> <string name="content_description_linphone_user">Contact is a &appName; user</string>
<string name="content_description_contact_selected">Contact is selected</string> <string name="content_description_contact_selected">Contact is selected</string>

View file

@ -29,7 +29,7 @@
<item name="backgroundColor">@color/white_color</item> <item name="backgroundColor">@color/white_color</item>
<item name="backgroundColor2">@color/header_background_color</item> <item name="backgroundColor2">@color/header_background_color</item>
<item name="backgroundContastColor">@color/dark_grey_color</item> <item name="backgroundContrastColor">@color/dark_grey_color</item>
<item name="dividerColor">@color/light_grey_color</item> <item name="dividerColor">@color/light_grey_color</item>
<item name="drawableTintColor">@color/dark_grey_color</item> <item name="drawableTintColor">@color/dark_grey_color</item>