diff --git a/app/src/main/java/org/linphone/LinphoneApplication.kt b/app/src/main/java/org/linphone/LinphoneApplication.kt index 187a374a0..5c66f727f 100644 --- a/app/src/main/java/org/linphone/LinphoneApplication.kt +++ b/app/src/main/java/org/linphone/LinphoneApplication.kt @@ -19,6 +19,7 @@ */ package org.linphone +import android.annotation.SuppressLint import android.app.Application import android.content.Context import org.linphone.core.CoreContext @@ -29,7 +30,9 @@ import org.linphone.core.tools.Log class LinphoneApplication : Application() { companion object { + @SuppressLint("StaticFieldLeak") lateinit var corePreferences: CorePreferences + @SuppressLint("StaticFieldLeak") lateinit var coreContext: CoreContext fun ensureCoreExists(context: Context, pushReceived: Boolean = false) { diff --git a/app/src/main/res/drawable/menu_background.xml b/app/src/main/res/drawable/menu_background.xml new file mode 100644 index 000000000..414e4d2eb --- /dev/null +++ b/app/src/main/res/drawable/menu_background.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/menu_background_color.xml b/app/src/main/res/drawable/menu_background_color.xml new file mode 100644 index 000000000..b0f1a4a64 --- /dev/null +++ b/app/src/main/res/drawable/menu_background_color.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/app/src/main/res/drawable/menu_pressed_background_color.xml b/app/src/main/res/drawable/menu_pressed_background_color.xml new file mode 100644 index 000000000..ae56471dd --- /dev/null +++ b/app/src/main/res/drawable/menu_pressed_background_color.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml b/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml index 7d2ea0a6f..164ca8105 100644 --- a/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml +++ b/app/src/main/res/layout-sw533dp/chat_room_master_fragment.xml @@ -117,7 +117,7 @@ android:visibility="@{viewModel.sharingPending ? View.VISIBLE : View.GONE, default=gone}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/backgroundContastColor" + android:background="?attr/backgroundContrastColor" android:textColor="?attr/secondaryTextColor" android:padding="10dp" 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:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/backgroundContastColor" + android:background="?attr/backgroundContrastColor" android:textColor="?attr/secondaryTextColor" android:padding="10dp" android:text="@string/chat_room_choose_conversation_for_message_forward" /> diff --git a/app/src/main/res/layout/chat_message_long_press_menu.xml b/app/src/main/res/layout/chat_message_long_press_menu.xml index a9e92b56a..910e33459 100644 --- a/app/src/main/res/layout/chat_message_long_press_menu.xml +++ b/app/src/main/res/layout/chat_message_long_press_menu.xml @@ -44,6 +44,7 @@ diff --git a/app/src/main/res/layout/chat_room_master_fragment.xml b/app/src/main/res/layout/chat_room_master_fragment.xml index d2a1d9e73..e87c9ba57 100644 --- a/app/src/main/res/layout/chat_room_master_fragment.xml +++ b/app/src/main/res/layout/chat_room_master_fragment.xml @@ -106,7 +106,7 @@ android:visibility="@{viewModel.sharingPending ? View.VISIBLE : View.GONE, default=gone}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/backgroundContastColor" + android:background="?attr/backgroundContrastColor" android:textColor="?attr/secondaryTextColor" android:padding="10dp" 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:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/backgroundContastColor" + android:background="?attr/backgroundContrastColor" android:textColor="?attr/secondaryTextColor" android:padding="10dp" android:text="@string/chat_room_choose_conversation_for_message_forward" /> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e5ff31cd6..274fb3773 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,7 +1,9 @@ + + ]> + &appName; Servicio &appName; se ha iniciado automáticamente @@ -560,4 +562,4 @@ Restablecer registros Nombre de la pantalla Nombre de usuario - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 025b2baed..07162df63 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,7 +1,9 @@ + + ]> + Vidéo Erreur durant le téléchargement ou l\'application de la configuration distante… @@ -600,4 +602,4 @@ Annuler le partage Sélectionnez une conversation ou créez-en une nouvelle Sélectionnez une conversation ou créez-en une nouvelle - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index adba52333..772eaf7f6 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1,7 +1,9 @@ + + ]> + Nem sikerült feltölteni a naplókat! A naplók törlésre kerültek @@ -595,4 +597,9 @@ Az elutasított hívások átirányítása a hangposta URI-ra Ugrás a hívás részleteire A lista összes elemének kijelölése megszüntetése - \ No newline at end of file + Hívás szüneteltetése, ha a hang bemenet vagy kimenet megszűnése esetén + Megosztás leállítása + Beszélgetés kiválasztása vagy új létrehozása + Beszélgetés kiválasztása vagy új létrehozása + Az üzenet továbbításának visszavonása + diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 49cce9b18..6933329f9 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -28,7 +28,7 @@ @color/dark_grey_color @color/grey_color - @color/white_color + @color/white_color @color/light_grey_color @color/white_color diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4c03ddbf1..e69652bc6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2,7 +2,7 @@ - ]> +]> &appName; is automatisch gestart @@ -133,4 +133,4 @@ Inkomende oproep Uitgaande oproep Versleuteld - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 471046739..9be7dbf40 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,7 +1,9 @@ + + ]> + 传输 UDP 用户数据报协议 @@ -566,4 +568,4 @@ 重启日志 显示名 用户名 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index fde6defa7..e4979f265 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,7 +1,9 @@ + + ]> + &appName;服務 若要在後台可接聽電話,這是必選項 @@ -555,4 +557,4 @@ 視頻附件 顯示名 用戶名 - \ No newline at end of file + diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index fd3beb608..550a79b69 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -13,7 +13,7 @@ - + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 89b108822..e7a10675a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -620,6 +620,7 @@ Attached file Message delivery status Message has been forwarded + Forward message in this conversation Message is ephemeral Contact is a &appName; user Contact is selected diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index efe8a63b0..7fcde243d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -29,7 +29,7 @@ @color/white_color @color/header_background_color - @color/dark_grey_color + @color/dark_grey_color @color/light_grey_color @color/dark_grey_color