From 50a53ec0d1ca15a9b318e556a7fb145bac197342 Mon Sep 17 00:00:00 2001 From: Lars Kiesow Date: Wed, 8 Feb 2023 22:27:56 +0100 Subject: [PATCH 01/26] Simplify progress (re)sets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch is a follow up to the discussion from #559 about potentially simplifying progress interactions. This patch essentially reduces the interactions to two simple options which allow users to always marks books as finished or discard the progress and thus mark them as not yet started with a single interaction: - If users have already listed to the book, regardless of the state of the progress (finished, half way through, …), they get an option to discard the progress. This replaces the additional “mark as not finished” option but it should still be clear to users what happens. - If a book is not yet finished, regardless of the state of the progress (not yet started, half way through), users get a “mark as finished” option which sets the progress to 100%. This is hopefully a bit simpler than what we have now but also doesn't require a user to figure out that you need to first mark a book as finished to be able to discard the progress. --- pages/item/_id/index.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pages/item/_id/index.vue b/pages/item/_id/index.vue index ab0d4bba..cf5cbd68 100644 --- a/pages/item/_id/index.vue +++ b/pages/item/_id/index.vue @@ -372,12 +372,14 @@ export default { }) } - items.push({ - text: this.userIsFinished ? 'Mark as Not Finished' : 'Mark as Finished', - value: 'markFinished' - }) + if (!this.userIsFinished) { + items.push({ + text: 'Mark as Finished', + value: 'markFinished' + }) + } - if (this.progressPercent > 0 && !this.userIsFinished) { + if (this.progressPercent > 0) { items.push({ text: 'Discard Progress', value: 'discardProgress' From 20e64523b203cd84846a1c3da89f5db2dc0476ab Mon Sep 17 00:00:00 2001 From: Andrew Frahn Date: Thu, 9 Feb 2023 08:38:50 +1100 Subject: [PATCH 02/26] Disable ATS for iOS --- ios/App/App/Info.plist | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist index 62b197f6..89d1ca4a 100644 --- a/ios/App/App/Info.plist +++ b/ios/App/App/Info.plist @@ -53,6 +53,11 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + UIViewControllerBasedStatusBarAppearance From 9866a787bd1b4f53f1d3ea885e44ebcf63802620 Mon Sep 17 00:00:00 2001 From: Lars Kiesow Date: Wed, 8 Feb 2023 23:09:52 +0100 Subject: [PATCH 03/26] Icons for book details menu This patch adds icons similar to those used in other app menus to the book details menu. --- pages/item/_id/index.vue | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pages/item/_id/index.vue b/pages/item/_id/index.vue index cf5cbd68..7a4dd278 100644 --- a/pages/item/_id/index.vue +++ b/pages/item/_id/index.vue @@ -368,21 +368,24 @@ export default { if (!this.isIos) { items.push({ text: 'History', - value: 'history' + value: 'history', + icon: 'history' }) } if (!this.userIsFinished) { items.push({ text: 'Mark as Finished', - value: 'markFinished' + value: 'markFinished', + icon: 'beenhere' }) } if (this.progressPercent > 0) { items.push({ text: 'Discard Progress', - value: 'discardProgress' + value: 'discardProgress', + icon: 'backspace' }) } } @@ -390,20 +393,23 @@ export default { if (this.localLibraryItemId) { items.push({ text: 'Manage Local Files', - value: 'manageLocal' + value: 'manageLocal', + icon: 'folder' }) } if (!this.isPodcast && this.serverLibraryItemId) { items.push({ text: 'Add to Playlist', - value: 'playlist' + value: 'playlist', + icon: 'playlist_add' }) } items.push({ text: 'More Info', - value: 'details' + value: 'details', + icon: 'info' }) return items From 6114e03cb72df14c4f6965a71d227087f0d2a645 Mon Sep 17 00:00:00 2001 From: Lars Kiesow Date: Wed, 8 Feb 2023 23:19:37 +0100 Subject: [PATCH 04/26] Increase passing for menus This patch slightly increases the padding for menu dialogs. No real reason for this except that I like the look of this better ;-) --- components/modals/Dialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/modals/Dialog.vue b/components/modals/Dialog.vue index 19e1a85e..99c7e2f0 100644 --- a/components/modals/Dialog.vue +++ b/components/modals/Dialog.vue @@ -7,7 +7,7 @@
-
+