aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/activity_change_password.xml4
-rw-r--r--src/main/res/layout/activity_edit_account.xml7
-rw-r--r--src/main/res/menu/block.xml3
-rw-r--r--src/main/res/values-de/strings.xml1
-rw-r--r--src/main/res/values-fil/strings.xml2
-rw-r--r--src/main/res/values-ru/strings.xml1
-rw-r--r--src/main/res/values/attrs.xml1
-rw-r--r--src/main/res/values/defaults.xml1
-rw-r--r--src/main/res/values/strings.xml4
-rw-r--r--src/main/res/values/themes.xml2
10 files changed, 17 insertions, 9 deletions
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 6bd7f2d0d..4ff57e22b 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -39,7 +39,7 @@
app:passwordToggleEnabled="true"
app:passwordToggleTint="?android:textColorSecondary">
- <android.support.design.widget.TextInputEditText
+ <de.pixart.messenger.ui.widget.TextInputEditText.widget.TextInputEditText
android:id="@+id/current_password"
style="@style/Widget.Conversations.EditText"
android:layout_width="match_parent"
@@ -59,7 +59,7 @@
app:passwordToggleEnabled="true"
app:passwordToggleTint="?android:textColorSecondary">
- <android.support.design.widget.TextInputEditText
+ <de.pixart.messenger.ui.widget.TextInputEditText
android:id="@+id/new_password"
style="@style/Widget.Conversations.EditText"
android:layout_width="match_parent"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 0742955d3..011f89e5b 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -78,7 +78,7 @@
android:layout_height="wrap_content"
android:imeOptions="actionNext"
android:inputType="textEmailAddress"
- android:textColor="?attr/text_Color_Main" />
+ android:textColor="?attr/edit_text_color" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
@@ -91,13 +91,14 @@
app:passwordToggleEnabled="true"
app:passwordToggleTint="?android:textColorSecondary">
- <android.support.design.widget.TextInputEditText
+ <de.pixart.messenger.ui.widget.TextInputEditText
android:id="@+id/account_password"
style="@style/Widget.Conversations.EditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/password"
- android:inputType="textPassword" />
+ android:inputType="textPassword"
+ android:textColor="?attr/edit_text_color" />
</android.support.design.widget.TextInputLayout>
<LinearLayout
diff --git a/src/main/res/menu/block.xml b/src/main/res/menu/block.xml
index 1256f7142..0a86ef124 100644
--- a/src/main/res/menu/block.xml
+++ b/src/main/res/menu/block.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
+ android:id="@+id/reject"
+ android:title="@string/reject_request" />
+ <item
android:id="@+id/block_domain"
android:title="@string/block_entire_domain" />
<item
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index e871df164..d29077753 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -836,7 +836,6 @@
<string name="remote_server_timeout">Timeout des Remote-Servers</string>
<string name="already_drafting_message">Du bist bereits dabei, eine Nachricht zu entwerfen.</string>
<string name="bad_key_for_encryption">Ungültiger Schlüssel für die Verschlüsselung.</string>
- <string name="server_info_available_with">ja, %s</string>
<string name="delete_message_dialog">Nachricht löschen</string>
<string name="delete_message_dialog_msg">Bist du sicher, dass du diese Nachricht löschen möchtest?\n\n<b>Achtung:</b> Dies wird keine Kopien dieser Nachricht löschen, die auf anderen Geräten oder Servern gespeichert sind.</string>
<string name="feature_not_implemented">Funktion ist nicht implementiert</string>
diff --git a/src/main/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml
index 449701f22..691e6fcf2 100644
--- a/src/main/res/values-fil/strings.xml
+++ b/src/main/res/values-fil/strings.xml
@@ -168,7 +168,7 @@
<string name="passwords_do_not_match">Ang password ay hindi magkatugma</string>
<string name="invalid_jid">Hindi ito balido na Jabber-ID</string>
<string name="error_out_of_memory">Wala ng memorya. Ang imahe ay napakalaki</string>
- <string name="add_phone_book_text">Gusto mo bang magdagdag sa iyong address book?</string>
+ <string name="add_phone_book_text">Gusto mo bang magdagdag %s sa iyong address book?</string>
<string name="server_info_show_more">Impormasyon sa server</string>
<string name="server_info_mam">XEP-0313: MAM</string>
<string name="server_info_carbon_messages">XEP-0280: Mensagheng karbon</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 196ae0d5d..f4703e8bb 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -326,5 +326,4 @@
<string name="delete_file_dialog">Удалить файл</string>
<string name="cancelled">отменён</string>
<string name="bad_key_for_encryption">Неправильный ключ для шифрования.</string>
- <string name="server_info_available_with">да, %s</string>
</resources>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index c537fd248..8c824c7a6 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -20,6 +20,7 @@
<attr name="color_background_tertiary" format="reference|color" />
<attr name="color_background_secondary" format="reference|color" />
<attr name="color_background_primary" format="reference|color" />
+ <attr name="edit_text_color" format="reference|color" />
<attr name="color_warning" format="reference|color" />
<attr name="EmojiColor" format="reference|color" />
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 7c0072f86..e8ef0805e 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -52,6 +52,7 @@
\n\nhttp://leafletjs.com/\n(BSD 2-Clause)
\n\nhttps://www.openstreetmap.org/\n(Open Database License)
\n\nhttp://xmpp.rocks/\n(The MIT License (MIT))
+ \n\nhttps://github.com/drakeet/ToastCompat/\n(Apache License, Version 2.0)
</string>
<string name="default_resource" translatable="false">Phone</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0fd36d8b1..8e8d26713 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -836,9 +836,11 @@
<string name="remote_server_timeout">Remote server timeout</string>
<string name="already_drafting_message">You are already drafting a message.</string>
<string name="bad_key_for_encryption">Bad key for encryption.</string>
- <string name="server_info_available_with">yes, %s</string>
<string name="delete_message_dialog">Delete message</string>
<string name="delete_message_dialog_msg">Are you sure you want to delete this message?\n\n<b>Warning:</b> This will not delete copies of this message that are stored on other devices or servers.</string>
<string name="feature_not_implemented">Feature not implemented</string>
+ <string name="device_does_not_support_unknown_source_op">Your device does not support allowing app installs from unknon sources.</string>
+ <string name="reject_request">Reject request</string>
+ <string name="error_message_copied_to_clipboard">Copied error message to clipboard</string>
</resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 342ed8aa1..c10f8bffd 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -16,6 +16,7 @@
<item name="color_warning">@color/red700</item>
<item name="TextColorOnline">@color/green500</item>
<item name="TextColorError">@color/red800</item>
+ <item name="edit_text_color">@color/black87</item>
<item name="activity_background_search">@drawable/search_background_light</item>
<item name="activity_background_no_results">@drawable/no_results_background_light</item>
@@ -170,6 +171,7 @@
<item name="color_warning">@color/red700</item>
<item name="TextColorOnline">@color/green500</item>
<item name="TextColorError">@color/red500</item>
+ <item name="edit_text_color">@color/white</item>
<item name="activity_background_search">@drawable/search_background_dark</item>
<item name="activity_background_no_results">@drawable/no_results_background_dark</item>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-12 23:11:01 +0000