From 1d7cd5b7b04fa178a6d51d4b888bcc0fcac1a675 Mon Sep 17 00:00:00 2001
From: Julian Serbezki <j.serbezki@gmail.com>
Date: Fri, 31 Jul 2015 12:46:08 +0300
Subject: [PATCH] Added formula options.

---
 .classpath                                    |  16 ++-
 AndroidManifest.xml                           | 102 +++++++-------
 res/layout/activity_instruction.xml           |  27 ++++
 res/menu/game_option_menu.xml                 |   3 +
 res/values/strings.xml                        |  41 +++---
 src/eu/veldsoft/fish/rings/GameActivity.java  | 132 ++++++++----------
 .../fish/rings/InstructionActivity.java       |  40 ++++++
 src/eu/veldsoft/fish/rings/Rings.java         | 116 +++++----------
 .../veldsoft/fish/rings/SplashActivity.java   |  28 ++--
 9 files changed, 256 insertions(+), 249 deletions(-)
 create mode 100644 res/layout/activity_instruction.xml
 create mode 100644 src/eu/veldsoft/fish/rings/InstructionActivity.java

diff --git a/.classpath b/.classpath
index 1b4b1ee..4595cb3 100755
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1a4b81b..fe2b56a 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,50 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eu.veldsoft.fish.rings"
-    android:versionCode="2"
-    android:versionName="1.1" >
-
-    <uses-sdk
-        android:minSdkVersion="15"
-        android:targetSdkVersion="15" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name=".GameActivity"
-            android:label="@string/title_activity_game"
-            android:screenOrientation="portrait" >
-        </activity>
-        <activity
-            android:name=".HelpActivity"
-            android:label="@string/title_activity_help" >
-        </activity>
-        <activity
-            android:name=".AboutActivity"
-            android:label="@string/title_activity_about" >
-        </activity>
-        <activity
-            android:name=".SplashActivity"
-            android:label="@string/title_activity_splash"
-            android:noHistory="true" >
-            <meta-data
-                android:name="timeout"
-                android:value="5000" />
-            <meta-data
-                android:name="redirect"
-                android:value="eu.veldsoft.fish.rings.GameActivity" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.veldsoft.fish.rings"
+    android:versionCode="3"
+    android:versionName="1.2" >
+
+    <uses-sdk
+        android:minSdkVersion="15"
+        android:targetSdkVersion="15" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name=".GameActivity"
+            android:label="@string/title_activity_game"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name=".HelpActivity"
+            android:label="@string/title_activity_help" >
+        </activity>
+        <activity
+            android:name=".AboutActivity"
+            android:label="@string/title_activity_about" >
+        </activity>
+        <activity
+            android:name=".SplashActivity"
+            android:label="@string/title_activity_splash"
+            android:noHistory="true" >
+            <meta-data
+                android:name="timeout"
+                android:value="5000" />
+            <meta-data
+                android:name="redirect"
+                android:value="eu.veldsoft.fish.rings.GameActivity" />
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".InstructionActivity"
+            android:label="@string/title_activity_instruction" >
+        </activity>
+    </application>
+
 </manifest>
\ No newline at end of file
diff --git a/res/layout/activity_instruction.xml b/res/layout/activity_instruction.xml
new file mode 100644
index 0000000..b1f1272
--- /dev/null
+++ b/res/layout/activity_instruction.xml
@@ -0,0 +1,27 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="${relativePackage}.${activityClass}" >
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/enter_formula_label" />
+
+    <EditText
+        android:id="@+id/formula"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <requestFocus />
+    </EditText>
+
+    <Button
+        android:id="@+id/formula_entered"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/run_formula_button_label" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/game_option_menu.xml b/res/menu/game_option_menu.xml
index de5a23d..d1260a1 100755
--- a/res/menu/game_option_menu.xml
+++ b/res/menu/game_option_menu.xml
@@ -7,6 +7,9 @@
     <item
         android:id="@+id/shuffle_game"
         android:title="@string/shuffle_option"/>
+    <item
+        android:id="@+id/run_formula"
+        android:title="@string/run_formula_option"/>
     <item
         android:id="@+id/help_game"
         android:title="@string/help_option"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0353db0..c9bc998 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="you_win">You win!</string>
-    <string name="reset_option">Reset</string>
-    <string name="shuffle_option">Shuffle</string>
-    <string name="help_option">Help</string>
-    <string name="about_option">About</string>
-    <string name="ebinqo_url">http://ebinqo.com/</string>
-    <string name="app_name">Fish Rings for Android</string>
-    <string name="title_activity_game">Fish Rings</string>
-    <string name="title_activity_help">Help</string>
-    <string name="title_activity_about">About</string>
-    <string name="help_text">"  It is a really simple game that has something similar with the Rubik’s Cube.
\n  First you need to shuffle the puzzle and after that the goal is to return it in the starting state, using two directional rotations of the rings. To do this you should click on the tokens.
\n  There are three rings, labeled as A (red), B (green), C (blue). The rings can be rotated in two directions (clockwise and counterclockwise). By this way six operations over the game can be constructed:
\n  +A    Rotate ring A clockwise.
\n  -A    Rotate ring A counterclockwise.
\n  +B    Rotate ring B clockwise.
\n  -B    Rotate ring B counterclockwise.
\n  +C    Rotate ring C clockwise.
\n  -C    Rotate ring C counterclockwise.
\n  These operations can be used for expressions construction:
\n  +A+B    Rotate ring A clockwise, after that ring B clockwise.
\n  +A-A+B-B    Nothing changed after the rotation.
\n  These expressions can be extended by inserting one digit between the sign and the letter:
\n  +9A+9B    Rotate ring A clockwise nine times and after that the same with ring B.
\n  By proper formulas puzzle can be solved every time."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="you_win">You win!</string>
+    <string name="reset_option">Reset</string>
+    <string name="shuffle_option">Shuffle</string>
+    <string name="help_option">Help</string>
+    <string name="about_option">About</string>
+    <string name="ebinqo_url">http://ebinqo.com/</string>
+    <string name="app_name">Fish Rings for Android</string>
+    <string name="title_activity_game">Fish Rings</string>
+    <string name="title_activity_help">Help</string>
+    <string name="title_activity_about">About</string>
+    <string name="help_text">"  It is a really simple game that has something similar with the Rubik’s Cube.
\n  First you need to shuffle the puzzle and after that the goal is to return it in the starting state, using two directional rotations of the rings. To do this you should click on the tokens.
\n  There are three rings, labeled as A (red), B (green), C (blue). The rings can be rotated in two directions (clockwise and counterclockwise). By this way six operations over the game can be constructed:
\n  +A    Rotate ring A clockwise.
\n  -A    Rotate ring A counterclockwise.
\n  +B    Rotate ring B clockwise.
\n  -B    Rotate ring B counterclockwise.
\n  +C    Rotate ring C clockwise.
\n  -C    Rotate ring C counterclockwise.
\n  These operations can be used for expressions construction:
\n  +A+B    Rotate ring A clockwise, after that ring B clockwise.
\n  +A-A+B-B    Nothing changed after the rotation.
\n  These expressions can be extended by inserting one digit between the sign and the letter:
\n  +9A+9B    Rotate ring A clockwise nine times and after that the same with ring B.
\n  By proper formulas puzzle can be solved every time."</string>
     <string name="about_text">"  Fish Rings for Android is published by Velbazhd Software LLC.
 \n  This puzzle consists of three intersecting rings made up of number of colored balls. The rings of balls intersect at few places, so they share some of the balls. Each ring of balls can be rotated, so the balls can be mixed.
 \n  Newer versions can be checked at: 
-\n  http://github.com/TodorBalabanov/FishRingsForAndroid"</string>
-    <string name="title_activity_splash">Fish Rings</string>
-    <string name="redirect_activity_is_missing_message">Redirect activity is missing!</string>
-
+\n  http://github.com/TodorBalabanov/FishRingsForAndroid"</string>
+    <string name="title_activity_splash">Fish Rings</string>
+    <string name="redirect_activity_is_missing_message">Redirect activity is missing!</string>
+    <string name="title_activity_instruction">Puzzle Formula Entry</string>
+    <string name="enter_formula_label">Enter Formula:</string>
+    <string name="run_formula_button_label">Run Formula</string>
+    <string name="run_formula_option">Formula</string>
+    <string name="incorrect_formula_warning">The formula is incorrect!</string>
+    
 </resources>
\ No newline at end of file
diff --git a/src/eu/veldsoft/fish/rings/GameActivity.java b/src/eu/veldsoft/fish/rings/GameActivity.java
index acaaffb..82ffb37 100755
--- a/src/eu/veldsoft/fish/rings/GameActivity.java
+++ b/src/eu/veldsoft/fish/rings/GameActivity.java
@@ -14,6 +14,8 @@
 import android.widget.Toast;
 
 public class GameActivity extends Activity {
+	private static int FORMULA_REQUEST_ID = 1;
+
 	private Rings rings = null;
 
 	private ImageView views[] = {};
@@ -129,93 +131,72 @@ protected void onCreate(Bundle savedInstanceState) {
 		cartoon007Player = MediaPlayer.create(this, R.raw.cartoon007);
 		cartoon012Player = MediaPlayer.create(this, R.raw.cartoon012);
 
-		ImageView views[] = { (ImageView) findViewById(R.id.imageView000),
-				(ImageView) findViewById(R.id.imageView001),
-				(ImageView) findViewById(R.id.imageView002),
-				(ImageView) findViewById(R.id.imageView003),
-				(ImageView) findViewById(R.id.imageView004),
-				(ImageView) findViewById(R.id.imageView005),
-				(ImageView) findViewById(R.id.imageView006),
-				(ImageView) findViewById(R.id.imageView007),
-				(ImageView) findViewById(R.id.imageView008),
-				(ImageView) findViewById(R.id.imageView009),
-				(ImageView) findViewById(R.id.imageView010),
-				(ImageView) findViewById(R.id.imageView011),
-				(ImageView) findViewById(R.id.imageView100),
-				(ImageView) findViewById(R.id.imageView101),
-				(ImageView) findViewById(R.id.imageView102),
-				(ImageView) findViewById(R.id.imageView103),
-				(ImageView) findViewById(R.id.imageView104),
-				(ImageView) findViewById(R.id.imageView105),
-				(ImageView) findViewById(R.id.imageView106),
-				(ImageView) findViewById(R.id.imageView107),
-				(ImageView) findViewById(R.id.imageView108),
-				(ImageView) findViewById(R.id.imageView109),
-				(ImageView) findViewById(R.id.imageView110),
-				(ImageView) findViewById(R.id.imageView111),
-				(ImageView) findViewById(R.id.imageView200),
-				(ImageView) findViewById(R.id.imageView201),
-				(ImageView) findViewById(R.id.imageView202),
-				(ImageView) findViewById(R.id.imageView203),
-				(ImageView) findViewById(R.id.imageView204),
-				(ImageView) findViewById(R.id.imageView205),
-				(ImageView) findViewById(R.id.imageView206),
-				(ImageView) findViewById(R.id.imageView207),
-				(ImageView) findViewById(R.id.imageView208),
-				(ImageView) findViewById(R.id.imageView209),
-				(ImageView) findViewById(R.id.imageView210),
-				(ImageView) findViewById(R.id.imageView211), };
+		ImageView views[] = { (ImageView) findViewById(R.id.imageView000), (ImageView) findViewById(R.id.imageView001),
+				(ImageView) findViewById(R.id.imageView002), (ImageView) findViewById(R.id.imageView003),
+				(ImageView) findViewById(R.id.imageView004), (ImageView) findViewById(R.id.imageView005),
+				(ImageView) findViewById(R.id.imageView006), (ImageView) findViewById(R.id.imageView007),
+				(ImageView) findViewById(R.id.imageView008), (ImageView) findViewById(R.id.imageView009),
+				(ImageView) findViewById(R.id.imageView010), (ImageView) findViewById(R.id.imageView011),
+				(ImageView) findViewById(R.id.imageView100), (ImageView) findViewById(R.id.imageView101),
+				(ImageView) findViewById(R.id.imageView102), (ImageView) findViewById(R.id.imageView103),
+				(ImageView) findViewById(R.id.imageView104), (ImageView) findViewById(R.id.imageView105),
+				(ImageView) findViewById(R.id.imageView106), (ImageView) findViewById(R.id.imageView107),
+				(ImageView) findViewById(R.id.imageView108), (ImageView) findViewById(R.id.imageView109),
+				(ImageView) findViewById(R.id.imageView110), (ImageView) findViewById(R.id.imageView111),
+				(ImageView) findViewById(R.id.imageView200), (ImageView) findViewById(R.id.imageView201),
+				(ImageView) findViewById(R.id.imageView202), (ImageView) findViewById(R.id.imageView203),
+				(ImageView) findViewById(R.id.imageView204), (ImageView) findViewById(R.id.imageView205),
+				(ImageView) findViewById(R.id.imageView206), (ImageView) findViewById(R.id.imageView207),
+				(ImageView) findViewById(R.id.imageView208), (ImageView) findViewById(R.id.imageView209),
+				(ImageView) findViewById(R.id.imageView210), (ImageView) findViewById(R.id.imageView211), };
 		this.views = views;
 
 		findViewById(R.id.arrow01).setOnClickListener(aRingClockwiseClick);
-		findViewById(R.id.arrow02).setOnClickListener(
-				aRingCounterClockwiseClick);
+		findViewById(R.id.arrow02).setOnClickListener(aRingCounterClockwiseClick);
 		findViewById(R.id.arrow03).setOnClickListener(bRingClockwiseClick);
-		findViewById(R.id.arrow04).setOnClickListener(
-				bRingCounterClockwiseClick);
+		findViewById(R.id.arrow04).setOnClickListener(bRingCounterClockwiseClick);
 		findViewById(R.id.arrow05).setOnClickListener(cRingClockwiseClick);
-		findViewById(R.id.arrow06).setOnClickListener(
-				cRingCounterClockwiseClick);
+		findViewById(R.id.arrow06).setOnClickListener(cRingCounterClockwiseClick);
 
 		findViewById(R.id.imageView004).setOnClickListener(aRingClockwiseClick);
 		findViewById(R.id.imageView005).setOnClickListener(aRingClockwiseClick);
-		findViewById(R.id.imageView006).setOnClickListener(
-				aRingCounterClockwiseClick);
-		findViewById(R.id.imageView007).setOnClickListener(
-				aRingCounterClockwiseClick);
+		findViewById(R.id.imageView006).setOnClickListener(aRingCounterClockwiseClick);
+		findViewById(R.id.imageView007).setOnClickListener(aRingCounterClockwiseClick);
 
 		findViewById(R.id.imageView108).setOnClickListener(bRingClockwiseClick);
 		findViewById(R.id.imageView109).setOnClickListener(bRingClockwiseClick);
 		findViewById(R.id.imageView110).setOnClickListener(bRingClockwiseClick);
-		findViewById(R.id.imageView105).setOnClickListener(
-				bRingCounterClockwiseClick);
-		findViewById(R.id.imageView106).setOnClickListener(
-				bRingCounterClockwiseClick);
-		findViewById(R.id.imageView107).setOnClickListener(
-				bRingCounterClockwiseClick);
+		findViewById(R.id.imageView105).setOnClickListener(bRingCounterClockwiseClick);
+		findViewById(R.id.imageView106).setOnClickListener(bRingCounterClockwiseClick);
+		findViewById(R.id.imageView107).setOnClickListener(bRingCounterClockwiseClick);
 
 		findViewById(R.id.imageView208).setOnClickListener(cRingClockwiseClick);
 		findViewById(R.id.imageView209).setOnClickListener(cRingClockwiseClick);
 		findViewById(R.id.imageView210).setOnClickListener(cRingClockwiseClick);
-		findViewById(R.id.imageView205).setOnClickListener(
-				cRingCounterClockwiseClick);
-		findViewById(R.id.imageView206).setOnClickListener(
-				cRingCounterClockwiseClick);
-		findViewById(R.id.imageView207).setOnClickListener(
-				cRingCounterClockwiseClick);
-
-		((ImageView) findViewById(R.id.ebinqoLogo))
-				.setOnClickListener(new OnClickListener() {
-					@Override
-					public void onClick(View view) {
-						GameActivity.this.startActivity(new Intent(
-								Intent.ACTION_VIEW, Uri.parse(getResources()
-										.getString(R.string.ebinqo_url))));
-					}
-				});
-
-		rings = new Rings(this.getWindow().getDecorView().getWidth(), this
-				.getWindow().getDecorView().getHeight());
+		findViewById(R.id.imageView205).setOnClickListener(cRingCounterClockwiseClick);
+		findViewById(R.id.imageView206).setOnClickListener(cRingCounterClockwiseClick);
+		findViewById(R.id.imageView207).setOnClickListener(cRingCounterClockwiseClick);
+
+		((ImageView) findViewById(R.id.ebinqoLogo)).setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				GameActivity.this.startActivity(
+						new Intent(Intent.ACTION_VIEW, Uri.parse(getResources().getString(R.string.ebinqo_url))));
+			}
+		});
+
+		rings = new Rings(this.getWindow().getDecorView().getWidth(), this.getWindow().getDecorView().getHeight());
+	}
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+
+		if (resultCode == RESULT_OK && requestCode == FORMULA_REQUEST_ID) {
+			String formula = data.getCharSequenceExtra(InstructionActivity.EXTRA_RESULT_FORMULA_KEY).toString();
+			rings.eval(formula.toUpperCase());
+			GameActivity.this.updateInfo();
+		}
 	}
 
 	@Override
@@ -238,13 +219,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
 			cartoon012Player.start();
 			GameActivity.this.repaint();
 			break;
+		case R.id.run_formula:
+			startActivityForResult(new Intent(GameActivity.this, InstructionActivity.class), FORMULA_REQUEST_ID);
+			break;
 		case R.id.help_game:
-			GameActivity.this.startActivity(new Intent(GameActivity.this,
-					HelpActivity.class));
+			GameActivity.this.startActivity(new Intent(GameActivity.this, HelpActivity.class));
 			break;
 		case R.id.about_game:
-			GameActivity.this.startActivity(new Intent(GameActivity.this,
-					AboutActivity.class));
+			GameActivity.this.startActivity(new Intent(GameActivity.this, AboutActivity.class));
 			break;
 		}
 		return true;
diff --git a/src/eu/veldsoft/fish/rings/InstructionActivity.java b/src/eu/veldsoft/fish/rings/InstructionActivity.java
new file mode 100644
index 0000000..c3063f7
--- /dev/null
+++ b/src/eu/veldsoft/fish/rings/InstructionActivity.java
@@ -0,0 +1,40 @@
+package eu.veldsoft.fish.rings;
+
+import java.util.regex.Pattern;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+public class InstructionActivity extends Activity {
+
+	static final String EXTRA_RESULT_FORMULA_KEY = "eu.veldsoft.fish.rings.resultFormulaKey";
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_instruction);
+
+		((Button) findViewById(R.id.formula_entered)).setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				String formula = ((EditText) findViewById(R.id.formula)).getText().toString();
+				setResult(Activity.RESULT_OK, (new Intent().putExtra(EXTRA_RESULT_FORMULA_KEY, formula)));
+
+				formula = formula.toUpperCase();
+
+				if (Pattern.compile("([+-]{1}[0-9]{1}[ABC]{1})+").matcher(formula).matches() == true) {
+					finish();
+				} else {
+					Toast.makeText(InstructionActivity.this,
+							getResources().getString(R.string.incorrect_formula_warning), Toast.LENGTH_LONG).show();
+				}
+			}
+		});
+	}
+}
diff --git a/src/eu/veldsoft/fish/rings/Rings.java b/src/eu/veldsoft/fish/rings/Rings.java
index c489ae5..23d86fd 100755
--- a/src/eu/veldsoft/fish/rings/Rings.java
+++ b/src/eu/veldsoft/fish/rings/Rings.java
@@ -31,27 +31,24 @@ void init(int width, int height) {
 		rdiam = (int) (2.5 * pdiam);
 
 		for (double i = 0, alpha = +3.5; i < 12; i++, alpha++) {
-			coordiantes[0][(int) i][0] = (int) (Math.min(width, height) / 2.0 + rdiam
-					* Math.cos(alpha * 2 * Math.PI / 12));
-			coordiantes[0][(int) i][1] = (int) (Math.min(width, height) / 2.0
-					- Math.sqrt(2.0) * rdiam / 2.0 + rdiam
-					* Math.sin(alpha * 2 * Math.PI / 12));
+			coordiantes[0][(int) i][0] = (int) (Math.min(width, height) / 2.0
+					+ rdiam * Math.cos(alpha * 2 * Math.PI / 12));
+			coordiantes[0][(int) i][1] = (int) (Math.min(width, height) / 2.0 - Math.sqrt(2.0) * rdiam / 2.0
+					+ rdiam * Math.sin(alpha * 2 * Math.PI / 12));
 		}
 
 		for (double i = 0, alpha = -3.5; i < 12; i++, alpha--) {
-			coordiantes[1][(int) i][0] = (int) (Math.min(width, height) / 2.0
-					+ Math.sqrt(2.0) * rdiam / 2.0 + rdiam
-					* Math.cos(alpha * 2 * Math.PI / 12));
-			coordiantes[1][(int) i][1] = (int) (Math.min(width, height) / 2.0 + rdiam
-					* Math.sin(alpha * 2 * Math.PI / 12));
+			coordiantes[1][(int) i][0] = (int) (Math.min(width, height) / 2.0 + Math.sqrt(2.0) * rdiam / 2.0
+					+ rdiam * Math.cos(alpha * 2 * Math.PI / 12));
+			coordiantes[1][(int) i][1] = (int) (Math.min(width, height) / 2.0
+					+ rdiam * Math.sin(alpha * 2 * Math.PI / 12));
 		}
 
 		for (double i = 0, alpha = -2.5; i < 12; i++, alpha++) {
-			coordiantes[2][(int) i][0] = (int) (Math.min(width, height) / 2.0
-					- Math.sqrt(2.0) * rdiam / 2.0 + rdiam
-					* Math.cos(alpha * 2 * Math.PI / 12));
-			coordiantes[2][(int) i][1] = (int) (Math.min(width, height) / 2.0 + rdiam
-					* Math.sin(alpha * 2 * Math.PI / 12));
+			coordiantes[2][(int) i][0] = (int) (Math.min(width, height) / 2.0 - Math.sqrt(2.0) * rdiam / 2.0
+					+ rdiam * Math.cos(alpha * 2 * Math.PI / 12));
+			coordiantes[2][(int) i][1] = (int) (Math.min(width, height) / 2.0
+					+ rdiam * Math.sin(alpha * 2 * Math.PI / 12));
 		}
 
 		rings[0][0] = 4;
@@ -71,40 +68,6 @@ void init(int width, int height) {
 		rings[2][11] = 1;
 
 		moves = 0;
-
-		// for (int i = 0; i < coordiantes.length; i++) {
-		// for (int j = 0; j < coordiantes[i].length; j++) {
-		// String color = "";
-		// switch (rings[i][j]) {
-		// case 1:
-		// color = "red";
-		// break;
-		// case 2:
-		// color = "green";
-		// break;
-		// case 3:
-		// color = "blue";
-		// break;
-		// case 4:
-		// color = "violet";
-		// break;
-		// }
-		// System.err
-		// .print("<ImageView android:id=\"@+id/imageView"
-		// + i
-		// + ((j < 10) ? "0" : "")
-		// + j
-		// +
-		// "\" android:layout_width=\"wrap_content\" android:layout_height=\"wrap_content\" android:layout_alignParentLeft=\"true\" android:layout_alignParentTop=\"true\" android:layout_marginLeft=\""
-		// + (coordiantes[i][j][0] - 10)
-		// + "dp\" android:layout_marginTop=\""
-		// + (coordiantes[i][j][1] - 10 + 60)
-		// +
-		// "dp\" android:adjustViewBounds=\"true\" android:maxHeight=\"20dp\" android:maxWidth=\"20dp\" android:src=\"@drawable/"
-		// + color + "\"/>");
-		// System.err.println();
-		// }
-		// }
 	}
 
 	void cwa() {
@@ -210,37 +173,37 @@ void reset() {
 	}
 
 	boolean eval(String sequ) {
-		for (int i = -1, rep = 0; i < sequ.length();)
+		for (int i = -1, rep = 0; i < sequ.length() - 1;)
 			if (sequ.charAt(++i) == '+') {
-				if ('0' <= sequ.charAt(++i) && sequ.charAt(++i) <= '9')
-					rep = sequ.charAt(++i) - '0';
+				if ('0' <= sequ.charAt(++i) && sequ.charAt(i) <= '9')
+					rep = sequ.charAt(i++) - '0';
 				else
 					rep = 1;
 
-				if (sequ.charAt(++i) == 'A')
+				if (sequ.charAt(i) == 'A')
 					for (int j = 0; j < rep; j++)
 						cwa();
-				else if (sequ.charAt(++i) == 'B')
+				else if (sequ.charAt(i) == 'B')
 					for (int j = 0; j < rep; j++)
 						cwb();
-				else if (sequ.charAt(++i) == 'C')
+				else if (sequ.charAt(i) == 'C')
 					for (int j = 0; j < rep; j++)
 						cwc();
 				else
 					return false;
 			} else if (sequ.charAt(++i) == '-') {
-				if ('0' <= sequ.charAt(++i) && sequ.charAt(++i) <= '9')
-					rep = sequ.charAt(++i) - '0';
+				if ('0' <= sequ.charAt(++i) && sequ.charAt(i) <= '9')
+					rep = sequ.charAt(i++) - '0';
 				else
 					rep = 1;
 
-				if (sequ.charAt(++i) == 'A')
+				if (sequ.charAt(i) == 'A')
 					for (int j = 0; j < rep; j++)
 						ccwa();
-				else if (sequ.charAt(++i) == 'B')
+				else if (sequ.charAt(i) == 'B')
 					for (int j = 0; j < rep; j++)
 						ccwb();
-				else if (sequ.charAt(++i) == 'C')
+				else if (sequ.charAt(i) == 'C')
 					for (int j = 0; j < rep; j++)
 						ccwc();
 				else
@@ -260,9 +223,8 @@ boolean action(int x, int y) {
 			case 2:
 			case 4:
 			case 5:
-				if ((Math.pow(x - coordiantes[0][j][0], 2.0) + Math.pow(y
-						- coordiantes[0][j][1], 2.0)) < Math.pow(pdiam / 2.0,
-						2.0)) {
+				if ((Math.pow(x - coordiantes[0][j][0], 2.0) + Math.pow(y - coordiantes[0][j][1], 2.0)) < Math
+						.pow(pdiam / 2.0, 2.0)) {
 					cwa();
 					done = true;
 				}
@@ -271,9 +233,8 @@ boolean action(int x, int y) {
 			case 7:
 			case 9:
 			case 10:
-				if ((Math.pow(x - coordiantes[0][j][0], 2.0) + Math.pow(y
-						- coordiantes[0][j][1], 2.0)) < Math.pow(pdiam / 2.0,
-						2.0)) {
+				if ((Math.pow(x - coordiantes[0][j][0], 2.0) + Math.pow(y - coordiantes[0][j][1], 2.0)) < Math
+						.pow(pdiam / 2.0, 2.0)) {
 					ccwa();
 					done = true;
 				}
@@ -285,9 +246,8 @@ boolean action(int x, int y) {
 			case 0:
 			case 2:
 			case 5:
-				if ((Math.pow(x - coordiantes[1][j][0], 2.0) + Math.pow(y
-						- coordiantes[1][j][1], 2.0)) < Math.pow(pdiam / 2.0,
-						2.0)) {
+				if ((Math.pow(x - coordiantes[1][j][0], 2.0) + Math.pow(y - coordiantes[1][j][1], 2.0)) < Math
+						.pow(pdiam / 2.0, 2.0)) {
 					ccwb();
 					done = true;
 				}
@@ -297,9 +257,8 @@ boolean action(int x, int y) {
 			case 8:
 			case 9:
 			case 10:
-				if ((Math.pow(x - coordiantes[1][j][0], 2.0) + Math.pow(y
-						- coordiantes[1][j][1], 2.0)) < Math.pow(pdiam / 2.0,
-						2.0)) {
+				if ((Math.pow(x - coordiantes[1][j][0], 2.0) + Math.pow(y - coordiantes[1][j][1], 2.0)) < Math
+						.pow(pdiam / 2.0, 2.0)) {
 					cwb();
 					done = true;
 				}
@@ -311,9 +270,8 @@ boolean action(int x, int y) {
 			case 0:
 			case 2:
 			case 5:
-				if ((Math.pow(x - coordiantes[2][j][0], 2.0) + Math.pow(y
-						- coordiantes[2][j][1], 2.0)) < Math.pow(pdiam / 2.0,
-						2.0)) {
+				if ((Math.pow(x - coordiantes[2][j][0], 2.0) + Math.pow(y - coordiantes[2][j][1], 2.0)) < Math
+						.pow(pdiam / 2.0, 2.0)) {
 					ccwc();
 					done = true;
 				}
@@ -323,9 +281,8 @@ boolean action(int x, int y) {
 			case 8:
 			case 9:
 			case 10:
-				if ((Math.pow(x - coordiantes[2][j][0], 2.0) + Math.pow(y
-						- coordiantes[2][j][1], 2.0)) < Math.pow(pdiam / 2.0,
-						2.0)) {
+				if ((Math.pow(x - coordiantes[2][j][0], 2.0) + Math.pow(y - coordiantes[2][j][1], 2.0)) < Math
+						.pow(pdiam / 2.0, 2.0)) {
 					cwc();
 					done = true;
 				}
@@ -350,8 +307,7 @@ else if (rings[2][i] != rings[2][i + 1] && i != 4 && i != 10)
 	}
 
 	int[] getState() {
-		int[] result = new int[rings[0].length + rings[1].length
-				+ rings[2].length];
+		int[] result = new int[rings[0].length + rings[1].length + rings[2].length];
 		for (int a = 0, j = 0; a < rings.length; a++) {
 			for (int i = 0; i < rings[a].length; i++, j++) {
 				result[j] = rings[a][i];
diff --git a/src/eu/veldsoft/fish/rings/SplashActivity.java b/src/eu/veldsoft/fish/rings/SplashActivity.java
index 24f41f9..1ec7357 100644
--- a/src/eu/veldsoft/fish/rings/SplashActivity.java
+++ b/src/eu/veldsoft/fish/rings/SplashActivity.java
@@ -24,24 +24,19 @@ protected void onCreate(Bundle savedInstanceState) {
 		/*
 		 * Activate JavaScript.
 		 */
-		((WebView) findViewById(R.id.ads)).getSettings().setJavaScriptEnabled(
-				true);
+		((WebView) findViewById(R.id.ads)).getSettings().setJavaScriptEnabled(true);
 
 		/*
 		 * Load local web page as banner holder.
 		 */
-		((WebView) findViewById(R.id.ads))
-				.loadUrl("file:///android_asset/banner.html");
+		((WebView) findViewById(R.id.ads)).loadUrl("file:///android_asset/banner.html");
 
 		/*
 		 * Get splash screen timeout.
 		 */
 		try {
-			timeout = getPackageManager().getActivityInfo(
-					this.getComponentName(),
-					PackageManager.GET_ACTIVITIES
-							| PackageManager.GET_META_DATA).metaData.getInt(
-					"timeout", 0);
+			timeout = getPackageManager().getActivityInfo(this.getComponentName(),
+					PackageManager.GET_ACTIVITIES | PackageManager.GET_META_DATA).metaData.getInt("timeout", 0);
 		} catch (Exception e) {
 			timeout = 0;
 		}
@@ -50,17 +45,11 @@ protected void onCreate(Bundle savedInstanceState) {
 		 * Get redirect activity class name.
 		 */
 		try {
-			redirect = getPackageManager().getActivityInfo(
-					this.getComponentName(),
-					PackageManager.GET_ACTIVITIES
-							| PackageManager.GET_META_DATA).metaData
-					.getString("redirect");
+			redirect = getPackageManager().getActivityInfo(this.getComponentName(),
+					PackageManager.GET_ACTIVITIES | PackageManager.GET_META_DATA).metaData.getString("redirect");
 		} catch (Exception e) {
 			redirect = this.getClass().toString();
-			Toast.makeText(
-					this,
-					getResources().getString(
-							R.string.redirect_activity_is_missing_message),
+			Toast.makeText(this, getResources().getString(R.string.redirect_activity_is_missing_message),
 					Toast.LENGTH_LONG).show();
 		}
 	}
@@ -72,8 +61,7 @@ protected void onResume() {
 		new Timer().schedule(new TimerTask() {
 			public void run() {
 				try {
-					startActivity(new Intent(SplashActivity.this, Class
-							.forName(redirect)));
+					startActivity(new Intent(SplashActivity.this, Class.forName(redirect)));
 				} catch (Exception e) {
 				}
 			}