Grid view

.travis.yml

@@ -7,8 +7,8 @@ android:
   components:
       - tools
       - platform-tools
-      - build-tools-23.0.2
-      - android-23
+      - build-tools-26.0.1
+      - android-26
       - extra-android-support
       - extra-android-m2repository
 

app/build.gradle

@@ -88,6 +88,7 @@ android {
         compile fileTree(include: ['*.jar'], dir: 'libs')
         compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
         compile "com.android.support:design:${rootProject.ext.supportLibVersion}"
+        compile "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}"
 //        https://github.com/InkApplications/Android-ViewPagerIndicator
         compile 'com.inkapplications.viewpageindicator:library:2.4.3'
 //        https://github.com/kevinsawicki/http-request

app/src/main/AndroidManifest.xml

@@ -154,7 +154,7 @@
 
         <provider
             android:name="com.seafile.seadroid2.provider.SeafileProvider"
-            android:authorities="${applicationId}"
+            android:authorities="com.seafile.seadroid2"
             android:exported="true"
             android:grantUriPermissions="true"
             android:permission="android.permission.MANAGE_DOCUMENTS"

app/src/main/java/com/seafile/seadroid2/SeadroidApplication.java

@@ -50,6 +50,7 @@ public static void initImageLoader(Context context) {
                 .diskCache(new UnlimitedDiscCache(cacheDir))
                 .threadPriority(Thread.NORM_PRIORITY - 2)
                 .denyCacheImageMultipleSizesInMemory()
+                .threadPoolSize(6)
                 .diskCacheFileNameGenerator(new Md5FileNameGenerator())
                 .diskCacheSize(50 * 1024 * 1024) // 50 Mb
                 .tasksProcessingOrder(QueueProcessingType.LIFO)

app/src/main/java/com/seafile/seadroid2/SettingsManager.java

@@ -7,11 +7,14 @@
 
 import com.seafile.seadroid2.account.AccountManager;
 import com.seafile.seadroid2.gesturelock.LockPatternUtils;
+import com.seafile.seadroid2.ui.fragment.ReposFragment;
 import com.seafile.seadroid2.util.Utils;
 
 import java.util.Arrays;
 import java.util.List;
 
+import static com.seafile.seadroid2.ui.fragment.ReposFragment.ViewMode.LIST;
+
 /**
  * Access the app settings
  */
@@ -90,6 +93,10 @@ private SettingsManager() {
     public static final String SORT_FILES_TYPE = "sort_files_type";
     public static final String SORT_FILES_ORDER = "sort_files_order";
 
+    // Repo view
+    public static final String REPO_VIEW_GRID_LIST = "repo_view_grid_list";
+
+
     public static long lock_timestamp = 0;
     public static final long LOCK_EXPIRATION_MSECS = 5 * 60 * 1000;
 
@@ -232,6 +239,14 @@ public void saveSortFilesPref(int type, int order) {
         editor.putInt(SORT_FILES_ORDER, order).commit();
     }
 
+    public void setRepoViewPref(String type){
+        editor.putString(REPO_VIEW_GRID_LIST,type).commit();
+    }
+
+    public String getRepoViewPref(){
+        return sharedPref.getString(REPO_VIEW_GRID_LIST, ReposFragment.ViewMode.LIST.toString());
+    }
+
     public void setCameraUploadBucketList(List<String> list) {
         String s = TextUtils.join(",", list);
         sharedPref.edit().putString(SHARED_PREF_CAMERA_UPLOAD_BUCKETS, s).commit();

app/src/main/java/com/seafile/seadroid2/data/DataManager.java

@@ -48,6 +48,8 @@ public class DataManager {
     public static final String PULL_TO_REFRESH_LAST_TIME_FOR_STARRED_FRAGMENT = "starred fragment last update ";
     private static SimpleDateFormat ptrDataFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
+    public static final String THUMBNAIL_LINK = "api2/repos/%s/thumbnail/?p=%s&size=%s";
+
     private static Map<String, PasswordInfo> passwords = Maps.newHashMap();
     private static Map<String, Long> direntsRefreshTimeMap = Maps.newHashMap();
     public static final long REFRESH_EXPIRATION_MSECS = 10 * 60 * 1000; // 10 mins
@@ -116,7 +118,7 @@ public String getThumbnailLink(String repoName, String repoID, String filePath,
         } else {
             try {
                 String pathEnc = URLEncoder.encode(filePath, "UTF-8");
-                return account.getServer() + String.format("api2/repos/%s/thumbnail/?p=%s&size=%s", repoID, pathEnc, size);
+                return account.getServer() + String.format(THUMBNAIL_LINK, repoID, pathEnc, size);
             } catch (UnsupportedEncodingException e) {
                 return null;
             }

app/src/main/java/com/seafile/seadroid2/ui/activity/BrowserActivity.java

@@ -480,9 +480,40 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
+    private ReposFragment.ViewMode determineNextViewMode(){
+        ReposFragment.ViewMode currentMode = ReposFragment.ViewMode.valueOf(
+                SettingsManager.instance().getRepoViewPref());
+        switch (currentMode){
+            case GRID:
+                return ReposFragment.ViewMode.LIST;
+            case LIST:
+                return ReposFragment.ViewMode.GRID;
+            default:
+                return ReposFragment.ViewMode.LIST;
+        }
+    }
+
+    private void setViewModeIcon(MenuItem item,ReposFragment.ViewMode currentMode){
+
+        switch (currentMode){
+            case GRID:
+                item.setIcon(ContextCompat.getDrawable(this, R.drawable.list_view));
+                break;
+            case LIST:
+                item.setIcon(ContextCompat.getDrawable(this, R.drawable.grid_view));
+                break;
+        }
+    }
+
     @Override
     public boolean onMenuItemClick(MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.switch_view:
+                ReposFragment.ViewMode nextMode = determineNextViewMode();
+                SettingsManager.instance().setRepoViewPref(nextMode.toString());
+                setViewModeIcon(item,nextMode);
+                getReposFragment().changeLayout(nextMode);
+                return true;
             case R.id.sort:
                 showSortFilesDialog();
                 return true;
@@ -912,6 +943,12 @@ public boolean onCreateOptionsMenu(Menu menu) {
         Toolbar toolbar = getActionBarToolbar();
         toolbar.inflateMenu(R.menu.browser_menu);
         toolbar.setOnMenuItemClickListener(this);
+        MenuItem item = toolbar.getMenu().findItem(R.id.switch_view);
+        if(item!=null){
+            ReposFragment.ViewMode currentMode = ReposFragment.ViewMode.valueOf(
+                    SettingsManager.instance().getRepoViewPref());
+            setViewModeIcon(item, currentMode);
+        }
         return true;
     }