From 4be0b2502e264f7f95f32214c2790c90fe461406 Mon Sep 17 00:00:00 2001 From: Kevin Richter Date: Tue, 9 Feb 2016 16:25:36 +0100 Subject: [PATCH] Change stop to pause in download queue view --- .../tachiyomi/ui/download/DownloadFragment.java | 12 ++++++------ app/src/main/res/drawable-hdpi/ic_pause.png | Bin 0 -> 105 bytes app/src/main/res/drawable-ldpi/ic_pause.png | Bin 0 -> 95 bytes app/src/main/res/drawable-mdpi/ic_pause.png | Bin 0 -> 83 bytes app/src/main/res/drawable-xhdpi/ic_pause.png | Bin 0 -> 90 bytes app/src/main/res/drawable-xxhdpi/ic_pause.png | Bin 0 -> 92 bytes app/src/main/res/drawable-xxxhdpi/ic_pause.png | Bin 0 -> 94 bytes app/src/main/res/menu/download_queue.xml | 6 +++--- app/src/main/res/values/strings.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_pause.png create mode 100644 app/src/main/res/drawable-ldpi/ic_pause.png create mode 100644 app/src/main/res/drawable-mdpi/ic_pause.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_pause.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_pause.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_pause.png diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadFragment.java b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadFragment.java index 30e85441ae..57ee5fba46 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadFragment.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadFragment.java @@ -29,7 +29,7 @@ public class DownloadFragment extends BaseRxFragment { private DownloadAdapter adapter; private MenuItem startButton; - private MenuItem stopButton; + private MenuItem pauseButton; private Subscription queueStatusSubscription; private boolean isRunning; @@ -64,11 +64,11 @@ public class DownloadFragment extends BaseRxFragment { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { inflater.inflate(R.menu.download_queue, menu); startButton = menu.findItem(R.id.start_queue); - stopButton = menu.findItem(R.id.stop_queue); + pauseButton = menu.findItem(R.id.pause_queue); // Menu seems to be inflated after onResume in fragments, so we initialize them here startButton.setVisible(!isRunning && !getPresenter().downloadManager.getQueue().isEmpty()); - stopButton.setVisible(isRunning); + pauseButton.setVisible(isRunning); } @Override @@ -77,7 +77,7 @@ public class DownloadFragment extends BaseRxFragment { case R.id.start_queue: DownloadService.start(getActivity()); break; - case R.id.stop_queue: + case R.id.pause_queue: DownloadService.stop(getActivity()); break; } @@ -101,8 +101,8 @@ public class DownloadFragment extends BaseRxFragment { isRunning = running; if (startButton != null) startButton.setVisible(!running && !getPresenter().downloadManager.getQueue().isEmpty()); - if (stopButton != null) - stopButton.setVisible(running); + if (pauseButton != null) + pauseButton.setVisible(running); } private void createAdapter() { diff --git a/app/src/main/res/drawable-hdpi/ic_pause.png b/app/src/main/res/drawable-hdpi/ic_pause.png new file mode 100644 index 0000000000000000000000000000000000000000..4d2ea05c462291e4a4f8bd30856a25ad33fd420f GIT binary patch literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;fv1aOh{y5d1PRu~43dBH9UPL5 z6iT4)78&qol`;+06sJs-v9sr literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_pause.png b/app/src/main/res/drawable-mdpi/ic_pause.png new file mode 100644 index 0000000000000000000000000000000000000000..2272d478c38ddb2a4b3c592b2eadee8d4e296432 GIT binary patch literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1DNh&25R22v2@)?K*o!=P)So4B g)u6(pM}&c4fy8~qgzopr0A!jv*C{ m$r5W0{Noqkjk>0hJ%NeAb!~d=tj~okAZ?zmelF{r5}E*xz!xz9 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause.png b/app/src/main/res/drawable-xxxhdpi/ic_pause.png new file mode 100644 index 0000000000000000000000000000000000000000..660ac658589240d14b259e91e6864dc8a8f3665d GIT binary patch literal 94 zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc^29w|978G? plNp)=Km51n;8#DVkv_$ki-GCDeZ`wzAGd%sdb;|#taD0e0szsl7@+_F literal 0 HcmV?d00001 diff --git a/app/src/main/res/menu/download_queue.xml b/app/src/main/res/menu/download_queue.xml index e15e208e08..8de1cd1075 100644 --- a/app/src/main/res/menu/download_queue.xml +++ b/app/src/main/res/menu/download_queue.xml @@ -8,9 +8,9 @@ android:visible="false" app:showAsAction="ifRoom"/> - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 387a69d8b7..8dbfb919f5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -35,12 +35,12 @@ Next unread Start Stop + Pause Previous chapter Next chapter Retry Change display mode - OK Cancel