androminionfan · oboulonis · Dec 28, 2015 · Dec 28, 2015 · Dec 28, 2015 · Dec 28, 2015
diff --git a/README.MD b/README.MD
@@ -1,71 +1,71 @@
-[Download latest Androminion.apk](https://github.com/mehtank/androminion/releases/download/5.0.0/Androminion.apk "Androminion.apk")
-
-1. About this project
-
-	This is a fork of androminion by Ankur Metah, originated from google code
-	project "androminion", an android based	implementation of the game
-	"Dominion" by Rio Grande Games.
-
-	This fork was originally based on version r561 (2012-08-02) of the
-	official project and has since been updated up to r638 (2012-08-31).
-
-	Goals of this fork are:
-	- A better User Interface, first for smartphones and later for tablets
-	  (done)
-	- Better AI players, possibly using a neural network
-	  (work in progress)
-	- Possibly a separate server and multiplayer functionality
-	  (later)
-	- And of course some bug fixing and code commenting
-	  (partly done)
-
-	Licensed under LGPL: http://www.gnu.org/licenses/lgpl-3.0.html
-
-2. Branching strategy
-
-	------------------------------------------------------------------------------
-	master:
-	latest stable version, ready for production
-	------------------------------------------------------------------------------
-	^
-	|
-	------------------------------------------------------------------------------
-	develop:
-	contains changes in progress, may not be ready for production
-	will be marged into master when in a stable, tested state
-	------------------------------------------------------------------------------
-	^    ^    ^    ^    ^    
-	|    |    |    |    |    
-	------------------------------------------------------------------------------
-	topic branches (e.g. dev-ui or dev-bot):
-	for working on a feature or bug fix, will then be merged into develop
-	------------------------------------------------------------------------------
-
-	See also:
-	http://stackoverflow.com/questions/2428722/git-branch-strategy-for-small-dev-team
-
-3. Import newest changes from Google Code SVN
-
-	3.1 Prepare SVN synchronisation with SVN metadata
-	(Do only once after cloning bitbucket repository)
-
-		git checkout master
-		git update-ref refs/remotes/trunk origin/master
-		git svn init http://androminion.googlecode.com/svn/trunk/
-		git svn fetch
-
-	3.2 Copy newest changes in SVN to bitbucket
-
-		git checkout master
-		git svn fetch (or git svn rebase?)
-		git push master
-
-	3.3 Copy newest changes in git/bitbucket back to SVN
-
-		git checkout master
-		git svn dcommit
-			--commit-url https://androminion.googlecode.com/svn/trunk/ 
-			--username=google.user@gmail.com
-
-	Merging seems only to work properly with the master branch, so this is
-	used for synchronizing svn and git.
+[Download latest Androminion.apk](https://github.com/mehtank/androminion/releases/download/5.0.0/Androminion.apk "Androminion.apk")
+
+1. About this project
+
+	This is a fork of androminion by Ankur Metah, originated from google code
+	project "androminion", an android based	implementation of the game
+	"Dominion" by Rio Grande Games.
+	
+	This fork was originally based on version r561 (2012-08-02) of the
+	official project and has since been updated up to r638 (2012-08-31).
+	
+	Goals of this fork are:
+	- A better User Interface, first for smartphones and later for tablets
+	  (done)
+	- Better AI players, possibly using a neural network
+	  (work in progress)
+	- Possibly a separate server and multiplayer functionality
+	  (later)
+	- And of course some bug fixing and code commenting
+	  (partly done)
+
+	Licensed under LGPL: http://www.gnu.org/licenses/lgpl-3.0.html
+
+2. Branching strategy
+
+	------------------------------------------------------------------------------
+	master:
+	latest stable version, ready for production
+	------------------------------------------------------------------------------
+	^
+	|
+	------------------------------------------------------------------------------
+	develop:
+	contains changes in progress, may not be ready for production
+	will be marged into master when in a stable, tested state
+	------------------------------------------------------------------------------
+	^    ^    ^    ^    ^    
+	|    |    |    |    |    
+	------------------------------------------------------------------------------
+	topic branches (e.g. dev-ui or dev-bot):
+	for working on a feature or bug fix, will then be merged into develop
+	------------------------------------------------------------------------------
+  
+	See also:
+	http://stackoverflow.com/questions/2428722/git-branch-strategy-for-small-dev-team
+
+3. Import newest changes from Google Code SVN
+
+	3.1 Prepare SVN synchronisation with SVN metadata
+	(Do only once after cloning bitbucket repository)
+	
+		git checkout master
+		git update-ref refs/remotes/trunk origin/master
+		git svn init http://androminion.googlecode.com/svn/trunk/
+		git svn fetch
+
+	3.2 Copy newest changes in SVN to bitbucket
+	
+		git checkout master
+		git svn fetch (or git svn rebase?)
+		git push master
+
+	3.3 Copy newest changes in git/bitbucket back to SVN
+	
+		git checkout master
+		git svn dcommit
+			--commit-url https://androminion.googlecode.com/svn/trunk/ 
+			--username=google.user@gmail.com
+	
+	Merging seems only to work properly with the master branch, so this is
+	used for synchronizing svn and git.
diff --git a/androminion/AndroidManifest.xml b/androminion/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mehtank.androminion"
-    android:versionCode="600"
-    android:versionName="6.00" >
+    android:versionCode="607"
+    android:versionName="6.07" >
 
     <uses-sdk
         android:minSdkVersion="7"

diff --git a/androminion/libs/vdom.jar b/androminion/libs/vdom.jar
diff --git a/androminion/res/drawable/circulartoken.xml b/androminion/res/drawable/circulartoken.xml
@@ -0,0 +1,15 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval" >
+
+    <stroke
+        android:width="2dp"
+        android:color="#000000" />
+
+    <padding
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp" />
+
+    <solid android:color="#ffffff" />
+</shape>
diff --git a/androminion/res/drawable/journeytoken.xml b/androminion/res/drawable/journeytoken.xml
@@ -3,13 +3,13 @@
 
     <stroke
         android:width="2dp"
-        android:color="#006600" />
+        android:color="#6e2d21" />
 
     <padding
         android:bottom="1dp"
         android:left="1dp"
         android:right="1dp"
         android:top="1dp" />
 
-    <solid android:color="#32cd32" />
+    <solid android:color="#c7704e" />
 </shape>
diff --git a/androminion/res/drawable/rectangulartoken.xml b/androminion/res/drawable/rectangulartoken.xml
@@ -0,0 +1,16 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <stroke
+        android:width="2dp"
+        android:color="#000000" />
+
+    <padding
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp" />
+
+    <solid android:color="#ffffff" />
+
+</shape>
diff --git a/androminion/res/drawable/stashborder.xml b/androminion/res/drawable/stashborder.xml
@@ -0,0 +1,17 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <stroke
+        android:width="2dp"
+        android:color="@color/stashBorder" />
+
+    <padding
+        android:bottom="3dp"
+        android:left="3dp"
+        android:right="3dp"
+        android:top="3dp" />
+
+    <corners android:radius="2dp" />
+
+    <solid android:color="@android:color/transparent" />
+
+</shape>
diff --git a/androminion/res/drawable/thinstashborder.xml b/androminion/res/drawable/thinstashborder.xml
@@ -0,0 +1,22 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <stroke
+        android:width="2dp"
+        android:color="@color/stashBorder" />
+
+    <padding
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp" />
+
+    <!--
+    Corners get overlay from background, making it ugly.
+    Could be fixed by creating a seperate border definition
+    for every card background color type I guess.
+    -->
+    <corners android:radius="0dp" />
+
+    <solid android:color="@android:color/transparent" />
+
+</shape>