Merge pull request #33 from MonoHelixLabs/linemode

New feature: control how the lines between data points are drawn

DataFeeds-iOS/Assets.xcassets/plotsettings.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "plotsettings40pt.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "plotsettings80pt.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "plotsettings120pt.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

DataFeeds-iOS/FeedDetailsViewController.swift

@@ -23,6 +23,8 @@ class FeedDetailsViewController: UIViewController, UITableViewDataSource, UITabl
 
     var timer: Timer!
 
+    var lineMode: Int!
+
     #if os(iOS)
         @IBOutlet var lineChartView: LineChartView!
     #else
@@ -80,6 +82,7 @@ class FeedDetailsViewController: UIViewController, UITableViewDataSource, UITabl
             timer = Timer.scheduledTimer(timeInterval: refreshInterval, target: self, selector: #selector(FeedDetailsViewController.refreshHistFeedData(_:)), userInfo: nil, repeats: true)
         }
 
+        lineMode = UserDefaultsManager.sharedInstance.getLineMode()
     }
 
 
@@ -150,8 +153,20 @@ class FeedDetailsViewController: UIViewController, UITableViewDataSource, UITabl
                 ds1.drawValuesEnabled = false
                 ds1.drawFilledEnabled = true
                 ds1.fillColor = UIColor(red: 0.0/255.0, green: 204.0/255.0, blue: 204.0/255.0, alpha: 1.0)
-                ds1.mode = LineChartDataSet.Mode.horizontalBezier
-                ds1.cubicIntensity = 0.2
+
+                switch lineMode {
+                case 0:
+                    ds1.mode = LineChartDataSet.Mode.horizontalBezier
+                    ds1.cubicIntensity = 0.2
+                case 1:
+                    ds1.mode = LineChartDataSet.Mode.linear
+                case 2:
+                    ds1.mode = LineChartDataSet.Mode.stepped
+                default:
+                    ds1.mode = LineChartDataSet.Mode.horizontalBezier
+                    ds1.cubicIntensity = 0.2
+                }
+
                 ds1.setDrawHighlightIndicators(false)
 
                 data.addDataSet(ds1)

DataFeeds-iOS/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.1</string>
+	<string>1.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

DataFeeds-iOS/PlotSettingsViewController.swift

@@ -0,0 +1,53 @@
+//
+//  PlotSettingsViewController.swift
+//  DataFeeds
+//
+//  Created by Paula on 21/07/2017.
+//  Copyright © 2017 monohelixlabs. All rights reserved.
+//
+
+import UIKit
+
+
+class PlotSettingsViewController: UIViewController, UIPickerViewDataSource, UIPickerViewDelegate {
+
+    @IBOutlet weak var lineModePicker: UIPickerView!
+
+    var pickerData = [
+        ["Horizontal Bezier","Linear","Stepped"]
+    ]
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        self.navigationController?.navigationBar.barTintColor = UIColor(red: 0.0/255.0, green: 204.0/255.0, blue: 204.0/255.0, alpha: 1.0)
+        self.navigationController?.navigationBar.isTranslucent = false
+        self.navigationController?.navigationBar.tintColor = UIColor.black
+        self.navigationController?.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName : UIColor.white]
+
+        lineModePicker.delegate = self
+        lineModePicker.dataSource = self
+
+    }
+
+    override func viewDidAppear(_ animated: Bool) {
+        lineModePicker.selectRow(UserDefaultsManager.sharedInstance.getLineMode(), inComponent: 0, animated: false)
+    }
+
+    func numberOfComponents(in pickerView: UIPickerView) -> Int {
+        return pickerData.count
+    }
+
+    func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
+        return pickerData[component].count
+    }
+
+    func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
+        return pickerData[component][row]
+    }
+
+    func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int)
+    {
+        UserDefaultsManager.sharedInstance.setLineMode(lineModePicker.selectedRow(inComponent: 0))
+    }
+}

DataFeeds-iOS/UserDefaultsManager.swift

@@ -23,9 +23,17 @@ class UserDefaultsManager: NSObject {
     let mainfeedrefreshdefault = 0
     let feeddetailsrefreshString = "feeddetailsrefresh"
     let feeddetailsrefreshdefault = 0
-
     let refreshRates = [0.0, 15.0, 30.0, 60.0, 120.0]
 
+    let linemodeString = "linemode"
+    let linemodedefault = 0
+
+    //
+    // Preferences that are synced with iCloud
+    //
+
+    // AIO key
+
     func getAIOkey() -> String {
 
         let iCloudKeyStore: NSUbiquitousKeyValueStore? = NSUbiquitousKeyValueStore()
@@ -52,6 +60,8 @@ class UserDefaultsManager: NSObject {
 
     }
 
+    // Feed emojis
+
     func getImagesPreferences() -> [String:String]{
 
         let iCloudKeyStore: NSUbiquitousKeyValueStore? = NSUbiquitousKeyValueStore()
@@ -96,6 +106,8 @@ class UserDefaultsManager: NSObject {
 
     }
 
+    // Helper functions
+
     func syncWithiCloud() {
 
         let iCloudKeyStore: NSUbiquitousKeyValueStore? = NSUbiquitousKeyValueStore()
@@ -115,7 +127,9 @@ class UserDefaultsManager: NSObject {
         return String(Character(UnicodeScalar(Int(emoji,radix:16)!)!))
     }
 
+    //
     // Preferences that are not synced with iCloud follow
+    //
 
     func getShownKeyScreen() -> Bool {
         let prefs = UserDefaults.standard
@@ -129,12 +143,7 @@ class UserDefaultsManager: NSObject {
         UserDefaults.standard.synchronize()
     }
 
-    func getRefreshRateMainFeed() -> Int {
-        let prefs = UserDefaults.standard
-        var mainfeedrefresh = prefs.integer(forKey: mainfeedrefreshString)
-        if (mainfeedrefresh == 0) { mainfeedrefresh = mainfeedrefreshdefault }
-        return mainfeedrefresh
-    }
+    // Refresh Rate
 
     func getRefreshRateMainFeedToInterval() -> Double {
         return refreshRates[getRefreshRateMainFeed()]
@@ -144,6 +153,13 @@ class UserDefaultsManager: NSObject {
         return refreshRates[getRefreshRateDetailsFeed()]
     }
 
+    func getRefreshRateMainFeed() -> Int {
+        let prefs = UserDefaults.standard
+        var mainfeedrefresh = prefs.integer(forKey: mainfeedrefreshString)
+        if (mainfeedrefresh == 0) { mainfeedrefresh = mainfeedrefreshdefault }
+        return mainfeedrefresh
+    }
+
     func setRefreshRateMainFeed(_ value: Int) {
         let prefs = UserDefaults.standard
         prefs.set(value, forKey: mainfeedrefreshString)
@@ -162,6 +178,19 @@ class UserDefaultsManager: NSObject {
         prefs.set(value, forKey: feeddetailsrefreshString)
         UserDefaults.standard.synchronize()
     }
-
+
+    // Line Mode
+
+    func getLineMode() -> Int {
+        let prefs = UserDefaults.standard
+        let linemode = prefs.integer(forKey: linemodeString)
+        return linemode
+    }
+
+    func setLineMode(_ value: Int) {
+        let prefs = UserDefaults.standard
+        prefs.set(value, forKey: linemodeString)
+        UserDefaults.standard.synchronize()
+    }
 
 }