Iteration 2 for file detail & new sharing by AndyScherzinger · Pull Request #2573 · nextcloud/android

AndyScherzinger · 2018-05-11T20:56:18Z

Iteration 1 can be found here: #2533 ☑️

WiP for #2485 and collab with @tobiasKaminsky

Open for iteration 3/4

implement actual email share type menu options (behaves as is, so atm like a user share type)
remove old/legacy ShareActivity and launch FileDetailFragment with sharing tab active
MVP the sharing part

mario · 2018-05-29T06:42:45Z

src/main/java/com/owncloud/android/files/FileMenuFilter.java

                mContext.getResources().getBoolean(R.bool.share_with_users_feature));

-        OCCapability capability = mComponentsGetter.getStorageManager().getCapability(mAccount.name);
        boolean shareApiEnabled = capability != null &&


DONE via 84401e7

mario · 2018-05-29T06:43:12Z

src/main/java/com/owncloud/android/files/FileMenuFilter.java

-        // SEE DETAILS
-        if (!isSingleFile()) {
+    private void filterDetails(List<Integer> toShow, List<Integer> toHide) {
+        if (!isSingleSelection()) {


DONE via 84401e7

mario · 2018-05-29T06:43:23Z

src/main/java/com/owncloud/android/files/FileMenuFilter.java


-        // Kept available offline
+    private void filterKeepAvailableOffline(List<Integer> toShow, List<Integer> toHide, boolean synchronizing) {
        if (!allFiles() || synchronizing || allKeptAvailableOffline()) {


kept since it'll end up with

if (allFiles() || !synchronizing || !allKeptAvailableOffline()) {

mario · 2018-05-29T06:43:30Z

src/main/java/com/owncloud/android/files/FileMenuFilter.java


-        // Not kept available offline
+    private void filterDontKeepAvailableOffline(List<Integer> toShow, List<Integer> toHide, boolean synchronizing) {
        if (!allFiles() || synchronizing || allNotKeptAvailableOffline()) {


And everywhere else :P

kept since it'll end up with

if (allFiles() || !synchronizing || !allKeptAvailableOffline()) {

mario · 2018-05-29T06:43:46Z

src/main/java/com/owncloud/android/files/FileMenuFilter.java

+    }
+
+    private void filterDeselectAll(List<Integer> toShow, List<Integer> toHide, boolean inSingleFileFragment) {
+        if (!inSingleFileFragment) {


Invert again. Positive first.

DONE via 84401e7

mario · 2018-05-29T06:48:28Z

src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

+    private static final String ARG_ACCOUNT = "ACCOUNT";
+    private static final String ARG_ACTIVE_TAB = "TAB";
+
+    @Nullable @BindView(R.id.fdProgressBlock)


Kill the prefix pls.

DONE via c3209d8

mario · 2018-05-29T06:51:42Z

src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

+    @BindView(R.id.searchView)
+    SearchView searchView;
+
+    @BindView(R.id.fdshareUsersList)


DONE via c3209d8

mario · 2018-05-29T06:53:03Z

src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java



-    /// BEWARE: next methods will failed with NullPointerException if called before onCreateView() finishes
+    // BEWARE: next methods will failed with NullPointerException if called before onCreateView() finishes


"will fail" instead of "will failed".

also "next" -> "the following"

DONE via c3209d8

mario · 2018-05-29T06:53:33Z

src/main/java/com/owncloud/android/ui/fragment/util/FileDetailSharingFragmentHelper.java

+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                // return true to prevent the query is processed to be queried;


Uh. Can you rephrase this entire sentence? xD

DONE via c3209d8

mario · 2018-05-29T06:53:57Z

src/main/java/com/owncloud/android/utils/DisplayUtils.java

-            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 · 2018-05-29T06:54:14Z

src/main/res/drawable/divider.xml

+            <size android:height="1dp" />
+        </shape>
+    </item>
+</layer-list>


DONE via c3209d8

mario · 2018-05-29T06:55:22Z

src/main/res/menu/file_details_actions_menu.xml

+        android:title="@string/common_rename"
+        app:showAsAction="never"
+        android:showAsAction="never"
+        android:orderInCategory="1" />


Remove orderInCategory

DONE via c3209d8

mario · 2018-05-29T06:55:50Z

src/main/res/values/strings.xml

    <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>


Updaeting -> Updating

DONE via c3209d8

mario · 2018-05-29T07:20:42Z

👍

Decent enough :P

AndyScherzinger · 2018-05-29T07:22:49Z

Just waiting for Drone to "succeed"...

AndyScherzinger · 2018-05-29T09:02:18Z

Lint check is green, everything is green, Drone is not working right again... so merging

jancborchardt · 2018-05-31T01:14:01Z

Yay, awesome work! :) Really looking forward to this landing in the release!

AndyScherzinger added the 2. developing label May 11, 2018

AndyScherzinger changed the title ~~Iteration 2 for File detail & new sharing~~ Iteration 2 for file detail & new sharing May 11, 2018

AndyScherzinger added enhancement design labels May 11, 2018

AndyScherzinger force-pushed the fileDetails branch from cec0eb8 to a7ca665 Compare May 11, 2018 21:35

nextcloud deleted a comment May 11, 2018

mario reviewed May 29, 2018

View reviewed changes

nextcloud deleted a comment May 29, 2018

mario reviewed May 29, 2018

View reviewed changes

AndyScherzinger added 3 commits May 29, 2018 09:01

fix menu filter

84401e7

fix further review comments

c3209d8

Fix comment again

ba0aff4

AndyScherzinger merged commit 36584a1 into master May 29, 2018

AndyScherzinger deleted the fileDetails branch May 29, 2018 09:02

AndyScherzinger added this to the Nextcloud App 3.2.0 milestone May 29, 2018

AndyScherzinger removed the 3. to review label May 29, 2018

This was referenced Jun 1, 2018

Iteration 3 for file detail & new sharing #2671

Merged

Iteration 4 for file detail & new sharing #2676

Closed

nextcloud-android-bot mentioned this pull request Sep 11, 2018

Animated GIFs broken #3020

Closed

nextcloud-android-bot mentioned this pull request Oct 9, 2018

Animated GIFs still broken! #3125

Closed



		/// BEWARE: next methods will failed with NullPointerException if called before onCreateView() finishes
		// BEWARE: next methods will failed with NullPointerException if called before onCreateView() finishes

Uh oh!

Conversation

AndyScherzinger commented May 11, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mario commented May 29, 2018 • edited by AndyScherzinger Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AndyScherzinger commented May 29, 2018

Uh oh!

AndyScherzinger commented May 29, 2018

Uh oh!

jancborchardt commented May 31, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

AndyScherzinger commented May 11, 2018 •

edited

Loading

mario commented May 29, 2018 •

edited by AndyScherzinger

Loading