added indeterminate progress bar to show activity since this isn't supported by AppCo...

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 (file)
index 0000000..fb146c3
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 (file)
index 0000000..1fc3b4e
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 (file)
index 0000000..6cae209
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 (file)
index 0000000..fb146c3
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 (file)
index 0000000..1fc3b4e
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 (file)
index 0000000..6cae209
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 (file)
index 0000000..2444d83
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 (file)
index 0000000..35ca0a7
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 (file)
index 0000000..94b63b5
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 (file)
index 0000000..efe4948
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 (file)
index 0000000..e91efc5
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 (file)
index 0000000..815d093
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 (file)
index 0000000..c78647d
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 (file)
index 0000000..1edad5a
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 649c863..9d57a6a 100644 (file)
--- a/res/layout/files.xml
+++ b/res/layout/files.xml
@@ -25,28 +25,46 @@
 \r
     <!-- The main content view -->\r
     <LinearLayout\r
 \r
     <!-- The main content view -->\r
     <LinearLayout\r

-        xmlns:android="http://schemas.android.com/apk/res/android"\r

         android:layout_width="match_parent"\r
         android:layout_height="match_parent"\r
         android:layout_width="match_parent"\r
         android:layout_height="match_parent"\r

-        android:background="@color/background_color"\r
-        android:baselineAligned="false"\r
-        android:orientation="horizontal"\r
-        android:id="@+id/ListLayout"\r
-        android:contentDescription="@string/list_layout"\r
-        >\r
-\r
-\r
-        <FrameLayout\r
-            android:id="@+id/left_fragment_container"\r
-            android:layout_width="0dp"\r
-            android:layout_height="match_parent"\r
-            android:layout_weight="1" />\r
-\r
-        <FrameLayout\r
-            android:id="@+id/right_fragment_container"\r
-            android:layout_width="0dp"\r
-            android:layout_height="match_parent"\r
-            android:layout_weight="2" />\r
+        android:orientation="vertical">\r
+\r
+        <ProgressBar android:id="@+id/progressBar"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="6dp"\r
+            android:padding="0dp"\r
+            android:layout_margin="0dp"\r
+            style="@style/Widget.ownCloud.TopProgressBar"\r
+            android:indeterminate="true"\r
+            android:indeterminateOnly="true"\r
+            android:background="#ffffff"\r
+\r
+            />\r
+\r
+        <LinearLayout\r
+            xmlns:android="http://schemas.android.com/apk/res/android"\r
+            android:layout_width="match_parent"\r
+            android:layout_height="wrap_content"\r
+            android:background="@color/background_color"\r
+\r
+            android:orientation="horizontal"\r
+            android:id="@+id/ListLayout"\r
+            android:contentDescription="@string/list_layout"\r
+            >\r
+\r
+            <FrameLayout\r
+                android:id="@+id/left_fragment_container"\r
+                android:layout_width="0dp"\r
+                android:layout_height="match_parent"\r
+                android:layout_weight="1" />\r
+\r
+            <FrameLayout\r
+                android:id="@+id/right_fragment_container"\r
+                android:layout_width="0dp"\r
+                android:layout_height="match_parent"\r
+                android:layout_weight="2" />\r
+        </LinearLayout>\r
+\r

     </LinearLayout>\r
 \r
     <include\r
     </LinearLayout>\r
 \r
     <include\r

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 633ff24..65cad17 100644 (file)
--- 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>
 
     <color name="owncloud_blue">#1D2D44</color>
     <color name="login_text_color">#AAAAAA</color>
 

+

     <!-- Colors -->
     <color name="color_accent">@color/owncloud_blue_bright</color>
 
     <!-- Colors -->
     <color name="color_accent">@color/owncloud_blue_bright</color>
 

diff --git a/res/values/styles.xml b/res/values/styles.xml
index de8a0ab..2cea91d 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -39,6 +39,12 @@
                <item name="colorAccent">@color/color_accent</item>
     </style>
 
                <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>
        <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 be430aa..d896764 100644 (file)
--- 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.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;
 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 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";
 
     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");
     @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
 
         super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account
                                             // is valid


@@ -184,6 +185,8 @@ public class FileDisplayActivity extends HookActivity
         // Navigation Drawer
         initDrawer();
 
         // 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);
         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);
 
         //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();
         // 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);
                     }
                     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();
                         
 
                     setBackgroundText();
                         


@@ -1037,7 +1042,8 @@ public class FileDisplayActivity extends HookActivity
                     } // TODO what about other kind of previews?
                 }
 
                     } // TODO what about other kind of previews?
                 }
 

-                setSupportProgressBarIndeterminate(false);
+                //setSupportProgressBarIndeterminate(false);
+                mProgressBar.setVisibility(View.INVISIBLE);

 
             } finally {
                 if (intent != null) {
 
             } finally {
                 if (intent != null) {


@@ -1562,8 +1568,9 @@ public class FileDisplayActivity extends HookActivity
                 getApplicationContext()
         );
         synchFolderOp.execute(getAccount(), MainApp.getAppContext(), this, null, null);
                 getApplicationContext()
         );
         synchFolderOp.execute(getAccount(), MainApp.getAppContext(), this, null, null);

-        
-        setSupportProgressBarIndeterminateVisibility(true);
+
+        mProgressBar.setVisibility(View.VISIBLE);
+        //setSupportProgressBarIndeterminateVisibility(true);

 
         setBackgroundText();
     }
 
         setBackgroundText();
     }