Cleaned up the old toolbar progressbar dependent code

Signed-off-by: Kilian Périsset <kilian.perisset@infomaniak.com>

src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

@@ -154,7 +154,6 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
             ThemeUtils.setColoredTitle(getSupportActionBar(), caption, this);
         }
 
-        showProgressBar(mSyncInProgress);
         // always AFTER setContentView(...) ; to work around bug in its implementation
 
         // sets message for empty list of folders
@@ -265,7 +264,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
                                                                             getApplicationContext());
 
         refreshFolderOperation.execute(getAccount(), this, null, null);
-        showProgressBar(true);
+        getListOfFilesFragment().setLoading(true);
         setBackgroundText();
     }
 
@@ -273,6 +272,8 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
     protected void onResume() {
         super.onResume();
         Log_OC.e(TAG, "onResume() start");
+        getListOfFilesFragment().setLoading(mSyncInProgress);
+
 
         // refresh list of files
         refreshListOfFilesFragment(false);
@@ -544,7 +545,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
                     DataHolderUtil.getInstance().delete(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT));
                     Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
 
-                    showProgressBar(mSyncInProgress);
+                    getListOfFilesFragment().setLoading(mSyncInProgress);
 
                     setBackgroundText();
                 }

src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java

@@ -30,7 +30,6 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.owncloud.android.R;
@@ -46,7 +45,6 @@ import androidx.appcompat.widget.Toolbar;
  * Base class providing toolbar registration functionality, see {@link #setupToolbar()}.
  */
 public abstract class ToolbarActivity extends BaseActivity {
-    private ProgressBar mProgressBar;
     private ImageView mPreviewImage;
     private FrameLayout mPreviewImageContainer;
     private LinearLayout mInfoBox;
@@ -68,9 +66,6 @@ public abstract class ToolbarActivity extends BaseActivity {
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        mProgressBar = findViewById(R.id.toolbar_progressBar);
-        setProgressBarBackgroundColor();
-
         mInfoBox = findViewById(R.id.info_box);
         mInfoBoxMessage = findViewById(R.id.info_box_message);
 
@@ -160,17 +155,6 @@ public abstract class ToolbarActivity extends BaseActivity {
         mInfoBox.setVisibility(View.GONE);
     }
 
-    /**
-     * Change the visibility for the toolbar's progress bar.
-     *
-     * @param isVisible visibility of the progress bar
-     */
-    public void showProgressBar(boolean isVisible) {
-        if (mProgressBar != null) {
-            mProgressBar.setVisibility(isVisible? View.VISIBLE : View.GONE);
-        }
-    }
-
     /**
      * Change the visibility for the toolbar's preview image.
      *
@@ -210,16 +194,4 @@ public abstract class ToolbarActivity extends BaseActivity {
     public ImageView getPreviewImageView() {
             return mPreviewImage;
     }
-
-    /**
-     * Set the background to to progress bar of the toolbar. The resource should refer to
-     * a Drawable object or 0 to remove the background.#
-     *
-     */
-    private void setProgressBarBackgroundColor() {
-        if (mProgressBar != null) {
-            mProgressBar.setBackgroundColor(ThemeUtils.primaryAppbarColor(this));
-            mProgressBar.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryColor(this), PorterDuff.Mode.SRC_IN);
-        }
-    }
 }

src/main/java/com/owncloud/android/ui/asynctasks/PhotoSearchTask.java

@@ -118,9 +118,7 @@ public class PhotoSearchTask extends AsyncTask<Void, Void, RemoteOperationResult
 
             final ToolbarActivity fileDisplayActivity = (ToolbarActivity) photoFragment.getActivity();
 
-            if (fileDisplayActivity != null) {
-                fileDisplayActivity.showProgressBar(false);
-            }
+                photoFragment.setLoading(false);
 
             if (!result.isSuccess() && !isCancelled()) {
                 photoFragment.setEmptyListMessage(ExtendedListFragment.SearchType.PHOTO_SEARCH);

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

@@ -241,7 +241,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
     private void activatePreviewImage() {
         if (activity != null) {
             activity.setPreviewImageVisibility(View.VISIBLE);
-            activity.showProgressBar(false);
             ThemeUtils.setStatusBarColor(activity, activity.getResources().getColor(R.color.background_color_inverse));
             if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(null);
@@ -378,7 +377,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
         if(activity != null) {
             activity.setupToolbar();
             activity.setPreviewImageVisibility(View.GONE);
-            activity.showProgressBar(true);
         }
 
         super.onStop();

src/main/res/layout/toolbar_standard.xml

@@ -56,16 +56,6 @@
             android:layout_height="?attr/actionBarSize"
             app:popupTheme="@style/Theme.AppCompat.DayNight.NoActionBar" />
 
-        <ProgressBar
-            android:id="@+id/toolbar_progressBar"
-            style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/toolbar"
-            android:layout_marginTop="-7dp"
-            android:layout_marginBottom="-7dp"
-            android:indeterminate="true"
-            android:visibility="gone" />
     </RelativeLayout>
 
     <include layout="@layout/info_box" />