Iteration 2 for file detail & new sharing #2573

Merged

AndyScherzinger merged 75 commits intomasterfrom

May 29, 2018

Member

AndyScherzinger commented May 11, 2018 •

edited

Loading

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

AndyScherzinger added the 2. developing label

AndyScherzinger changed the title ~~Iteration 2 for File detail & new sharing~~ Iteration 2 for file detail & new sharing

AndyScherzinger added enhancement design labels

AndyScherzinger force-pushed the fileDetails branch from cec0eb8 to a7ca665 Compare

May 11, 2018 21:35

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

nextcloud deleted a comment

Member Author

AndyScherzinger commented May 29, 2018

All DONE and rebased, ready for final approval/review @tobiasKaminsky @mario @ardevd


          java imports, unused java been removed...

f731e4d

mario reviewed

View reviewed changes

src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

+                          ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProvider(mContext.getContentResolver());
+                          String eTag = arbitraryDataProvider.getValue(accountName, ThumbnailsCacheManager.AVATAR);
+                          String avatarKey = "a_" + mUserId + "_" + mServerName + "_" + eTag;

Contributor

mario May 29, 2018

Because I don't and don't wanna know what "a" is, please change to "avatar".

Member

tobiasKaminsky May 29, 2018

This is the key for our cache:
a_: avatar
t_: thumbnail
r_: resizedImage

As the key is changing for avatar, we can rename it, but then it is not consistent to the other.
Hopefully we/I find the time to change to glide, then this all will change again…

Member Author

AndyScherzinger May 29, 2018

so leave it as-is then for now?

mario reviewed

View reviewed changes

src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

    
                                              if (avatar != null && !TextUtils.isEmpty(newETag)) {

                                                  avatar = handlePNG(avatar, px, px);

                                                  String newImageKey = "a_" + username + "_" + eTag;

                                                  String newImageKey = "a_" + mUserId + "_" + mServerName + "_" + newETag;

Contributor

mario May 29, 2018

avatar_ instead of a_.

mario reviewed

View reviewed changes

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

-                      // SHARE FILE
+                  private void filterShareFile(List<Integer> toShow, List<Integer> toHide, OCCapability capability) {
                       boolean shareViaLinkAllowed = (mContext != null &&

Contributor

mario May 29, 2018

Useless variable. I already removed them in a private branch, but please remove them as they bring nothing. Just use their content in the one place where needed. I know it's not related to this PR, but you touch the file so :P

Member Author

AndyScherzinger May 29, 2018

which variable?

Member Author

AndyScherzinger May 29, 2018

DONE via 84401e7

mario reviewed

View reviewed changes

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

+                  private void filterShareFile(List<Integer> toShow, List<Integer> toHide, OCCapability capability) {
                       boolean shareViaLinkAllowed = (mContext != null &&
                               mContext.getResources().getBoolean(R.bool.share_via_link_feature));
                       boolean shareWithUsersAllowed = (mContext != null &&

Contributor

mario May 29, 2018

Same as above.

Member Author

AndyScherzinger May 29, 2018

DONE via 84401e7

mario reviewed

View reviewed changes

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

                               mContext.getResources().getBoolean(R.bool.share_with_users_feature));
-                      OCCapability capability = mComponentsGetter.getStorageManager().getCapability(mAccount.name);
                       boolean shareApiEnabled = capability != null &&

Contributor

mario May 29, 2018

Same.

Member Author

AndyScherzinger May 29, 2018

DONE via 84401e7

mario reviewed

View reviewed changes

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

    
                      // SEE DETAILS

                      if (!isSingleFile()) {

                  private void filterDetails(List<Integer> toShow, List<Integer> toHide) {

                      if (!isSingleSelection()) {

Contributor

mario May 29, 2018

Invert.

Member Author

AndyScherzinger May 29, 2018

DONE via 84401e7

mario reviewed

View reviewed changes

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()) {

Contributor

mario May 29, 2018

And again.

Member Author

AndyScherzinger May 29, 2018

kept since it'll end up with

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

mario reviewed

View reviewed changes

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()) {

Contributor

mario May 29, 2018

And everywhere else :P

Member Author

AndyScherzinger May 29, 2018

kept since it'll end up with

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

mario reviewed

View reviewed changes

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

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

Contributor

mario May 29, 2018

Invert again. Positive first.

Member Author

AndyScherzinger May 29, 2018

DONE via 84401e7

mario reviewed

View reviewed changes

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

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

Contributor

mario May 29, 2018

Kill the prefix pls.

Member Author

AndyScherzinger May 29, 2018

DONE via c3209d8

mario reviewed

View reviewed changes

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

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

Contributor

mario May 29, 2018

fd again.

Member Author

AndyScherzinger May 29, 2018

DONE via c3209d8

mario reviewed

View reviewed changes

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



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

Contributor

mario May 29, 2018

"will fail" instead of "will failed".

also "next" -> "the following"

Member Author

AndyScherzinger May 29, 2018

DONE via c3209d8

mario reviewed

View reviewed changes

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

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

Contributor

mario May 29, 2018

Uh. Can you rephrase this entire sentence? xD

Member Author

AndyScherzinger May 29, 2018

DONE via c3209d8

mario reviewed

View reviewed changes

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;

Contributor

mario May 29, 2018

"avatar_"

mario reviewed

View reviewed changes

src/main/res/drawable/divider.xml Outdated

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

                
                    No newline at end of file

Contributor

mario May 29, 2018

New line.

Member Author

AndyScherzinger May 29, 2018

DONE via c3209d8

mario reviewed

View reviewed changes

src/main/res/menu/file_details_actions_menu.xml Outdated

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

Contributor

mario May 29, 2018

Remove orderInCategory

Member Author

AndyScherzinger May 29, 2018

DONE via c3209d8

mario reviewed

View reviewed changes

src/main/res/values/strings.xml Outdated

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

Contributor

mario May 29, 2018

Updaeting -> Updating

Member Author

AndyScherzinger May 29, 2018

DONE via c3209d8

AndyScherzinger added 3 commits

May 29, 2018 09:01


          fix menu filter

84401e7


          fix further review comments

c3209d8


          Fix comment again

ba0aff4

Contributor

mario commented May 29, 2018 •

edited by AndyScherzinger

Loading

👍

Decent enough :P

Member Author

AndyScherzinger commented May 29, 2018

Just waiting for Drone to "succeed"...

Member Author

AndyScherzinger commented May 29, 2018

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

Member

jancborchardt commented May 31, 2018

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

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

Animated GIFs broken #3020

Closed

nextcloud-android-bot mentioned this pull request

Animated GIFs still broken! #3125

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

design enhancement