DigitalCampus#566: Added option to let the user choose the sorting of…

… the list
jjoseba · Sep 6, 2016 · d2d1a09 · d2d1a09
1 parent 60623f9
commit d2d1a09
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 9 deletions.
diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/DownloadMediaActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/DownloadMediaActivity.java
@@ -29,6 +29,8 @@
 import org.digitalcampus.oppia.adapter.DownloadMediaListAdapter;
 import org.digitalcampus.oppia.listener.DownloadMediaListener;
 import org.digitalcampus.oppia.listener.ListInnerBtnOnClickListener;
+import org.digitalcampus.oppia.model.Course;
+import org.digitalcampus.oppia.model.CourseMetaPage;
 import org.digitalcampus.oppia.model.Media;
 import org.digitalcampus.oppia.service.DownloadBroadcastReceiver;
 import org.digitalcampus.oppia.service.DownloadService;
@@ -45,6 +47,8 @@
 import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -98,6 +102,7 @@ public void onResume(){
 		super.onResume();
         if ((missingMedia != null) && missingMedia.size()>0) {
             //We already have loaded media (coming from orientationchange)
+            dmla.sortByFilename();
             dmla.notifyDataSetChanged();
         }
         receiver = new DownloadBroadcastReceiver();
@@ -127,7 +132,25 @@ protected void onSaveInstanceState(Bundle savedInstanceState) {
         super.onSaveInstanceState(savedInstanceState);
         savedInstanceState.putSerializable(TAG, missingMedia);
     }
-
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        menu.clear();
+        getMenuInflater().inflate(R.menu.missing_media_sortby, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        int itemId = item.getItemId();
+        switch(itemId){
+            case R.id.menuSortCourseTitle:  dmla.sortByCourse(); break;
+            case R.id.menuSortMediaTitle: dmla.sortByFilename(); break;
+        }
+        return true;
+    }
+
 	private void downloadViaPC(){
 		String filename = "oppia-media.html";
 		String strData = "<html>";

diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/DownloadMediaListAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/DownloadMediaListAdapter.java
@@ -18,6 +18,8 @@
 package org.digitalcampus.oppia.adapter;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Locale;
 
 import org.digitalcampus.mobile.learning.R;
@@ -133,4 +135,31 @@ public void onClick(View v) {
     public void setOnClickListener(ListInnerBtnOnClickListener onClickListener) {
         this.onClickListener = onClickListener;
     }
+
+    public void sortByCourse(){
+        //Sort the media list by filename
+        Collections.sort(this.mediaList, new Comparator<Object>() {
+            @Override
+            public int compare(Object o1, Object o2){
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
+            String titleCourse1 = ((Media) o1).getCourses().get(0).getTitle(prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage()));
+            String titleCourse2= ((Media) o2).getCourses().get(0).getTitle(prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage()));
+            return (titleCourse1.compareTo(titleCourse2));
+            }
+        });
+
+        notifyDataSetChanged();
+    }
+
+    public void sortByFilename(){
+        //Sort the media list by filename
+        Collections.sort(this.mediaList, new Comparator<Object>() {
+            @Override
+            public int compare(Object o1, Object o2){
+                return ((Media) o1).getFilename().compareTo(((Media) o2).getFilename());
+            }
+        });
+
+        notifyDataSetChanged();
+    }
 }
diff --git a/app/src/main/java/org/digitalcampus/oppia/task/ScanMediaTask.java b/app/src/main/java/org/digitalcampus/oppia/task/ScanMediaTask.java
@@ -92,14 +92,6 @@ protected Payload doInBackground(Payload... params) {
 
 		}
 
-		//Sort the media list by filename
-		Collections.sort(payload.getResponseData(), new Comparator<Object>() {
-			@Override
-			public int compare(Object o1, Object o2){
-				return ((Media) o1).getFilename().compareTo(((Media) o2).getFilename());
-			}
-		});
-
 		return payload;
 	}
 

diff --git a/app/src/main/res/drawable-hdpi/ic_sort.png b/app/src/main/res/drawable-hdpi/ic_sort.png
diff --git a/app/src/main/res/drawable-mdpi/ic_sort.png b/app/src/main/res/drawable-mdpi/ic_sort.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_sort.png b/app/src/main/res/drawable-xhdpi/ic_sort.png
diff --git a/app/src/main/res/menu/missing_media_sortby.xml b/app/src/main/res/menu/missing_media_sortby.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:oppiamobile="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/sort_by"
+        android:icon="@drawable/ic_sort"
+        oppiamobile:showAsAction="ifRoom"
+        android:title="@string/menu_sort_by">
+
+        <menu>
+            <item
+                android:id="@+id/menuSortCourseTitle"
+                android:title="@string/menu_sort_by_course" />
+            <item
+                android:id="@+id/menuSortMediaTitle"
+                android:title="@string/menu_sort_by_filename" />
+        </menu>
+    </item>
+</menu>