From 7c875219f0a52ff6b525a6f75e927162b77f9a47 Mon Sep 17 00:00:00 2001
From: Michel Roux <xefir@crystalyx.net>
Date: Wed, 30 Aug 2023 09:27:12 +0200
Subject: [PATCH] Reorganize List

---
 src/components/Atoms/List.vue                  | 16 ++++++++++++++++
 src/components/Discover/Search.vue             | 11 ++++-------
 src/components/Feed/{List.vue => Episodes.vue} | 10 +++++++---
 src/components/Sidebar/Subscriptions.vue       |  9 ++++-----
 src/views/Feed.vue                             |  6 +++---
 5 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 src/components/Atoms/List.vue
 rename src/components/Feed/{List.vue => Episodes.vue} (89%)

diff --git a/src/components/Atoms/List.vue b/src/components/Atoms/List.vue
new file mode 100644
index 0000000..c476aa2
--- /dev/null
+++ b/src/components/Atoms/List.vue
@@ -0,0 +1,16 @@
+<template>
+	<ul :style="{marginBottom: episode ? '6rem' : 'auto'}">
+		<slot />
+	</ul>
+</template>
+
+<script>
+export default {
+	name: 'List',
+	computed: {
+		episode() {
+			return this.$store.state.player.episode
+		},
+	},
+}
+</script>
diff --git a/src/components/Discover/Search.vue b/src/components/Discover/Search.vue
index 7f592a3..a5f0183 100644
--- a/src/components/Discover/Search.vue
+++ b/src/components/Discover/Search.vue
@@ -1,5 +1,5 @@
 <template>
-	<ul :style="{marginBottom: episode ? '6rem' : 'auto'}">
+	<List>
 		<NcListItem v-for="feed in feeds"
 			:key="feed.link"
 			:details="formatTimeAgo(new Date(feed.fetchedAtUnix*1000))"
@@ -14,11 +14,12 @@
 				{{ feed.author }}
 			</template>
 		</NcListItem>
-	</ul>
+	</List>
 </template>
 
 <script>
 import { NcAvatar, NcListItem } from '@nextcloud/vue'
+import List from '../Atoms/List.vue'
 import axios from '@nextcloud/axios'
 import { debounce } from '../../utils/debounce.js'
 import { formatTimeAgo } from '../../utils/time.js'
@@ -28,6 +29,7 @@ import { showError } from '@nextcloud/dialogs'
 export default {
 	name: 'Search',
 	components: {
+		List,
 		NcAvatar,
 		NcListItem,
 	},
@@ -42,11 +44,6 @@ export default {
 			feeds: [],
 		}
 	},
-	computed: {
-		episode() {
-			return this.$store.state.player.episode
-		},
-	},
 	watch: {
 		value() {
 			this.search()
diff --git a/src/components/Feed/List.vue b/src/components/Feed/Episodes.vue
similarity index 89%
rename from src/components/Feed/List.vue
rename to src/components/Feed/Episodes.vue
index 079b270..a601179 100644
--- a/src/components/Feed/List.vue
+++ b/src/components/Feed/Episodes.vue
@@ -1,12 +1,14 @@
 <template>
 	<div>
 		<NcLoadingIcon v-if="loading" />
-		<ul v-if="!loading" :style="{marginBottom: currentEpisode ? '6rem' : 'auto'}">
+		<List v-if="!loading">
 			<NcListItem v-for="episode in episodes"
 				:key="episode.episodeGuid"
+				:active="isCurrentEpisode(episode)"
 				:details="formatTimeAgo(new Date(episode.episodePubDate.date))"
 				:force-display-actions="true"
 				:name="episode.episodeName"
+				:style="{opacity: episode.episodeAction && episode.episodeAction.position >= episode.episodeAction.total ? '.5' : 1}"
 				:title="episode.episodeDescription">
 				<template #icon>
 					<NcAvatar :display-name="episode.episodeName"
@@ -31,13 +33,14 @@
 					</NcActionButton>
 				</template>
 			</NcListItem>
-		</ul>
+		</List>
 	</div>
 </template>
 
 <script>
 import { NcActionButton, NcAvatar, NcListItem, NcLoadingIcon } from '@nextcloud/vue'
 import { formatTimeAgo, formatTimer } from '../../utils/time.js'
+import List from '../Atoms/List.vue'
 import PlayButton from 'vue-material-design-icons/Play.vue'
 import StopButton from 'vue-material-design-icons/Stop.vue'
 import axios from '@nextcloud/axios'
@@ -45,8 +48,9 @@ import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 
 export default {
-	name: 'List',
+	name: 'Episodes',
 	components: {
+		List,
 		NcActionButton,
 		NcAvatar,
 		NcListItem,
diff --git a/src/components/Sidebar/Subscriptions.vue b/src/components/Sidebar/Subscriptions.vue
index 6893dbf..619b597 100644
--- a/src/components/Sidebar/Subscriptions.vue
+++ b/src/components/Sidebar/Subscriptions.vue
@@ -9,11 +9,11 @@
 				</NcAppNavigationNew>
 			</router-link>
 			<NcLoadingIcon v-if="loading" />
-			<ul v-if="!loading" :style="{marginBottom: episode ? '6rem' : 'auto'}">
+			<List v-if="!loading">
 				<Item v-for="subscriptionUrl of subscriptions"
 					:key="subscriptionUrl"
 					:url="subscriptionUrl" />
-			</ul>
+			</List>
 		</NcAppContentList>
 	</NcAppNavigation>
 </template>
@@ -26,6 +26,7 @@ import {
 	NcLoadingIcon,
 } from '@nextcloud/vue'
 import Item from './Item.vue'
+import List from '../Atoms/List.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
 import { showError } from '@nextcloud/dialogs'
 
@@ -33,6 +34,7 @@ export default {
 	name: 'Subscriptions',
 	components: {
 		Item,
+		List,
 		NcAppContentList,
 		NcAppNavigation,
 		NcAppNavigationNew,
@@ -45,9 +47,6 @@ export default {
 		}
 	},
 	computed: {
-		episode() {
-			return this.$store.state.player.episode
-		},
 		subscriptions() {
 			return this.$store.state.subscriptions.subscriptions
 		},
diff --git a/src/views/Feed.vue b/src/views/Feed.vue
index 689855a..6a35177 100644
--- a/src/views/Feed.vue
+++ b/src/views/Feed.vue
@@ -12,7 +12,7 @@
 			:image-url="feed.imageUrl"
 			:link="feed.link"
 			:title="feed.title" />
-		<List v-if="feed" />
+		<Episodes v-if="feed" />
 	</NcAppContent>
 </template>
 
@@ -20,7 +20,7 @@
 import { NcAppContent, NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
 import Alert from 'vue-material-design-icons/Alert.vue'
 import Banner from '../components/Feed/Banner.vue'
-import List from '../components/Feed/List.vue'
+import Episodes from '../components/Feed/Episodes.vue'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 
@@ -29,10 +29,10 @@ export default {
 	components: {
 		Alert,
 		Banner,
+		Episodes,
 		NcAppContent,
 		NcEmptyContent,
 		NcLoadingIcon,
-		List,
 	},
 	data() {
 		return {