Run again

.gitignore

@@ -1 +1,25 @@
+# macOS
 .DS_Store
+
+# Xcode user-specific files
+xcuserdata/
+*.xcuserstate
+*.xcscmblueprint
+
+# Build products
+build/
+DerivedData/
+
+# Swift Package Manager
+.swiftpm/
+.build/
+Package.resolved
+
+# Build artifacts
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods (falls später benötigt)
+Pods/

Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "AppIcon-1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

CardEngine/CECard.m

@@ -34,8 +34,8 @@ + (NSUInteger) indexWithRank: (CERank) rank andSuit: (CESuit) suit
 	NSUInteger		index = 0;
 
 	// Param check.
-	require ((rank >= kCERankAce) && (rank <= kCERankKing), bail);
-	require ((suit >= kCESuitDiamonds) && (suit <= kCESuitClubs), bail);
+	__Require ((rank >= kCERankAce) && (rank <= kCERankKing), bail);
+	__Require ((suit >= kCESuitDiamonds) && (suit <= kCESuitClubs), bail);
 
 	// Compute index.
 	index = (suit * 13) + rank;
@@ -52,7 +52,7 @@ + (CERank) rankFromIndex: (NSUInteger) index
 	CERank		rank = 0;
 
 	// Param check.
-	require ((index >= 1) && (index <= 52), bail);
+	__Require ((index >= 1) && (index <= 52), bail);
 
 	// Modulo 13.
 	rank = ((index - 1) % 13) + 1;
@@ -69,7 +69,7 @@ + (CESuit) suitFromIndex: (NSUInteger) index
 	CESuit		suit = 0;
 
 	// Param check.
-	require ((index >= 1) && (index <= 52), bail);
+	__Require ((index >= 1) && (index <= 52), bail);
 
 	// Divide by 13.
 	suit = (index - 1) / 13;
@@ -187,7 +187,7 @@ - (id) initWithIndex: (NSUInteger) index
 
 	// Super.
 	myself = [super init];
-	require (myself, bail);
+	__Require (myself, bail);
 
 	// Assign instance variable.
 	if (index == 0)
@@ -203,14 +203,6 @@ - (id) initWithIndex: (NSUInteger) index
 	return myself;
 }
 
-// ------------------------------------------------------------------------------------------------------------- dealloc
-
-- (void) dealloc
-{
-	// Super.
-	[super dealloc];
-}
-
 // ---------------------------------------------------------------------------------------------------------------- suit
 
 - (CESuit) suit

CardEngine/CECardDealer.h

@@ -22,15 +22,15 @@
 	BOOL						_dealing;
 	BOOL						_enableUndoGrouping;
 	NSTimer						*_dealTimer;
-	id <CECardDealerDelegate>	_delegate;
+	__weak id <CECardDealerDelegate>	_delegate;
 }
 
-@property(nonatomic,retain,readonly)	CEStackView					*sourceStack;
-@property(nonatomic,retain,readonly)	CEStackView					*destStack;
+@property(nonatomic,strong,readonly)	CEStackView					*sourceStack;
+@property(nonatomic,strong,readonly)	CEStackView					*destStack;
 @property(nonatomic)					NSTimeInterval				dealDuration;	// Default: 0.25 seconds.
 @property(nonatomic)					NSTimeInterval				dealDelay;		// Default: 0.20 seconds.
 @property(nonatomic)					BOOL						enableUndoGrouping;
-@property(nonatomic,assign)				id <CECardDealerDelegate>	delegate;		// Optional delegate.
+@property(nonatomic,weak)				id <CECardDealerDelegate>	delegate;		// Optional delegate.
 @property(nonatomic,readonly)			BOOL						dealing;
 
 - (void) dealCardsFromStackView: (CEStackView *) source toStackView: (CEStackView *) dest count: (NSUInteger) count;

CardEngine/CECardDealer.m

@@ -34,7 +34,7 @@ - (id) init
 
 	// Super.
 	myself = [super init];
-	require (myself, bail);
+	__Require (myself, bail);
 
 	// Initialize instance variables.
 	_duration = kDefaultDealAnimationDuration;
@@ -54,17 +54,10 @@ - (void) dealloc
 	// Finish any deal in progress.
 	if (_dealing)
 		[self quickComplete];
-
-	// Release instance var.
-	[_sourceStack release];
-	[_destStack release];
-
+
 	// Clean up timer.
 	if (_dealTimer)
 		[_dealTimer invalidate];
-
-	// Super.
-	[super dealloc];
 }
 
 // --------------------------------------------------------------------------------------------------------- dealOneCard
@@ -80,8 +73,8 @@ - (void) dealOneCard
 		if (_enableUndoGrouping)
 			[[CETableView sharedCardUndoManager] endUndoGrouping];
 		_count = 0;
-		[_sourceStack release];
-		[_destStack release];
+		_sourceStack = nil;
+		_destStack = nil;
 		_dealing = NO;
 	}
 	else
@@ -118,9 +111,9 @@ - (void) dealCardsFromStackView: (CEStackView *) source toStackView: (CEStackVie
 	if ([source.stack topCard] == nil)
 		return;
 
-	// Retain stacks.
-	_sourceStack = [source retain];
-	_destStack = [dest retain];
+	// Store stacks.
+	_sourceStack = source;
+	_destStack = dest;
 	_count = count;
 	_dealing = YES;
 
@@ -169,8 +162,8 @@ - (void) quickComplete
 		if (_enableUndoGrouping)
 			[[CETableView sharedCardUndoManager] endUndoGrouping];
 		_count = 0;
-		[_sourceStack release];
-		[_destStack release];
+		_sourceStack = nil;
+		_destStack = nil;
 		_dealing = NO;
 	}
 }

CardEngine/CECardView.h

@@ -30,9 +30,9 @@ enum
 	BOOL			_hasShadow;						// Shadow state.
 }
 
-@property(nonatomic,retain)	CECard		*card;				// The card object backing the view. This is the card displayed.
-@property(nonatomic,retain)	UIColor		*highlightColor;	// Fill color when view is highlighted. Can be set to nil.
-@property(nonatomic,retain)	NSString	*label;				// Fill color when view is highlighted. Can be set to nil.
+@property(nonatomic,strong)	CECard		*card;				// The card object backing the view. This is the card displayed.
+@property(nonatomic,strong)	UIColor		*highlightColor;	// Fill color when view is highlighted. Can be set to nil.
+@property(nonatomic,strong)	NSString	*label;				// Fill color when view is highlighted. Can be set to nil.
 @property(nonatomic)		BOOL		highlight;			// During live drag, view may highlight when stack dragged into.
 @property(nonatomic)		BOOL		hasShadow;			// Whether to draw a shadow beneath card. Default is NO.
 

CardEngine/CECardView.m

@@ -83,7 +83,7 @@ - (id) initWithFrame: (CGRect) frame
 
 	// Super.
 	myself = [super initWithFrame: frame];
-	require (myself, bail);
+	__Require (myself, bail);
 
 	// Initialize instance variables.
 	_card = nil;
@@ -104,18 +104,6 @@ - (id) initWithFrame: (CGRect) frame
 	return self;
 }
 
-// ------------------------------------------------------------------------------------------------------------- dealloc
-
-- (void) dealloc
-{
-	// Release instance var.
-	[_card release];
-	[_highlightColor release];
-
-	// Super.
-	[super dealloc];
-}
-
 // ------------------------------------------------------------------------------------------------------------ isOpaque
 
 - (BOOL) isOpaque
@@ -132,9 +120,8 @@ - (void) setCard: (CECard *) card
 	if (_card == card)
 		return;
 
-	// Release, retain, redraw.
-	[_card release];
-	_card = [card retain];
+	// Assign, redraw.
+	_card = card;
 
 	[self setNeedsDisplay];
 }
@@ -155,9 +142,8 @@ - (void) setLabel: (NSString *) label
 	if (label == _label)
 		return;
 
-	// Release, retain, assign.
-	[_label release];
-	_label = [label retain];
+	// Assign.
+	_label = label;
 
 	// Redraw.
 	[self setNeedsDisplay];
@@ -272,9 +258,8 @@ - (void) drawRect: (CGRect) rect
 		NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
 		style.lineBreakMode = NSLineBreakByWordWrapping;
 		style.alignment = NSTextAlignmentCenter;
-		[_label drawInRect: box withAttributes: [NSDictionary dictionaryWithObjectsAndKeys: font, NSFontAttributeName, 
+		[_label drawInRect: box withAttributes: [NSDictionary dictionaryWithObjectsAndKeys: font, NSFontAttributeName,
 				style, NSParagraphStyleAttributeName, nil]];
-		[style release];
 	}
 }
 
@@ -305,25 +290,25 @@ - (void) drawCardFace
 
 		// Get image URL from bundle.
 		bundle = CFBundleGetMainBundle ();
-		require (bundle, bail);
+		__Require (bundle, bail);
 
 		base = CFBundleCopyResourcesDirectoryURL (bundle);
-		require (base, bail);
+		__Require (base, bail);
 
 		url = CFURLCreateWithFileSystemPathRelativeToBase (kCFAllocatorDefault, CFSTR ("Cards.pdf"), 
 				kCFURLPOSIXPathStyle, false, base); 
-		require (url, bail);
+		__Require (url, bail);
 
 		// Get PDF document.
 		gCardPDFDocument = CGPDFDocumentCreateWithURL (url);
 	}
 
 	// Must have a PDF document by now.
-	require (gCardPDFDocument, bail);
+	__Require (gCardPDFDocument, bail);
 
 	// Get the page of the PDF that corresponds to our card index.
 	cardPage = CGPDFDocumentGetPage (gCardPDFDocument, [_card index]);
-	require (cardPage, bail);
+	__Require (cardPage, bail);
 
 	transform = CGPDFPageGetDrawingTransform (cardPage, kCGPDFCropBox, bounds, 0, true);
 
@@ -372,25 +357,25 @@ - (void) drawCardBack
 
 		// Get image URL from bundle.
 		bundle = CFBundleGetMainBundle ();
-		require (bundle, bail);
+		__Require (bundle, bail);
 
 		base = CFBundleCopyResourcesDirectoryURL (bundle);
-		require (base, bail);
+		__Require (base, bail);
 
 		url = CFURLCreateWithFileSystemPathRelativeToBase (kCFAllocatorDefault, CFSTR ("Cards.pdf"), 
 				kCFURLPOSIXPathStyle, false, base); 
-		require (url, bail);
+		__Require (url, bail);
 
 		// Get PDF document.
 		gCardPDFDocument = CGPDFDocumentCreateWithURL (url);
 	}
 
 	// Must have a PDF document by now.
-	require (gCardPDFDocument, bail);
+	__Require (gCardPDFDocument, bail);
 
 	// Get the page of the PDF that corresponds to our card index.
 	cardPage = CGPDFDocumentGetPage (gCardPDFDocument, 53);
-	require (cardPage, bail);
+	__Require (cardPage, bail);
 
 	transform = CGPDFPageGetDrawingTransform (cardPage, kCGPDFCropBox, bounds, 0, true);