CHG: optimze code

Author: xuchdeid

macOS/APIExample/Commons/GlobalSettings.swift

@@ -36,14 +36,14 @@ class GlobalSettings {
     static let shared = GlobalSettings()
     let resolutionSetting: SettingItem<Int> = SettingItem(
         selected: Configs.defaultResolutionIdx,
-        options: Configs.Resolutions.enumerated().map({ (element: EnumeratedSequence<[Resolution]>.Iterator.Element) -> SettingItemOption<Int> in
-            return SettingItemOption(idx: element.offset, label: element.element.name(), value: element.offset)
-        })
+        options: Configs.Resolutions.enumerated().map {
+            SettingItemOption(idx: $0.offset, label: $0.element.name(), value: $0.offset)
+        }
     )
     let fpsSetting: SettingItem<Int> = SettingItem(
         selected: Configs.defaultFpsIdx,
-        options: Configs.Fps.enumerated().map({ (element: EnumeratedSequence<[Int]>.Iterator.Element) -> SettingItemOption<Int> in
-            return SettingItemOption(idx: element.offset, label: "\(element.element)fps", value: element.offset)
-        })
+        options: Configs.Fps.enumerated().map {
+            SettingItemOption(idx: $0.offset, label: "\($0.element)fps", value: $0.offset)
+        }
     )
 }

macOS/APIExample/Examples/Advanced/CustomVideoRender/CustomVideoRender.swift

@@ -38,15 +38,11 @@ class CustomVideoRender: BaseViewController {
         layoutVideos(2)
 
         // prepare resolution picker
-        resolutionPicker.addItems(withTitles: Configs.Resolutions.map({ (res:Resolution) -> String in
-            return res.name()
-        }))
+        resolutionPicker.addItems(withTitles: Configs.Resolutions.map { $0.name() })
         resolutionPicker.selectItem(at: GlobalSettings.shared.resolutionSetting.selectedOption().value)
 
         // prepare fps picker
-        fpsPicker.addItems(withTitles: Configs.Fps.map({ (fps:Int) -> String in
-            return "\(fps)fps"
-        }))
+        fpsPicker.addItems(withTitles: Configs.Fps.map { "\($0)fps" })
         fpsPicker.selectItem(at: GlobalSettings.shared.fpsSetting.selectedOption().value)
 
         // set up agora instance when view loaded

macOS/APIExample/Examples/Advanced/CustomVideoSourceMediaIO/CustomVideoSourceMediaIO.swift

@@ -38,15 +38,11 @@ class CustomVideoSourceMediaIO: BaseViewController {
         layoutVideos(2)
 
         // prepare resolution picker
-        resolutionPicker.addItems(withTitles: Configs.Resolutions.map({ (res:Resolution) -> String in
-            return res.name()
-        }))
+        resolutionPicker.addItems(withTitles: Configs.Resolutions.map { $0.name() })
         resolutionPicker.selectItem(at: GlobalSettings.shared.resolutionSetting.selectedOption().value)
 
         // prepare fps picker
-        fpsPicker.addItems(withTitles: Configs.Fps.map({ (fps:Int) -> String in
-            return "\(fps)fps"
-        }))
+        fpsPicker.addItems(withTitles: Configs.Fps.map { "\($0)fps" })
         fpsPicker.selectItem(at: GlobalSettings.shared.fpsSetting.selectedOption().value)
 
         // set up agora instance when view loaded

macOS/APIExample/Examples/Advanced/CustomVideoSourcePush/CustomVideoSourcePush.swift

@@ -40,15 +40,11 @@ class CustomVideoSourcePush: BaseViewController {
         layoutVideos(2)
 
         // prepare resolution picker
-        resolutionPicker.addItems(withTitles: Configs.Resolutions.map({ (res:Resolution) -> String in
-            return res.name()
-        }))
+        resolutionPicker.addItems(withTitles: Configs.Resolutions.map { $0.name() })
         resolutionPicker.selectItem(at: GlobalSettings.shared.resolutionSetting.selectedOption().value)
 
         // prepare fps picker
-        fpsPicker.addItems(withTitles: Configs.Fps.map({ (fps:Int) -> String in
-            return "\(fps)fps"
-        }))
+        fpsPicker.addItems(withTitles: Configs.Fps.map { "\($0)fps" })
         fpsPicker.selectItem(at: GlobalSettings.shared.fpsSetting.selectedOption().value)
 
         // set up agora instance when view loaded

macOS/APIExample/Examples/Advanced/RawMediaData/RawMediaData.swift

@@ -37,15 +37,11 @@ class RawMediaData: BaseViewController {
         layoutVideos(2)
 
         // prepare resolution picker
-        resolutionPicker.addItems(withTitles: Configs.Resolutions.map({ (res:Resolution) -> String in
-            return res.name()
-        }))
+        resolutionPicker.addItems(withTitles: Configs.Resolutions.map { $0.name() })
         resolutionPicker.selectItem(at: GlobalSettings.shared.resolutionSetting.selectedOption().value)
 
         // prepare fps picker
-        fpsPicker.addItems(withTitles: Configs.Fps.map({ (fps:Int) -> String in
-            return "\(fps)fps"
-        }))
+        fpsPicker.addItems(withTitles: Configs.Fps.map { "\($0)fps" })
         fpsPicker.selectItem(at: GlobalSettings.shared.fpsSetting.selectedOption().value)
 
         // set up agora instance when view loaded

macOS/APIExample/Examples/Advanced/ScreenShare/ScreenShare.swift

@@ -70,15 +70,11 @@ class ScreenShare: BaseViewController {
         layoutVideos(2)
 
         // prepare resolution picker
-        resolutionPicker.addItems(withTitles: Configs.Resolutions.map({ (res:Resolution) -> String in
-            return res.name()
-        }))
+        resolutionPicker.addItems(withTitles: Configs.Resolutions.map { $0.name() })
         resolutionPicker.selectItem(at: GlobalSettings.shared.resolutionSetting.selectedOption().value)
 
         // prepare fps picker
-        fpsPicker.addItems(withTitles: Configs.Fps.map({ (fps:Int) -> String in
-            return "\(fps)fps"
-        }))
+        fpsPicker.addItems(withTitles: Configs.Fps.map { "\($0)fps" })
         fpsPicker.selectItem(at: GlobalSettings.shared.fpsSetting.selectedOption().value)
 
         // prepare window manager and list

macOS/APIExample/Examples/Advanced/StreamEncryption/StreamEncryption.swift

@@ -40,15 +40,11 @@ class StreamEncryption: BaseViewController {
         layoutVideos(2)
 
         // prepare resolution picker
-        resolutionPicker.addItems(withTitles: Configs.Resolutions.map({ (res:Resolution) -> String in
-            return res.name()
-        }))
+        resolutionPicker.addItems(withTitles: Configs.Resolutions.map { $0.name() })
         resolutionPicker.selectItem(at: GlobalSettings.shared.resolutionSetting.selectedOption().value)
 
         // prepare fps picker
-        fpsPicker.addItems(withTitles: Configs.Fps.map({ (fps:Int) -> String in
-            return "\(fps)fps"
-        }))
+        fpsPicker.addItems(withTitles: Configs.Fps.map { "\($0)fps" })
         fpsPicker.selectItem(at: GlobalSettings.shared.fpsSetting.selectedOption().value)
 
         // prepare encryptionn picker

macOS/APIExample/Examples/Basic/JoinChannelVideo/JoinChannelVideo.swift

@@ -57,15 +57,11 @@ class JoinChannelVideoMain: BaseViewController {
         layoutVideos(2)
 
         // prepare resolution picker
-        resolutionPicker.addItems(withTitles: Configs.Resolutions.map({ (res:Resolution) -> String in
-            return res.name()
-        }))
+        resolutionPicker.addItems(withTitles: Configs.Resolutions.map { $0.name() })
         resolutionPicker.selectItem(at: GlobalSettings.shared.resolutionSetting.selectedOption().value)
 
         // prepare fps picker
-        fpsPicker.addItems(withTitles: Configs.Fps.map({ (fps:Int) -> String in
-            return "\(fps)fps"
-        }))
+        fpsPicker.addItems(withTitles: Configs.Fps.map { "\($0)fps" })
         fpsPicker.selectItem(at: GlobalSettings.shared.fpsSetting.selectedOption().value)
         rolePicker.addItems(withTitles: AgoraClientRole.allValues().map({$0.description()}))