[Saved Projects] Implemented Sort

scopeInfinity · scopeInfinity · commit decb99d119bd · 2016-03-25T11:26:04.000+05:30
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/SavedProjectAdapter.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/SavedProjectAdapter.java
@@ -7,10 +7,13 @@
 import android.widget.BaseAdapter;
 
 import org.buildmlearn.toolkit.R;
+import org.buildmlearn.toolkit.fragment.LoadProjectFragment;
 import org.buildmlearn.toolkit.model.SavedProject;
 import org.buildmlearn.toolkit.views.TextViewPlus;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Locale;
 
 /**
@@ -22,6 +25,7 @@ public class SavedProjectAdapter extends BaseAdapter {
 
     private Context mContext;
     private ArrayList<SavedProject> data;
+    private int sortType;
 
     public SavedProjectAdapter(Context mContext, ArrayList<SavedProject> data) {
         this.mContext = mContext;
@@ -78,6 +82,44 @@ public View getView(int position, View convertView, ViewGroup parent) {
         return convertView;
     }
 
+    public void setSortType(int sortType) {
+        this.sortType = sortType;
+    }
+
+    public int getSortType() {
+        return sortType;
+    }
+
+    public void sort() {
+        Comparator<SavedProject> comparator = null;
+        switch (sortType) {
+            case LoadProjectFragment.SORT_TYPE_MODIFIED :
+                comparator = new Comparator<SavedProject>() {
+                    public int compare(SavedProject f1, SavedProject f2) {
+                        //f1 Modified later than f2
+                        return Long.valueOf(f2.getFile().lastModified()).compareTo(f1.getFile().lastModified());
+                    }
+                };
+                break;
+            case LoadProjectFragment.SORT_TYPE_NAME :
+                comparator = new Comparator<SavedProject>() {
+                    public int compare(SavedProject f1, SavedProject f2) {
+                        return f1.getName().compareToIgnoreCase(f2.getName());
+                    }
+                };
+                break;
+            case LoadProjectFragment.SORT_TYPE_AUTHOR :
+                comparator = new Comparator<SavedProject>() {
+                    public int compare(SavedProject f1, SavedProject f2) {
+                        return f1.getAuthor().compareToIgnoreCase(f2.getAuthor());
+                    }
+                };
+                break;
+
+        }
+        Collections.sort(data, comparator);
+    }
+
     public class ProjectHolder {
         TextViewPlus projectName;
         TextViewPlus projectIcon;
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadProjectFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/LoadProjectFragment.java
@@ -3,10 +3,12 @@
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -58,6 +60,12 @@ public class LoadProjectFragment extends Fragment implements AbsListView.OnItemC
     private ArrayList<SavedProject> savedProjects;
     private View selectedView = null;
 
+    private SharedPreferences prefs;
+    private static final String PREF_SORT = "sortType";
+    public static final int SORT_TYPE_MODIFIED = 0;
+    public static final int SORT_TYPE_NAME = 1;
+    public static final int SORT_TYPE_AUTHOR = 2;
+
     private int selectedPosition = -1;
 
     /**
@@ -70,6 +78,7 @@ public void onCreate(Bundle savedInstanceState) {
         mToolkit = (ToolkitApplication) getActivity().getApplicationContext();
         activity = getActivity();
         savedProjects = new ArrayList<>();
+        prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
 
         String path = mToolkit.getSavedDir();
         Log.d("Files", "Path: " + path);
@@ -105,13 +114,6 @@ public void onCreate(Bundle savedInstanceState) {
             }
         }
 
-        Collections.sort(savedProjects, new Comparator<SavedProject>() {
-            public int compare(SavedProject f1, SavedProject f2) {
-                return Long.valueOf(f1.getFile().lastModified()).compareTo(f2.getFile().lastModified());
-            }
-        });
-
-        Collections.reverse(savedProjects);
     }
 
     /**
@@ -131,7 +133,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     public void onViewCreated(View view, Bundle savedInstanceState) {
         mAdapter = new SavedProjectAdapter(getActivity(), savedProjects);
         mListView = (AbsListView) view.findViewById(android.R.id.list);
+        mAdapter.setSortType(prefs.getInt(PREF_SORT, SORT_TYPE_MODIFIED));
+        mAdapter.sort();
         setAdapter(mAdapter);
+
+
         mListView.setOnItemClickListener(this);
         mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
@@ -230,13 +236,7 @@ public void onResume() {
                 }
             }
 
-            Collections.sort(savedProjects, new Comparator<SavedProject>() {
-                public int compare(SavedProject f1, SavedProject f2) {
-                    return Long.valueOf(f1.getFile().lastModified()).compareTo(f2.getFile().lastModified());
-                }
-            });
-
-            Collections.reverse(savedProjects);
+            mAdapter.sort();
             mAdapter.notifyDataSetChanged();
         }
         super.onResume();
@@ -291,8 +291,11 @@ public void changeColorScheme() {
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
+        menu.clear();
         if (showTemplateSelectedMenu) {
             activity.getMenuInflater().inflate(R.menu.menu_project_selected, menu);
+        } else {
+            activity.getMenuInflater().inflate(R.menu.menu_project, menu);
         }
     }
 
@@ -306,22 +309,43 @@ public boolean onOptionsItemSelected(MenuItem item) {
         switch (id) {
             case R.id.action_delete:
 
-                final MaterialDialog dialog = new MaterialDialog.Builder(activity)
+                final MaterialDialog dialogDelete = new MaterialDialog.Builder(activity)
                         .title(R.string.dialog_delete_title)
                         .content(R.string.dialog_delete_msg)
                         .positiveText(R.string.dialog_yes)
                         .negativeText(R.string.dialog_no)
                         .build();
 
-                dialog.getActionButton(DialogAction.POSITIVE).setOnClickListener(new View.OnClickListener() {
+                dialogDelete.getActionButton(DialogAction.POSITIVE).setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        dialog.dismiss();
+                        dialogDelete.dismiss();
                         deleteItem(selectedPosition);
                         restoreSelectedView();
                     }
                 });
-                dialog.show();
+                dialogDelete.show();
+                break;
+            case R.id.action_sort:
+
+                final MaterialDialog dialogSort = new MaterialDialog.Builder(activity)
+                        .title(R.string.dialog_sort_title)
+                        .items(R.array.project_sort)
+                        .itemsCallbackSingleChoice(mAdapter.getSortType(), new MaterialDialog.ListCallbackSingleChoice() {
+                            @Override
+                            public boolean onSelection(MaterialDialog dialog, View itemView, int which, CharSequence text) {
+                                mAdapter.setSortType(which);
+                                SharedPreferences.Editor editor = prefs.edit();
+                                editor.putInt(PREF_SORT, which);
+                                editor.commit();
+                                mAdapter.sort();
+                                mAdapter.notifyDataSetChanged();
+                                return true;
+                            }
+                        })
+                        .build();
+
+                dialogSort.show();
                 break;
         }
         return super.onOptionsItemSelected(item);
diff --git a/source-code/app/src/main/res/menu/menu_project.xml b/source-code/app/src/main/res/menu/menu_project.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.buildmlearn.toolkit.activity.TemplateEditor">
+
+    <item
+        android:id="@+id/action_sort"
+        android:orderInCategory="2"
+        android:title="@string/menu_project_sort"
+        app:showAsAction="never" />
+
+</menu>
diff --git a/source-code/app/src/main/res/values/array.xml b/source-code/app/src/main/res/values/array.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer-array name="project_sort">
+        <item>@string/dialog_sort_modified</item>
+        <item>@string/dialog_sort_name</item>
+        <item>@string/dialog_sort_author</item>
+    </integer-array>
+</resources>
diff --git a/source-code/app/src/main/res/values/strings.xml b/source-code/app/src/main/res/values/strings.xml
@@ -132,11 +132,19 @@
 
     <!-- Menu Strings-->
 
+    <string name="menu_project_sort">Sort</string>
     <string name="menu_save_template">Save Template</string>
     <string name="menu_simulate">Simulate</string>
     <string name="menu_delete_template_item">Delete</string>
     <string name="menu_edit_template_item">Edit</string>
 
+    <!-- Dialog Sort -->
+
+    <string name="dialog_sort_title">Sort By</string>
+    <string name="dialog_sort_modified">Last Modified Time</string>
+    <string name="dialog_sort_name">Project Name</string>
+    <string name="dialog_sort_author">Author Name</string>
+
     <!-- Bottom Sheet-->
     <string name="bottom_sheet_share_apk">Share APK</string>
     <string name="bottom_sheet_publish"> Publish to BuildmLearn Store</string>
