From fecc1572803e3969af710db3927733bfb894e14d Mon Sep 17 00:00:00 2001
From: Ushal Naidoo <unai004@aucklanduni.ac.nz>
Date: Thu, 14 May 2015 17:50:48 +1200
Subject: [PATCH 1/2] Implemented Double Down Enhancement

Implemented Double Down Enhancement
---
 res/layout/activity_main.xml             | 512 +++++++++++------------
 src/com/swap/blackjack/MainActivity.java | 223 +++-------
 2 files changed, 306 insertions(+), 429 deletions(-)

diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index f6f225d..f9f3b3a 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -1,278 +1,256 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/parentLayout"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/back11"
-    android:orientation="vertical" >
+              android:id="@+id/parentLayout"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:background="@drawable/back11"
+              android:orientation="vertical">
+
+  <ScrollView
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content">
 
-    <ScrollView
+    <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+      <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/imgChips"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/chips"/>
+
+        <TextView
+            android:id="@+id/tvMoney"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            android:textColor="#ffff00"
+            android:textSize="25sp"/>
 
         <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <ImageView
-                    android:id="@+id/imgChips"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/chips" />
-
-                <TextView
-                    android:id="@+id/tvMoney"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="0"
-                    android:textColor="#ffff00"
-                    android:textSize="25sp" />
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:gravity="right" >
-
-                    <TextView
-                        android:id="@+id/tvHighest"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:gravity="right"
-                        android:text="0"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="#ffff00" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical" >
-
-                <TextView
-                    android:id="@+id/tvDealer"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Dealer&apos;s Score :- 0"
-                    android:textColor="#ffff00" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
-
-                <ImageSwitcher
-                    android:id="@+id/ivDealerCard1"
-                    android:layout_width="60dp"
-                    android:layout_height="80dp"
-                    android:layout_marginLeft="2dp" />
-
-                <ImageSwitcher
-                    android:id="@+id/ivDealerCard2"
-                    android:layout_width="60dp"
-                    android:layout_height="80dp"
-                    android:layout_marginLeft="2dp" />
-
-                <ImageSwitcher
-                    android:id="@+id/ivDealerCard3"
-                    android:layout_width="60dp"
-                    android:layout_height="80dp"
-                    android:layout_marginLeft="2dp" />
-
-                <ImageSwitcher
-                    android:id="@+id/ivDealerCard4"
-                    android:layout_width="60dp"
-                    android:layout_height="80dp"
-                    android:layout_marginLeft="2dp" />
-
-                <ImageSwitcher
-                    android:id="@+id/ivDealerCard5"
-                    android:layout_width="60dp"
-                    android:layout_height="80dp"
-                    android:layout_marginLeft="2dp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical" >
-
-                <TextView
-                    android:id="@+id/tvYou"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Your Score :- 0"
-                    android:textColor="#ffff00" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
-
-                <ImageSwitcher
-                    android:id="@+id/ivYourCard1"
-                    android:layout_width="60dp"
-                    android:layout_height="80dp"
-                    android:layout_marginLeft="2dp" />
-
-                <ImageSwitcher
-                    android:id="@+id/ivYourCard2"
-                    android:layout_width="60dp"
-                    android:layout_height="80dp"
-                    android:layout_marginLeft="2dp" />
-
-                <ImageSwitcher
-                    android:id="@+id/ivYourCard3"
-                    android:layout_width="60dp"
-                    android:layout_height="80dp"
-                    android:layout_marginLeft="2dp" />
-
-                <ImageSwitcher
-                    android:id="@+id/ivYourCard4"
-                    android:layout_width="60dp"
-                    android:layout_height="80dp"
-                    android:layout_marginLeft="2dp" />
-
-                <ImageSwitcher
-                    android:id="@+id/ivYourCard5"
-                    android:layout_width="60dp"
-                    android:layout_height="80dp"
-                    android:layout_marginLeft="2dp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center" >
-
-                <TextView
-                    android:id="@+id/tvBet"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="0"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textColor="#ffff00" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center" >
-
-                <SeekBar
-                    android:id="@+id/sbBetAmount"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical" >
-
-                <Button
-                    android:id="@+id/btnPlaceBet"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Place Bet" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center" >
-
-                <Button
-                    android:id="@+id/btnHit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight=".3"
-                    android:text="Hit" />
-
-                <Button
-                    android:id="@+id/btnStand"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight=".4"
-                    android:text="Stand" />
-
-                <Button
-                    android:id="@+id/btnSurrender"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight=".4"
-                    android:text="Surrender" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <Button
-                    android:id="@+id/btnExit"
-                    style="?android:attr/buttonStyleSmall"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:layout_weight="50"
-                    android:text="Click to Exit" />
-
-                <Button
-                    android:id="@+id/btnHelp"
-                    style="?android:attr/buttonStyleSmall"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:layout_weight="50"
-                    android:text="How to Play" />
-            </LinearLayout>
-
-          <LinearLayout
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content" >
-            <ImageSwitcher
-                android:id="@+id/ivSplitCard1"
-                android:layout_width="60dp"
-                android:layout_height="80dp"
-                android:layout_marginLeft="2dp" />
-
-            <ImageSwitcher
-                android:id="@+id/ivSplitCard2"
-                android:layout_width="60dp"
-                android:layout_height="80dp"
-                android:layout_marginLeft="2dp" />
-
-            <ImageSwitcher
-                android:id="@+id/ivSplitCard3"
-                android:layout_width="60dp"
-                android:layout_height="80dp"
-                android:layout_marginLeft="2dp" />
-
-            <ImageSwitcher
-                android:id="@+id/ivSplitCard4"
-                android:layout_width="60dp"
-                android:layout_height="80dp"
-                android:layout_marginLeft="2dp" />
-
-            <ImageSwitcher
-                android:id="@+id/ivSplitCard5"
-                android:layout_width="60dp"
-                android:layout_height="80dp"
-                android:layout_marginLeft="2dp" />
-          </LinearLayout>
+            android:layout_gravity="right"
+            android:gravity="right">
+
+          <TextView
+              android:id="@+id/tvHighest"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="right"
+              android:gravity="right"
+              android:text="0"
+              android:textAppearance="?android:attr/textAppearanceSmall"
+              android:textColor="#ffff00"/>
         </LinearLayout>
-    </ScrollView>
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center"
+          android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tvDealer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Dealer&apos;s Score :- 0"
+            android:textColor="#ffff00"/>
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content">
+
+        <ImageSwitcher
+            android:id="@+id/ivDealerCard1"
+            android:layout_width="60dp"
+            android:layout_height="80dp"
+            android:layout_marginLeft="2dp"/>
+
+        <ImageSwitcher
+            android:id="@+id/ivDealerCard2"
+            android:layout_width="60dp"
+            android:layout_height="80dp"
+            android:layout_marginLeft="2dp"/>
+
+        <ImageSwitcher
+            android:id="@+id/ivDealerCard3"
+            android:layout_width="60dp"
+            android:layout_height="80dp"
+            android:layout_marginLeft="2dp"/>
+
+        <ImageSwitcher
+            android:id="@+id/ivDealerCard4"
+            android:layout_width="60dp"
+            android:layout_height="80dp"
+            android:layout_marginLeft="2dp"/>
+
+        <ImageSwitcher
+            android:id="@+id/ivDealerCard5"
+            android:layout_width="60dp"
+            android:layout_height="80dp"
+            android:layout_marginLeft="2dp"/>
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center"
+          android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tvYou"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Your Score :- 0"
+            android:textColor="#ffff00"/>
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content">
+
+        <ImageSwitcher
+            android:id="@+id/ivYourCard1"
+            android:layout_width="60dp"
+            android:layout_height="80dp"
+            android:layout_marginLeft="2dp"/>
+
+        <ImageSwitcher
+            android:id="@+id/ivYourCard2"
+            android:layout_width="60dp"
+            android:layout_height="80dp"
+            android:layout_marginLeft="2dp"/>
+
+        <ImageSwitcher
+            android:id="@+id/ivYourCard3"
+            android:layout_width="60dp"
+            android:layout_height="80dp"
+            android:layout_marginLeft="2dp"/>
+
+        <ImageSwitcher
+            android:id="@+id/ivYourCard4"
+            android:layout_width="60dp"
+            android:layout_height="80dp"
+            android:layout_marginLeft="2dp"/>
+
+        <ImageSwitcher
+            android:id="@+id/ivYourCard5"
+            android:layout_width="60dp"
+            android:layout_height="80dp"
+            android:layout_marginLeft="2dp"/>
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center">
+
+        <TextView
+            android:id="@+id/tvBet"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="#ffff00"/>
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center">
+
+        <SeekBar
+            android:id="@+id/sbBetAmount"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"/>
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center"
+          android:orientation="vertical">
+
+        <Button
+            android:id="@+id/btnPlaceBet"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Place Bet"/>
+      </LinearLayout>
+      <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center"
+          android:orientation="vertical">
+
+        <Button
+            android:id="@+id/btnDoubleDown"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Double Down"/>
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center">
+
+        <Button
+            android:id="@+id/btnHit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight=".3"
+            android:text="Hit"/>
+
+        <Button
+            android:id="@+id/btnStand"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight=".4"
+            android:text="Stand"/>
+
+        <Button
+            android:id="@+id/btnSurrender"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight=".4"
+            android:text="Surrender"/>
+      </LinearLayout>
+
+      <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/btnExit"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="50"
+            android:text="Click to Exit"/>
+
+        <Button
+            android:id="@+id/btnHelp"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="50"
+            android:text="How to Play"/>
+      </LinearLayout>
+    </LinearLayout>
+  </ScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/com/swap/blackjack/MainActivity.java b/src/com/swap/blackjack/MainActivity.java
index ebcba49..1a70cd5 100644
--- a/src/com/swap/blackjack/MainActivity.java
+++ b/src/com/swap/blackjack/MainActivity.java
@@ -8,6 +8,7 @@
 import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -48,8 +49,7 @@ public class MainActivity extends Activity implements OnClickListener,
   private ImageSwitcher ivDealerCard1, ivDealerCard2, ivDealerCard3, ivDealerCard4,
       ivDealerCard5;
   private ImageSwitcher ivYourCard1, ivYourCard2, ivYourCard3, ivYourCard4, ivYourCard5;
-  private ImageSwitcher ivSplitCard1, ivSplitCard2, ivSplitCard3, ivSplitCard4, ivSplitCard5;
-  private Button btnPlaceBet;
+  private Button btnPlaceBet,btnDoubleDown;
   private Button btnHit, btnStand, btnSurrender;
   private SeekBar sbBetAmount;
 
@@ -63,11 +63,7 @@ public class MainActivity extends Activity implements OnClickListener,
   int _dealerScore = 0, _playerScore = 0;
   int _dealerCardNumber = 0, _playerCardNumber = 0;
   int _randomNumber;
-  int _splitCard;
-  int _splitDealerCard;
-  int _splitScore;
   int _highestScore;
-  boolean splitting;
 
   // To make sure no card comes twice
   ArrayList<Integer> _alCardsTracking = new ArrayList<Integer>();
@@ -98,6 +94,7 @@ public void onCreate(Bundle savedInstanceState) {
     imageSwitcherStuff();
 
     // Starting stuff
+    btnDoubleDown.setVisibility(View.GONE);
     _money = 500;
     tvMoney.setText(" $ " + _money);
     sbBetAmount.setMax(_money);
@@ -126,12 +123,6 @@ private void imageSwitcherStuff() {
     ivYourCard4.setFactory(this);
     ivYourCard5.setFactory(this);
 
-    ivSplitCard1.setFactory(this);
-    ivSplitCard2.setFactory(this);
-    ivSplitCard3.setFactory(this);
-    ivSplitCard4.setFactory(this);
-    ivSplitCard5.setFactory(this);
-
     ivDealerCard1.setInAnimation(AnimationUtils.loadAnimation(this,
                                                               android.R.anim.slide_in_left));
     ivDealerCard1.setOutAnimation(AnimationUtils.loadAnimation(this,
@@ -210,13 +201,8 @@ private void resetEveryThing() {
     ivYourCard4.setImageResource(R.drawable.default_blue);
     ivYourCard5.setImageResource(R.drawable.default_blue);
 
-    ivSplitCard1.setVisibility(View.GONE);
-    ivSplitCard2.setVisibility(View.GONE);
-    ivSplitCard3.setVisibility(View.GONE);
-    ivSplitCard4.setVisibility(View.GONE);
-    ivSplitCard5.setVisibility(View.GONE);
-
     btnPlaceBet.setVisibility(View.VISIBLE);
+    btnDoubleDown.setVisibility(View.GONE);
     hidePlayButtons();
     _dealerCardNumber = _playerCardNumber = 0;
     _dealerScore = _playerScore = 0;
@@ -306,12 +292,6 @@ private void setupVariables() {
     ivYourCard4 = (ImageSwitcher) findViewById(R.id.ivYourCard4);
     ivYourCard5 = (ImageSwitcher) findViewById(R.id.ivYourCard5);
 
-    ivSplitCard1 = (ImageSwitcher) findViewById(R.id.ivSplitCard1);
-    ivSplitCard2 = (ImageSwitcher) findViewById(R.id.ivSplitCard2);
-    ivSplitCard3 = (ImageSwitcher) findViewById(R.id.ivSplitCard3);
-    ivSplitCard4 = (ImageSwitcher) findViewById(R.id.ivSplitCard4);
-    ivSplitCard5 = (ImageSwitcher) findViewById(R.id.ivSplitCard5);
-
     btnHit = (Button) findViewById(R.id.btnHit);
     btnStand = (Button) findViewById(R.id.btnStand);
     btnSurrender = (Button) findViewById(R.id.btnSurrender);
@@ -322,6 +302,8 @@ private void setupVariables() {
 
     btnPlaceBet = (Button) findViewById(R.id.btnPlaceBet);
     btnPlaceBet.setOnClickListener(this);
+    btnDoubleDown = (Button) findViewById(R.id.btnDoubleDown);
+    btnDoubleDown.setOnClickListener(this);
     Button btnExit = (Button) findViewById(R.id.btnExit);
     btnExit.setOnClickListener(this);
     Button btnHelp = (Button) findViewById(R.id.btnHelp);
@@ -365,6 +347,11 @@ public void onClick(View v) {
                          Toast.LENGTH_SHORT).show();
         }
 
+        break;
+      case R.id.btnDoubleDown:
+
+        btnDoubleDownClick();
+
         break;
 
       // Hit
@@ -413,6 +400,51 @@ public void onClick(View v) {
 
   }
 
+  private void btnDoubleDownClick() {
+    Thread t = new Thread() {
+      public void run() {
+        runOnUiThread(new Runnable() {
+          public void run() {
+            try {
+              sleep(700);
+              _money = _money - _bet;
+              _bet = _bet * 2;
+              btnDoubleDown.setVisibility(View.GONE);
+              playerCall();
+              calculatePlayerScore();
+              // If reached here player has no aces
+              // Aces count as 1
+              if (_playerScore > 21) {
+                for (int i = 0; i < 5; i++) {
+                  if (_playerCardArray[i] == 'A' && _playerScoreCount[i] == 11) {
+                    _playerScoreCount[i] = 1;
+                    Toast.makeText(MainActivity.this,
+                                   "Aces will be count as 1", Toast.LENGTH_LONG)
+                        .show();
+                    break;
+                  }
+                }
+                calculatePlayerScore();
+              }
+
+              // If reached here player has no aces
+              if (_playerScore > 21) {
+                youLose();
+                showTextViews();
+              }else {
+                btnStandClick();
+              }
+              alertBox();
+            } catch (InterruptedException e) {
+              Log.e("Check", "InterruptedException: ", e);
+            }
+          }
+        });
+      }
+    };
+    t.start();
+  }
+
   private void gameStart() {
 
     // Opening 1 Card of Dealer
@@ -425,10 +457,8 @@ private void gameStart() {
     // Opening 2 Cards of Player
     playerCall();
     calculatePlayerScore();
-
-    //Check for Split
-    if (_playerCardArray[0] == _playerCardArray[1] && _money > _bet) {
-      splitAlertBox();
+    if(_money >= _bet) {
+      btnDoubleDown.setVisibility(View.VISIBLE);
     }
     // Looking for BlackJack
     if (_playerScore == 21) {
@@ -834,6 +864,7 @@ public int getIntValueFromCard(char card) {
   }
 
   private void btnHitClick() {
+    btnDoubleDown.setVisibility(View.GONE);
     playerCall();
     calculatePlayerScore();
 
@@ -881,6 +912,7 @@ public void run() {
   }
 
   public void btnStandClick() {
+    btnDoubleDown.setVisibility(View.GONE);
     // Computer Play here
     do {
       // Opening 1 Card of Dealer
@@ -929,116 +961,12 @@ public void checkWin() {
     }
   }
 
-  public void splitAlertBox() {
-
-    final Builder alert = new Builder(this);
-    alert.setCancelable(false);
-    Thread t = new Thread() {
-      public void run() {
-
-        runOnUiThread(new Runnable() {
-          public void run() {
-            alert.setMessage("Would you like to split for double your bet?");
-            alert.setPositiveButton("Yes Please",
-                                    new DialogInterface.OnClickListener() {
-
-                                      public void onClick(DialogInterface dialog,
-                                                          int which) {
-                                        SplitClicked();
-                                      }
-                                    });
-            alert.show();
-          }
-        });
-        alert.setNegativeButton("No Thanks", new DialogInterface.OnClickListener() {
-          public void onClick(DialogInterface dialog, int arg1) {
-            dialog.dismiss();
-          }
-        });
-      }
-    };
-    t.start();
-    // Thread ends here
-  }
-
-  private void SplitClicked() {
-    splitting = true;
-    _playerScore = _playerScore - _playerScoreCount[1];
-    tvYourScore.setText("Your Score : " + _playerScore);
-
-    ivSplitCard1.setVisibility(View.VISIBLE);
-    ivSplitCard2.setVisibility(View.VISIBLE);
-    ivSplitCard3.setVisibility(View.VISIBLE);
-    ivSplitCard4.setVisibility(View.VISIBLE);
-    ivSplitCard5.setVisibility(View.VISIBLE);
-
-    _playerCardNumber--;
-    _money = _money - _bet;
-    tvMoney.setText(" $ " + _money);
-    _bet = _bet * 2;
-    tvBet.setText("Bet - $ " + _bet);
-
-    //========================
-
-    ivSplitCard1.setInAnimation(AnimationUtils.loadAnimation(getBaseContext(),
-                                                             android.R.anim.slide_in_left));
-    ivSplitCard1.setOutAnimation(AnimationUtils.loadAnimation(getBaseContext(),
-                                                              android.R.anim.slide_out_right));
-
-    ivSplitCard2.setInAnimation(AnimationUtils.loadAnimation(getBaseContext(),
-                                                             android.R.anim.slide_in_left));
-    ivSplitCard2.setOutAnimation(AnimationUtils.loadAnimation(getBaseContext(),
-                                                              android.R.anim.slide_out_right));
-
-    ivSplitCard3.setInAnimation(AnimationUtils.loadAnimation(getBaseContext(),
-                                                             android.R.anim.slide_in_left));
-    ivSplitCard3.setOutAnimation(AnimationUtils.loadAnimation(getBaseContext(),
-                                                              android.R.anim.slide_out_right));
-
-    ivSplitCard4.setInAnimation(AnimationUtils.loadAnimation(getBaseContext(),
-                                                             android.R.anim.slide_in_left));
-    ivSplitCard4.setOutAnimation(AnimationUtils.loadAnimation(getBaseContext(),
-                                                              android.R.anim.slide_out_right));
-
-    ivSplitCard5.setInAnimation(AnimationUtils.loadAnimation(getBaseContext(),
-                                                             android.R.anim.slide_in_left));
-    ivSplitCard5.setOutAnimation(AnimationUtils.loadAnimation(getBaseContext(),
-                                                              android.R.anim.slide_out_right));
-    ivSplitCard1.setImageResource(R.drawable.default_blue);
-    ivSplitCard2.setImageResource(R.drawable.default_blue);
-    ivSplitCard3.setImageResource(R.drawable.default_blue);
-    ivSplitCard4.setImageResource(R.drawable.default_blue);
-    ivSplitCard5.setImageResource(R.drawable.default_blue);
-
-    Thread t = new Thread() {
-      public void run() {
-
-        try {
-          sleep(100);
-        } catch (InterruptedException e) {
-          e.printStackTrace();
-        }
-      }
-    };
-    t.start();
-
-    ivYourCard2.setImageResource(R.drawable.default_blue);
-    _splitCard = _randomNumber;
-    _splitDealerCard = dealerNumber;
-   _splitScore = _playerScore;
-    cardsCalling(_splitCard, ivSplitCard1);
-  }
-
   public void alertBox() {
 
     final Builder alert = new Builder(this);
     alert.setCancelable(false);
     String message = "Play Again";
     String positive = "Next Hand";
-    if (splitting) {
-      message = "You previously split, continue?";
-      positive = "I am ready";
-    }
     final String finalMessage = message;
     final String finalPositive = positive;
     Thread t = new Thread() {
@@ -1058,36 +986,7 @@ public void run() {
 
                                       public void onClick(DialogInterface dialog,
                                                           int which) {
-                                        if (splitting) {
-                                          _dealerScore = 0;
-                                          tvYourScore.setText("Your Score : " + _splitScore);
-                                          tvMoney.setText(" $ " + _money);
-                                          tvBet.setText("Bet - $ " + _bet);
-
-                                          splitting = false;
-                                          ivSplitCard1.setVisibility(View.GONE);
-                                          ivSplitCard2.setVisibility(View.GONE);
-                                          ivSplitCard3.setVisibility(View.GONE);
-                                          ivSplitCard4.setVisibility(View.GONE);
-                                          ivSplitCard5.setVisibility(View.GONE);
-
-                                          ivDealerCard1.setImageResource(R.drawable.default_red);
-                                          ivDealerCard2.setImageResource(R.drawable.default_red);
-                                          ivDealerCard3.setImageResource(R.drawable.default_red);
-                                          ivDealerCard4.setImageResource(R.drawable.default_red);
-                                          ivDealerCard5.setImageResource(R.drawable.default_red);
-
-                                          ivYourCard1.setImageResource(R.drawable.default_blue);
-                                          ivYourCard2.setImageResource(R.drawable.default_blue);
-                                          ivYourCard3.setImageResource(R.drawable.default_blue);
-                                          ivYourCard4.setImageResource(R.drawable.default_blue);
-                                          ivYourCard5.setImageResource(R.drawable.default_blue);
-
-                                          _playerCardArray[0] = cardsCalling(_splitCard, ivYourCard1);
-                                          _dealerCardArray[0] = cardsCalling(_splitDealerCard, ivDealerCard1);
-                                          _playerCardNumber = 1;
-                                          _dealerCardNumber = 1;
-                                        }else  {
+                                       {
                                           resetEveryThing();
                                           hidePlayButtons();
                                           // Making some sound here

From 5e189d05a3a50ba92c160b032f519be318a9c913 Mon Sep 17 00:00:00 2001
From: Ushal Naidoo <unai004@aucklanduni.ac.nz>
Date: Fri, 15 May 2015 10:56:03 +1200
Subject: [PATCH 2/2] Adjusted text values

Adjusted the display for bet and money
---
 src/com/swap/blackjack/MainActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/swap/blackjack/MainActivity.java b/src/com/swap/blackjack/MainActivity.java
index 1a70cd5..da67a47 100644
--- a/src/com/swap/blackjack/MainActivity.java
+++ b/src/com/swap/blackjack/MainActivity.java
@@ -409,6 +409,7 @@ public void run() {
               sleep(700);
               _money = _money - _bet;
               _bet = _bet * 2;
+              showTextViews();
               btnDoubleDown.setVisibility(View.GONE);
               playerCall();
               calculatePlayerScore();