From: AndyScherzinger <info@andy-scherzinger.de>
Date: Sun, 26 Jul 2015 15:52:29 +0000 (+0200)
Subject: added indeterminate progress bar to show activity since this isn't supported by AppCo... 
X-Git-Tag: oc-android-1.8~42^2~65
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/49b3acd2be5140725d48ec3988017182b07f9376

added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore
---

diff --git a/res/drawable-xxhdpi/backup/owncloud_progress_bg_light.9.png b/res/drawable-xxhdpi/backup/owncloud_progress_bg_light.9.png
new file mode 100644
index 00000000..fb146c33
Binary files /dev/null and b/res/drawable-xxhdpi/backup/owncloud_progress_bg_light.9.png differ
diff --git a/res/drawable-xxhdpi/backup/owncloud_progress_primary_light.9.png b/res/drawable-xxhdpi/backup/owncloud_progress_primary_light.9.png
new file mode 100644
index 00000000..1fc3b4ec
Binary files /dev/null and b/res/drawable-xxhdpi/backup/owncloud_progress_primary_light.9.png differ
diff --git a/res/drawable-xxhdpi/backup/owncloud_progress_secondary_light.9.png b/res/drawable-xxhdpi/backup/owncloud_progress_secondary_light.9.png
new file mode 100644
index 00000000..6cae209f
Binary files /dev/null and b/res/drawable-xxhdpi/backup/owncloud_progress_secondary_light.9.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progress_bg_light.9.png b/res/drawable-xxhdpi/owncloud_progress_bg_light.9.png
new file mode 100644
index 00000000..fb146c33
Binary files /dev/null and b/res/drawable-xxhdpi/owncloud_progress_bg_light.9.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progress_primary_light.9.png b/res/drawable-xxhdpi/owncloud_progress_primary_light.9.png
new file mode 100644
index 00000000..1fc3b4ec
Binary files /dev/null and b/res/drawable-xxhdpi/owncloud_progress_primary_light.9.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progress_secondary_light.9.png b/res/drawable-xxhdpi/owncloud_progress_secondary_light.9.png
new file mode 100644
index 00000000..6cae209f
Binary files /dev/null and b/res/drawable-xxhdpi/owncloud_progress_secondary_light.9.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png
new file mode 100644
index 00000000..2444d836
Binary files /dev/null and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_1.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_2.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_2.png
new file mode 100644
index 00000000..35ca0a76
Binary files /dev/null and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_2.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png
new file mode 100644
index 00000000..94b63b5c
Binary files /dev/null and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_3.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png
new file mode 100644
index 00000000..efe4948d
Binary files /dev/null and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_4.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_5.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_5.png
new file mode 100644
index 00000000..e91efc5e
Binary files /dev/null and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_5.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_6.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_6.png
new file mode 100644
index 00000000..815d093b
Binary files /dev/null and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_6.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png
new file mode 100644
index 00000000..c78647de
Binary files /dev/null and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_7.png differ
diff --git a/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png
new file mode 100644
index 00000000..1edad5a7
Binary files /dev/null and b/res/drawable-xxhdpi/owncloud_progressbar_indeterminate_8.png differ
diff --git a/res/layout/files.xml b/res/layout/files.xml
index 649c863a..9d57a6ae 100644
--- a/res/layout/files.xml
+++ b/res/layout/files.xml
@@ -25,28 +25,46 @@
 
     <!-- The main content view -->
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background_color"
-        android:baselineAligned="false"
-        android:orientation="horizontal"
-        android:id="@+id/ListLayout"
-        android:contentDescription="@string/list_layout"
-        >
-
-
-        <FrameLayout
-            android:id="@+id/left_fragment_container"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1" />
-
-        <FrameLayout
-            android:id="@+id/right_fragment_container"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="2" />
+        android:orientation="vertical">
+
+        <ProgressBar android:id="@+id/progressBar"
+            android:layout_width="match_parent"
+            android:layout_height="6dp"
+            android:padding="0dp"
+            android:layout_margin="0dp"
+            style="@style/Widget.ownCloud.TopProgressBar"
+            android:indeterminate="true"
+            android:indeterminateOnly="true"
+            android:background="#ffffff"
+
+            />
+
+        <LinearLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/background_color"
+
+            android:orientation="horizontal"
+            android:id="@+id/ListLayout"
+            android:contentDescription="@string/list_layout"
+            >
+
+            <FrameLayout
+                android:id="@+id/left_fragment_container"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <FrameLayout
+                android:id="@+id/right_fragment_container"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2" />
+        </LinearLayout>
+
     </LinearLayout>
 
     <include
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 633ff241..65cad177 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -29,6 +29,7 @@
     <color name="owncloud_blue">#1D2D44</color>
     <color name="login_text_color">#AAAAAA</color>
 
+
     <!-- Colors -->
     <color name="color_accent">@color/owncloud_blue_bright</color>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index de8a0ab9..2cea91de 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -39,6 +39,12 @@
 		<item name="colorAccent">@color/color_accent</item>
     </style>
 
+	<!-- Progress bar -->
+	<style name="Widget.ownCloud.TopProgressBar" parent="android:Widget.Holo.ProgressBar.Horizontal">
+		<item name="android:progressDrawable">@drawable/actionbar_progress_horizontal</item>
+		<item name="android:indeterminateDrawable">@drawable/actionbar_progress_indeterminate_horizontal</item>
+	</style>
+
 	<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.AppCompat">
         <item name="android:windowFullscreen">true</item>
     </style>
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index be430aaf..d8967647 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -53,7 +53,7 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.Window;
+import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import com.owncloud.android.MainApp;
@@ -120,6 +120,7 @@ public class FileDisplayActivity extends HookActivity
     private boolean mDualPane;
     private View mLeftFragmentContainer;
     private View mRightFragmentContainer;
+    private ProgressBar mProgressBar;
 
     private static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW";
     private static final String KEY_SYNC_IN_PROGRESS = "SYNC_IN_PROGRESS";
@@ -151,7 +152,7 @@ public class FileDisplayActivity extends HookActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Log_OC.v(TAG, "onCreate() start");
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+        //requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 
         super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account
                                             // is valid
@@ -184,6 +185,8 @@ public class FileDisplayActivity extends HookActivity
         // Navigation Drawer
         initDrawer();
 
+        mProgressBar = (ProgressBar) findViewById(R.id.progressBar);
+
         mDualPane = getResources().getBoolean(R.bool.large_land_layout);
         mLeftFragmentContainer = findViewById(R.id.left_fragment_container);
         mRightFragmentContainer = findViewById(R.id.right_fragment_container);
@@ -200,8 +203,9 @@ public class FileDisplayActivity extends HookActivity
         //getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setHomeButtonEnabled(true);
 
-        setSupportProgressBarIndeterminateVisibility(mSyncInProgress
-        /*|| mRefreshSharesInProgress*/);
+        mProgressBar.setVisibility((mSyncInProgress) ? View.VISIBLE : View.INVISIBLE);
+        //setSupportProgressBarIndeterminateVisibility(mSyncInProgress
+        /*|| mRefreshSharesInProgress*/ //);
         // always AFTER setContentView(...) ; to work around bug in its implementation
 
         initDrawer();
@@ -939,8 +943,9 @@ public class FileDisplayActivity extends HookActivity
                     }
                     removeStickyBroadcast(intent);
                     Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
-                    setSupportProgressBarIndeterminateVisibility(mSyncInProgress
-                    /*|| mRefreshSharesInProgress*/);
+                    mProgressBar.setVisibility((mSyncInProgress) ? View.VISIBLE : View.INVISIBLE);
+                    //setSupportProgressBarIndeterminateVisibility(mSyncInProgress
+                    /*|| mRefreshSharesInProgress*/ //);
 
                     setBackgroundText();
                         
@@ -1037,7 +1042,8 @@ public class FileDisplayActivity extends HookActivity
                     } // TODO what about other kind of previews?
                 }
 
-                setSupportProgressBarIndeterminate(false);
+                //setSupportProgressBarIndeterminate(false);
+                mProgressBar.setVisibility(View.INVISIBLE);
 
             } finally {
                 if (intent != null) {
@@ -1562,8 +1568,9 @@ public class FileDisplayActivity extends HookActivity
                 getApplicationContext()
         );
         synchFolderOp.execute(getAccount(), MainApp.getAppContext(), this, null, null);
-        
-        setSupportProgressBarIndeterminateVisibility(true);
+
+        mProgressBar.setVisibility(View.VISIBLE);
+        //setSupportProgressBarIndeterminateVisibility(true);
 
         setBackgroundText();
     }