Merge calendar and subscription list

css/app-navigation.scss

@@ -206,6 +206,27 @@
 		}
 	}
 
+	.app-navigation-entry-new-calendar {
+		.app-navigation-entry__title {
+			color: var(--color-text-maxcontrast) !important;
+		}
+
+		&:hover,
+		&--open {
+			.app-navigation-entry__title {
+				color: var(--color-text-light) !important;
+			}
+		}
+
+		.action-item:not(.action-item--open) {
+			.action-item__menutoggle:not(:hover):not(:focus):not(:active) {
+				opacity: .5;
+			}
+		}
+
+	}
+
+
 	ul {
 
 		// Calendar list items / Subscription list items

css/icons.scss

@@ -26,6 +26,8 @@
 @include icon-black-white('eye', 'calendar', 4);
 @include icon-black-white('invitees-no-response', 'calendar', 5);
 @include icon-black-white('leftarrow', 'calendar', 2);
+@include icon-black-white('new-calendar', 'calendar', 2);
+@include icon-black-white('new-calendar-with-task-list', 'calendar', 2);
 @include icon-black-white('random', 'calendar', 1);
 @include icon-black-white('reminder', 'calendar', 4);
 @include icon-black-white('reminder-audio', 'calendar', 1);

img/LICENSES.md

@@ -39,3 +39,13 @@
 - Created by: Google
 - License: Apache License version 2.0
 - Link: https://material.io/resources/icons/?search=view_&icon=view_week&style=baseline
+
+## new-calendar.svg
+- Created by: Austin Andrews
+- License: Apache License version 2.0
+- Link: https://materialdesignicons.com/icon/calendar-blank
+
+## new-calendar-with-task-list.svg
+- Created by: Google
+- License: Apache License version 2.0
+- Link: https://materialdesignicons.com/icon/calendar-check

src/components/AppNavigation/CalendarList.vue

@@ -24,30 +24,22 @@
 		id="calendars-list"
 		name="list"
 		tag="ul">
-		<CalendarListNew
-			:key="newCalendarKey"
-			:disabled="loadingCalendars" />
+		<AppNavigationSpacer :key="spacerKey" />
 		<CalendarListItemLoadingPlaceholder v-if="loadingCalendars" :key="loadingKeyCalendars" />
 		<CalendarListItem
-			v-for="calendar in calendars"
-			:key="calendar.id"
-			:calendar="calendar" />
-
-		<AppNavigationSpacer
-			:key="spacerKey" />
-
-		<SubscriptionListNew :key="newSubscriptionKey" :disabled="loadingCalendars" />
-		<CalendarListItemLoadingPlaceholder v-if="loadingCalendars" :key="loadingKeySubscriptions" />
-		<CalendarListItem
-			v-for="calendar in subscriptions"
+			v-for="calendar in allCalendars"
 			:key="calendar.id"
 			:calendar="calendar" />
+		<CalendarListNew
+			v-if="!loadingCalendars"
+			:key="newCalendarKey"
+			:disabled="loadingCalendars" />
 	</transition-group>
 	<transition-group v-else
 		id="calendars-list"
 		name="list"
 		tag="ul">
-		<CalendarListItemLoadingPlaceholder v-if="loadingCalendars" :key="loadingKeySubscriptions" />
+		<CalendarListItemLoadingPlaceholder v-if="loadingCalendars" :key="loadingKeyCalendars" />
 		<PublicCalendarListItem
 			v-for="calendar in subscriptions"
 			:key="calendar.id"
@@ -56,26 +48,22 @@
 </template>
 
 <script>
-import {
-	AppNavigationSpacer
-} from '@nextcloud/vue'
 import {
 	mapGetters
 } from 'vuex'
+import { AppNavigationSpacer } from '@nextcloud/vue'
+import CalendarListNew from './CalendarList/CalendarListNew.vue'
 import CalendarListItem from './CalendarList/CalendarListItem.vue'
 import PublicCalendarListItem from './CalendarList/PublicCalendarListItem.vue'
 import CalendarListItemLoadingPlaceholder from './CalendarList/CalendarListItemLoadingPlaceholder.vue'
-import CalendarListNew from './CalendarList/CalendarListNew.vue'
-import SubscriptionListNew from './CalendarList/SubscriptionListNew.vue'
 
 export default {
 	name: 'CalendarList',
 	components: {
 		AppNavigationSpacer,
+		CalendarListNew,
 		CalendarListItem,
 		CalendarListItemLoadingPlaceholder,
-		CalendarListNew,
-		SubscriptionListNew,
 		PublicCalendarListItem
 	},
 	props: {
@@ -90,7 +78,7 @@ export default {
 	},
 	computed: {
 		...mapGetters({
-			calendars: 'sortedCalendars',
+			allCalendars: 'sortedCalendarsSubscriptions',
 			subscriptions: 'sortedSubscriptions'
 		}),
 		newCalendarKey() {
@@ -99,12 +87,6 @@ export default {
 		loadingKeyCalendars() {
 			return this._uid + '-loading-placeholder-calendars'
 		},
-		loadingKeySubscriptions() {
-			return this._uid + '-loading-placeholder-subscriptions'
-		},
-		newSubscriptionKey() {
-			return this._uid + '-new-subscription'
-		},
 		spacerKey() {
 			return this._uid + '-spacer'
 		}