Added circles to indicate transaction with < 6 confirmations

Author: D-32

BitStore.xcodeproj/project.pbxproj

@@ -95,6 +95,7 @@
 		9A9D588819D484C900EA940A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9A9D588A19D484C900EA940A /* Localizable.strings */; };
 		9A9D588E19D4867400EA940A /* AccountActionButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D588D19D4867400EA940A /* AccountActionButton.m */; };
 		9A9D588F19D4867700EA940A /* AccountActionButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D588D19D4867400EA940A /* AccountActionButton.m */; };
+		9A9D589219D4BDD200EA940A /* CircleIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D589119D4BDD200EA940A /* CircleIndicator.m */; };
 		9AA466BC1972D82A00A7B562 /* Color.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AA466BB1972D82A00A7B562 /* Color.m */; };
 		9AA6C44C1986FAFA0035A430 /* HTAutocompleteTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AA6C44B1986FAFA0035A430 /* HTAutocompleteTextField.m */; };
 		9AAAC41E19D092FE00994EB6 /* NotificationCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AAAC41D19D092FE00994EB6 /* NotificationCenter.framework */; };
@@ -320,6 +321,8 @@
 		9A9D588B19D484CE00EA940A /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		9A9D588C19D4867400EA940A /* AccountActionButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccountActionButton.h; sourceTree = "<group>"; };
 		9A9D588D19D4867400EA940A /* AccountActionButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AccountActionButton.m; sourceTree = "<group>"; };
+		9A9D589019D4BDD200EA940A /* CircleIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleIndicator.h; sourceTree = "<group>"; };
+		9A9D589119D4BDD200EA940A /* CircleIndicator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CircleIndicator.m; sourceTree = "<group>"; };
 		9AA466BA1972D82A00A7B562 /* Color.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Color.h; sourceTree = "<group>"; };
 		9AA466BB1972D82A00A7B562 /* Color.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Color.m; sourceTree = "<group>"; };
 		9AA6C44A1986FAFA0035A430 /* HTAutocompleteTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTAutocompleteTextField.h; sourceTree = "<group>"; };
@@ -851,6 +854,8 @@
 				9ABC072A1983174100EC87A3 /* AmountView.h */,
 				9ABC072B1983174100EC87A3 /* AmountView.m */,
 				9ABC072D1983175300EC87A3 /* AmountViewDelegate.h */,
+				9A9D589019D4BDD200EA940A /* CircleIndicator.h */,
+				9A9D589119D4BDD200EA940A /* CircleIndicator.m */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -1127,6 +1132,7 @@
 				9A67A77F1950D70A001FCE32 /* Address.m in Sources */,
 				9A67A7821950D70A001FCE32 /* ContactList.m in Sources */,
 				9A1DAECB197C305400BB9DF7 /* ChangeUnitViewController.m in Sources */,
+				9A9D589219D4BDD200EA940A /* CircleIndicator.m in Sources */,
 				9A9D588319D1F73800EA940A /* SharedUser.m in Sources */,
 				9AFC4A14197F0F8400EAF46B /* KeysViewController.m in Sources */,
 				9A67A75E1950D70A001FCE32 /* ContactsNavigationController.m in Sources */,

BitStore/Cells/TransactionCell.m

@@ -15,6 +15,7 @@
 #import "ContactHelper.h"
 #import "ContactListListener.h"
 #import "Unit.h"
+#import "CircleIndicator.h"
 
 @interface TransactionCell () <ExchangeListener, ContactListListener>
 @end
@@ -26,6 +27,7 @@ @implementation TransactionCell {
     UILabel* _personLabel;
     UILabel* _valueLabel;
     UILabel* _dateLabel;
+    CircleIndicator* _circleIndicator;
 }
 
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
@@ -44,8 +46,14 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
     _dateLabel.font = [UIFont systemFontOfSize:11];
     _dateLabel.textAlignment = NSTextAlignmentRight;
     _dateLabel.textColor = [UIColor colorWithWhite:0.65 alpha:1.0];
+    _dateLabel.hidden = YES;
     [self addSubview:_dateLabel];
 
+    _circleIndicator = [[CircleIndicator alloc] initWithCircles:6];
+    _circleIndicator.frame = CGRectMake(self.frame.size.width - 90, 30, 80, 20);
+    _circleIndicator.hidden = YES;
+    [self addSubview:_circleIndicator];
+    
     [[ExchangeHelper instance] addExchangeListener:self];
     [[ContactHelper instance] addContactListListener:self];
 
@@ -83,8 +91,12 @@ - (void)updateValues {
     _personLabel.text = [_contactList displayTextForAddress:address];
     _valueLabel.text = [_exchange.unit valueForSatoshi:_transaction.total];
     if (_transaction.confirmations < 6) {
-        _dateLabel.text = @"Pending";
+        _circleIndicator.hidden = NO;
+        _dateLabel.hidden = YES;
+        [_circleIndicator setFilledCircles:_transaction.confirmations];
     } else {
+        _circleIndicator.hidden = YES;
+        _dateLabel.hidden = NO;
         _dateLabel.text = _transaction.date.dateTimeAgo;
     }
 }

BitStore/Views/CircleIndicator.h

@@ -0,0 +1,19 @@
+//
+//  CircleIndicator.h
+//  BitStore
+//
+//  Created by Dylan Marriott on 25/09/14.
+//  Copyright (c) 2014 Dylan Marriott. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface CircleIndicator : UIView
+
+- (id)initWithCircles:(int)numberOfCircles;
+- (void)setFilledCircles:(int)filledCircles;
+
+- (id)init UNAVAILABLE_ATTRIBUTE;
+- (instancetype)initWithFrame:(CGRect)frame UNAVAILABLE_ATTRIBUTE;
+
+@end

BitStore/Views/CircleIndicator.m

@@ -0,0 +1,56 @@
+//
+//  CircleIndicator.m
+//  BitStore
+//
+//  Created by Dylan Marriott on 25/09/14.
+//  Copyright (c) 2014 Dylan Marriott. All rights reserved.
+//
+
+#import "CircleIndicator.h"
+
+static CGFloat circleRadius = 4;
+
+@implementation CircleIndicator {
+    NSMutableArray* _circleViews;
+}
+
+- (id)initWithCircles:(int)numberOfCircles {
+    if (self = [super init]) {
+        _circleViews = [NSMutableArray array];
+        for (int i = 0; i < numberOfCircles; i++) {
+            UIView* circle = [[UIView alloc] init];
+            circle.layer.cornerRadius = circleRadius;
+            circle.layer.borderColor = [UIColor colorWithWhite:0.6 alpha:1.0].CGColor;
+            circle.layer.borderWidth = 0.5f;
+            circle.backgroundColor = [UIColor clearColor];
+            [_circleViews addObject:circle];
+            [self addSubview:circle];
+        }
+    }
+    return self;
+}
+
+- (void)setFilledCircles:(int)filledCircles {
+    NSAssert(filledCircles <= _circleViews.count, @"Can't fill more circles than provided.");
+    NSAssert(filledCircles >= 0, @"Can't fill < 0 circles.");
+    
+    for (int i = 0; i < filledCircles; i++) {
+        UIView* circle = [_circleViews objectAtIndex:_circleViews.count - i - 1];
+        circle.backgroundColor = [UIColor colorWithWhite:0.8 alpha:1.0];
+    }
+    for (int i = filledCircles; i < _circleViews.count; i++) {
+        UIView* circle = [_circleViews objectAtIndex:_circleViews.count - i - 1];
+        circle.backgroundColor = [UIColor clearColor];
+    }
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    CGFloat space = (self.bounds.size.width - (circleRadius * 2 * _circleViews.count)) / (_circleViews.count - 1);
+    for (int i = 0; i < _circleViews.count; i++) {
+        UIView* circle = [_circleViews objectAtIndex:i];
+        circle.frame = CGRectMake(i * (space + circleRadius * 2), self.bounds.size.height / 2 - circleRadius, circleRadius * 2, circleRadius * 2);
+    }
+}
+
+@end