Skip to content

Commit 0eb00b3

Browse files
committed
Merge pull request #2 from chrisinsfo/Average_Fix
Refactor valueString methods
2 parents 85b17e2 + 7bced94 commit 0eb00b3

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

APCAppCore/APCAppCore/UI/Model/APCTableViewItem.m

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -189,34 +189,26 @@ +(NSAttributedString *)legendForSeries1:(NSString *) series1 series2:(NSString *
189189
- (NSString *)averageValueString
190190
{
191191
double averageValue = [[self.graphData averageDataPoint] doubleValue];
192-
193-
HKUnit *unit = self.graphData.unit;
194-
NSString *unitString = (self.hidesUnitString || !unit) ? @"" : unit.unitString;
195-
NSString *averageString = [NSString stringWithFormat:NSLocalizedString(@"%0.0f %@", nil), averageValue, unitString];
196-
197-
return averageString;
192+
return [self stringWithDoubleValue:averageValue];
198193
}
199194

200195
- (NSString *)minimumValueString
201196
{
202197
double minValue = [[self.graphData minimumDataPoint] doubleValue];
203-
204-
HKUnit *unit = self.graphData.unit;
205-
NSString *unitString = (self.hidesUnitString || !unit) ? @"" : unit.unitString;
206-
NSString *minString = [NSString stringWithFormat:NSLocalizedString(@"%0.0f %@", nil), minValue, unitString];
207-
208-
return minString;
198+
return [self stringWithDoubleValue:minValue];
209199
}
210200

211201
- (NSString *)maximumValueString
212202
{
213203
double maxValue = [[self.graphData maximumDataPoint] doubleValue];
214-
204+
return [self stringWithDoubleValue:maxValue];
205+
}
206+
207+
- (NSString *)stringWithDoubleValue: (double)value
208+
{
215209
HKUnit *unit = self.graphData.unit;
216210
NSString *unitString = (self.hidesUnitString || !unit) ? @"" : unit.unitString;
217-
NSString *maxString = [NSString stringWithFormat:NSLocalizedString(@"%0.0f %@", nil), maxValue, unitString];
218-
219-
return maxString;
211+
return [NSString stringWithFormat:NSLocalizedString(@"%0.0f %@", nil), value, unitString];
220212
}
221213

222214
@end

0 commit comments

Comments
 (0)