Align Snakoid to Droids implementation

app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
       android:versionCode="1"
       android:versionName="1.0">
     <application android:icon="@drawable/icon" android:label="Snakoid">
-        <activity android:name=".SnakoidGame"
+        <activity android:name=".view.SnakoidGame"
                   android:label="Snakoid"
                   android:configChanges="keyboard|keyboardHidden|orientation"
                   android:screenOrientation="portrait">

app/src/main/java/org/androidforfun/retrogames/framework/Music.java

@@ -2,20 +2,12 @@
 
 public interface Music {
     public void play();
-
     public void stop();
-
     public void pause();
-
     public void setLooping(boolean looping);
-
     public void setVolume(float volume);
-
     public boolean isPlaying();
-
     public boolean isStopped();
-
     public boolean isLooping();
-
     public void dispose();
 }

app/src/main/java/org/androidforfun/retrogames/framework/Screen.java

@@ -8,7 +8,7 @@ public Screen(Game game) {
     }
 
     public abstract void update(float deltaTime);
-    public abstract void present(float deltaTime);
+    public abstract void draw(float deltaTime);
     public abstract void pause();
     public abstract void resume();
     public abstract void dispose();

app/src/main/java/org/androidforfun/retrogames/framework/Sound.java

@@ -2,6 +2,5 @@
 
 public interface Sound {
     public void play(float volume);
-
     public void dispose();
 }

app/src/main/java/org/androidforfun/retrogames/framework/impl/AndroidFastRenderView.java

@@ -37,7 +37,7 @@ public void run() {
             startTime = System.nanoTime();
 
             game.getCurrentScreen().update(deltaTime);
-            game.getCurrentScreen().present(deltaTime);
+            game.getCurrentScreen().draw(deltaTime);
 
             Canvas canvas = holder.lockCanvas();
             canvas.getClipBounds(dstRect);

app/src/main/java/org/androidforfun/retrogames/snakoid/Settings.java → app/src/main/java/org/androidforfun/retrogames/snakoid/model/Settings.java

@@ -1,13 +1,13 @@
-package org.androidforfun.retrogames.snakoid;
+package org.androidforfun.retrogames.snakoid.model;
+
+import org.androidforfun.retrogames.framework.FileIO;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 
-import org.androidforfun.retrogames.framework.FileIO;
-
 public class Settings {
     public static boolean soundEnabled = true;
     public static int[] highscores = new int[] { 100, 80, 50, 30, 10 };

app/src/main/java/org/androidforfun/retrogames/snakoid/Snake.java → app/src/main/java/org/androidforfun/retrogames/snakoid/model/Snake.java

@@ -1,4 +1,4 @@
-package org.androidforfun.retrogames.snakoid;
+package org.androidforfun.retrogames.snakoid.model;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,11 +12,8 @@ public class Snake {
     public List<SnakePart> parts = new ArrayList<SnakePart>();
     public int direction;    
 
-    public Snake() {        
-        direction = UP;
-        parts.add(new SnakePart(5, 6));
-        parts.add(new SnakePart(5, 7));
-        parts.add(new SnakePart(5, 8));
+    public Snake() {
+        reset();
     }
 
     public void turnLeft() {
@@ -65,7 +62,15 @@ public void advance() {
         if(head.y > 12)
             head.y = 0;
     }
-
+
+    public void reset() {
+        direction = UP;
+        parts.clear();
+        parts.add(new SnakePart(5, 6));
+        parts.add(new SnakePart(5, 7));
+        parts.add(new SnakePart(5, 8));
+    }
+
     public boolean checkBitten() {
         int len = parts.size();
         SnakePart head = parts.get(0);

app/src/main/java/org/androidforfun/retrogames/snakoid/SnakePart.java → app/src/main/java/org/androidforfun/retrogames/snakoid/model/SnakePart.java

@@ -1,4 +1,4 @@
-package org.androidforfun.retrogames.snakoid;
+package org.androidforfun.retrogames.snakoid.model;
 
 public class SnakePart {
     public int x, y;