add media icon for spreadsheets

Daniel Gultsch created 9 months ago

Change summary

src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java | 12 
src/main/res/drawable/ic_description_48dp.xml                     | 15 
src/main/res/drawable/ic_table_48dp.xml                           | 10 
3 files changed, 29 insertions(+), 8 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java

@@ -10,24 +10,20 @@ import android.os.AsyncTask;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-
 import androidx.annotation.DimenRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.core.widget.ImageViewCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.google.android.material.color.MaterialColors;
 import com.google.common.base.Strings;
-
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ItemMediaBinding;
 import eu.siacs.conversations.ui.XmppActivity;
 import eu.siacs.conversations.ui.util.Attachment;
 import eu.siacs.conversations.ui.util.ViewUtil;
 import eu.siacs.conversations.worker.ExportBackupWorker;
-
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -44,6 +40,12 @@ public class MediaAdapter extends RecyclerView.Adapter<MediaAdapter.MediaViewHol
                     "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
                     "text/x-tex",
                     "text/plain");
+    public static final List<String> SPREAD_SHEET_MIMES =
+            Arrays.asList(
+                    "text/comma-separated-values",
+                    "application/vnd.ms-excel",
+                    "application/vnd.oasis.opendocument.spreadsheet",
+                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
 
     private static final List<String> ARCHIVE_MIMES =
             Arrays.asList(
@@ -111,6 +113,8 @@ public class MediaAdapter extends RecyclerView.Adapter<MediaAdapter.MediaViewHol
             return R.drawable.ic_backup_48dp;
         } else if (DOCUMENT_MIMES.contains(mime)) {
             return R.drawable.ic_description_48dp;
+        } else if (SPREAD_SHEET_MIMES.contains(mime)) {
+            return R.drawable.ic_table_48dp;
         } else if (mime.equals("application/gpx+xml")) {
             return R.drawable.ic_tour_48dp;
         } else if (mime.startsWith("image/")) {

src/main/res/drawable/ic_description_48dp.xml

@@ -1,5 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="48dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="48dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
-    
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z" />
+
 </vector>

src/main/res/drawable/ic_table_48dp.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="@android:color/white"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM440,600L200,600L200,760Q200,760 200,760Q200,760 200,760L440,760L440,600ZM520,600L520,760L760,760Q760,760 760,760Q760,760 760,760L760,600L520,600ZM440,520L440,360L200,360L200,520L440,520ZM520,520L760,520L760,360L520,360L520,520ZM200,280L760,280L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,280Z" />
+</vector>