Эх сурвалжийг харах

Merge pull request #13053 from nextcloud/restore-right-global-pause-icon

Bugfix Restore correct global pause icon in uploads tab
Jonas Mayer 1 жил өмнө
parent
commit
664fad2723

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

@@ -267,10 +267,10 @@ public class UploadListActivity extends FileActivity {
         int iconId;
         String title;
         if (preferences.isGlobalUploadPaused()) {
-            iconId = R.drawable.ic_play;
+            iconId = R.drawable.ic_global_resume;
             title = getString(R.string.upload_action_global_upload_resume);
         } else {
-            iconId = R.drawable.ic_pause;
+            iconId = R.drawable.ic_global_pause;
             title = getString(R.string.upload_action_global_upload_pause);
         }
 

+ 17 - 0
app/src/main/res/drawable/ic_global_pause.xml

@@ -0,0 +1,17 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2024 Jonas Mayer
+  ~ SPDX-FileCopyrightText: 2024 Nextcloud GmbH
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@color/foreground_highlight"
+        android:pathData="M560,760L560,200L720,200L720,760L560,760ZM240,760L240,200L400,200L400,760L240,760Z" />
+</vector>

+ 17 - 0
app/src/main/res/drawable/ic_global_resume.xml

@@ -0,0 +1,17 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2023 Alper Ozturk <alper_ozturk@proton.me>
+  ~ SPDX-FileCopyrightText: 2023 Nextcloud GmbH
+  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@color/foreground_highlight"
+        android:pathData="M320,760v-560l440,280 -440,280Z"/>
+</vector>

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

@@ -14,7 +14,7 @@
 
         <item
             android:id="@+id/action_toggle_global_pause"
-            android:icon="@android:drawable/ic_media_pause"
+            android:icon="@drawable/ic_global_pause"
             android:title="@string/upload_action_global_upload_pause"
             app:showAsAction="always" />
     </group>