diff --git a/apps/weather_status/img/cross.svg b/apps/weather_status/img/cross.svg deleted file mode 100644 index daaca07c30fc8..0000000000000 --- a/apps/weather_status/img/cross.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/apps/weather_status/src/App.vue b/apps/weather_status/src/App.vue index 95f55b844f561..2a9b197cb80a0 100644 --- a/apps/weather_status/src/App.vue +++ b/apps/weather_status/src/App.vue @@ -24,18 +24,25 @@ {{ forecastMessage }} + {{ locationText }} {{ addRemoveFavoriteText }} @@ -45,8 +52,8 @@ :aria-hidden="true" @click="onBrowserLocationClick"> {{ t('weather_status', 'Detect location') }} @@ -66,7 +73,10 @@ :aria-hidden="true" @click="onFavoriteClick($event, favorite)"> {{ favorite }} @@ -80,8 +90,6 @@ import { showError } from '@nextcloud/dialogs' import moment from '@nextcloud/moment' import { getLocale } from '@nextcloud/l10n' import { imagePath } from '@nextcloud/router' -import IconStar from 'vue-material-design-icons/Star.vue' -import IconStarOutline from 'vue-material-design-icons/StarOutline.vue' import NcActions from '@nextcloud/vue/dist/Components/NcActions.js' import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js' import NcActionCaption from '@nextcloud/vue/dist/Components/NcActionCaption.js' @@ -92,7 +100,10 @@ import NcActionText from '@nextcloud/vue/dist/Components/NcActionText.js' import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js' import NcIconSvgWrapper from '@nextcloud/vue/dist/Components/NcIconSvgWrapper.js' import * as network from './services/weatherStatusService.js' -import crossSvg from '../img/cross.svg?raw' +import crosshairsSvg from '@mdi/svg/svg/crosshairs.svg?raw' +import mapMarkerSvg from '@mdi/svg/svg/map-marker.svg?raw' +import starSvg from '@mdi/svg/svg/star.svg?raw' +import starOutlineSvg from '@mdi/svg/svg/star-outline.svg?raw' const MODE_BROWSER_LOCATION = 1 const MODE_MANUAL_LOCATION = 2 @@ -227,7 +238,6 @@ const weatherOptions = { export default { name: 'App', components: { - IconStar, NcActions, NcActionButton, NcActionCaption, @@ -240,7 +250,10 @@ export default { }, data() { return { - crossSvg, + crosshairsSvg, + mapMarkerSvg, + starSvg, + starOutlineSvg, locale: getLocale(), loading: true, errorMessage: '', @@ -314,10 +327,10 @@ export default { gotWeather() { return this.address && !this.errorMessage }, - addRemoveFavoriteIcon() { + addRemoveFavoriteSvg() { return this.currentAddressIsFavorite - ? IconStar - : IconStarOutline + ? starSvg + : starOutlineSvg }, addRemoveFavoriteText() { return this.currentAddressIsFavorite