画像一覧画面で、画像が転送されていない時にアイコンを表示するようにした。

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/playback/ImageGridViewFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/playback/ImageGridViewFragment.java
index 58013e9..7c2d24f 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/playback/ImageGridViewFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/playback/ImageGridViewFragment.java
@@ -380,6 +380,7 @@ public class ImageGridViewFragment extends Fragment
     {
                ImageView imageView;
                ImageView iconView;
+               ImageView selectView;
        }
        
        private class GridViewAdapter extends BaseAdapter
@@ -433,8 +434,9 @@ public class ImageGridViewFragment extends Fragment
                                viewHolder = new GridCellViewHolder();
                                viewHolder.imageView = convertView.findViewById(R.id.imageViewY);
                                viewHolder.iconView = convertView.findViewById(R.id.imageViewZ);
+                viewHolder.selectView = convertView.findViewById(R.id.imageViewX);
 
-                               convertView.setTag(viewHolder);
+                convertView.setTag(viewHolder);
                        }
             else
             {
@@ -445,16 +447,18 @@ public class ImageGridViewFragment extends Fragment
             ICameraFileInfo item = (infoEx != null) ? infoEx.getFileInfo() : null;
                        if (item == null)
             {
-                               viewHolder.imageView.setImageDrawable(null);
+                viewHolder.imageView.setImageResource(R.drawable.ic_satellite_grey_24dp);
                                viewHolder.iconView.setImageDrawable(null);
+                viewHolder.selectView.setImageDrawable(null);
                                return convertView;
                        }
                        String path = new File(item.getDirectoryPath(), item.getFilename()).getPath();
                        Bitmap thumbnail = imageCache.get(path);
                        if (thumbnail == null)
             {
-                               viewHolder.imageView.setImageDrawable(null);
+                viewHolder.imageView.setImageResource(R.drawable.ic_satellite_grey_24dp);
                                viewHolder.iconView.setImageDrawable(null);
+                viewHolder.selectView.setImageDrawable(null);
                                if (!gridViewIsScrolling)
                 {
                                        if (executor.isShutdown())

diff --git a/app/src/main/res/drawable/ic_check_green_24dp.xml b/app/src/main/res/drawable/ic_check_green_24dp.xml
new file mode 100644 (file)
index 0000000..2513654
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check_green_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#80FA80"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>

diff --git a/app/src/main/res/drawable/ic_satellite_grey_24dp.xml b/app/src/main/res/drawable/ic_satellite_grey_24dp.xml
new file mode 100644 (file)
index 0000000..6a9acca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_satellite_grey_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#C0C0C0"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM5,4.99h3C8,6.65 6.66,8 5,8L5,4.99zM5,12v-2c2.76,0 5,-2.25 5,-5.01h2C12,8.86 8.87,12 5,12zM5,18l3.5,-4.5 2.5,3.01L14.5,12l4.5,6L5,18z"/>
+</vector>

diff --git a/app/src/main/res/layout-land/view_grid_cell.xml b/app/src/main/res/layout-land/view_grid_cell.xml
index a82d8ff..2e710d8 100644 (file)
--- a/app/src/main/res/layout-land/view_grid_cell.xml
+++ b/app/src/main/res/layout-land/view_grid_cell.xml
@@ -26,4 +26,20 @@
         android:scaleType="centerCrop"
         android:src="@null"
         tools:ignore="ContentDescription" />
+
+    <ImageView
+        android:id="@+id/imageViewX"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="15dp"
+        android:layout_marginStart="15dp"
+        android:layout_marginTop="15dp"
+        android:scaleType="centerCrop"
+        android:src="@null"
+        tools:ignore="ContentDescription" />
+
+
 </RelativeLayout>
\ No newline at end of file

diff --git a/app/src/main/res/layout/view_grid_cell.xml b/app/src/main/res/layout/view_grid_cell.xml
index a82d8ff..2e710d8 100644 (file)
--- a/app/src/main/res/layout/view_grid_cell.xml
+++ b/app/src/main/res/layout/view_grid_cell.xml
@@ -26,4 +26,20 @@
         android:scaleType="centerCrop"
         android:src="@null"
         tools:ignore="ContentDescription" />
+
+    <ImageView
+        android:id="@+id/imageViewX"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginLeft="15dp"
+        android:layout_marginStart="15dp"
+        android:layout_marginTop="15dp"
+        android:scaleType="centerCrop"
+        android:src="@null"
+        tools:ignore="ContentDescription" />
+
+
 </RelativeLayout>
\ No newline at end of file