Iteration 2 for file detail & new sharing #2573
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AndyScherzinger
changed the title
AndyScherzinger
force-pushed
the
fileDetails
branch
from
cec0eb8 to
a7ca665
Compare
mario
reviewed
May 29, 2018
| boolean shareViaLinkAllowed = (mContext != null && | ||
| mContext.getResources().getBoolean(R.bool.share_via_link_feature)); | ||
| boolean shareWithUsersAllowed = (mContext != null && | ||
| mContext.getResources().getBoolean(R.bool.share_with_users_feature)); | ||
|
|
||
| OCCapability capability = mComponentsGetter.getStorageManager().getCapability(mAccount.name); | ||
| boolean shareApiEnabled = capability != null && |
There was a problem hiding this comment.
DONE via 84401e7
mario
reviewed
May 29, 2018
| // SEE DETAILS | ||
| if (!isSingleFile()) { | ||
| private void filterDetails(List<Integer> toShow, List<Integer> toHide) { | ||
| if (!isSingleSelection()) { |
There was a problem hiding this comment.
DONE via 84401e7
mario
reviewed
May 29, 2018
|
|
||
| // Kept available offline | ||
| private void filterKeepAvailableOffline(List<Integer> toShow, List<Integer> toHide, boolean synchronizing) { | ||
| if (!allFiles() || synchronizing || allKeptAvailableOffline()) { |
There was a problem hiding this comment.
kept since it'll end up with
if (allFiles() || !synchronizing || !allKeptAvailableOffline()) {
mario
reviewed
May 29, 2018
|
|
||
| // Not kept available offline | ||
| private void filterDontKeepAvailableOffline(List<Integer> toShow, List<Integer> toHide, boolean synchronizing) { | ||
| if (!allFiles() || synchronizing || allNotKeptAvailableOffline()) { |
There was a problem hiding this comment.
kept since it'll end up with
if (allFiles() || !synchronizing || !allKeptAvailableOffline()) {
mario
reviewed
May 29, 2018
| } | ||
|
|
||
| private void filterDeselectAll(List<Integer> toShow, List<Integer> toHide, boolean inSingleFileFragment) { | ||
| if (!inSingleFileFragment) { |
There was a problem hiding this comment.
Invert again. Positive first.
There was a problem hiding this comment.
DONE via 84401e7
mario
reviewed
May 29, 2018
| private static final String ARG_ACCOUNT = "ACCOUNT"; | ||
| private static final String ARG_ACTIVE_TAB = "TAB"; | ||
|
|
||
| @Nullable @BindView(R.id.fdProgressBlock) |
There was a problem hiding this comment.
DONE via c3209d8
mario
reviewed
May 29, 2018
| @BindView(R.id.searchView) | ||
| SearchView searchView; | ||
|
|
||
| @BindView(R.id.fdshareUsersList) |
There was a problem hiding this comment.
DONE via c3209d8
mario
reviewed
May 29, 2018
| @@ -846,7 +846,7 @@ public void onClick(View v) { | |||
| } | |||
|
|
|||
|
|
|||
| /// BEWARE: next methods will failed with NullPointerException if called before onCreateView() finishes | |||
| // BEWARE: next methods will failed with NullPointerException if called before onCreateView() finishes | |||
There was a problem hiding this comment.
"will fail" instead of "will failed".
also "next" -> "the following"
There was a problem hiding this comment.
DONE via c3209d8
mario
reviewed
May 29, 2018
| searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { | ||
| @Override | ||
| public boolean onQueryTextSubmit(String query) { | ||
| // return true to prevent the query is processed to be queried; |
There was a problem hiding this comment.
Uh. Can you rephrase this entire sentence? xD
There was a problem hiding this comment.
DONE via c3209d8
mario
reviewed
May 29, 2018
| String eTag = arbitraryDataProvider.getValue(account, ThumbnailsCacheManager.AVATAR); | ||
| String serverName = account.name.substring(account.name.lastIndexOf('@') + 1, account.name.length()); | ||
| String eTag = arbitraryDataProvider.getValue(userId + "@" + serverName, ThumbnailsCacheManager.AVATAR); | ||
| String avatarKey = "a_" + userId + "_" + serverName + "_" + eTag; |
mario
reviewed
May 29, 2018
| <size android:height="1dp" /> | ||
| </shape> | ||
| </item> | ||
| </layer-list> |
There was a problem hiding this comment.
DONE via c3209d8
mario
reviewed
May 29, 2018
| android:title="@string/common_rename" | ||
| app:showAsAction="never" | ||
| android:showAsAction="never" | ||
| android:orderInCategory="1" /> |
There was a problem hiding this comment.
DONE via c3209d8
mario
reviewed
May 29, 2018
src/main/res/values/strings.xml
Outdated
| @@ -784,4 +785,7 @@ | |||
| <string name="create_new_folder">Create new folder</string> | |||
| <string name="uploads_view_upload_status_virus_detected">Virus detected. Upload cannot be completed!</string> | |||
| <string name="tags">Tags</string> | |||
| <string name="sharee_add_failed">Adding sharee failed</string> | |||
| <string name="unsharing_failed">Unsharing failed</string> | |||
| <string name="updating_share_failed">Updateing share failed</string> | |||
There was a problem hiding this comment.
DONE via c3209d8
|
👍 Decent enough :P |
|
Just waiting for Drone to "succeed"... |
|
Lint check is green, everything is green, Drone is not working right again... so merging |
|
Yay, awesome work! :) Really looking forward to this landing in the release! |
This was referenced Jun 1, 2018
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Iteration 1 can be found here: #2533 ☑️
WiP for #2485 and collab with @tobiasKaminsky
ListViewwithRecyclerViewOpen for iteration 3/4