Merge pull request #654 from ueokande/settings-as-a-class

Refactor settings on shared logics

3 files changed, 5 insertions, 5 deletions

diff --git a/src/background/usecases/CompletionsUseCase.ts b/src/background/usecases/CompletionsUseCase.ts
index 8cd4f32..bfff1e6 100644
--- a/src/background/usecases/CompletionsUseCase.ts
+++ b/src/background/usecases/CompletionsUseCase.ts
@@ -5,7 +5,7 @@ import CompletionsRepository from '../repositories/CompletionsRepository';
 import * as filters from './filters';
 import SettingRepository from '../repositories/SettingRepository';
 import TabPresenter from '../presenters/TabPresenter';
-import * as PropertyDefs from '../../shared/property-defs';
+import Properties from '../../shared/settings/Properties';
 
 const COMPLETION_ITEM_LIMIT = 10;
 
@@ -129,7 +129,7 @@ export default class CompletionsUseCase {
   }
 
   querySet(name: string, keywords: string): Promise<CompletionGroup[]> {
-    let items = PropertyDefs.defs.map((def) => {
+    let items = Properties.defs().map((def) => {
       if (def.type === 'boolean') {
         return [
           {
diff --git a/src/background/usecases/SettingUseCase.ts b/src/background/usecases/SettingUseCase.ts
index d73521f..d78d440 100644
--- a/src/background/usecases/SettingUseCase.ts
+++ b/src/background/usecases/SettingUseCase.ts
@@ -3,7 +3,7 @@ import PersistentSettingRepository
   from '../repositories/PersistentSettingRepository';
 import SettingRepository from '../repositories/SettingRepository';
 import { DefaultSettingData } from '../../shared/SettingData';
-import Settings from '../../shared/Settings';
+import Settings from '../../shared/settings/Settings';
 import NotifyPresenter from '../presenters/NotifyPresenter';
 
 @injectable()
diff --git a/src/background/usecases/parsers.ts b/src/background/usecases/parsers.ts
index 6135fd8..e8a1149 100644
--- a/src/background/usecases/parsers.ts
+++ b/src/background/usecases/parsers.ts
@@ -1,4 +1,4 @@
-import * as PropertyDefs from '../../shared//property-defs';
+import Properties from '../../shared/settings/Properties';
 
 const mustNumber = (v: any): number => {
   let num = Number(v);
@@ -16,7 +16,7 @@ const parseSetOption = (
     value = !key.startsWith('no');
     key = value ? key : key.slice(2);
   }
-  let def = PropertyDefs.defs.find(d => d.name === key);
+  let def = Properties.def(key);
   if (!def) {
     throw new Error('Unknown property: ' + key);
   }