Merge pull request #6 from ololx/develop

Added  the saving settings in local storage (`defaults`)

Author: ololx

CHANGELOG.md

@@ -10,6 +10,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Other UI elements for the SBC codec settings.
 
+## [3.1.0] - 2020-12-09
+
+### Added
+
+- The saving settings in local storage (`defaults`).
+
 ## [3.0.0] - 2020-11-28
 
 ### Changed

README.md

@@ -2,7 +2,7 @@
 
 This is a simple tool for the sound quality improving of wireless headphones with the sbc codec on a mac.
 
-[![status](https://img.shields.io/badge/status-frozen-inactive?style=flat-square)](BADGES_GUIDE.md#status) [![version](https://img.shields.io/badge/version-3.0.0-informational?style=flat-square)](BADGES_GUIDE.md@version) [![oss lifecycle](https://img.shields.io/badge/oss_lifecycle-maintenance-important?style=flat-square)](BADGES_GUIDE.md#oss-lifecycle) [![maintenance](https://img.shields.io/badge/maintenance-yes-informational?style=flat-square)](BADGES_GUIDE.md#maintenance)  [![latest release date](https://img.shields.io/badge/latest_release_date-November_28,_2020-informational?style=flat-square)](BADGES_GUIDE.md#release-date) [![last commit](https://img.shields.io/badge/last_commit-November_28,_2020-informational?style=flat-square)](BADGES_GUIDE.md#commit-date)
+[![status](https://img.shields.io/badge/status-frozen-inactive?style=flat-square)](BADGES_GUIDE.md#status) [![version](https://img.shields.io/badge/version-3.1.0-informational?style=flat-square)](BADGES_GUIDE.md@version) [![oss lifecycle](https://img.shields.io/badge/oss_lifecycle-maintenance-important?style=flat-square)](BADGES_GUIDE.md#oss-lifecycle) [![maintenance](https://img.shields.io/badge/maintenance-yes-informational?style=flat-square)](BADGES_GUIDE.md#maintenance)  [![latest release date](https://img.shields.io/badge/latest_release_date-December_09,_2020-informational?style=flat-square)](BADGES_GUIDE.md#release-date) [![last commit](https://img.shields.io/badge/last_commit-December_09,_2020-informational?style=flat-square)](BADGES_GUIDE.md#commit-date)
 
 [![license](https://img.shields.io/badge/license-MIT-informational?style=flat-square)](LICENSE) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg?style=flat-square)](code_of_conduct.md)
 

TODO.md

@@ -6,6 +6,6 @@
 - [x] To automate the increasing process of the sbc bluetooth audio bit rate.
 - [x] Add the UI dialog for the requesting values of minimal Bitpool for the setting it.
 - [x] Add the UI dialog for the requesting values of current and maximum Bitpool for the setting it.
-- [x ] Add the UI element on main window with check button for setting dual channels.
+- [x] Add the UI element on main window with check button for setting dual channels.
 
 ---

sbc bitpool expander.xcodeproj/project.pbxproj

@@ -7,22 +7,42 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		A313E7A1257CFD8100C7AC6C /* BluetoothAudioDefaultsProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A313E7A0257CFD8100C7AC6C /* BluetoothAudioDefaultsProtocol.swift */; };
+		A313E7A6257CFFE200C7AC6C /* BluetoothAudioDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = A313E7A5257CFFE200C7AC6C /* BluetoothAudioDefaults.swift */; };
 		A34E91802570BC73000DB3F4 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A34E917F2570BC73000DB3F4 /* AppDelegate.swift */; };
-		A34E91822570BC73000DB3F4 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A34E91812570BC73000DB3F4 /* ViewController.swift */; };
+		A34E91822570BC73000DB3F4 /* SbcViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A34E91812570BC73000DB3F4 /* SbcViewController.swift */; };
 		A34E91852570BC73000DB3F4 /* sbc_bitpool_expander.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = A34E91832570BC73000DB3F4 /* sbc_bitpool_expander.xcdatamodeld */; };
 		A34E91872570BC74000DB3F4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A34E91862570BC74000DB3F4 /* Assets.xcassets */; };
 		A34E918A2570BC74000DB3F4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A34E91882570BC74000DB3F4 /* Main.storyboard */; };
+		A3681907257BE32700438C80 /* ChannelDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3681906257BE32700438C80 /* ChannelDetail.swift */; };
+		A3A4BF38257E6AB600F06042 /* SbcBitpoolExpanderDefaultsProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3A4BF37257E6AB600F06042 /* SbcBitpoolExpanderDefaultsProtocol.swift */; };
+		A3A4BF40257E862F00F06042 /* SbcAssemblyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3A4BF3F257E862F00F06042 /* SbcAssemblyProtocol.swift */; };
+		A3A4BF45257E86A100F06042 /* SbcAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3A4BF44257E86A100F06042 /* SbcAssembly.swift */; };
+		A3A4BF4C257E8C3D00F06042 /* SbcServiceProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3A4BF4B257E8C3D00F06042 /* SbcServiceProtocol.swift */; };
+		A3D064402577E51200CF800B /* SbcBitpoolExpanderDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3D0643F2577E51200CF800B /* SbcBitpoolExpanderDefaults.swift */; };
+		A3DCA541257E9065005459EE /* SbcService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3DCA540257E9065005459EE /* SbcService.swift */; };
+		A3E001462577838A00B42B52 /* BitpoolDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3E001452577838A00B42B52 /* BitpoolDetail.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		A313E7A0257CFD8100C7AC6C /* BluetoothAudioDefaultsProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothAudioDefaultsProtocol.swift; sourceTree = "<group>"; };
+		A313E7A5257CFFE200C7AC6C /* BluetoothAudioDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothAudioDefaults.swift; sourceTree = "<group>"; };
 		A34E917C2570BC73000DB3F4 /* sbc bitpool expander.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "sbc bitpool expander.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		A34E917F2570BC73000DB3F4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		A34E91812570BC73000DB3F4 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		A34E91812570BC73000DB3F4 /* SbcViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SbcViewController.swift; sourceTree = "<group>"; };
 		A34E91842570BC73000DB3F4 /* sbc_bitpool_expander.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = sbc_bitpool_expander.xcdatamodel; sourceTree = "<group>"; };
 		A34E91862570BC74000DB3F4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		A34E91892570BC74000DB3F4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		A34E918B2570BC74000DB3F4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A34E918C2570BC74000DB3F4 /* sbc_bitpool_expander.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = sbc_bitpool_expander.entitlements; sourceTree = "<group>"; };
+		A3681906257BE32700438C80 /* ChannelDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelDetail.swift; sourceTree = "<group>"; };
+		A3A4BF37257E6AB600F06042 /* SbcBitpoolExpanderDefaultsProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SbcBitpoolExpanderDefaultsProtocol.swift; sourceTree = "<group>"; };
+		A3A4BF3F257E862F00F06042 /* SbcAssemblyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SbcAssemblyProtocol.swift; sourceTree = "<group>"; };
+		A3A4BF44257E86A100F06042 /* SbcAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SbcAssembly.swift; sourceTree = "<group>"; };
+		A3A4BF4B257E8C3D00F06042 /* SbcServiceProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SbcServiceProtocol.swift; sourceTree = "<group>"; };
+		A3D0643F2577E51200CF800B /* SbcBitpoolExpanderDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SbcBitpoolExpanderDefaults.swift; sourceTree = "<group>"; };
+		A3DCA540257E9065005459EE /* SbcService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SbcService.swift; sourceTree = "<group>"; };
+		A3E001452577838A00B42B52 /* BitpoolDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BitpoolDetail.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -36,6 +56,15 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		A313E7AE257D071D00C7AC6C /* entity */ = {
+			isa = PBXGroup;
+			children = (
+				A3E001452577838A00B42B52 /* BitpoolDetail.swift */,
+				A3681906257BE32700438C80 /* ChannelDetail.swift */,
+			);
+			path = entity;
+			sourceTree = "<group>";
+		};
 		A34E91732570BC73000DB3F4 = {
 			isa = PBXGroup;
 			children = (
@@ -55,17 +84,66 @@
 		A34E917E2570BC73000DB3F4 /* sbc bitpool expander */ = {
 			isa = PBXGroup;
 			children = (
-				A34E917F2570BC73000DB3F4 /* AppDelegate.swift */,
-				A34E91812570BC73000DB3F4 /* ViewController.swift */,
+				A3F044492580F47B009F370F /* assembly */,
+				A3F044482580EFFB009F370F /* route */,
+				A313E7AE257D071D00C7AC6C /* entity */,
+				A3681910257BE6AC00438C80 /* presenter */,
+				A368190F257BE69F00438C80 /* interactor */,
+				A3681903257BDFD000438C80 /* view */,
 				A34E91862570BC74000DB3F4 /* Assets.xcassets */,
-				A34E91882570BC74000DB3F4 /* Main.storyboard */,
 				A34E918B2570BC74000DB3F4 /* Info.plist */,
 				A34E918C2570BC74000DB3F4 /* sbc_bitpool_expander.entitlements */,
 				A34E91832570BC73000DB3F4 /* sbc_bitpool_expander.xcdatamodeld */,
 			);
 			path = "sbc bitpool expander";
 			sourceTree = "<group>";
 		};
+		A3681903257BDFD000438C80 /* view */ = {
+			isa = PBXGroup;
+			children = (
+				A34E91882570BC74000DB3F4 /* Main.storyboard */,
+				A34E91812570BC73000DB3F4 /* SbcViewController.swift */,
+			);
+			path = view;
+			sourceTree = "<group>";
+		};
+		A368190F257BE69F00438C80 /* interactor */ = {
+			isa = PBXGroup;
+			children = (
+				A313E7A0257CFD8100C7AC6C /* BluetoothAudioDefaultsProtocol.swift */,
+				A313E7A5257CFFE200C7AC6C /* BluetoothAudioDefaults.swift */,
+				A3A4BF37257E6AB600F06042 /* SbcBitpoolExpanderDefaultsProtocol.swift */,
+				A3D0643F2577E51200CF800B /* SbcBitpoolExpanderDefaults.swift */,
+			);
+			path = interactor;
+			sourceTree = "<group>";
+		};
+		A3681910257BE6AC00438C80 /* presenter */ = {
+			isa = PBXGroup;
+			children = (
+				A3A4BF4B257E8C3D00F06042 /* SbcServiceProtocol.swift */,
+				A3DCA540257E9065005459EE /* SbcService.swift */,
+			);
+			path = presenter;
+			sourceTree = "<group>";
+		};
+		A3F044482580EFFB009F370F /* route */ = {
+			isa = PBXGroup;
+			children = (
+				A34E917F2570BC73000DB3F4 /* AppDelegate.swift */,
+			);
+			path = route;
+			sourceTree = "<group>";
+		};
+		A3F044492580F47B009F370F /* assembly */ = {
+			isa = PBXGroup;
+			children = (
+				A3A4BF3F257E862F00F06042 /* SbcAssemblyProtocol.swift */,
+				A3A4BF44257E86A100F06042 /* SbcAssembly.swift */,
+			);
+			path = assembly;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -135,9 +213,19 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A34E91822570BC73000DB3F4 /* ViewController.swift in Sources */,
+				A3681907257BE32700438C80 /* ChannelDetail.swift in Sources */,
+				A3DCA541257E9065005459EE /* SbcService.swift in Sources */,
+				A3A4BF4C257E8C3D00F06042 /* SbcServiceProtocol.swift in Sources */,
+				A34E91822570BC73000DB3F4 /* SbcViewController.swift in Sources */,
+				A3A4BF45257E86A100F06042 /* SbcAssembly.swift in Sources */,
+				A313E7A1257CFD8100C7AC6C /* BluetoothAudioDefaultsProtocol.swift in Sources */,
+				A3D064402577E51200CF800B /* SbcBitpoolExpanderDefaults.swift in Sources */,
 				A34E91852570BC73000DB3F4 /* sbc_bitpool_expander.xcdatamodeld in Sources */,
 				A34E91802570BC73000DB3F4 /* AppDelegate.swift in Sources */,
+				A3A4BF40257E862F00F06042 /* SbcAssemblyProtocol.swift in Sources */,
+				A3E001462577838A00B42B52 /* BitpoolDetail.swift in Sources */,
+				A3A4BF38257E6AB600F06042 /* SbcBitpoolExpanderDefaultsProtocol.swift in Sources */,
+				A313E7A6257CFFE200C7AC6C /* BluetoothAudioDefaults.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

sbc bitpool expander.xcodeproj/project.xcworkspace/xcuserdata/ololx.xcuserdatad/UserInterfaceState.xcuserstate

@@ -0,0 +1,23 @@
+//
+//  SbcAssembly.swift
+//  sbc bitpool expander
+//
+//  Created by Alexander A. Kropotin on 07.12.2020.
+//
+
+import Foundation
+
+public class SbcAssembly: SbcAssemblyProtocol {
+    
+    func configure(with viewController: SbcViewController) {
+        //Create components
+        let sbcService = SbcService.init(view: viewController);
+        let bluetoothAudioDefaults = BluetoothAudioDefaults.init(presenter: sbcService);
+        let sbcBitpoolExpanderDefaults = SbcBitpoolExpanderDefaults.init(presenter: sbcService);
+        
+        //Inject components
+        viewController.scbService = sbcService;
+        sbcService.bluetoothAudioDefaults = bluetoothAudioDefaults;
+        sbcService.sbcBitpoolExpanderDefaults = sbcBitpoolExpanderDefaults;
+    }
+}

sbc bitpool expander/ViewController.swift

@@ -0,0 +1,13 @@
+//
+//  SbcAssemblyProtocol.swift
+//  sbc bitpool expander
+//
+//  Created by Alexander A. Kropotin on 07.12.2020.
+//
+
+import Foundation
+
+protocol SbcAssemblyProtocol: class {
+    
+    func configure(with viewController: SbcViewController)
+}

sbc bitpool expander/assembly/SbcAssembly.swift

@@ -0,0 +1,77 @@
+//
+//  BitpoolDetail.swift
+//  sbc bitpool expander
+//
+//  Created by Alexander A. Kropotin on 02.12.2020.
+//
+
+public struct BitpoolDetail {
+    
+    public class BitpoolDetailBuilder {
+        
+        private var obj: BitpoolDetail!;
+        
+        public init() {
+            self.obj = BitpoolDetail();
+        }
+        
+        public func buid() -> BitpoolDetail {
+            return self.obj;
+        }
+        
+        public func curr(_ curr: Int!) -> BitpoolDetailBuilder {
+            self.obj.curr = curr;
+            
+            return self;
+        }
+        
+        public func min(_ min: Int!) -> BitpoolDetailBuilder {
+            self.obj.min = min;
+            
+            return self;
+        }
+        
+        public func max(_ max: Int!) -> BitpoolDetailBuilder {
+            self.obj.max = max;
+            
+            return self;
+        }
+    }
+    
+    public static func builder() -> BitpoolDetailBuilder {
+        return BitpoolDetailBuilder();
+    }
+    
+    //The current/initial bitpool value
+    private var curr: Int!
+    
+    //The minimum bitpool value
+    private var min: Int!
+    
+    //The maximum bitpool value
+    private var max: Int!
+    
+    init() {
+        self.curr = 40;
+        self.min = 2;
+        self.max = 53;
+    }
+    
+    public init(curr: Int!, min: Int!, max: Int!) {
+        self.curr = curr;
+        self.min = min;
+        self.max = max;
+    }
+    
+    public func getCurr() -> Int {
+        return self.curr;
+    }
+    
+    public func getMin() -> Int {
+        return self.min;
+    }
+    
+    public func getMax() -> Int {
+        return self.max;
+    }
+}