@@ -18,8 +18,8 @@ class CharacteristicsController: UIViewController {
1818
1919 @IBOutlet weak var characteristicsTableView : UITableView !
2020
21- private var characteristicsList : [ Characteristic ] = [ ]
22- private let characteristicCellId = " CharacteristicCell "
21+ fileprivate var characteristicsList : [ Characteristic ] = [ ]
22+ fileprivate let characteristicCellId = " CharacteristicCell "
2323
2424 override func viewDidLoad( ) {
2525 super. viewDidLoad ( )
@@ -29,100 +29,96 @@ class CharacteristicsController: UIViewController {
2929 characteristicsTableView. rowHeight = UITableViewAutomaticDimension
3030 }
3131
32- override func viewWillAppear( animated: Bool ) {
32+ override func viewWillAppear( _ animated: Bool ) {
3333 super. viewWillAppear ( animated)
34- getCharacteristicsForService ( service)
34+ getCharacteristics ( for : service)
3535 }
3636
37- private func getCharacteristicsForService ( service: Service ) {
37+ private func getCharacteristics ( for service: Service ) {
3838 service. discoverCharacteristics ( nil )
39- . subscribeNext { characteristics in
39+ . subscribe ( onNext : { characteristics in
4040 self . characteristicsList = characteristics
4141 self . characteristicsTableView. reloadData ( )
42- } . addDisposableTo ( disposeBag)
42+ } ) . addDisposableTo ( disposeBag)
4343 }
4444
45- private func setNotificationsState( enabled enabled: Bool , characteristic: Characteristic ) {
45+ fileprivate func setNotificationsState( enabled: Bool , characteristic: Characteristic ) {
4646 characteristic. setNotifyValue ( enabled)
47- . subscribeNext {
48- self . refreshCharacteristic ( $0 )
49- } . addDisposableTo ( disposeBag)
47+ . subscribe ( onNext : { [ weak self ] _ in
48+ self ? . characteristicsTableView . reloadData ( )
49+ } ) . addDisposableTo ( disposeBag)
5050 }
5151
5252 private func showWriteFieldForCharacteristic( characteristic: Characteristic ) {
5353 let valueWriteController = UIAlertController ( title: " Write value " , message: " Specify value in HEX to write " ,
54- preferredStyle: . Alert )
55- valueWriteController. addTextFieldWithConfigurationHandler { textField in
54+ preferredStyle: . alert )
55+ valueWriteController. addTextField { textField in
5656
5757 }
58- valueWriteController. addAction ( UIAlertAction ( title: " Cancel " , style: . Cancel , handler: nil ) )
59- valueWriteController. addAction ( UIAlertAction ( title: " Write " , style: . Default ) { _ in
58+ valueWriteController. addAction ( UIAlertAction ( title: " Cancel " , style: . cancel , handler: nil ) )
59+ valueWriteController. addAction ( UIAlertAction ( title: " Write " , style: . default ) { _ in
6060 print ( " " )
6161 } )
6262 }
6363
64- private func triggerValueReadForCharacteristic ( characteristic: Characteristic ) {
64+ fileprivate func triggerValueRead ( for characteristic: Characteristic ) {
6565 characteristic. readValue ( )
66- . subscribeNext {
67- self . refreshCharacteristic ( $0)
68- } . addDisposableTo ( disposeBag)
69- }
70-
71- private func refreshCharacteristic( characteristic: Characteristic ) {
72- characteristicsTableView. reloadData ( )
66+ . subscribe ( onNext: { [ weak self] _ in
67+ self ? . characteristicsTableView. reloadData ( )
68+ } ) . addDisposableTo ( disposeBag)
7369 }
7470}
7571
7672extension CharacteristicsController : UITableViewDataSource , UITableViewDelegate {
7773
78- func tableView( tableView: UITableView , numberOfRowsInSection section: Int ) -> Int {
74+ func tableView( _ tableView: UITableView , numberOfRowsInSection section: Int ) -> Int {
7975 return characteristicsList. count
8076 }
8177
82- func tableView( tableView: UITableView , cellForRowAtIndexPath indexPath: NSIndexPath ) -> UITableViewCell {
83- let cell = tableView. dequeueReusableCellWithIdentifier ( characteristicCellId, forIndexPath : indexPath)
78+ func tableView( _ tableView: UITableView , cellForRowAt indexPath: IndexPath ) -> UITableViewCell {
79+ let cell = tableView. dequeueReusableCell ( withIdentifier : characteristicCellId, for : indexPath)
8480 let characteristic = characteristicsList [ indexPath. row]
8581 if let cell = cell as? CharacteristicTableViewCell {
86- cell. updateWithCharacteristic ( characteristic)
82+ cell. update ( with : characteristic)
8783 }
8884 return cell
8985 }
9086
91- func tableView( tableView: UITableView , didSelectRowAtIndexPath indexPath: NSIndexPath ) {
87+ func tableView( _ tableView: UITableView , didSelectRowAt indexPath: IndexPath ) {
9288 let characteristic = characteristicsList [ indexPath. row]
93- let actionSheet = UIAlertController ( title: " Choose action " , message: nil , preferredStyle: . ActionSheet )
89+ let actionSheet = UIAlertController ( title: " Choose action " , message: nil , preferredStyle: . actionSheet )
9490
95- if characteristic. properties. contains ( . Notify ) {
96- let turnNotificationOffAction = UIAlertAction ( title: " Turn OFF notifications " , style: . Default ) { _ in
91+ if characteristic. properties. contains ( . notify ) {
92+ let turnNotificationOffAction = UIAlertAction ( title: " Turn OFF notifications " , style: . default ) { _ in
9793 self . setNotificationsState ( enabled: false , characteristic: characteristic)
9894 }
99- let turnNotificationOnAction = UIAlertAction ( title: " Turn ON notifications " , style: . Default ) { _ in
95+ let turnNotificationOnAction = UIAlertAction ( title: " Turn ON notifications " , style: . default ) { _ in
10096 self . setNotificationsState ( enabled: true , characteristic: characteristic)
10197 }
10298 actionSheet. addAction ( turnNotificationOffAction)
10399 actionSheet. addAction ( turnNotificationOnAction)
104100 }
105- if characteristic. properties. contains ( . Read ) {
106- let readValueNotificationAction = UIAlertAction ( title: " Trigger value read " , style: . Default ) { _ in
107- self . triggerValueReadForCharacteristic ( characteristic)
101+ if characteristic. properties. contains ( . read ) {
102+ let readValueNotificationAction = UIAlertAction ( title: " Trigger value read " , style: . default ) { _ in
103+ self . triggerValueRead ( for : characteristic)
108104 }
109105 actionSheet. addAction ( readValueNotificationAction)
110106 }
111- self . presentViewController ( actionSheet, animated: true , completion: nil )
107+ self . present ( actionSheet, animated: true , completion: nil )
112108 }
113109
114- func tableView( tableView: UITableView , viewForFooterInSection section: Int ) -> UIView ? {
110+ func tableView( _ tableView: UITableView , viewForFooterInSection section: Int ) -> UIView ? {
115111 return UIView ( frame: . zero)
116112 }
117113
118- func tableView( tableView: UITableView , titleForHeaderInSection section: Int ) -> String ? {
114+ func tableView( _ tableView: UITableView , titleForHeaderInSection section: Int ) -> String ? {
119115 return " CHARACTERISTICS "
120116 }
121117}
122118
123119extension CharacteristicTableViewCell {
124- func updateWithCharacteristic ( characteristic: Characteristic ) {
125- self . UUIDLabel. text = characteristic. UUID . UUIDString
120+ func update ( with characteristic: Characteristic ) {
121+ self . UUIDLabel. text = characteristic. uuid . uuidString
126122 self . isNotifyingLabel. text = characteristic. isNotifying ? " true " : " false "
127123 self . valueLabel. text = characteristic. value? . hexadecimalString ?? " Empty "
128124 }
0 commit comments