From 06b71586c1cfdfc44e520dece7ca93a508e4c642 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Wed, 2 Oct 2019 17:58:29 +0500
Subject: [PATCH] Sort by folder 1st approach

---
 .../java/org/mian/gitnex/fragments/FilesFragment.java    | 5 ++---
 .../java/org/mian/gitnex/viewmodels/FilesViewModel.java  | 9 +++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
index 137b43df..f61daf11 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
@@ -22,7 +22,6 @@ import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.models.Files;
 import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.FilesViewModel;
-import org.mian.gitnex.viewmodels.ReleasesViewModel;
 import java.util.List;
 
 /**
@@ -96,9 +95,9 @@ public class FilesFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        ReleasesViewModel.loadReleasesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
+                        FilesViewModel.loadFilesList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
                     }
-                }, 50);
+                }, 200);
             }
         });
 
diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java
index 5d209a6a..e2f386ab 100644
--- a/app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java
+++ b/app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java
@@ -7,6 +7,8 @@ import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.models.Files;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -40,6 +42,13 @@ public class FilesViewModel extends ViewModel {
             @Override
             public void onResponse(@NonNull Call<List<Files>> call, @NonNull Response<List<Files>> response) {
 
+                Collections.sort(response.body(), new Comparator<Files>() {
+                    @Override
+                    public int compare(Files byType1, Files byType2) {
+                        return byType1.getType().compareTo(byType2.getType());
+                    }
+                });
+
                 if (response.isSuccessful()) {
                     filesList.postValue(response.body());
                 } else {