24
24
{{ forecastMessage }}
25
25
</NcActionText >
26
26
<NcActionLink v-if =" gotWeather"
27
- icon =" icon-address"
28
27
target =" _blank"
29
28
:aria-hidden =" true"
30
29
:href =" weatherLinkTarget"
31
30
:close-after-click =" true" >
31
+ <template #icon >
32
+ <NcIconSvgWrapper name =" MapMarker"
33
+ :svg =" mapMarkerSvg"
34
+ :size =" 20" />
35
+ </template >
32
36
{{ locationText }}
33
37
</NcActionLink >
34
38
<NcActionButton v-if =" gotWeather"
35
39
:aria-hidden =" true"
36
40
@click =" onAddRemoveFavoriteClick" >
37
41
<template #icon >
38
- <component :is =" addRemoveFavoriteIcon" :size =" 20" class =" favorite-color" />
42
+ <NcIconSvgWrapper name =" Star"
43
+ :svg =" addRemoveFavoriteSvg"
44
+ :size =" 20"
45
+ class =" favorite-color" />
39
46
</template >
40
47
{{ addRemoveFavoriteText }}
41
48
</NcActionButton >
45
52
:aria-hidden =" true"
46
53
@click =" onBrowserLocationClick" >
47
54
<template #icon >
48
- <NcIconSvgWrapper : name =" t('weather_status', 'Detect location') "
49
- :svg =" crossSvg "
55
+ <NcIconSvgWrapper name =" Crosshairs "
56
+ :svg =" crosshairsSvg "
50
57
:size =" 20" />
51
58
</template >
52
59
{{ t('weather_status', 'Detect location') }}
66
73
:aria-hidden =" true"
67
74
@click =" onFavoriteClick($event, favorite)" >
68
75
<template #icon >
69
- <IconStar :size =" 20" :class =" {'favorite-color': address === favorite}" />
76
+ <NcIconSvgWrapper name =" Star"
77
+ :svg =" starSvg"
78
+ :size =" 20"
79
+ class =" favorite-color" />
70
80
</template >
71
81
{{ favorite }}
72
82
</NcActionButton >
@@ -80,8 +90,6 @@ import { showError } from '@nextcloud/dialogs'
80
90
import moment from ' @nextcloud/moment'
81
91
import { getLocale } from ' @nextcloud/l10n'
82
92
import { imagePath } from ' @nextcloud/router'
83
- import IconStar from ' vue-material-design-icons/Star.vue'
84
- import IconStarOutline from ' vue-material-design-icons/StarOutline.vue'
85
93
import NcActions from ' @nextcloud/vue/dist/Components/NcActions.js'
86
94
import NcActionButton from ' @nextcloud/vue/dist/Components/NcActionButton.js'
87
95
import NcActionCaption from ' @nextcloud/vue/dist/Components/NcActionCaption.js'
@@ -92,7 +100,10 @@ import NcActionText from '@nextcloud/vue/dist/Components/NcActionText.js'
92
100
import NcLoadingIcon from ' @nextcloud/vue/dist/Components/NcLoadingIcon.js'
93
101
import NcIconSvgWrapper from ' @nextcloud/vue/dist/Components/NcIconSvgWrapper.js'
94
102
import * as network from ' ./services/weatherStatusService.js'
95
- import crossSvg from ' ../img/cross.svg?raw'
103
+ import crosshairsSvg from ' @mdi/svg/svg/crosshairs.svg?raw'
104
+ import mapMarkerSvg from ' @mdi/svg/svg/map-marker.svg?raw'
105
+ import starSvg from ' @mdi/svg/svg/star.svg?raw'
106
+ import starOutlineSvg from ' @mdi/svg/svg/star-outline.svg?raw'
96
107
97
108
const MODE_BROWSER_LOCATION = 1
98
109
const MODE_MANUAL_LOCATION = 2
@@ -227,7 +238,6 @@ const weatherOptions = {
227
238
export default {
228
239
name: ' App' ,
229
240
components: {
230
- IconStar,
231
241
NcActions,
232
242
NcActionButton,
233
243
NcActionCaption,
@@ -240,7 +250,10 @@ export default {
240
250
},
241
251
data () {
242
252
return {
243
- crossSvg,
253
+ crosshairsSvg,
254
+ mapMarkerSvg,
255
+ starSvg,
256
+ starOutlineSvg,
244
257
locale: getLocale (),
245
258
loading: true ,
246
259
errorMessage: ' ' ,
@@ -314,10 +327,10 @@ export default {
314
327
gotWeather () {
315
328
return this .address && ! this .errorMessage
316
329
},
317
- addRemoveFavoriteIcon () {
330
+ addRemoveFavoriteSvg () {
318
331
return this .currentAddressIsFavorite
319
- ? IconStar
320
- : IconStarOutline
332
+ ? starSvg
333
+ : starOutlineSvg
321
334
},
322
335
addRemoveFavoriteText () {
323
336
return this .currentAddressIsFavorite
0 commit comments