tobiasKaminsky 10 years ago
parent
commit
6bd7065c73

+ 5 - 0
res/menu/main_menu.xml

@@ -34,6 +34,11 @@
         app:showAsAction="always"
         android:title="@string/actionbar_mkdir"
         android:contentDescription="@string/actionbar_mkdir"/>
+    <item
+        android:id="@+id/action_switch_view"
+        android:icon="@android:drawable/ic_menu_view"
+        android:orderInCategory="2"
+        android:title="@string/action_switch_grid_view" />
     <item
         android:id="@+id/action_sync_account"
         android:icon="@drawable/ic_action_refresh"

+ 2 - 0
res/values/strings.xml

@@ -395,4 +395,6 @@
     <string name="share_sharee_unavailable">Sorry, your server version does not allow share with users within clients.
         \nPlease contact your administrator</string>
 
+    <string name="action_switch_grid_view">Switch to grid view</string>
+    <string name="action_switch_list_view">Switch to list view</string>
 </resources>

+ 3 - 0
src/com/owncloud/android/datamodel/OCFile.java

@@ -31,6 +31,7 @@ import android.webkit.MimeTypeMap;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.io.File;
+import java.util.Enumeration;
 
 import third_parties.daveKoeller.AlphanumComparator;
 public class OCFile implements Parcelable, Comparable<OCFile> {
@@ -90,6 +91,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
      */
     private Uri mLocalUri;
 
+    private boolean mShowGridView;
+
 
     /**
      * Create new {@link OCFile} with given path.

+ 0 - 1
src/com/owncloud/android/files/FileMenuFilter.java

@@ -226,7 +226,6 @@ public class FileMenuFilter {
         } else {
             toShow.add(R.id.action_unfavorite_file);
         }
-
     }
 
 }

+ 6 - 0
src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -495,6 +495,9 @@ public class FileDisplayActivity extends HookActivity
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.main_menu, menu);
+
+        // TODO Tobi change according to pref
+        menu.getItem(2).setTitle(getApplicationContext().getString(R.string.action_switch_grid_view));
         return true;
     }
     
@@ -1211,6 +1214,9 @@ public class FileDisplayActivity extends HookActivity
         cleanSecondFragment();
         // Sync Folder
         startSyncFolderOperation(directory, false);
+
+        // switch list vs. grid view
+
     }
 
     /**

+ 3 - 0
src/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -333,6 +333,9 @@ public class OCFileListFragment extends ExtendedListFragment
                     item.setEnabled(false);
                 }
             }
+
+//            String.format(mContext.getString(R.string.subject_token),
+//                    getClient().getCredentials().getUsername(), file.getFileName()));
         }
     }