Fixes #126 – only initial and color in chat list if avatars are off

app/src/main/java/de/kuschku/quasseldroid/util/avatars/AvatarHelper.kt

@@ -39,13 +39,13 @@ object AvatarHelper {
                      avatarUrl: String?, size: Int?) =
     listOfNotNull(
       avatarUrl.notBlank()?.let { listOf(Avatar.NativeAvatar(it)) },
-      settings.showIRCCloudAvatars.letIf {
+      (settings.showAvatars && settings.showIRCCloudAvatars).letIf {
         ircCloudFallback(ident, size)
       },
-      settings.showGravatarAvatars.letIf {
+      (settings.showAvatars && settings.showGravatarAvatars).letIf {
         gravatarFallback(realName, size)
       },
-      settings.showMatrixAvatars.letIf {
+      (settings.showAvatars && settings.showMatrixAvatars).letIf {
         matrixFallback(realName, size)
       }
     ).flatten()

app/src/main/res/xml/preferences.xml

@@ -156,16 +156,16 @@
       android:key="@string/preference_show_prefix_key"
       android:title="@string/preference_show_prefix_title" />
 
-    <SwitchPreference
-      android:defaultValue="true"
-      android:key="@string/preference_show_avatars_key"
-      android:title="@string/preference_show_avatars_title" />
-
     <SwitchPreference
       android:defaultValue="false"
       android:key="@string/preference_square_avatars_key"
       android:title="@string/preference_square_avatars_title" />
 
+    <SwitchPreference
+      android:defaultValue="true"
+      android:key="@string/preference_show_avatars_key"
+      android:title="@string/preference_show_avatars_title" />
+
     <SwitchPreference
       android:defaultValue="false"
       android:dependency="@string/preference_show_avatars_key"