From b3ca8a2744816d7ef3629415a0c0dc1589521d10 Mon Sep 17 00:00:00 2001 From: Sebastian Lange Date: Fri, 11 Jan 2019 12:23:36 +0100 Subject: [PATCH] refactor: move SettingsProvider into package 'settings' --- src/app/app.component.spec.ts | 4 +-- src/app/app.component.ts | 4 +-- src/app/app.module.ts | 4 +-- .../settings/item/settings-item.component.ts | 2 +- .../settings/page/settings-page.component.ts | 4 +-- src/app/modules/settings/settings.module.ts | 2 ++ .../settings.provider.spec.ts | 0 .../settings.provider.ts | 0 .../settingsProvider.module.ts | 27 ------------------- 9 files changed, 10 insertions(+), 37 deletions(-) rename src/app/modules/{settingsProvider => settings}/settings.provider.spec.ts (100%) rename src/app/modules/{settingsProvider => settings}/settings.provider.ts (100%) delete mode 100644 src/app/modules/settingsProvider/settingsProvider.module.ts diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 2ebda520..ddf6d4a7 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 StApps + * Copyright (C) 2018, 2019 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. @@ -21,7 +21,7 @@ import {Platform} from '@ionic/angular'; import {TranslateService} from '@ngx-translate/core'; import {AppComponent} from './app.component'; -import {SettingsProvider} from './modules/settingsProvider/settings.provider'; +import {SettingsProvider} from './modules/settings/settings.provider'; describe('AppComponent', () => { diff --git a/src/app/app.component.ts b/src/app/app.component.ts index cf107079..3be148b4 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 StApps + * Copyright (C) 2018, 2019 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. @@ -19,7 +19,7 @@ import {Platform} from '@ionic/angular'; import {TranslateService} from '@ngx-translate/core'; import {SCLanguageCode} from '@openstapps/core'; -import {SettingsProvider} from './modules/settingsProvider/settings.provider'; +import {SettingsProvider} from './modules/settings/settings.provider'; @Component({ selector: 'app-root', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7bc7de1c..f2974585 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 StApps + * Copyright (C) 2018, 2019 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. @@ -29,7 +29,6 @@ import {AppComponent} from './app.component'; import {DataModule} from './modules/data/data.module'; import {MenuModule} from './modules/menu/menu.module'; import {SettingsModule} from './modules/settings/settings.module'; -import {SettingsProviderModule} from './modules/settingsProvider/settingsProvider.module'; import {StorageModule} from './modules/storage/storage.module'; export function createTranslateLoader(http: HttpClient) { @@ -44,7 +43,6 @@ export function createTranslateLoader(http: HttpClient) { DataModule, MenuModule, SettingsModule, - SettingsProviderModule, TranslateModule.forRoot({ loader: { deps: [HttpClient], diff --git a/src/app/modules/settings/item/settings-item.component.ts b/src/app/modules/settings/item/settings-item.component.ts index bd55d5d1..8fc30a80 100644 --- a/src/app/modules/settings/item/settings-item.component.ts +++ b/src/app/modules/settings/item/settings-item.component.ts @@ -21,7 +21,7 @@ import { SCSetting, SCSettingMeta, } from '@openstapps/core'; -import {SettingsProvider} from '../../settingsProvider/settings.provider'; +import {SettingsProvider} from '../settings.provider'; @Component({ selector: 'stapps-settings-item', diff --git a/src/app/modules/settings/page/settings-page.component.ts b/src/app/modules/settings/page/settings-page.component.ts index 5baa496e..43cca939 100644 --- a/src/app/modules/settings/page/settings-page.component.ts +++ b/src/app/modules/settings/page/settings-page.component.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 StApps + * Copyright (C) 2018, 2019 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. @@ -15,7 +15,7 @@ import {Component, OnInit} from '@angular/core'; import {LangChangeEvent, TranslateService} from '@ngx-translate/core'; import {SCLanguageName, SCSettingMeta} from '@openstapps/core'; -import {SettingsCache, SettingsProvider} from '../../settingsProvider/settings.provider'; +import {SettingsCache, SettingsProvider} from '../settings.provider'; @Component({ selector: 'stapps-settings-page', diff --git a/src/app/modules/settings/settings.module.ts b/src/app/modules/settings/settings.module.ts index 1f4a2ef8..8b473848 100644 --- a/src/app/modules/settings/settings.module.ts +++ b/src/app/modules/settings/settings.module.ts @@ -22,6 +22,7 @@ import {TranslateModule} from '@ngx-translate/core'; import {SettingsItemComponent} from './item/settings-item.component'; import {SettingsPageComponent} from './page/settings-page.component'; +import {SettingsProvider} from './settings.provider'; const settingsRoutes: Routes = [ { path: 'settings', component: SettingsPageComponent }, @@ -41,6 +42,7 @@ const settingsRoutes: Routes = [ ], providers: [ Geolocation, + SettingsProvider, ], }) export class SettingsModule {} diff --git a/src/app/modules/settingsProvider/settings.provider.spec.ts b/src/app/modules/settings/settings.provider.spec.ts similarity index 100% rename from src/app/modules/settingsProvider/settings.provider.spec.ts rename to src/app/modules/settings/settings.provider.spec.ts diff --git a/src/app/modules/settingsProvider/settings.provider.ts b/src/app/modules/settings/settings.provider.ts similarity index 100% rename from src/app/modules/settingsProvider/settings.provider.ts rename to src/app/modules/settings/settings.provider.ts diff --git a/src/app/modules/settingsProvider/settingsProvider.module.ts b/src/app/modules/settingsProvider/settingsProvider.module.ts deleted file mode 100644 index 302b94dc..00000000 --- a/src/app/modules/settingsProvider/settingsProvider.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2018 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 . - */ -import { NgModule } from '@angular/core'; -import { IonicStorageModule } from '@ionic/storage'; -import { SettingsProvider } from './settings.provider'; - -@NgModule({ - imports: [ - IonicStorageModule.forRoot(), - ], - providers: [ - SettingsProvider, - ], -}) -export class SettingsProviderModule {}