- File Icon Is Not Showing (BUGFIX)

- Sorting system

Author: BalioFVFX

app/src/main/java/com/example/fileexplorer/MainActivity.java

@@ -1,13 +1,17 @@
 package com.example.fileexplorer;
 
+import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
+import com.example.simplefileexplorer.SimpleFileExplorerActivity;
+
 public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        startActivity(new Intent(this, SimpleFileExplorerActivity.class));
     }
 }

simplefileexplorer/src/main/java/com/example/simplefileexplorer/SimpleFileExplorerAdapter.java

@@ -12,6 +12,8 @@
 import android.widget.TextView;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 class SimpleFileExplorerAdapter extends RecyclerView.Adapter<SimpleFileExplorerViewHolder> {
@@ -61,6 +63,16 @@ public int getItemCount() {
 
     public void loadDirectory(List<FileModel> filesList) {
         this.filesList = new ArrayList<>(filesList);
+        Collections.sort(this.filesList, new Comparator<FileModel>() {
+            @Override
+            public int compare(FileModel o1, FileModel o2) {
+                int directorySortResult = o2.getFileModelType().compareTo(o1.getFileModelType());
+                if(directorySortResult == 0){
+                    return o1.getAbsolutePath().compareTo(o2.getAbsolutePath());
+                }
+                return directorySortResult;
+            }
+        });
         this.notifyDataSetChanged();
     }
 
@@ -72,7 +84,7 @@ private void setImagesByFileType(ImageView imageView, FileModelType fileModelTyp
         int fileImageId = 0;
         int directoryImageId = 0;
         if(SimpleFileResources.imageFileId == null){
-            directoryImageId = SimpleFileResources.defaultImageFileId;
+            fileImageId = SimpleFileResources.defaultImageFileId;
         }
         if(SimpleFileResources.imageDirectoryId == null){
             directoryImageId = SimpleFileResources.defaultImageDirectoryId;