From: Andy Scherzinger Date: Tue, 10 Nov 2015 10:27:23 +0000 (+0100) Subject: Merge branch '1193_uploader_layout' of https://github.com/owncloud/android into beta X-Git-Tag: beta-20151122~19^2~5 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bc472ee32b28e047fa07b7921a46fe572647712e?ds=inline;hp=--cc Merge branch '1193_uploader_layout' of https://github.com/owncloud/android into beta Conflicts: res/layout/uploader_layout.xml res/layout/uploader_list_item_layout.xml src/com/owncloud/android/ui/activity/Uploader.java --- bc472ee32b28e047fa07b7921a46fe572647712e diff --cc CHANGELOG.md index 3be88b44,099a4456..22f32dee --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -1,40 -1,60 +1,44 @@@ -## 1.8.0 (September 2015) -- New MATERIAL DESIGN theme -- Updated FILE TYPE ICONS -- Preview TXT files within the app -- COPY files & folders -- Preview the full file/folder name from the long press menu -- Set a file as FAVORITE (kept-in-sync) from the CONTEXT MENU -- Updated CONFLICT RESOLUTION dialog (wording) -- Updated background for images with TRANSPARENCY in GALLERY -- Hidden files will not enforce list view instead of GRID VIEW (folders from Picasa & others) -- Security: - + Updated network stack with security fixes (Jackrabbit 2.10.1) -- Bugs fixed: - + Fixed crash when ETag is lost - + Passcode creation not restarted on device rotation - + Recovered share icon shown on folders 'shared with me' - + User name added to subject when sending a share link through e-mail (fixed on SAMLed apps) - -## 1.7.2 (July 2015) -- New navigation drawer -- Improved Passcode -- Automatic grid view just for folders full of images -- More characters allowed in file names -- Support for servers in same domain, different path -- Bugs fixed: - + Frequent crashes in folder with several images - + Sync error in servers with huge quota and external storage enable - + Share by link error - + Some other crashes and minor bugs - -## 1.7.1 (April 2015) - -- Share link even with password enforced by server -- Get the app ready for oc 8.1 servers -- Added option to create new folder in uploads from external apps -- Improved management of deleted users -- Bugs fixed - + Fixed crash on Android 2.x devices - + Improvements on uploads - -## 1.7.0 (February 2015) - -- Download full folders -- Grid view for images -- Remote thumbnails (OC Server 8.0+) -- Added number of files and folders at the end of the list -- "Open with" in contextual menu -- Downloads added to Media Provider -- Uploads: - + Local thumbnails in section "Files" - + Multiple selection in "Content from other apps" (Android 4.3+) -- Gallery: - + proper handling of EXIF - + obey sorting in the list of files -- Settings view updated -- Improved subjects in e-mails -- Bugs fixed - - - ++# 2015-11-10 ++- update master ++- PR [#1277] (https://github.com/owncloud/android/pull/1277) "Optimized uploader layout and user configured sorting" merged ++ +# 2015-11-05 +- update master +- fix #1244 +- add changelog +- add check for update of beta version + +# 2015-11-02 +- PR [#1240](https://github.com/owncloud/android/pull/1240) "Set as wallpaper" merged +- updated other PRs + +# 2015-11-01 +- PR [#1236](https://github.com/owncloud/android/pull/1236) "Streaming video/audio" merged +- PR [#1035](https://github.com/owncloud/android/pull/1035) "Enable video thumbnail" merged + +# 2015-10-31 +- updated all PR +- bugfix: #1234, #1230 +- implement Crash Handler +- implement direct download of latest apk in settings -> last item on bottom + +# 2015-10-30 +- fixed problem with Authority + +# 2015-10-29 +- PR [#1099](https://github.com/owncloud/android/pull/1099) "Switch list vs grid" merged +- PR [#1100](https://github.com/owncloud/android/pull/1100) "Material FAB with speed dial implementation" merged +- PR [#1209](https://github.com/owncloud/android/pull/1209) "Material buttons - before in #1090" merged +- PR [#1205](https://github.com/owncloud/android/pull/1205) "Switch between online and offline files" merged +- PR [#1195](https://github.com/owncloud/android/pull/1195) "Resize Cache" merged +- PR [#1187](https://github.com/owncloud/android/pull/1187) "Video: Big thumbnails" merged +- PR [#1058](https://github.com/owncloud/android/pull/1058) "add sort to UploadFileActiviy" merged +- PR [#1168](https://github.com/owncloud/android/pull/1168) "Avoid duplicate files" merged +- PR [#1176](https://github.com/owncloud/android/pull/1176) "Multi select" merged + + +# 2015-10-26 +- start of branch +- PR [#745](https://github.com/owncloud/android/pull/745) merged +- PR [#1044](https://github.com/owncloud/android/pull/1044) merged: < 8.1: GalleryPlus app needed, >= 8.2 Gallery app needed +- PR [#1111](https://github.com/owncloud/android/pull/1111) merged diff --cc owncloud-android-library index fff67c91,32ab89fc..b06021b0 --- a/owncloud-android-library +++ b/owncloud-android-library @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit fff67c91f73532229cd678cbbee19b52b0852db5 -Subproject commit 32ab89fc308af2a51b9b7ded7fb40fc786dfd8a6 ++Subproject commit b06021b059d532a268a59da3943d11fb0bb880e8 diff --cc res/layout/uploader_layout.xml index 1c2b6cc3,601ac606..e313c09e --- a/res/layout/uploader_layout.xml +++ b/res/layout/uploader_layout.xml @@@ -18,29 -18,23 +18,23 @@@ along with this program. If not, see . --> - - - - + android:id="@+id/upload_list" + android:layout_above="@+id/upload_actions"> - + android:dividerHeight="1dp"> diff --cc res/layout/uploader_list_item_layout.xml index b66df448,988c6e95..9f6f5ba8 --- a/res/layout/uploader_list_item_layout.xml +++ b/res/layout/uploader_list_item_layout.xml @@@ -17,29 -17,57 +17,56 @@@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - - - - - - + + + + + + + + + + + ++ android:textSize="16sp" /> + + ++ android:textSize="14sp" /> + + + diff --cc src/com/owncloud/android/ui/activity/Uploader.java index 0194092d,99ca54ec..daa136d0 --- a/src/com/owncloud/android/ui/activity/Uploader.java +++ b/src/com/owncloud/android/ui/activity/Uploader.java @@@ -333,7 -334,10 +334,10 @@@ public class Uploader extends FileActiv public void onItemClick(AdapterView parent, View view, int position, long id) { // click on folder in the list Log_OC.d(TAG, "on item click"); - Vector tmpfiles = getStorageManager().getFolderContent(mFile, false); + // TODO Enable when "On Device" is recovered ? - Vector tmpfiles = getStorageManager().getFolderContent(mFile /*, false*/); ++ Vector tmpfiles = getStorageManager().getFolderContent(mFile , false); + tmpfiles = sortFileList(tmpfiles); + if (tmpfiles.size() <= 0) return; // filter on dirtype Vector files = new Vector(); @@@ -417,12 -422,16 +422,16 @@@ mFile = getStorageManager().getFileByPath(full_path); if (mFile != null) { + // TODO Enable when "On Device" is recovered ? - Vector files = getStorageManager().getFolderContent(mFile/*, false*/); + Vector files = getStorageManager().getFolderContent(mFile, false); + files = sortFileList(files); + List> data = new LinkedList>(); for (OCFile f : files) { - HashMap h = new HashMap(); if (f.isFolder()) { + HashMap h = new HashMap(); h.put("dirname", f.getFileName()); + h.put("last_mod", DisplayUtils.getRelativeTimestamp(this, f)); data.add(h); } } @@@ -443,6 -452,18 +452,18 @@@ } } + private Vector sortFileList(Vector files) { + SharedPreferences sharedPreferences = PreferenceManager + .getDefaultSharedPreferences(this); + + // Read sorting order, default to sort by name ascending + FileStorageUtils.mSortOrder = sharedPreferences.getInt("sortOrder", 0); + FileStorageUtils.mSortAscending = sharedPreferences.getBoolean("sortAscending", true); + - files = FileStorageUtils.sortFolder(files); ++ files = FileStorageUtils.sortOcFolder(files); + return files; + } + private String generatePath(Stack dirs) { String full_path = ""; diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java index 48047547,975095b5..c46b2968 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@@ -202,15 -193,14 +202,15 @@@ public class FileListListAdapter extend switch (viewType){ case LIST_ITEM: TextView fileSizeV = (TextView) view.findViewById(R.id.file_size); + TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator); TextView lastModV = (TextView) view.findViewById(R.id.last_mod); - ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox); + lastModV.setVisibility(View.VISIBLE); - lastModV.setText(showRelativeTimestamp(file)); + lastModV.setText(DisplayUtils.getRelativeTimestamp(mContext, file)); - checkBoxV.setVisibility(View.GONE); + fileSizeSeparatorV.setVisibility(View.VISIBLE); fileSizeV.setVisibility(View.VISIBLE); fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));