Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-21 00:52:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: migrate to material symbols icon set

Browse Source
This commit is contained in:
Thea Schöbl
2022-08-19 11:48:34 +00:00
parent f3cf3b30e3
commit 68734bfe21
2097 changed files with 26045 additions and 18101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/modules/map/item/map-item.component.html
View File

@@ -1,3 +1,18 @@
<!--
~ Copyright (C) 2022 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<ion-card class="compact">
<ion-card-header>
<stapps-data-list-item
@@ -22,7 +37,7 @@
class="close"
(click)="onCloseClick()"
>
<ion-icon name="circle-x"></ion-icon>
<ion-icon name="cancel" fill></ion-icon>
</ion-button>
</ion-card-header>
<ion-card-content>

22
src/app/modules/map/map.module.ts
View File

@@ -1,16 +1,16 @@
/*
* Copyright (C) 2019-2021 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
@@ -34,6 +34,7 @@ import {MapSingleModalComponent} from './page/modals/map-single-modal.component'
import {MapItemComponent} from './item/map-item.component';
import {NgModule} from '@angular/core';
import {UtilModule} from '../../util/util.module';
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
/**
* Initializes the default area to show in advance (before components are initialized)
@@ -72,6 +73,7 @@ const mapRoutes: Routes = [
CommonModule,
IonicModule.forRoot(),
LeafletModule,
IonIconModule,
LeafletMarkerClusterModule,
RouterModule.forChild(mapRoutes),
TranslateModule.forChild(),

38
src/app/modules/map/map.provider.ts
View File

@@ -1,16 +1,16 @@
/*
* Copyright (C) 2019-2021 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
* Copyright (C) 2022 StApps
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
import {ElementRef, Injectable} from '@angular/core';
import {
@@ -27,6 +27,7 @@ import {DataProvider} from '../data/data.provider';
import {MapPosition, PositionService} from './position.service';
import {hasValidLocation} from '../data/types/place/place-types';
import {ConfigProvider} from '../config/config.provider';
import {SCIcon} from '../../util/ion-icon/icon';
/**
* Provides methods for presenting the map
@@ -73,10 +74,19 @@ export class MapProvider {
className: className,
html:
typeof position.heading !== 'undefined'
? `<ion-icon name="navigate-straight"
style="transform-origin: center; transform: rotate(${position.heading}deg);">
</ion-icon>`
: '<ion-icon name="current-location"></ion-icon>',
? `<span
class="material-symbols-rounded map-location-pin"
style="
transform-origin: center;
transform: rotate(${position.heading}deg);
font-size: ${iconSize}px;
"
>${SCIcon`navigation`}</span>`
: `<span
name="${SCIcon`person_pin_circle`}"
class="material-symbols-rounded map-location-pin"
style="font-size: ${iconSize}px;"
>${SCIcon`person_pin_circle`}</span>`,
iconSize: [iconSize, iconSize],
}),
zIndexOffset: 1000,

10
src/app/modules/map/page/map-page.html
View File

@@ -36,7 +36,7 @@
class="filterable"
>
<ion-menu-button menu="context" auto-hide="false">
<ion-icon name="adjustments"></ion-icon>
<ion-icon name="tune"></ion-icon>
</ion-menu-button>
</ion-searchbar>
</ion-toolbar>
@@ -78,10 +78,10 @@
>
<ion-icon
*ngIf="position !== null; else questionIcon"
name="current-location"
name="my_location"
></ion-icon>
<ng-template #questionIcon>
<ion-icon name="help"></ion-icon>
<ion-icon name="location_searching"></ion-icon>
</ng-template>
</ion-button>
</div>
@@ -114,10 +114,10 @@
>
<ion-icon
*ngIf="position !== null; else questionIcon"
name="current-location"
name="my_location"
></ion-icon>
<ng-template #questionIcon>
<ion-icon name="help"></ion-icon>
<ion-icon name="location_searching"></ion-icon>
</ng-template>
</ion-button>
</div>

17
src/app/modules/map/widget/map-widget.html
View File

@@ -1,3 +1,18 @@
<!--
~ Copyright (C) 2022 StApps
~ This program is free software: you can redistribute it and/or modify it
~ under the terms of the GNU General Public License as published by the Free
~ Software Foundation, version 3.
~
~ This program is distributed in the hope that it will be useful, but WITHOUT
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
~ more details.
~
~ You should have received a copy of the GNU General Public License along with
~ this program. If not, see <https://www.gnu.org/licenses/>.
-->
<div
class="map-container"
(leafletMapReady)="onMapReady($event)"
@@ -12,6 +27,6 @@
size="small"
[routerLink]="['/map', place.uid]"
>
<ion-icon name="arrows-maximize"></ion-icon>
<ion-icon name="zoom_out_map"></ion-icon>
</ion-button>
</div>