From dd25caa81ea7573df3a4e661493aa8845ad5f575 Mon Sep 17 00:00:00 2001
From: GauthamAsir <gauthamasir@gmail.com>
Date: Wed, 23 Dec 2020 22:06:55 +0530
Subject: [PATCH] Add Delete option for saved files & bug fixes.

Signed-off-by: GauthamAsir <gauthamasir@gmail.com>
---
 .idea/compiler.xml                            |  6 +++
 .idea/gradle.xml                              |  1 +
 .idea/misc.xml                                |  2 +-
 app/build.gradle                              |  4 +-
 .../Adapter/FilesAdapter.java                 | 14 ++++++-
 .../Fragments/SavedFilesFragment.java         |  5 ++-
 .../res/drawable/ic_baseline_delete_24.xml    |  9 ++++
 app/src/main/res/layout/item_saved_files.xml  | 42 ++++++++++---------
 8 files changed, 57 insertions(+), 26 deletions(-)
 create mode 100644 .idea/compiler.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_delete_24.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..9bba60d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -14,6 +14,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..d5d35ec 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 38155a2..8135bbd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "a.gautham.statusdownloader"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 3
-        versionName "3.0"
+        versionCode 4
+        versionName "4.0"
         Date date = new Date()
         String d = date.format('_ddMMYYYY')
         setProperty("archivesBaseName", "WhatsApp_Status_Downloader_v$versionName$d")
diff --git a/app/src/main/java/a/gautham/statusdownloader/Adapter/FilesAdapter.java b/app/src/main/java/a/gautham/statusdownloader/Adapter/FilesAdapter.java
index ae919bd..c9ba634 100644
--- a/app/src/main/java/a/gautham/statusdownloader/Adapter/FilesAdapter.java
+++ b/app/src/main/java/a/gautham/statusdownloader/Adapter/FilesAdapter.java
@@ -14,9 +14,11 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.MediaController;
+import android.widget.Toast;
 import android.widget.VideoView;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.squareup.picasso.Picasso;
@@ -48,8 +50,9 @@ public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType
     @Override
     public void onBindViewHolder(@NonNull final ItemViewHolder holder, int position) {
 
-        holder.save.setVisibility(View.GONE);
+        holder.save.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_baseline_delete_24));
         holder.share.setVisibility(View.VISIBLE);
+        holder.save.setVisibility(View.VISIBLE);
 
         final Status status = imagesList.get(position);
 
@@ -58,6 +61,15 @@ public void onBindViewHolder(@NonNull final ItemViewHolder holder, int position)
         else
             Picasso.get().load(status.getFile()).into(holder.imageView);
 
+        holder.save.setOnClickListener(view -> {
+            if (status.getFile().delete()) {
+                imagesList.remove(position);
+                notifyDataSetChanged();
+                Toast.makeText(context, "File Deleted", Toast.LENGTH_SHORT).show();
+            } else
+                Toast.makeText(context, "Unable to Delete File", Toast.LENGTH_SHORT).show();
+        });
+
         holder.share.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/java/a/gautham/statusdownloader/Fragments/SavedFilesFragment.java b/app/src/main/java/a/gautham/statusdownloader/Fragments/SavedFilesFragment.java
index aa86795..4bf7305 100644
--- a/app/src/main/java/a/gautham/statusdownloader/Fragments/SavedFilesFragment.java
+++ b/app/src/main/java/a/gautham/statusdownloader/Fragments/SavedFilesFragment.java
@@ -9,7 +9,6 @@
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -121,7 +120,8 @@ public void run() {
                             @Override
                             public void run() {
                                 progressBar.setVisibility(View.GONE);
-                                Toast.makeText(getActivity(), "Dir doest not exists", Toast.LENGTH_SHORT).show();
+                                no_files_found.setVisibility(View.VISIBLE);
+//                                Toast.makeText(getActivity(), "Dir doest not exists", Toast.LENGTH_SHORT).show();
                             }
                         });
 
@@ -132,6 +132,7 @@ public void run() {
 
         }else {
             no_files_found.setVisibility(View.VISIBLE);
+            progressBar.setVisibility(View.GONE);
         }
 
     }
diff --git a/app/src/main/res/drawable/ic_baseline_delete_24.xml b/app/src/main/res/drawable/ic_baseline_delete_24.xml
new file mode 100644
index 0000000..4828bcc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_delete_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:textColorPrimary"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+</vector>
diff --git a/app/src/main/res/layout/item_saved_files.xml b/app/src/main/res/layout/item_saved_files.xml
index 1282e54..62cc5f9 100644
--- a/app/src/main/res/layout/item_saved_files.xml
+++ b/app/src/main/res/layout/item_saved_files.xml
@@ -9,42 +9,44 @@
     app:cardUseCompatPadding="true">
 
     <RelativeLayout
+        android:id="@+id/rl1"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <RelativeLayout
+        <ImageView
+            android:id="@+id/ivThumbnail"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/rl1">
+            android:layout_height="@dimen/_90sdp"
+            android:contentDescription="@null"
+            android:scaleType="centerCrop" />
 
-            <ImageView
-                android:id="@+id/ivThumbnail"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/_90sdp"
-                android:scaleType="centerCrop"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/ivThumbnail"
+            android:orientation="horizontal">
 
             <ImageButton
                 android:id="@+id/save"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@+id/ivThumbnail"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:src="@drawable/ic_file_download_black"
                 android:tint="@color/white"
-                android:gravity="center"
-                android:backgroundTint="@android:color/transparent"/>
+                android:backgroundTint="@android:color/transparent"
+                android:contentDescription="@null" />
 
             <ImageButton
                 android:id="@+id/share"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@+id/ivThumbnail"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:src="@drawable/ic_share"
                 android:tint="@color/white"
-                android:gravity="center"
-                android:visibility="gone"
-                android:backgroundTint="@android:color/transparent"/>
+                android:backgroundTint="@android:color/transparent"
+                android:contentDescription="@null" />
 
-        </RelativeLayout>
+        </LinearLayout>
 
     </RelativeLayout>