From 0a86ce285683692fd6fc1d3d4151ee563fdb4460 Mon Sep 17 00:00:00 2001
From: Nikola Trubitsyn <nikola.trubitsyn@gmail.com>
Date: Sat, 27 Jan 2018 23:58:49 +0300
Subject: [PATCH 1/4] Add an option to show/hide contact thumbnails

---
 .../contacts/activities/MainActivity.kt       |  7 ++++++
 .../contacts/activities/SettingsActivity.kt   |  9 ++++++++
 .../contacts/adapters/ContactsAdapter.kt      | 22 ++++++++++++-------
 .../contacts/helpers/Config.kt                |  4 ++++
 .../contacts/helpers/Constants.kt             |  1 +
 app/src/main/res/layout/activity_settings.xml | 20 +++++++++++++++++
 6 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
index 730f4324..1ee745cb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
@@ -42,6 +42,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
     private var storedTextColor = 0
     private var storedBackgroundColor = 0
     private var storedPrimaryColor = 0
+    private var storedShowContactThumbnails = false
     private var storedShowPhoneNumbers = false
     private var storedStartNameWithSurname = false
 
@@ -76,6 +77,11 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
             return
         }
 
+        if (storedShowContactThumbnails != config.showContactThumbnails) {
+            restartActivity()
+            return
+        }
+
         if (storedShowPhoneNumbers != config.showPhoneNumbers) {
             restartActivity()
             return
@@ -154,6 +160,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
             storedTextColor = textColor
             storedBackgroundColor = backgroundColor
             storedPrimaryColor = primaryColor
+            storedShowContactThumbnails = showContactThumbnails
             storedShowPhoneNumbers = showPhoneNumbers
             storedStartNameWithSurname = startNameWithSurname
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt
index d8160ba2..23b3bc80 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt
@@ -21,6 +21,7 @@ class SettingsActivity : SimpleActivity() {
         setupCustomizeColors()
         setupUseEnglish()
         setupShowInfoBubble()
+        setupShowContactThumbnails()
         setupShowPhoneNumbers()
         setupCallContactOnClick()
         setupStartNameWithSurname()
@@ -51,6 +52,14 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
+    private fun setupShowContactThumbnails() {
+        settings_show_contact_thumbnails.isChecked = config.showContactThumbnails
+        settings_show_contact_thumbnails_holder.setOnClickListener {
+            settings_show_contact_thumbnails.toggle()
+            config.showContactThumbnails = settings_show_contact_thumbnails.isChecked
+        }
+    }
+
     private fun setupShowPhoneNumbers() {
         settings_show_phone_numbers.isChecked = config.showPhoneNumbers
         settings_show_phone_numbers_holder.setOnClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
index 5f176f22..61fa1083 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
@@ -33,10 +33,12 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
     lateinit private var contactDrawable: Drawable
     var config = activity.config
     var startNameWithSurname: Boolean
+    var showContactThumbnails: Boolean
     var showPhoneNumbers: Boolean
 
     init {
         initDrawables()
+        showContactThumbnails = config.showContactThumbnails
         showPhoneNumbers = config.showPhoneNumbers
         startNameWithSurname = config.startNameWithSurname
     }
@@ -190,16 +192,20 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
             contact_number?.text = contact.phoneNumbers.firstOrNull()?.value ?: ""
             contact_number?.setTextColor(textColor)
 
-            if (contact.photoUri.isNotEmpty()) {
-                val options = RequestOptions()
-                        .signature(ObjectKey(contact.photoUri))
-                        .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
-                        .error(contactDrawable)
-                        .centerCrop()
+            if (showContactThumbnails) {
+                if (contact.photoUri.isNotEmpty()) {
+                    val options = RequestOptions()
+                            .signature(ObjectKey(contact.photoUri))
+                            .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+                            .error(contactDrawable)
+                            .centerCrop()
 
-                Glide.with(activity).load(contact.photoUri).transition(DrawableTransitionOptions.withCrossFade()).apply(options).into(contact_tmb)
+                    Glide.with(activity).load(contact.photoUri).transition(DrawableTransitionOptions.withCrossFade()).apply(options).into(contact_tmb)
+                } else {
+                    contact_tmb.setImageDrawable(contactDrawable)
+                }
             } else {
-                contact_tmb.setImageDrawable(contactDrawable)
+                contact_tmb.visibility = View.GONE
             }
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Config.kt
index 25628b1c..77b8ca32 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Config.kt
@@ -24,6 +24,10 @@ class Config(context: Context) : BaseConfig(context) {
 
     fun showAllContacts() = displayContactSources.size == 1 && displayContactSources.first() == "-1"
 
+    var showContactThumbnails : Boolean
+        get() = prefs.getBoolean(SHOW_CONTACT_THUMBNAILS, true)
+        set(showContactThumbnails) = prefs.edit().putBoolean(SHOW_CONTACT_THUMBNAILS, showContactThumbnails).apply()
+
     var showPhoneNumbers: Boolean
         get() = prefs.getBoolean(SHOW_PHONE_NUMBERS, false)
         set(showPhoneNumbers) = prefs.edit().putBoolean(SHOW_PHONE_NUMBERS, showPhoneNumbers).apply()
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt
index bd29cb23..755bfa8e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt
@@ -4,6 +4,7 @@ import android.provider.ContactsContract.CommonDataKinds
 
 // shared prefs
 val CALL_CONTACT_ON_CLICK = "call_contact_on_click"
+val SHOW_CONTACT_THUMBNAILS = "show_contact_thumbnails"
 val SHOW_PHONE_NUMBERS = "show_phone_numbers"
 val DISPLAY_CONTACT_SOURCES = "display_contact_sources"
 val START_NAME_WITH_SURNAME = "start_name_with_surname"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 19759769..6defb454 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -70,6 +70,26 @@
 
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/settings_show_contact_thumbnails_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:padding="@dimen/activity_margin">
+
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_show_contact_thumbnails"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
+                android:text="@string/show_contact_avatars"/>
+
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/settings_show_phone_numbers_holder"
             android:layout_width="match_parent"

From 3f83b80a98a74a60721e9a2841829e5370fa6f32 Mon Sep 17 00:00:00 2001
From: Nikola Trubitsyn <nikola.trubitsyn@gmail.com>
Date: Sun, 28 Jan 2018 00:23:05 +0300
Subject: [PATCH 2/4] Use "thumbnails" instead of "avatars" in strings

---
 app/src/main/res/layout/activity_settings.xml | 2 +-
 app/src/main/res/values-de/strings.xml        | 2 +-
 app/src/main/res/values-ko-rKR/strings.xml    | 2 +-
 app/src/main/res/values-pt/strings.xml        | 2 +-
 app/src/main/res/values-ru/strings.xml        | 2 +-
 app/src/main/res/values-sk/strings.xml        | 2 +-
 app/src/main/res/values-sv/strings.xml        | 2 +-
 app/src/main/res/values/strings.xml           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 6defb454..c4415743 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -86,7 +86,7 @@
                 android:clickable="false"
                 android:paddingLeft="@dimen/medium_margin"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/show_contact_avatars"/>
+                android:text="@string/show_contact_thumbnails"/>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8809a0f8..2869c5d4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -23,7 +23,7 @@
     <string name="call_contact_on_click">Kontakt bei Klick anrufen</string>
     <string name="start_name_with_surname">Namen mit Nachnamen beginnen</string>
     <string name="show_phone_numbers">Zeige Telefonnummern im Hauptmenü</string>
-    <string name="show_contact_avatars">Show contact avatars</string>
+    <string name="show_contact_thumbnails">Show contact thumbnails</string>
 
     <!-- Emails -->
     <string name="email">Email</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index bde780d0..c59531a6 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -23,7 +23,7 @@
     <string name="call_contact_on_click">클릭으로 전화걸기</string>
     <string name="start_name_with_surname">성을 먼저 표시</string>
     <string name="show_phone_numbers">메인 스크린에 전화번호 표시</string>
-    <string name="show_contact_avatars">Show contact avatars</string>
+    <string name="show_contact_thumbnails">Show contact thumbnails</string>
 
     <!-- Emails -->
     <string name="email">이메일</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index e88a3341..a79e127a 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -23,7 +23,7 @@
     <string name="call_contact_on_click">Call contact on click</string>
     <string name="start_name_with_surname">Start name with surname</string>
     <string name="show_phone_numbers">Show phone numbers on the main screen</string>
-    <string name="show_contact_avatars">Show contact avatars</string>
+    <string name="show_contact_thumbnails">Show contact thumbnails</string>
 
     <!-- Emails -->
     <string name="email">E-mail</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9e6936ff..622e7d87 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -23,7 +23,7 @@
     <string name="call_contact_on_click">Вызывать контакт при нажатии</string>
     <string name="start_name_with_surname">Отображать сначала фамилии</string>
     <string name="show_phone_numbers">Отображать номера телефонов на главном экране</string>
-    <string name="show_contact_avatars">Show contact avatars</string>
+    <string name="show_contact_thumbnails">Show contact thumbnails</string>
 
     <!-- Emails -->
     <string name="email">Эл. почта</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 0d76b488..aa9203c8 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -23,7 +23,7 @@
     <string name="call_contact_on_click">Zavolať kontakt po kliknutí</string>
     <string name="start_name_with_surname">Začať meno priezviskom</string>
     <string name="show_phone_numbers">Zobraziť telefónne čísla na hlavnej obrazovke</string>
-    <string name="show_contact_avatars">Zobraziť obrázky kontaktov</string>
+    <string name="show_contact_thumbnails">Zobraziť obrázky kontaktov</string>
 
     <!-- Emails -->
     <string name="email">Email</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 1d4f9c6a..3a2dff9e 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -23,7 +23,7 @@
     <string name="call_contact_on_click">Ring kontakter när jag trycker på dem</string>
     <string name="start_name_with_surname">Visa efternamn först</string>
     <string name="show_phone_numbers">Visa telefonnummer i huvudvyn</string>
-    <string name="show_contact_avatars">Show contact avatars</string>
+    <string name="show_contact_thumbnails">Show contact thumbnails</string>
 
     <!-- Emails -->
     <string name="email">E-post</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4966b2d5..975e9b84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,7 +23,7 @@
     <string name="call_contact_on_click">Call contact on click</string>
     <string name="start_name_with_surname">Start name with surname</string>
     <string name="show_phone_numbers">Show phone numbers on the main screen</string>
-    <string name="show_contact_avatars">Show contact avatars</string>
+    <string name="show_contact_thumbnails">Show contact thumbnails</string>
 
     <!-- Emails -->
     <string name="email">Email</string>

From 978b72af3983a8ecfbec5296b8e5f21c6e4e194b Mon Sep 17 00:00:00 2001
From: Nikola Trubitsyn <nikola.trubitsyn@gmail.com>
Date: Sun, 28 Jan 2018 00:25:05 +0300
Subject: [PATCH 3/4] Use beVisibleIf on contact_tmb view

---
 .../simplemobiletools/contacts/adapters/ContactsAdapter.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
index 61fa1083..2d4d265c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
@@ -11,6 +11,7 @@ import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.signature.ObjectKey
 import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
+import com.simplemobiletools.commons.extensions.beVisibleIf
 import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
 import com.simplemobiletools.commons.extensions.isActivityDestroyed
 import com.simplemobiletools.commons.views.FastScroller
@@ -191,6 +192,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
             contact_name.setTextColor(textColor)
             contact_number?.text = contact.phoneNumbers.firstOrNull()?.value ?: ""
             contact_number?.setTextColor(textColor)
+            contact_tmb.beVisibleIf(showContactThumbnails)
 
             if (showContactThumbnails) {
                 if (contact.photoUri.isNotEmpty()) {
@@ -204,8 +206,6 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
                 } else {
                     contact_tmb.setImageDrawable(contactDrawable)
                 }
-            } else {
-                contact_tmb.visibility = View.GONE
             }
         }
     }

From 6d7eed64dc0da48ca59144621beaaa7f47b3cfa4 Mon Sep 17 00:00:00 2001
From: Nikola Trubitsyn <nikola.trubitsyn@gmail.com>
Date: Sun, 28 Jan 2018 15:16:20 +0300
Subject: [PATCH 4/4] Fix broken "show_contact_avatars" ru string resource

---
 app/src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3e8e8853..78dab7be 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -23,7 +23,7 @@
     <string name="call_contact_on_click">Вызывать контакт при нажатии</string>
     <string name="start_name_with_surname">Показывать сначала фамилию</string>
     <string name="show_phone_numbers">Показывать номера телефонов на главном экране</string>
-    <string name="show_contact_avatars">Показывать фото контакта</string>
+    <string name="show_contact_thumbnails">Показывать фото контакта</string>
 
     <!-- Emails -->
     <string name="email">Эл. почта</string>