Show folder type icon for non inboxes in unified inbox

app/src/main/java/eu/faircode/email/AdapterMessage.java

@@ -202,7 +202,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvFrom;
         private TextView tvSize;
         private TextView tvTime;
-        private ImageView ivDraft;
+        private ImageView ivType;
         private ImageView ivSnoozed;
         private ImageView ivBrowsed;
         private ImageView ivAnswered;
@@ -303,7 +303,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvFrom = itemView.findViewById(R.id.tvFrom);
             tvSize = itemView.findViewById(R.id.tvSize);
             tvTime = itemView.findViewById(R.id.tvTime);
-            ivDraft = itemView.findViewById(R.id.ivDraft);
+            ivType = itemView.findViewById(R.id.ivType);
             ivSnoozed = itemView.findViewById(R.id.ivSnoozed);
             ivBrowsed = itemView.findViewById(R.id.ivBrowsed);
             ivAnswered = itemView.findViewById(R.id.ivAnswered);
@@ -495,7 +495,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvFrom.setText(null);
             tvSize.setText(null);
             tvTime.setText(null);
-            ivDraft.setVisibility(View.GONE);
+            ivType.setVisibility(View.GONE);
             ivSnoozed.setVisibility(View.GONE);
             ivBrowsed.setVisibility(View.GONE);
             ivAnswered.setVisibility(View.GONE);
@@ -554,7 +554,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvFrom.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
                 tvSize.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
                 tvTime.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
-                ivDraft.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
+                ivType.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
                 ivSnoozed.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
                 ivBrowsed.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
                 ivAnswered.setAlpha(dim ? Helper.LOW_LIGHT : 1.0f);
@@ -613,7 +613,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvSubject.setText(message.subject);
 
             // Line 3
-            ivDraft.setVisibility(message.drafts > 0 ? View.VISIBLE : View.GONE);
+            ivType.setImageResource(message.drafts > 0
+                    ? R.drawable.baseline_edit_24 : EntityFolder.getIcon(message.folderType));
+            ivType.setVisibility(message.drafts > 0 ||
+                    (viewType == ViewType.UNIFIED && !EntityFolder.INBOX.equals(message.folderType))
+                    ? View.VISIBLE : View.GONE);
             ivSnoozed.setVisibility(message.ui_snoozed == null ? View.GONE : View.VISIBLE);
             ivBrowsed.setVisibility(message.ui_browsed ? View.VISIBLE : View.GONE);
             ivAnswered.setVisibility(message.ui_answered ? View.VISIBLE : View.GONE);

app/src/main/res/layout/item_folder.xml

@@ -66,7 +66,7 @@
             android:id="@+id/ivType"
             android:layout_width="30dp"
             android:layout_height="24dp"
-            android:contentDescription="@string/title_legend_folder_tye"
+            android:contentDescription="@string/title_legend_folder_type"
             android:paddingEnd="6dp"
             android:src="@drawable/baseline_inbox_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvType"

app/src/main/res/layout/item_folder_select.xml

@@ -35,7 +35,7 @@
             android:id="@+id/ivType"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:contentDescription="@string/title_legend_folder_tye"
+            android:contentDescription="@string/title_legend_folder_type"
             android:src="@drawable/baseline_inbox_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvName"
             app:layout_constraintStart_toEndOf="@+id/ivExpander"

app/src/main/res/layout/item_message_compact.xml

@@ -109,11 +109,11 @@
             app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
         <ImageView
-            android:id="@+id/ivDraft"
+            android:id="@+id/ivType"
             android:layout_width="21dp"
             android:layout_height="21dp"
             android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_draft"
+            android:contentDescription="@string/title_legend_folder_type"
             android:src="@drawable/baseline_edit_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
             app:layout_constraintStart_toEndOf="@id/paddingStart"
@@ -127,7 +127,7 @@
             android:contentDescription="@string/title_legend_snoozed"
             android:src="@drawable/baseline_timelapse_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
-            app:layout_constraintStart_toEndOf="@id/ivDraft"
+            app:layout_constraintStart_toEndOf="@id/ivType"
             app:layout_constraintTop_toTopOf="@+id/tvSubject" />
 
         <ImageView

app/src/main/res/layout/item_message_normal.xml

@@ -134,11 +134,11 @@
             app:layout_constraintTop_toBottomOf="@id/paddingTop" />
 
         <ImageView
-            android:id="@+id/ivDraft"
+            android:id="@+id/ivType"
             android:layout_width="21dp"
             android:layout_height="21dp"
             android:layout_marginStart="6dp"
-            android:contentDescription="@string/title_legend_draft"
+            android:contentDescription="@string/title_legend_folder_type"
             android:src="@drawable/baseline_edit_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
             app:layout_constraintStart_toEndOf="@id/ivAvatar"
@@ -152,7 +152,7 @@
             android:contentDescription="@string/title_legend_snoozed"
             android:src="@drawable/baseline_timelapse_24"
             app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-            app:layout_constraintStart_toEndOf="@id/ivDraft"
+            app:layout_constraintStart_toEndOf="@id/ivType"
             app:layout_constraintTop_toTopOf="@+id/tvFolder" />
 
         <ImageView

app/src/main/res/values-cs-rCZ/strings.xml

@@ -594,7 +594,6 @@
     <string name="title_legend_save">Uložit</string>
     <string name="title_legend_delete">Smazat</string>
     <string name="title_legend_count">Počet</string>
-    <string name="title_legend_folder_tye">Typ složky</string>
     <string name="title_hint_folder_actions">Dlouze podržet pro více možností</string>
     <string name="title_hint_folder_sync">Pro omezení spotřeby baterie a dat nebudou ve výchozím stavu synchronizovány všechny zprávy ani složky</string>
     <string name="title_hint_support">Máte-li dotaz nebo problém, použijte prosím menu podpory pro získání pomoci</string>

app/src/main/res/values-de-rDE/strings.xml

@@ -581,7 +581,6 @@
     <string name="title_legend_save">Speichern</string>
     <string name="title_legend_delete">Löschen</string>
     <string name="title_legend_count">Zählen</string>
-    <string name="title_legend_folder_tye">Ordner-Typ</string>
     <string name="title_hint_folder_actions">Gedrückt halten für weitere Optionen</string>
     <string name="title_hint_folder_sync">Um Akkuverbrauch und Datennutzung zu reduzieren, werden standardmäßig nicht alle Ordner und E-Mails synchronisiert</string>
     <string name="title_hint_support">Wenn Sie eine Frage oder ein Problem haben, verwenden Sie bitte die Hilfe im Menü</string>

app/src/main/res/values-es-rES/strings.xml

@@ -581,7 +581,6 @@
     <string name="title_legend_save">Guardar</string>
     <string name="title_legend_delete">Eliminar</string>
     <string name="title_legend_count">Cuenta</string>
-    <string name="title_legend_folder_tye">Tipo de carpetas</string>
     <string name="title_hint_folder_actions">Mantenga pulsado para opciones</string>
     <string name="title_hint_folder_sync">Para limitar el uso de batería y redes, no todas las carpetas y mensajes serán sincronizados por defecto</string>
     <string name="title_hint_support">Si tiene una pregunta o problema, por favor use el menú de soporte para obtener ayuda</string>

app/src/main/res/values-fi-rFI/strings.xml

@@ -578,7 +578,6 @@
     <string name="title_legend_save">Tallenna</string>
     <string name="title_legend_delete">Poista</string>
     <string name="title_legend_count">Lukumäärä</string>
-    <string name="title_legend_folder_tye">Kansion tyyppi</string>
     <string name="title_hint_folder_actions">Pitkä painallus avaa asetukset</string>
     <string name="title_hint_folder_sync">Akun ja verkon käytön rajoittamiseksi kaikkia kansioita ja viestejä ei oletusarvoisesti synkronoida</string>
     <string name="title_hint_support">Jos sinulla on kysyttävää tai ongelma, ole hyvä ja käytä tukivalikkoa saadaksesi apua</string>

app/src/main/res/values-fr-rFR/strings.xml

@@ -578,7 +578,6 @@
     <string name="title_legend_save">Enregistrer</string>
     <string name="title_legend_delete">Supprimer</string>
     <string name="title_legend_count">Nombre</string>
-    <string name="title_legend_folder_tye">Type de dossier</string>
     <string name="title_hint_folder_actions">Appui long pour les options</string>
     <string name="title_hint_folder_sync">Pour limiter l\'utilisation de la batterie et du réseau, les dossiers et les messages ne seront pas tous synchronisés par défaut</string>
     <string name="title_hint_support">Si vous avez une question ou un problème, veuillez utiliser le menu Support pour obtenir de l\'aide</string>

app/src/main/res/values-hr-rHR/strings.xml

@@ -260,4 +260,42 @@
     <string name="title_edit_rules">Uredi pravila</string>
     <string name="title_create_channel">Stvorite kanal obavijesti</string>
     <string name="title_edit_channel">Uredi kanal obavijesti</string>
+    <string name="title_delete_channel">Izbriši kanal obavijesti</string>
+    <string name="title_empty_trash_ask">Želite li trajno izbrisati sve poruke u otpadu?</string>
+    <string name="title_delete_operation">Brisanje operacija s porukom o pogrešci?</string>
+    <string name="title_delete_contacts">Želite li izbrisati sve lokalne kontakte?</string>
+    <string name="title_no_operations">Nema operacija na čekanju</string>
+    <string name="title_folder_name">Naziv mape</string>
+    <string name="title_display_name">Prikaži ime</string>
+    <string name="title_show_folders">Prikaži skrivene mape</string>
+    <string name="title_hide_folder">Sakrij mapu</string>
+    <string name="title_unified_folder">Prikaži u objedinjenoj ulaznoj pošti</string>
+    <string name="title_navigation_folder">Prikaži u navigacijskom izborniku</string>
+    <string name="title_synchronize_folder">Sinkroniziranje (primanje poruka)</string>
+    <string name="title_poll_folder">Povremeno provjeravanje umjesto kontinuirane sinkronizacije</string>
+    <string name="title_download_folder">Automatski preuzimajte tekst poruke i privitke</string>
+    <string name="title_notify_folder">Obavijest za nove poruke</string>
+    <string name="title_sync_days">Sinkroniziranje poruka (dana)</string>
+    <string name="title_sync_days_remark">Povećanjem ove vrijednosti povećat će se potrošnja baterije i podataka</string>
+    <string name="title_keep_days">Zadrži poruke (dana)</string>
+    <string name="title_keep_all">Zadrži sve poruke</string>
+    <string name="title_auto_delete">Automatski izbriši stare poruke</string>
+    <string name="title_folder_name_missing">Nedostaje naziv mape</string>
+    <string name="title_folder_exists">Postoji mapa %1$s</string>
+    <string name="title_folder_delete">Trajno izbrisati ovu mapu i sve poruke koje sadrži?</string>
+    <string name="title_folder_unified">Jedinstveni ulazni spremnik</string>
+    <string name="title_folder_inbox">Ulazni spremnik</string>
+    <string name="title_folder_outbox">Odlazni spremnik</string>
+    <string name="title_folder_all">Arhiva</string>
+    <string name="title_folder_drafts">Skice</string>
+    <string name="title_folder_trash">Otpad</string>
+    <string name="title_folder_junk">Spam</string>
+    <string name="title_folder_sent">Poslano</string>
+    <string name="title_folder_system">Sustav</string>
+    <string name="title_folder_user">Korisnik</string>
+    <string name="title_folder_primary">Mapa primarnog računa</string>
+    <string name="title_folder_thread">Konverzacija %1$s</string>
+    <string name="title_folders_unified">Mape jedinstvenog ulaznog spremnika</string>
+    <string name="title_no_messages">Nema poruka</string>
+    <string name="title_subject_reply">Re: %1$s</string>
 </resources>

app/src/main/res/values-it-rIT/strings.xml

@@ -581,7 +581,6 @@
     <string name="title_legend_save">Salva</string>
     <string name="title_legend_delete">Elimina</string>
     <string name="title_legend_count">Quantità</string>
-    <string name="title_legend_folder_tye">Tipo di cartelle</string>
     <string name="title_hint_folder_actions">Tieni premuto per le opzioni</string>
     <string name="title_hint_folder_sync">Per limitare l\'utilizzo della batteria e della rete, non tutte le cartelle e non tutti i messaggi verranno sincronizzati per impostazione predefinita</string>
     <string name="title_hint_support">Se hai una domanda o un problema, usa il menu di supporto per ottenere aiuto</string>

app/src/main/res/values-nl-rNL/strings.xml

@@ -581,7 +581,6 @@
     <string name="title_legend_save">Bewaren</string>
     <string name="title_legend_delete">Verwijderen</string>
     <string name="title_legend_count">Aantal</string>
-    <string name="title_legend_folder_tye">Maptype</string>
     <string name="title_hint_folder_actions">Druk lang voor opties</string>
     <string name="title_hint_folder_sync">Om het gebruik van de batterij en het netwerk te beperken, worden niet alle mappen en niet alle berichten standaard gesynchroniseerd</string>
     <string name="title_hint_support">Als u een vraag of een probleem heeft, gebruik dan het menu ondersteuning om hulp te krijgen</string>

app/src/main/res/values-nn-rNO/strings.xml

@@ -581,7 +581,6 @@
     <string name="title_legend_save">Lagre</string>
     <string name="title_legend_delete">Slett</string>
     <string name="title_legend_count">Antall</string>
-    <string name="title_legend_folder_tye">Mappe type</string>
     <string name="title_hint_folder_actions">Langt trykk for flere instillinger</string>
     <string name="title_hint_folder_sync">For å begrense batteri- og nettverks bruk, vil ikke alle mapper og ikke alle meldinger synkroniseres som standard</string>
     <string name="title_hint_support">Hvis du har et spørsmål eller et problem, vennligst bruk support menyen for å få hjelp</string>

app/src/main/res/values-no-rNO/strings.xml

@@ -581,7 +581,6 @@
     <string name="title_legend_save">Lagre</string>
     <string name="title_legend_delete">Slett</string>
     <string name="title_legend_count">Antall</string>
-    <string name="title_legend_folder_tye">Mappe type</string>
     <string name="title_hint_folder_actions">Langt trykk for flere instillinger</string>
     <string name="title_hint_folder_sync">For å begrense batteri- og nettverks bruk, vil ikke alle mapper og ikke alle meldinger synkroniseres som standard</string>
     <string name="title_hint_support">Hvis du har et spørsmål eller et problem, vennligst bruk support menyen for å få hjelp</string>

app/src/main/res/values-pl-rPL/strings.xml

@@ -577,7 +577,6 @@
     <string name="title_legend_save">Zapisz</string>
     <string name="title_legend_delete">Usuń</string>
     <string name="title_legend_count">Liczba</string>
-    <string name="title_legend_folder_tye">Rodzaje folderów</string>
     <string name="title_hint_folder_actions">Przytrzymaj, aby uzyskać więcej opcji</string>
     <string name="title_hint_folder_sync">W celu ograniczenia użycia baterii i sieci nie wszystkie foldery i wiadomości będą domyślnie synchronizowane</string>
     <string name="title_hint_support">Jeśli masz pytanie lub problem, użyj menu Pomoc, aby uzyskać pomoc</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -572,7 +572,6 @@
     <string name="title_legend_save">Salvar</string>
     <string name="title_legend_delete">Deletar</string>
     <string name="title_legend_count">Contagem</string>
-    <string name="title_legend_folder_tye">Tipo de pasta</string>
     <string name="title_hint_folder_actions">Mantenha pressionado para mais opções</string>
     <string name="title_hint_folder_sync">Para limitar o uso de bateria e de rede nem todas as pastas e mensagens serão sincronizadas por padrão</string>
     <string name="title_hint_support">Se você tiver uma pergunta ou um problema, por favor, use o menu de suporte para obter ajuda</string>

app/src/main/res/values-ro-rRO/strings.xml

@@ -589,7 +589,6 @@
     <string name="title_legend_save">Salvează</string>
     <string name="title_legend_delete">Șterge</string>
     <string name="title_legend_count">Contor</string>
-    <string name="title_legend_folder_tye">Tip de dosar</string>
     <string name="title_hint_folder_actions">Atingeți lung pentru opțiuni</string>
     <string name="title_hint_folder_sync">Pentru a limita utilizarea bateriei şi a conexiunii, nu vor fi sincronizate în mod implicit toate dosarele si mesajele</string>
     <string name="title_hint_support">Dacă aveți o întrebare sau o problemă, vă rugăm să utilizați meniul de suport tehnic pentru a obține ajutor</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -597,7 +597,6 @@
     <string name="title_legend_save">Сохранить</string>
     <string name="title_legend_delete">Удалить</string>
     <string name="title_legend_count">Количество</string>
-    <string name="title_legend_folder_tye">Типы папок</string>
     <string name="title_hint_folder_actions">Длительно нажмите для вариантов</string>
     <string name="title_hint_folder_sync">Для экономии заряда батареи и трафика не все папки и сообщения синхронизируются по умолчанию</string>
     <string name="title_hint_support">Если у вас есть вопрос или проблема, пожалуйста, используйте меню поддержки для получения помощи</string>

app/src/main/res/values-sv-rSE/strings.xml

@@ -560,7 +560,6 @@
     <string name="title_legend_save">Spara</string>
     <string name="title_legend_delete">Ta bort</string>
     <string name="title_legend_count">Antal</string>
-    <string name="title_legend_folder_tye">Mapptyp</string>
     <string name="title_hint_folder_actions">Långtryck för inställningar</string>
     <string name="title_hint_folder_sync">För att begränsa batteri- och nätverksanvändning synkroniseras inte alla mappar och inte alla meddelanden som standard</string>
     <string name="title_hint_support">Om du har en fråga eller ett problem, vänligen använd supportmenyn för att få hjälp</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -573,7 +573,6 @@
     <string name="title_legend_save">保存</string>
     <string name="title_legend_delete">删除</string>
     <string name="title_legend_count">总数</string>
-    <string name="title_legend_folder_tye">文件夹类型</string>
     <string name="title_hint_folder_actions">长按以显示更多选项</string>
     <string name="title_hint_folder_sync">为了减少电池和网络的使用量, 默认情况下, 并非所有文件夹和邮件都将同步</string>
     <string name="title_hint_support">如果您要提问或有问题，请使用支持选项获取帮助</string>

app/src/main/res/values/strings.xml

@@ -661,7 +661,7 @@
     <string name="title_legend_save">Save</string>
     <string name="title_legend_delete">Delete</string>
     <string name="title_legend_count">Count</string>
-    <string name="title_legend_folder_tye">Folders type</string>
+    <string name="title_legend_folder_type">Folders type</string>
 
     <string name="title_hint_folder_actions">Long press for options</string>
     <string name="title_hint_folder_sync">To limit battery and network usage not all folders and not all messages will be synchronized by default</string>