Skip to content

Commit

Permalink
minor changes. build ready for release
Browse files Browse the repository at this point in the history
  • Loading branch information
@brettalcox
brettalcox committed Mar 27, 2016
1 parent 8fdccc5 commit 7298187
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 25 deletions.
8 changes: 4 additions & 4 deletions logU/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -802,10 +802,10 @@
</subviews>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="dnT-RJ-lqw" firstAttribute="top" secondItem="zpm-gt-KDR" secondAttribute="bottom" id="dIf-dx-LxK"/>
<constraint firstItem="zpm-gt-KDR" firstAttribute="leading" secondItem="YqD-xj-IDE" secondAttribute="leadingMargin" id="fB5-Fw-g5X"/>
<constraint firstAttribute="trailingMargin" secondItem="zpm-gt-KDR" secondAttribute="trailing" id="p0s-C6-mxl"/>
<constraint firstItem="zpm-gt-KDR" firstAttribute="top" secondItem="Clq-5h-vKc" secondAttribute="bottom" id="po1-ZX-K0w"/>
<constraint firstAttribute="trailingMargin" secondItem="zpm-gt-KDR" secondAttribute="trailing" constant="20" id="Rqg-kw-WgD"/>
<constraint firstItem="dnT-RJ-lqw" firstAttribute="top" secondItem="zpm-gt-KDR" secondAttribute="bottom" constant="20" id="Z90-ey-EER"/>
<constraint firstItem="zpm-gt-KDR" firstAttribute="top" secondItem="Clq-5h-vKc" secondAttribute="bottom" constant="20" id="gaR-Zb-G8d"/>
<constraint firstItem="zpm-gt-KDR" firstAttribute="leading" secondItem="YqD-xj-IDE" secondAttribute="leadingMargin" constant="20" id="rMV-4n-Go6"/>
</constraints>
</view>
<navigationItem key="navigationItem" title="Targeted Muscle" id="ysh-4Z-ma9">
Expand Down
4 changes: 2 additions & 2 deletions logU/CommunityTargetMuscleViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class CommunityTargetedMuscleViewController: UIViewController, UIActionSheetDele
}

if dataPoints.count != 0 || values.count != 0 {
let radarChartDataSet = RadarChartDataSet(yVals: dataEntries, label: "")
let radarChartDataSet = RadarChartDataSet(yVals: dataEntries, label: "logU Community")
let radarChartData = RadarChartData(xVals: dataPoints, dataSet: radarChartDataSet)

radarChartDataSet.drawFilledEnabled = true
Expand All @@ -83,13 +83,13 @@ class CommunityTargetedMuscleViewController: UIViewController, UIActionSheetDele
radarChartView.xAxis.labelFont = UIFont .systemFontOfSize(10)
radarChartView.rotationEnabled = false
radarChartView.animate(yAxisDuration: 1.0)
radarChartView.animate(xAxisDuration: 1.0)
radarChartView.descriptionText = ""
radarChartView.data = radarChartData
radarChartView.backgroundColor = UIColor.groupTableViewBackgroundColor()
radarChartView.legend.enabled = false
radarChartView.highlightPerTapEnabled = false
radarChartView.yAxis.drawLabelsEnabled = false

}
}

Expand Down
2 changes: 1 addition & 1 deletion logU/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>25</string>
<string>26</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSLocationAlwaysUsageDescription</key>
Expand Down
2 changes: 1 addition & 1 deletion logU/LogLift.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ class LogLift: FormViewController, CLLocationManagerDelegate {
<<< PickerInlineRow<String>("Lift") { (row : PickerInlineRow<String>) -> Void in

row.title = "Lift"
row.options = ["Squat", "Pause Squat", "Front Squat", "Box Squat", "Hack Squat", "Zerker Squat", "Pin Squat", "Good Mornings", "Bench", "Close Grip Bench", "Incline Bench", "Decline Bench", "Pause Bench", "Floor Press", "Pin Press", "Deadlift", "Deficit Deadlift", "Pause Deadlift", "Snatch Grip Deadlift", "Straight Leg Deadlift", "Romanian Deadlift", "Overhead Press", "Sots Press", "Pullups", "Dips", "Push Ups", "Bent Over Rows", "T-Bar Rows", "Kroc Rows", "Upright Rows", "Cable Upright Rows", "Cable Seated Rows", "Straight Bar Bicep Curls", "EZ Bar Bicep Curls", "Barbell Bicep Curls", "Hammer Curls", "Cable Curls", "Chest Fly", "Cable Standing Fly", "Lat Pulldown", "Shoulder Fly", "Lateral Raise", "Shoulder Shrug", "Tricep Extension", "Tricep Pushdown", "Dumbbell Bench", "Dumbbell Incline Press", "Dumbbell Press", "Skullcrushers", "21's", "Leg Press", "Leg Extension", "Leg Curl", "Standing Calf Raise", "Seated Calf Raise", "Snatch", "Clean and Jerk", "Power Clean", "Power Snatch", "Hang Clean", "Hang Snatch", "Snatch Pulls", "Clean Pulls"]
row.options = ["Squat", "Pause Squat", "Front Squat", "Box Squat", "Hack Squat", "Zerker Squat", "Pin Squat", "Good Mornings", "Bench", "Close Grip Bench", "Incline Bench", "Decline Bench", "Pause Bench", "Floor Press", "Pin Press", "Deadlift", "Deficit Deadlift", "Pause Deadlift", "Snatch Grip Deadlift", "Straight Leg Deadlift", "Romanian Deadlift", "Overhead Press", "Sots Press", "Pullups", "Dips", "Push Ups", "Crunches", "Sit-ups", "General Ab Work", "Bent Over Rows", "T-Bar Rows", "Kroc Rows", "Upright Rows", "Cable Upright Rows", "Cable Seated Rows", "Straight Bar Bicep Curls", "EZ Bar Bicep Curls", "Barbell Bicep Curls", "Hammer Curls", "Cable Curls", "Chest Fly", "Cable Standing Fly", "Lat Pulldown", "Shoulder Fly", "Lateral Raise", "Shoulder Shrug", "Tricep Extension", "Tricep Pushdown", "Dumbbell Bench", "Dumbbell Incline Press", "Dumbbell Press", "Skullcrushers", "21's", "Leg Press", "Leg Extension", "Leg Curl", "Standing Calf Raise", "Seated Calf Raise", "Snatch", "Clean and Jerk", "Power Clean", "Power Snatch", "Hang Clean", "Hang Snatch", "Snatch Pulls", "Clean Pulls"]
row.value = row.options[0]
}

Expand Down
26 changes: 9 additions & 17 deletions logU/SettingsTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,11 @@ class SettingsTableViewController: FormViewController, CLLocationManagerDelegate
} else {
if (CLLocationManager.locationServicesEnabled()) {
if CLLocationManager.authorizationStatus() == .AuthorizedWhenInUse {
/*
locationManager = CLLocationManager()
locationManager.delegate = self
locationManager.desiredAccuracy = kCLLocationAccuracyBest
locationManager.startUpdatingLocation()
$0.value = locationManager.location
locationManager.stopUpdatingLocation()
*/
$0.value = CLLocation(latitude: 0, longitude: 0)
} else {
//$0.value = CLLocation(latitude: 39.0866, longitude: -94.5770)
$0.value = CLLocation(latitude: 0, longitude: 0)
}
} else {
//$0.value = CLLocation(latitude: 39.0866, longitude: -94.5770)
$0.value = CLLocation(latitude: 0, longitude: 0)
}
}
Expand All @@ -119,7 +109,6 @@ class SettingsTableViewController: FormViewController, CLLocationManagerDelegate
})
<<< SwitchRow("GPS") {
$0.title = "Log GPS on Community Map"
//defaults.synchronize()
if Int(String((defaults.valueForKey("GPS"))!)) == 1 {
$0.value = true
} else {
Expand All @@ -133,13 +122,16 @@ class SettingsTableViewController: FormViewController, CLLocationManagerDelegate
self.defaults.setInteger(0, forKey: "GPS")
}
})
<<< LabelRow("Label") {
$0.title = "If disabled, turn on Location Services."

<<< TextAreaRow(){
$0.disabled = true
}.cellSetup { cell, row in
cell.backgroundColor = UIColor .whiteColor()
}
$0.value = "If these options are disabled, turn on Location Services."
}.cellSetup({ (cell, row) -> () in
cell.textView.font = UIFont .systemFontOfSize(9)
cell.userInteractionEnabled = false
row.cell.height = {
return 35
}
})

+++ Section("Privacy")
<<< ButtonRow("Privacy") {
Expand Down

0 comments on commit 7298187

Please sign in to comment.