Skip to content

Multi Select #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
AndyScherzinger merged 107 commits into from
Jul 21, 2016
Merged

Multi Select #61

AndyScherzinger merged 107 commits into from
Jul 21, 2016

Conversation

@tobiasKaminsky
Copy link
Member

@tobiasKaminsky tobiasKaminsky commented Jun 23, 2016

completely readded from owncloud :/

Jenkins for ownCloud and others added 30 commits June 12, 2016 01:13
[tx-robot] updated from transifex
00e7c10
[tx-robot] updated from transifex
932c66d
@AndyScherzinger
implementation of #1193 - optimizing the uploader layout and taking u…
d74f5fd 
…ser configured sorting into account
@AndyScherzinger
fix background color
ef0b503
@AndyScherzinger
implementation of #1193 - optimizing the uploader layout and taking u…
8d47b77 
…ser configured sorting into account
@AndyScherzinger
Fixes after rebase
7c8fbf1
@AndyScherzinger
proper padding for the choose upload folder buttons
9bbd7ee
@AndyScherzinger
fixed menu, since grid view hasn't been part of the uploader screen
ee7873d
@AndyScherzinger
removed duplicate method call
8b04d61
@AndyScherzinger
fix after rebase
1f4e9aa
@AndyScherzinger
moved the preference accessing to the oC Preference Manager
94a6beb
@AndyScherzinger
moved the preference accessing to the oC Preference Manager
19c7885
@AndyScherzinger
removed now unused code
5c72090
@AndyScherzinger
streamlined PrefManager API for simpler usage
26ef68a
@AndyScherzinger
fix preference manager call after rebase
89dded1
@AndyScherzinger
code review: fixed minor layout optimizations, set generic preference…
68849c7 
… methods to private visibility
@AndyScherzinger
revert filtering out files in the external file upload view
53a0da7
@AndyScherzinger
revert, to show app name for upload from other app
8c863a6
@AndyScherzinger
layouting changes so file list, local list and uploader list look the…
0db0ab1 
… same
@AndyScherzinger
Merge pull request #1277 from owncloud/1193_uploader_layout
b0a6c3f 
#1193 - optimizing the uploader layout & taking user configured sorting into account
[tx-robot] updated from transifex
f361398
[tx-robot] updated from transifex
6333e30
@davivel
Read and save display name when account is created
a749012
@davivel
Undo buggy refactoring; too much to do in that sense to get it works
0f64fe4
@davivel
Show display name in account selector
70e24ce
@davivel
Show display name in navigation drawer
95152a3
@davivel
Added operation to sync display name
3584666
@davivel
Display name is sync'ed whenever a refresh of root folder occurs
0913e3f
@davivel
Updated after renaming operation in OC library
282f62b
@davivel
Show display name in account selector of ReceiveExternalFilesActivity…
ea3cf41 
….java
@AndyScherzinger AndyScherzinger changed the title new multi select Multi Select Jul 13, 2016
@tobiasKaminsky
Copy link
Member Author

tobiasKaminsky commented Jul 15, 2016

Updated, please test :)

@AndyScherzinger
Copy link
Member

AndyScherzinger commented Jul 18, 2016

Don't have the time right now to look into it... but...
device-2016-07-18-154744

Maybe due to the fact that we do not have an action bar anymore but a toolbar.

@AndyScherzinger
Copy link
Member

AndyScherzinger commented Jul 18, 2016

Nevermind.... fixed it right away: 2bfb1b6 - only thing left is the coloring of the progress bar, which can be postponed for any future release.

@tobiasKaminsky
Copy link
Member Author

tobiasKaminsky commented Jul 18, 2016

Awesome!

@AndyScherzinger
proper status bar coloring for multi select mode, cleanup logging
ecf1f9e
@AndyScherzinger
Merge branch 'master' of https://github.com/nextcloud/android into mu…
2af26ed 
…ltiSelectNew

Conflicts:
	res/values-ca/strings.xml
	res/values-he/strings.xml
	res/values-hu-rHU/strings.xml
	res/values-ja-rJP/strings.xml
	res/values-ko/strings.xml
	res/values-lb/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-th-rTH/strings.xml
	res/values-tr/strings.xml
@AndyScherzinger
CR changes
71a44db
@AndyScherzinger
Copy link
Member

AndyScherzinger commented Jul 20, 2016 •
edited
Loading

I did incorporate most of the review comments except for two which can imho be postponed or need further clarification which doesn't have an impact on the feature itself. It did a final test on my phone and it works (for me). I also fixed the progress bar coloring 🚀

So I say let's merge and hereby give it a 👍

@przybylski can you also give a final 👍 if this proceeding is fine with you since the remaining comments not incorporated by me are your comments.

@AndyScherzinger
Merge 'master' including conflict fixing
62c918f 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@AndyScherzinger
fixes after merge
573f95d
@AndyScherzinger
bumped support lib to latest version of 23
9474658
@AndyScherzinger AndyScherzinger merged commit 55c0dcc into master Jul 21, 2016
@AndyScherzinger AndyScherzinger deleted the multiSelectNew branch July 21, 2016 11:02
@mario mario mentioned this pull request Mar 3, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

enhancement priority: high

Projects

None yet

Milestone

Nextcloud App 1.2.0

Development

Successfully merging this pull request may close these issues.

6 participants

@tobiasKaminsky @AndyScherzinger @przybylski @davivel @jabarros @malkomich