sending eq type change event to ui, storing previous eq type, little refactor of Application.swift code

Author: nodeful

native/app/Source/Application.swift

@@ -45,40 +45,14 @@ class Application {
 
   static var dataBus: DataBus!
   static var updater = SUUpdater(for: Bundle.main)!
-  static func newState (_ state: ApplicationState) {}
 
-  static var supportPath: URL {
-    //Create App directory if not exists:
-    let fileManager = FileManager()
-    let urlPaths = fileManager.urls(for: .applicationSupportDirectory, in: .userDomainMask)
-    
-    let appDirectory = urlPaths.first!.appendingPathComponent(Bundle.main.bundleIdentifier! ,isDirectory: true)
-    var objCTrue: ObjCBool = true
-    let path = appDirectory.path
-    if !fileManager.fileExists(atPath: path, isDirectory: &objCTrue) {
-      try! fileManager.createDirectory(atPath: path, withIntermediateDirectories: true, attributes: nil)
-    }
-    return appDirectory
-  }
-  
-  static private let dispatchActionQueue = DispatchQueue(label: "dispatchActionQueue", qos: .userInitiated)
-  // Custom dispatch function. Need to execute all dispatches on the main thread
-  static func dispatchAction(_ action: Action, onMainThread: Bool = true) {
-    if (onMainThread) {
-      DispatchQueue.main.async {
-        store.dispatch(action)
-      }
-    } else {
-      dispatchActionQueue.async {
-        store.dispatch(action)
-      }
-    }
-  }
   static let store: Store = Store(reducer: ApplicationStateReducer, state: Storage[.state] ?? ApplicationState(), middleware: [])
 
 
   static public func start () {
-    setupSettings()
+    self.settings = Settings()
+    updater.automaticallyChecksForUpdates = true
+    
     Networking.startMonitor()
 
     if (!Constants.DEBUG) {
@@ -100,11 +74,6 @@ class Application {
     }
   }
 
-  private static func setupSettings () {
-    self.settings = Settings()
-    updater.automaticallyChecksForUpdates = true
-  }
-  
   private static func setupCrashReporting () {
     // Create a Sentry client and start crash handler
     SentrySDK.start { options in
@@ -525,5 +494,35 @@ class Application {
   static var version: String {
     return Bundle.main.infoDictionary!["CFBundleVersion"] as! String
   }
+  
+  static func newState (_ state: ApplicationState) {}
+  
+  static var supportPath: URL {
+    //Create App directory if not exists:
+    let fileManager = FileManager()
+    let urlPaths = fileManager.urls(for: .applicationSupportDirectory, in: .userDomainMask)
+    
+    let appDirectory = urlPaths.first!.appendingPathComponent(Bundle.main.bundleIdentifier! ,isDirectory: true)
+    var objCTrue: ObjCBool = true
+    let path = appDirectory.path
+    if !fileManager.fileExists(atPath: path, isDirectory: &objCTrue) {
+      try! fileManager.createDirectory(atPath: path, withIntermediateDirectories: true, attributes: nil)
+    }
+    return appDirectory
+  }
+  
+  static private let dispatchActionQueue = DispatchQueue(label: "dispatchActionQueue", qos: .userInitiated)
+  // Custom dispatch function. Need to execute all dispatches on the main thread
+  static func dispatchAction(_ action: Action, onMainThread: Bool = true) {
+    if (onMainThread) {
+      DispatchQueue.main.async {
+        store.dispatch(action)
+      }
+    } else {
+      dispatchActionQueue.async {
+        store.dispatch(action)
+      }
+    }
+  }
 }
 

native/app/Source/Audio/Effects/Equalizers/Equalizers.swift

@@ -32,8 +32,7 @@ let AllEqualizerTypes = [
 
 class Equalizers: Effect, StoreSubscriber {
   // MARK: - Events
-  var typeChanged = Event<EqualizerType>()
-  var gainChanged = Event<Double>()
+  static let typeChanged = Event<EqualizerType>()
 
   // MARK: - Properties
   private var _type: EqualizerType! {
@@ -82,7 +81,7 @@ class Equalizers: Effect, StoreSubscriber {
     }
     if (_type != state.type) {
       _type = state.type
-      typeChanged.emit(_type)
+      Equalizers.typeChanged.emit(_type)
     }
   }
 

native/app/Source/Audio/Effects/Equalizers/EqualizersDataBus.swift

@@ -8,12 +8,15 @@
 
 import Foundation
 import SwiftyJSON
+import EmitterKit
 
 class EqualizersDataBus: DataBus {
   var state: EqualizersState {
     return Application.store.state.effects.equalizers
   }
 
+  var typeChangedListener: EventListener<EqualizerType>?
+
   required init(route: String, bridge: Bridge) {
     super.init(route: route, bridge: bridge)
 
@@ -54,5 +57,9 @@ class EqualizersDataBus: DataBus {
 
     self.add("/basic", BasicEqualizerDataBus.self)
     self.add("/advanced", AdvancedEqualizerDataBus.self)
+
+    typeChangedListener = Equalizers.typeChanged.on { type in
+      self.send(to: "/type", data: [ "type": type.rawValue ])
+    }
   }
 }

native/app/Source/Audio/Effects/Equalizers/EqualizersState.swift

@@ -13,6 +13,7 @@ import SwiftyUserDefaults
 class EqualizersState: State {
   var enabled = true
   var type: EqualizerType = .basic
+  var previousType: EqualizerType?
   var basic = BasicEqualizerState()
   var advanced = AdvancedEqualizerState()
 }
@@ -26,6 +27,9 @@ func EqualizersStateReducer(action: Action, state: EqualizersState?) -> Equalize
   let state = state ?? EqualizersState()
   switch action as? EqualizersAction {
   case .setType(let type)?:
+    if (type != state.type) {
+      state.previousType = state.type
+    }
     state.type = type
   case .setEnabled(let enabled)?:
     state.enabled = enabled

native/app/Source/Audio/Engine.swift

@@ -165,7 +165,7 @@ class Engine {
   }
 
   private func setupListeners () {
-    eventListeners.append(effects.equalizers.typeChanged.on { _ in
+    eventListeners.append(Equalizers.typeChanged.on { _ in
       self.stop()
       Utilities.delay(100) {
         self.reattachEqualizer()

ui/src/app/services/context.service.ts

@@ -0,0 +1,26 @@
+import { Injectable } from '@angular/core'
+
+export type Context = 'EQ_TYPE_EXPERT'
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ContextService {
+  private static readonly key = 'CONTEXT'
+
+  static get (): Context {
+    return window.localStorage.getItem(this.key) as Context
+  }
+
+  static set (context: Context) {
+    return window.localStorage.setItem(this.key, context)
+  }
+
+  static clear () {
+    window.localStorage.removeItem(this.key)
+  }
+
+  get () { return ContextService.get() }
+  set (context: Context) { return ContextService.set(context) }
+  clear () { ContextService.clear() }
+}