mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-10-23 04:26:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
David A. Velasco 2013-06-05 11:08:33 +02:00
parent 16f121a7b2
commit 93f79c7099
4 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable/btn_cancel.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

8
res/layout/file_details_fragment.xml
View file

@ -183,7 +183,7 @@
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"
@ -199,12 +199,14 @@
android:indeterminateOnly="false"
/>
<Button
<ImageButton
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>

44
res/layout/file_download_fragment.xml
View file

@ -32,23 +32,37 @@
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:progressDrawable="@android:drawable/progress_horizontal"
android:indeterminate="false"
android:indeterminateOnly="false"
android:gravity="center"
android:layout_marginTop="12dp"
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"

4
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
View file

@ -27,7 +27,7 @@ import android.view.LayoutInflater;
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;
@ -127,7 +127,7 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
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();