Browse Source

Add info text to upload list activity

Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
Jonas Mayer 1 năm trước cách đây
mục cha
commit
bba93328ed

+ 4 - 0
app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -1155,6 +1155,10 @@ public abstract class DrawerActivity extends ToolbarActivity
         return true;
     }
 
+    public AppPreferences getAppPreferences(){
+        return preferences;
+    }
+
     @Override
     protected void onStart() {
         super.onStart();

+ 8 - 3
app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java

@@ -49,7 +49,6 @@ import com.owncloud.android.R;
 import com.owncloud.android.databinding.UploadListLayoutBinding;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.UploadsStorageManager;
-import com.owncloud.android.db.OCUpload;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -270,11 +269,17 @@ public class UploadListActivity extends FileActivity {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.activity_upload_list, menu);
 
-        if (menu.getItem(0).getItemId() == R.id.action_toogle_global_pause){
+        if (menu.getItem(0).getItemId() == R.id.action_toggle_global_pause){
             if (preferences.getGlobalUploadPaused()){
                 menu.getItem(0).setIcon(android.R.drawable.ic_media_play);
+                menu.getItem(0).setTitle(getApplicationContext().getString(
+                    R.string.upload_action_global_upload_resume
+                                                                          ));
             }else{
                 menu.getItem(0).setIcon(android.R.drawable.ic_media_pause);
+                menu.getItem(0).setTitle(getApplicationContext().getString(
+                    R.string.upload_action_global_upload_pause
+                                                                          ));
             }
 
         }
@@ -293,7 +298,7 @@ public class UploadListActivity extends FileActivity {
             } else {
                 openDrawer();
             }
-        } else if (itemId == R.id.action_toogle_global_pause) {
+        } else if (itemId == R.id.action_toggle_global_pause) {
             preferences.setGlobalUploadPaused(!preferences.getGlobalUploadPaused());
             if (preferences.getGlobalUploadPaused()){
                 item.setIcon(android.R.drawable.ic_media_play);

+ 2 - 0
app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java

@@ -646,6 +646,8 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
                 if (uploadHelper.isUploadingNow(upload)) {
                     // really uploading, bind the progress bar to listen for progress updates
                     status = parentActivity.getString(R.string.uploader_upload_in_progress_ticker);
+                } else if (parentActivity.getAppPreferences().getGlobalUploadPaused()) {
+                    status = parentActivity.getString(R.string.upload_global_pause);
                 }
                 break;
 

+ 2 - 2
app/src/main/res/menu/activity_upload_list.xml

@@ -23,9 +23,9 @@
         android:checkableBehavior="none">
 
         <item
-            android:id="@+id/action_toogle_global_pause"
+            android:id="@+id/action_toggle_global_pause"
             android:icon="@android:drawable/ic_media_pause"
-            android:title="@string/action_clear_failed_uploads"
+            android:title="@string/upload_action_global_upload_pause"
             app:showAsAction="always" />
     </group>
 </menu>

+ 2 - 0
app/src/main/res/values/strings.xml

@@ -852,6 +852,8 @@
     <string name="delete_entries">Delete entries</string>
     <string name="upload_action_failed_retry">Retry failed uploads</string>
     <string name="upload_action_failed_clear">Clear failed uploads</string>
+    <string name="upload_action_global_upload_pause">Pause all uploads</string>
+    <string name="upload_action_global_upload_resume">Resume all uploads</string>
     <string name="dismiss_notification_description">Dismiss notification</string>
     <string name="action_empty_notifications">Clear all notifications</string>
     <string name="timeout_richDocuments">Loading is taking longer than expected</string>