Added "Extraction complete" dialog and also bug fix for the extraction view for iBean, which caused the app to crash upon rotating in that view.

8 files changed, 74 insertions, 28 deletions

diff --git a/iBean/iBean/BeanCollectionExtractionScrollView.m b/iBean/iBean/BeanCollectionExtractionScrollView.m
index ea42000..4833814 100644
--- a/iBean/iBean/BeanCollectionExtractionScrollView.m
+++ b/iBean/iBean/BeanCollectionExtractionScrollView.m
@@ -39,6 +39,8 @@
   UIEdgeInsets insets = UIEdgeInsetsMake(0, 0, /*padding@bottom*/50, 0);
   [self setContentInset:insets];
   [self setScrollIndicatorInsets:insets];
+  
+  [super layoutSubviews];
 }
 
 /*
diff --git a/iBean/iBean/BeanCollectionExtractionViewController.h b/iBean/iBean/BeanCollectionExtractionViewController.h
index 449642a..88c8e92 100644
--- a/iBean/iBean/BeanCollectionExtractionViewController.h
+++ b/iBean/iBean/BeanCollectionExtractionViewController.h
@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 @class BeanCollection;
 
-@interface BeanCollectionExtractionViewController : UIViewController <UITableViewDelegate, UITableViewDataSource>
+@interface BeanCollectionExtractionViewController : UIViewController <UITableViewDelegate, UITableViewDataSource, UIAlertViewDelegate>
 
 @property (nonatomic, strong) BeanCollection *beanCollection;
 @property (nonatomic, assign) double extractionProgress;
diff --git a/iBean/iBean/BeanCollectionExtractionViewController.m b/iBean/iBean/BeanCollectionExtractionViewController.m
index dea550d..b1be270 100644
--- a/iBean/iBean/BeanCollectionExtractionViewController.m
+++ b/iBean/iBean/BeanCollectionExtractionViewController.m
@@ -6,6 +6,7 @@
 //  Copyright (c) 2013 Eddie Ehlin. All rights reserved.
 //
 
+#import <AudioToolbox/AudioToolbox.h>
 #import "BeanCollectionExtractionViewController.h"
 #import "BeanCollectionInfoViewController.h"
 #import "BeanCollection+Interface.h"
@@ -99,7 +100,14 @@
   {
     NSLog(@"Timer reached its limit!");
     [self haltExtractionTimer];
-    NSLog(@"Extraction count = %@", [(AppDelegate*) [[UIApplication sharedApplication] delegate] incrementExtractionCount]);
+    
+    UIAlertView *extractionCompleteAlert = [[UIAlertView alloc]
+                                            initWithTitle:@"Coffee time!"
+                                            message:@"Extraction completed."
+                                            delegate:self
+                                            cancelButtonTitle:@"OK" otherButtonTitles: nil];
+    AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
+    [extractionCompleteAlert show];
   }
 }
 
@@ -173,4 +181,11 @@
   return cell;
 }
 
+#pragma mark - UIAlertView delegate
+- (void) alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex
+{
+  //This will process thresholds etc.
+  NSLog(@"Extraction count = %@", [(AppDelegate*) [[UIApplication sharedApplication] delegate] incrementExtractionCount]);
+}
+
 @end
diff --git a/iBean/iBean/InstantExtractionViewController.h b/iBean/iBean/InstantExtractionViewController.h
index f988197..10b387a 100644
--- a/iBean/iBean/InstantExtractionViewController.h
+++ b/iBean/iBean/InstantExtractionViewController.h
@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface InstantExtractionViewController : UIViewController
+@interface InstantExtractionViewController : UIViewController <UIAlertViewDelegate>
 
 @property (nonatomic, assign) double extractionProgress;
 @property (nonatomic, assign) BOOL extractionInProgress;
diff --git a/iBean/iBean/InstantExtractionViewController.m b/iBean/iBean/InstantExtractionViewController.m
index 4c02b62..b2e1372 100644
--- a/iBean/iBean/InstantExtractionViewController.m
+++ b/iBean/iBean/InstantExtractionViewController.m
@@ -5,7 +5,7 @@
 //  Created by Eddie Ehlin on 2012-12-31.
 //  Copyright (c) 2012 Eddie Ehlin. All rights reserved.
 //
-
+#import <AudioToolbox/AudioToolbox.h>
 #import "InstantExtractionViewController.h"
 #import "AppDelegate+Storage.h"
 
@@ -66,7 +66,14 @@
   {
     NSLog(@"Timer reached its limit!");
     [self haltExtractionTimer];
-    NSLog(@"Extraction count = %@", [(AppDelegate*) [[UIApplication sharedApplication] delegate] incrementExtractionCount]);
+    
+    UIAlertView *extractionCompleteAlert = [[UIAlertView alloc]
+                                            initWithTitle:@"Coffee time!"
+                                            message:@"Extraction completed."
+                                            delegate:self
+                                            cancelButtonTitle:@"OK" otherButtonTitles: nil];
+    AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
+    [extractionCompleteAlert show];
   }
 }
 
@@ -120,4 +127,13 @@
   if (error == nil)
     [self updateExtractionSettingLabel];
 }
+
+/*****************************************************
+ Delegates
+ *****************************************************/
+#pragma mark - UIAlertView delegate
+- (void) alertView:(UIAlertView *)alertView willDismissWithButtonIndex:(NSInteger)buttonIndex
+{
+  NSLog(@"Extraction count = %@", [(AppDelegate*) [[UIApplication sharedApplication] delegate] incrementExtractionCount]);
+}
 @end
diff --git a/iBean/iBean/SettingsViewController.h b/iBean/iBean/SettingsViewController.h
index bfee4f8..efddfb2 100644
--- a/iBean/iBean/SettingsViewController.h
+++ b/iBean/iBean/SettingsViewController.h
@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 @class Configuration;
 
-@interface SettingsViewController : UITableViewController
+@interface SettingsViewController : UITableViewController <UIAlertViewDelegate>
 
 @property (nonatomic, strong) Configuration *configuration;
 
diff --git a/iBean/iBean/SettingsViewController.m b/iBean/iBean/SettingsViewController.m
index 7290f6d..b3dfb46 100644
--- a/iBean/iBean/SettingsViewController.m
+++ b/iBean/iBean/SettingsViewController.m
@@ -147,30 +147,43 @@
 
 - (void) resetExtractionCount:(id)sender
 {
-  if (self.configuration != nil)
+  UIAlertView *resetConfirmAlert = [[UIAlertView alloc]
+                                    initWithTitle:@"Reset extraction count?"
+                                    message:@"Are you sure about resetting extraction count?"
+                                    delegate:self
+                                    cancelButtonTitle:@"Yes"
+                                    otherButtonTitles:@"No", nil];
+  [resetConfirmAlert show];
+}
+
+/*****************************************************
+ Delegates
+ *****************************************************/
+#pragma mark - UIAlertView delegate
+- (void) alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex
+{
+  if (buttonIndex == 0)
   {
-    NSError *error = [(AppDelegate*) [[UIApplication sharedApplication] delegate] setExtractionCount:[NSNumber numberWithInt:0]];
-    self.extractionCountLabel.text = [self.configuration.extractionCount stringValue];
-    self.extractionCountStepper.value = [self.configuration.extractionCount doubleValue];
-    if (error != nil)
-    {
-      UIAlertView *setExtractionCountAlert = [[UIAlertView alloc]
-                                              initWithTitle:@"Configuration error!"
-                                              message:@"iBean was not able to save configuration attribute for \"Extraction count\"."
-                                              delegate:nil
-                                              cancelButtonTitle:@"OK" otherButtonTitles: nil];
-      [setExtractionCountAlert show];
-    }
-    else
+    if (self.configuration != nil)
     {
+      NSError *error = [(AppDelegate*) [[UIApplication sharedApplication] delegate] setExtractionCount:[NSNumber numberWithInt:0]];
       self.extractionCountLabel.text = [self.configuration.extractionCount stringValue];
       self.extractionCountStepper.value = [self.configuration.extractionCount doubleValue];
+      if (error != nil)
+      {
+        UIAlertView *setExtractionCountAlert = [[UIAlertView alloc]
+                                                initWithTitle:@"Configuration error!"
+                                                message:@"iBean was not able to save configuration attribute for \"Extraction count\"."
+                                                delegate:nil
+                                                cancelButtonTitle:@"OK" otherButtonTitles: nil];
+        [setExtractionCountAlert show];
+      }
+      else
+      {
+        self.extractionCountLabel.text = [self.configuration.extractionCount stringValue];
+        self.extractionCountStepper.value = [self.configuration.extractionCount doubleValue];
+      }
     }
   }
 }
-
-/*****************************************************
- Delegates
- *****************************************************/
-
 @end
diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard
index 0244142..22975ba 100644
--- a/iBean/iBean/iPhoneStoryboard.storyboard
+++ b/iBean/iBean/iPhoneStoryboard.storyboard
@@ -471,7 +471,7 @@
                                             <rect key="frame" x="10" y="1" width="300" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Value" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uLA-H4-Ds7">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Extractions" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uLA-H4-Ds7">
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="158" id="hTo-AL-kb1"/>
                                                     </constraints>
@@ -600,7 +600,7 @@
                                         <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="0.25dl milk (red)" translatesAutoresizingMaskIntoConstraints="NO" id="JHg-Fk-IL0">
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JHg-Fk-IL0">
                                         <color key="backgroundColor" red="0.6845703125" green="0.58594199899999999" blue="0.51132836960000005" alpha="1" colorSpace="calibratedRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="368" id="eyQ-2Q-yaW"/>
@@ -1364,7 +1364,7 @@
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
         <segue reference="utz-eo-nc3"/>
-        <segue reference="CyX-df-8ge"/>
+        <segue reference="OPZ-Pj-2Dz"/>
         <segue reference="qk2-F5-M1s"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file