Cancel button for downloads in progress replaceed with 'x' icon

diff --git a/res/drawable/btn_cancel.png b/res/drawable/btn_cancel.png
new file mode 100644 (file)
index 0000000..0a339bd
Binary files /dev/null and b/res/drawable/btn_cancel.png differ

diff --git a/res/layout/file_details_fragment.xml b/res/layout/file_details_fragment.xml
index 0415580..db41532 100644 (file)
--- a/res/layout/file_details_fragment.xml
+++ b/res/layout/file_details_fragment.xml
@@ -183,7 +183,7 @@
                                android:id="@+id/fdProgressBlock"
                                        android:layout_width="match_parent"
                                        android:layout_height="wrap_content"
                                android:id="@+id/fdProgressBlock"
                                        android:layout_width="match_parent"
                                        android:layout_height="wrap_content"

-                                       android:gravity="center_horizontal"
+                                       android:gravity="center"

                                        android:layout_marginTop="12dp"
                                        android:layout_marginBottom="12dp"
                                        android:orientation="horizontal"
                                        android:layout_marginTop="12dp"
                                        android:layout_marginBottom="12dp"
                                        android:orientation="horizontal"


@@ -199,12 +199,14 @@
                                                android:indeterminateOnly="false" 
                                        />
                                                                                                
                                                android:indeterminateOnly="false" 
                                        />
                                                                                                

-                                       <Button
+                                       <ImageButton

                                                android:id="@+id/fdCancelBtn"
                                                android:layout_width="wrap_content"
                                                android:layout_height="wrap_content"
                                                android:layout_marginLeft="12dp"
                                                android:id="@+id/fdCancelBtn"
                                                android:layout_width="wrap_content"
                                                android:layout_height="wrap_content"
                                                android:layout_marginLeft="12dp"

-                                               android:text="@string/common_cancel" />
+                                               android:src="@drawable/btn_cancel"
+                                               android:background="@android:color/transparent"
+                                               />

                                                
                                </LinearLayout>
        
                                                
                                </LinearLayout>
        

diff --git a/res/layout/file_download_fragment.xml b/res/layout/file_download_fragment.xml
index 9c91c37..f881847 100644 (file)
--- a/res/layout/file_download_fragment.xml
+++ b/res/layout/file_download_fragment.xml
@@ -32,23 +32,37 @@
                android:layout_marginBottom="15dp"
        />
        
                android:layout_marginBottom="15dp"
        />
        

-       <ProgressBar android:id="@+id/progressBar"
-               android:layout_width="match_parent" 
+    <LinearLayout
+        android:id="@+id/fdProgressBlock"
+               android:layout_width="match_parent"

                android:layout_height="wrap_content"
                android:layout_height="wrap_content"

-               android:progressDrawable="@android:drawable/progress_horizontal"
-               android:indeterminate="false" 
-               android:indeterminateOnly="false" 
+               android:gravity="center"
+               android:layout_marginTop="12dp"

                android:layout_marginBottom="15dp"
                android:layout_marginBottom="15dp"

-       />
-       
-       <Button
-               android:id="@+id/cancelBtn"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:text="@string/common_cancel" 
-               android:layout_marginBottom="15dp"
-       />
-       
+               android:orientation="horizontal"
+               >
+                                       
+               <ProgressBar android:id="@+id/progressBar"
+                       android:layout_width="0dp" 
+                       android:layout_height="wrap_content"
+                       android:layout_weight="1"
+                       android:progressDrawable="@android:drawable/progress_horizontal"
+                       android:indeterminate="false" 
+                       android:indeterminateOnly="false" 
+                       
+               />
+
+               <ImageButton
+                       android:id="@+id/cancelBtn"
+                       android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_marginLeft="12dp"
+                       android:src="@drawable/btn_cancel"
+                       android:background="@android:color/transparent"
+               />
+
+       </LinearLayout>
+                       

        <ImageView
                android:id="@+id/error_image"
                android:layout_width="wrap_content"
        <ImageView
                android:id="@+id/error_image"
                android:layout_width="wrap_content"

diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
index 2a97ad1..d3d5fe9 100644 (file)
--- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
+++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
@@ -27,7 +27,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;

-import android.widget.Button;
+import android.widget.ImageButton;

 import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import android.widget.ProgressBar;
 import android.widget.TextView;
 


@@ -127,7 +127,7 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
         ProgressBar progressBar = (ProgressBar)mView.findViewById(R.id.progressBar);
         mProgressListener = new ProgressListener(progressBar);
         
         ProgressBar progressBar = (ProgressBar)mView.findViewById(R.id.progressBar);
         mProgressListener = new ProgressListener(progressBar);
         

-        ((Button)mView.findViewById(R.id.cancelBtn)).setOnClickListener(this);
+        ((ImageButton)mView.findViewById(R.id.cancelBtn)).setOnClickListener(this);

         
         if (mError) {
             setButtonsForRemote();
         
         if (mError) {
             setButtonsForRemote();