Bläddra i källkod

Minimize new fragment to monitor the progress of file download

David A. Velasco 12 år sedan
förälder
incheckning
cb66b59918

+ 47 - 0
res/layout/file_download_fragment.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012-2013  ownCloud Inc.
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical" >
+	
+	<TextView 
+	    android:id="@+id/progressText" 
+	    android:layout_width="match_parent"
+		android:layout_height="wrap_content" 
+		android:text="@string/downloader_not_downloaded_yet"
+	/>
+	
+	<ProgressBar android:id="@+id/progressBar"
+		android:layout_width="match_parent" 
+		android:layout_height="wrap_content"
+		android:progressDrawable="@android:drawable/progress_horizontal"
+		android:indeterminate="false" 
+		android:indeterminateOnly="false" 
+	/>
+	
+	<Button
+		android:id="@+id/cancelBtn"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="@string/common_cancel" 
+	/>
+ 								
+</LinearLayout>
+

+ 3 - 0
res/values/strings.xml

@@ -88,6 +88,7 @@
     <string name="common_save_exit">Save &amp; Exit</string>
     <string name="common_exit">Leave %1$s</string>
     <string name="common_error">Error</string>
+    <string name="common_loading">Loading &#8230;</string>
     <string name="about_title">About</string>
     
     <string name="delete_account">Delete account</string>
@@ -109,6 +110,7 @@
     <string name="downloader_download_succeeded_content">%1$s was successfully downloaded</string>
     <string name="downloader_download_failed_ticker">Download failed</string>
     <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
+    <string name="downloader_not_downloaded_yet">Not downloaded yet</string>
     <string name="common_choose_account">Choose account</string>
     <string name="sync_string_contacts">Contacts</string>
 	<string name="sync_fail_ticker">Synchronization failed</string>
@@ -275,6 +277,7 @@
     <string name="conflict_dont_upload">Don\'t upload</string>
     
     <string name="image_preview">Image preview</string>
+    <string name="preview_image_loading"></string>
     
     <!-- we need to improve the communication of errors to the user -->
     <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local directory</string>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 51 - 838
src/com/owncloud/android/ui/fragment/FileDownloadFragment.java


Vissa filer visades inte eftersom för många filer har ändrats