From 2d7616e25024755a16e75ad4e781156c710ab342 Mon Sep 17 00:00:00 2001
From: xynngh <xynngh@protonmail.com>
Date: Sat, 26 Sep 2020 22:18:18 +0400
Subject: [PATCH] Add info icon in blacklist editor

---
 app/src/main/res/drawable/ic_info_24dp.xml    |  9 +++++++
 .../layout/activity_edit_blacklist_item.xml   | 26 +++++++++++++++----
 app/src/main/res/values-ru/strings.xml        |  3 ++-
 app/src/main/res/values/strings.xml           |  3 ++-
 4 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_info_24dp.xml

diff --git a/app/src/main/res/drawable/ic_info_24dp.xml b/app/src/main/res/drawable/ic_info_24dp.xml
new file mode 100644
index 0000000..7c40797
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_edit_blacklist_item.xml b/app/src/main/res/layout/activity_edit_blacklist_item.xml
index 995586d..8796b0c 100644
--- a/app/src/main/res/layout/activity_edit_blacklist_item.xml
+++ b/app/src/main/res/layout/activity_edit_blacklist_item.xml
@@ -55,13 +55,29 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             tools:text="3 calls, last: Aug 01, 2020 10:10" />
 
-        <TextView
-            android:id="@+id/contactsNotBlockedNotice"
-            android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/item_padding"
-            android:text="@string/contacts_are_not_blocked_blacklist_notice"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:orientation="horizontal">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:layout_marginTop="3dp"
+                android:layout_marginRight="6dp"
+                android:contentDescription="@string/info_icon_description"
+                android:src="@drawable/ic_info_24dp"
+                android:tint="@android:color/tab_indicator_text" />
+
+            <TextView
+                android:id="@+id/contactsNotBlockedNotice"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/contacts_are_not_blocked_blacklist_notice"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+        </LinearLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 431df7e..d7c0677 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -145,7 +145,8 @@
     <string name="number_pattern_incorrect">Некорректный шаблон</string>
     <string name="number_pattern_empty">Пустой шаблон</string>
     <string name="number_pattern_hint">Введите номер в формате +СТРАНА-НОМЕР (как Android показал бы в списке вызовов). Используйте \"*\" как подстановку для нуля и более цифр и \"#\" для одной цифры.</string>
-    <string name="contacts_are_not_blocked_blacklist_notice">Звонки от контактов никогда не блокируются (даже если номер совпадает с шаблоном из чёрного списка)</string>
+    <string name="info_icon_description">Инфо</string>
+    <string name="contacts_are_not_blocked_blacklist_notice">Звонки от контактов никогда не блокируются (даже при совпадении с шаблоном)</string>
     <string name="contacts_are_not_blocked_not_enabled">Звонки от контактов могут быть заблокированы, т.к. опция "Доступ к контактам" не включена!</string>
     <string name="contacts_are_not_blocked_no_permission">Звонки от контактов могут быть заблокированы, т.к. разрешение на доступ к контактам не предоставлено!</string>
     <string name="info_in_blacklist">В чёрном списке</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d221bab..20e61fb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -162,7 +162,8 @@
     <string name="number_pattern_incorrect">Incorrect pattern</string>
     <string name="number_pattern_empty">Empty pattern</string>
     <string name="number_pattern_hint">Enter the number in +COUNTRY-NUMBER format (as Android would show in your dialer). Use \"*\" as a wildcard for zero or more digits, and \"#\" for exactly one digit.</string>
-    <string name="contacts_are_not_blocked_blacklist_notice">Calls from contacts are never blocked (even if the number matches the blacklist pattern)</string>
+    <string name="info_icon_description">Info</string>
+    <string name="contacts_are_not_blocked_blacklist_notice">Calls from contacts are never blocked (even on pattern match)</string>
     <string name="contacts_are_not_blocked_not_enabled">Calls from contacts may be blocked because the \"Use contacts\" option is not enabled!</string>
     <string name="contacts_are_not_blocked_no_permission">Calls from contacts may be blocked because the \"Contacts\" permission is not granted!</string>
     <string name="info_in_blacklist">In blacklist</string>