projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
80c112a
)
wip
author
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 14 Aug 2015 16:13:20 +0000
(18:13 +0200)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 14 Aug 2015 16:13:20 +0000
(18:13 +0200)
res/menu/file_actions_menu.xml
patch
|
blob
|
blame
|
history
res/menu/main_menu.xml
patch
|
blob
|
blame
|
history
res/values/strings.xml
patch
|
blob
|
blame
|
history
src/com/owncloud/android/datamodel/OCFile.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/files/FileMenuFilter.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
patch
|
blob
|
blame
|
history
diff --git
a/res/menu/file_actions_menu.xml
b/res/menu/file_actions_menu.xml
index
9074b98
..
2551f31
100644
(file)
--- a/
res/menu/file_actions_menu.xml
+++ b/
res/menu/file_actions_menu.xml
@@
-18,7
+18,7
@@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
+
<item android:id="@+id/action_share_file" android:title="@string/action_share_file" android:icon="@android:drawable/ic_menu_share" android:orderInCategory="1" />
<item android:id="@+id/action_unshare_file" android:title="@string/action_unshare_file" android:icon="@android:drawable/ic_menu_share" android:orderInCategory="1" />
<item android:id="@+id/action_open_file_with" android:title="@string/actionbar_open_with" android:icon="@android:drawable/ic_menu_set_as" android:orderInCategory="1" />
<item android:id="@+id/action_share_file" android:title="@string/action_share_file" android:icon="@android:drawable/ic_menu_share" android:orderInCategory="1" />
<item android:id="@+id/action_unshare_file" android:title="@string/action_unshare_file" android:icon="@android:drawable/ic_menu_share" android:orderInCategory="1" />
<item android:id="@+id/action_open_file_with" android:title="@string/actionbar_open_with" android:icon="@android:drawable/ic_menu_set_as" android:orderInCategory="1" />
diff --git
a/res/menu/main_menu.xml
b/res/menu/main_menu.xml
index
236bfd6
..
8743512
100644
(file)
--- a/
res/menu/main_menu.xml
+++ b/
res/menu/main_menu.xml
@@
-35,6
+35,11
@@
android:title="@string/actionbar_mkdir"
android:contentDescription="@string/actionbar_mkdir"/>
<item
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"
android:orderInCategory="2"
android:id="@+id/action_sync_account"
android:icon="@drawable/ic_action_refresh"
android:orderInCategory="2"
diff --git
a/res/values/strings.xml
b/res/values/strings.xml
index
dd8ce04
..
071c4cb
100644
(file)
--- a/
res/values/strings.xml
+++ b/
res/values/strings.xml
@@
-357,5
+357,6
@@
<string name="file_list__footer__files">%1$d files</string>
<string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
<string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>
<string name="file_list__footer__files">%1$d files</string>
<string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
<string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>
-
+ <string name="action_switch_grid_view">Switch to grid view</string>
+ <string name="action_switch_list_view">Switch to list view</string>
</resources>
</resources>
diff --git
a/src/com/owncloud/android/datamodel/OCFile.java
b/src/com/owncloud/android/datamodel/OCFile.java
index
d1821b4
..
4b9b69a
100644
(file)
--- a/
src/com/owncloud/android/datamodel/OCFile.java
+++ b/
src/com/owncloud/android/datamodel/OCFile.java
@@
-27,6
+27,7
@@
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.utils.FileStorageUtils;
import java.io.File;
import com.owncloud.android.utils.FileStorageUtils;
import java.io.File;
+import java.util.Enumeration;
import third_parties.daveKoeller.AlphanumComparator;
public class OCFile implements Parcelable, Comparable<OCFile> {
import third_parties.daveKoeller.AlphanumComparator;
public class OCFile implements Parcelable, Comparable<OCFile> {
@@
-74,6
+75,8
@@
public class OCFile implements Parcelable, Comparable<OCFile> {
private boolean mIsDownloading;
private boolean mIsDownloading;
+ private boolean mShowGridView;
+
/**
* Create new {@link OCFile} with given path.
/**
* Create new {@link OCFile} with given path.
diff --git
a/src/com/owncloud/android/files/FileMenuFilter.java
b/src/com/owncloud/android/files/FileMenuFilter.java
index
2c2754c
..
58f35db
100644
(file)
--- a/
src/com/owncloud/android/files/FileMenuFilter.java
+++ b/
src/com/owncloud/android/files/FileMenuFilter.java
@@
-228,7
+228,6
@@
public class FileMenuFilter {
} else {
toShow.add(R.id.action_unfavorite_file);
}
} else {
toShow.add(R.id.action_unfavorite_file);
}
-
}
}
}
}
diff --git
a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index
a3d9b10
..
bd9fe83
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@
-468,6
+468,9
@@
public class FileDisplayActivity extends HookActivity
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.main_menu, menu);
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;
}
return true;
}
@@
-1137,6
+1140,9
@@
public class FileDisplayActivity extends HookActivity
cleanSecondFragment();
// Sync Folder
startSyncFolderOperation(directory, false);
cleanSecondFragment();
// Sync Folder
startSyncFolderOperation(directory, false);
+
+ // switch list vs. grid view
+
}
/**
}
/**
diff --git
a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index
47d9992
..
6b51d27
100644
(file)
--- a/
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@
-274,6
+274,9
@@
public class OCFileListFragment extends ExtendedListFragment {
item.setEnabled(false);
}
}
item.setEnabled(false);
}
}
+
+// String.format(mContext.getString(R.string.subject_token),
+// getClient().getCredentials().getUsername(), file.getFileName()));
}
}
}
}