Merge pull request #80 from git03-Nguyen/dev

Dev

Author: git03-Nguyen

app/src/main/AndroidManifest.xml

@@ -7,11 +7,12 @@
         android:required="false" />
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
-    <uses-permission android:name="android.permission.SET_WALLPAPER" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <!-- Other permissions... -->
+    <!-- Other permissions... -->
+    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

app/src/main/java/edu/team08/infinitegallery/main/MainActivity.java

@@ -144,7 +144,8 @@ public static void setWindowFlag(Activity activity, final int bits, boolean on)
     public void changeStatusBar() {
         runOnUiThread(() -> {
             if (currentFragment instanceof PhotosFragment) {
-                getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+                getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
                 setWindowFlag(this, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, false);
                 getWindow().setStatusBarColor(Color.TRANSPARENT);
             } else {

app/src/main/java/edu/team08/infinitegallery/optionphotos/PhotosAdapter.java

@@ -40,7 +40,7 @@
 
 public class PhotosAdapter extends RecyclerView.Adapter<PhotosAdapter.ViewHolder> {
     private final Context context;
-    private SparseBooleanArray selectedItemsIds;
+    private SparseBooleanArray selectedItemsMap;
     private List<File> allPhotos;
     private final int spanCount;
     private boolean selectionMode;
@@ -71,7 +71,7 @@ public PhotosAdapter(Context context, List<File> allPhotos, int spanCount) {
         this.context = context;
         this.allPhotos = allPhotos;
 
-        selectedItemsIds = new SparseBooleanArray();
+        selectedItemsMap = new SparseBooleanArray();
         this.spanCount = spanCount;
         this.selectionMode = false;
         this.selectedAll = false;
@@ -180,10 +180,10 @@ public void onClick(View v) {
         }
 
         if (selectedAll) {
-            selectedItemsIds.put(position, true);
+            selectedItemsMap.put(position, true);
         }
 
-        if(selectedItemsIds.get(position)) {
+        if(selectedItemsMap.get(position)) {
             holder.itemView.setBackgroundColor(0x993BF566);
             holder.checkbox.setVisibility(View.VISIBLE);
             holder.checkbox.setChecked(true);
@@ -216,43 +216,43 @@ public boolean getSelectionMode() {
     }
 
     public void toggleSelection(int position) {
-        if (selectedItemsIds.get(position)) {
-            selectedItemsIds.delete(position);
+        if (selectedItemsMap.get(position)) {
+            selectedItemsMap.delete(position);
         } else {
-            selectedItemsIds.put(position, true);
+            selectedItemsMap.put(position, true);
         }
         notifyItemChanged(position);
         ((MainCallbacks) context).onEmitMsgFromFragToMain("NUMBER OF SELECTIONS", String.valueOf(getSelectionsCount()));
     }
 
     @SuppressLint("NotifyDataSetChanged")
     public void selectAll() {
-        selectedItemsIds.clear();
+        selectedItemsMap.clear();
         selectedAll = true;
         notifyDataSetChanged();
     }
 
     @SuppressLint("NotifyDataSetChanged")
     public void unSelectAll() {
-        selectedItemsIds.clear();
+        selectedItemsMap.clear();
         selectedAll = false;
         notifyDataSetChanged();
     }
 
     @SuppressLint("NotifyDataSetChanged")
     public void removeAllSelections() {
-        selectedItemsIds.clear();
+        selectedItemsMap.clear();
         notifyDataSetChanged();
     }
 
     //Get total selected count
     public int getSelectionsCount() {
-        return selectedItemsIds.size();
+        return selectedItemsMap.size();
     }
 
     //Return all selected ids
     public SparseBooleanArray getSelectedIds() {
-        return selectedItemsIds;
+        return selectedItemsMap;
     }
 
 

app/src/main/java/edu/team08/infinitegallery/singlephoto/ViewPagerAdapter.java

@@ -9,7 +9,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.viewpager.widget.PagerAdapter;
@@ -18,7 +17,6 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
@@ -45,7 +43,7 @@ public ViewPagerAdapter(Context context, File[] photoFiles){
     static private Drawable getDrawable(String key){
         if(!cache.containsKey(key)){
             if (context instanceof SingleTrashActivity) {
-                cache.put(key, new BitmapDrawable(context.getResources(), new TrashBinManager(context).decryptPhoto(new File(key))));
+                cache.put(key, new BitmapDrawable(context.getResources(), new TrashBinManager(context).getTrashBitmap(new File(key))));
             } else {
                 cache.put(key, Drawable.createFromPath(key));
             }

app/src/main/java/edu/team08/infinitegallery/trashbin/TrashAdapter.java

@@ -14,7 +14,6 @@
 import android.widget.CheckBox;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -78,7 +77,7 @@ public void onBindViewHolder(@NonNull TrashAdapter.ViewHolder holder, @SuppressL
         // Set item to the ImageView using Glide library
         // holder.imageItem.setImageDrawable(Drawable.createFromPath(picturePath));
         Glide.with(context)
-                .load(trashBinManager.decryptPhoto(trash))
+                .load(trashBinManager.getTrashBitmap(trash))
                 .placeholder(R.drawable.img_image_placeholder)
                 .into(holder.imageItem);
         holder.imageItem.setOnClickListener(new View.OnClickListener() {

app/src/main/java/edu/team08/infinitegallery/trashbin/TrashBinManager.java

@@ -11,7 +11,6 @@
 import androidx.security.crypto.EncryptedFile;
 import androidx.security.crypto.MasterKey;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -341,7 +340,7 @@ public List<File> checkAndCleanTrashBin() {
 
     }
 
-    public Bitmap decryptPhoto(File src) {
+    public Bitmap getTrashBitmap(File src) {
 
         Bitmap myBitmap = null;
         MasterKey mainKey = null;

app/src/main/res/values-night/themes.xml

@@ -73,8 +73,6 @@
     <style name="Theme.MyTheme.AllPhotosTheme" parent="Theme.MyTheme">
         <item name="android:textColorSecondary">@color/white</item>
         <item name="android:windowTranslucentStatus">true</item>
-
-
     </style>
 
 </resources>

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

@@ -15,7 +15,6 @@
         <!-- Status bar color. -->
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:statusBarColor">@color/gray_trans</item>
-
         <item name="actionOverflowMenuStyle">@style/OverflowMenu</item>
 
         <item name="colorTertiary">@color/gray</item>
@@ -72,9 +71,6 @@
         <item name="android:textColorSecondary">@color/white</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowLightStatusBar">false</item>
-
-
-
     </style>
 
 </resources>