Refactor to org.vostan.sokoban.
This commit is contained in:
@@ -7,9 +7,9 @@
|
|||||||
android:targetSdkVersion="14"/>
|
android:targetSdkVersion="14"/>
|
||||||
<application android:label="@string/app_name"
|
<application android:label="@string/app_name"
|
||||||
android:icon="@drawable/icon"
|
android:icon="@drawable/icon"
|
||||||
android:name="org.dyndns.vahagn.sokoban.App"
|
android:name="org.vostan.sokoban.App"
|
||||||
android:theme="@android:style/Theme">
|
android:theme="@android:style/Theme">
|
||||||
<activity android:name="org.dyndns.vahagn.sokoban.menu.MainActivity"
|
<activity android:name="org.vostan.sokoban.menu.MainActivity"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:configChanges="keyboardHidden|orientation"
|
android:configChanges="keyboardHidden|orientation"
|
||||||
android:screenOrientation="portrait" >
|
android:screenOrientation="portrait" >
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
<activity android:name="org.dyndns.vahagn.sokoban.play.PlayActivity"
|
<activity android:name="org.vostan.sokoban.play.PlayActivity"
|
||||||
android:label="@string/play_activity"
|
android:label="@string/play_activity"
|
||||||
android:configChanges="keyboardHidden|orientation"
|
android:configChanges="keyboardHidden|orientation"
|
||||||
android:screenOrientation="portrait" >
|
android:screenOrientation="portrait" >
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
package org.dyndns.vahagn.sokoban;
|
package org.vostan.sokoban;
|
||||||
|
|
||||||
import android.app.Application;
|
import android.app.Application;
|
||||||
import android.content.Context;
|
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.preference.PreferenceManager;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
public class App extends Application
|
public class App extends Application
|
||||||
@@ -1,14 +1,13 @@
|
|||||||
package org.dyndns.vahagn.sokoban;
|
package org.vostan.sokoban;
|
||||||
|
|
||||||
//import java.lang.Exception;
|
//import java.lang.Exception;
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import static java.lang.Math.*;
|
import static java.lang.Math.*;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.graphics.Point;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
|
||||||
import static org.dyndns.vahagn.sokoban.App.TAG;
|
import static org.vostan.sokoban.App.TAG;
|
||||||
|
|
||||||
public class Puzzle
|
public class Puzzle
|
||||||
{
|
{
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
package org.dyndns.vahagn.sokoban;
|
package org.vostan.sokoban;
|
||||||
|
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import static org.dyndns.vahagn.sokoban.App.theApp;
|
import static org.vostan.sokoban.App.theApp;
|
||||||
import android.util.Log;
|
|
||||||
|
import org.dyndns.vahagn.sokoban.R;
|
||||||
|
|
||||||
public class PuzzleContainer
|
public class PuzzleContainer
|
||||||
{
|
{
|
||||||
@@ -1,32 +1,17 @@
|
|||||||
package org.dyndns.vahagn.sokoban.menu;
|
package org.vostan.sokoban.menu;
|
||||||
|
|
||||||
|
import org.vostan.sokoban.play.PlayActivity;
|
||||||
|
|
||||||
import org.dyndns.vahagn.sokoban.play.PlayActivity;
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.graphics.Bitmap;
|
|
||||||
import android.graphics.BitmapFactory;
|
|
||||||
import android.graphics.Canvas;
|
|
||||||
import android.graphics.Color;
|
|
||||||
import android.graphics.Paint;
|
|
||||||
import android.graphics.Rect;
|
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.app.Fragment;
|
|
||||||
import android.support.v4.app.FragmentActivity;
|
import android.support.v4.app.FragmentActivity;
|
||||||
import android.support.v4.app.FragmentManager;
|
import android.support.v4.app.FragmentManager;
|
||||||
import android.support.v4.app.FragmentTransaction;
|
import android.support.v4.app.FragmentTransaction;
|
||||||
import android.util.TypedValue;
|
|
||||||
import android.view.Display;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.view.Window;
|
import android.view.Window;
|
||||||
import android.widget.AdapterView;
|
|
||||||
import android.widget.AdapterView.OnItemClickListener;
|
|
||||||
import android.widget.BaseAdapter;
|
|
||||||
import android.widget.GridView;
|
|
||||||
import android.widget.ImageView;
|
|
||||||
import org.dyndns.vahagn.sokoban.R;
|
import org.dyndns.vahagn.sokoban.R;
|
||||||
import static org.dyndns.vahagn.sokoban.App.theApp;
|
import static org.vostan.sokoban.App.theApp;
|
||||||
|
|
||||||
public class MainActivity extends FragmentActivity
|
public class MainActivity extends FragmentActivity
|
||||||
{
|
{
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
* To change this template, choose Tools | Templates
|
* To change this template, choose Tools | Templates
|
||||||
* and open the template in the editor.
|
* and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
package org.dyndns.vahagn.sokoban.menu;
|
package org.vostan.sokoban.menu;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.app.Fragment;
|
import android.support.v4.app.Fragment;
|
||||||
@@ -11,7 +11,7 @@ import android.view.View;
|
|||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import static org.dyndns.vahagn.sokoban.App.theApp;
|
import static org.vostan.sokoban.App.theApp;
|
||||||
import org.dyndns.vahagn.sokoban.R;
|
import org.dyndns.vahagn.sokoban.R;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -2,11 +2,9 @@
|
|||||||
* To change this template, choose Tools | Templates
|
* To change this template, choose Tools | Templates
|
||||||
* and open the template in the editor.
|
* and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
package org.dyndns.vahagn.sokoban.menu;
|
package org.vostan.sokoban.menu;
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
import android.graphics.BitmapFactory;
|
import android.graphics.BitmapFactory;
|
||||||
import android.graphics.Canvas;
|
import android.graphics.Canvas;
|
||||||
@@ -23,14 +21,12 @@ import android.view.View;
|
|||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.AdapterView;
|
import android.widget.AdapterView;
|
||||||
import android.widget.BaseAdapter;
|
import android.widget.BaseAdapter;
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.GridView;
|
import android.widget.GridView;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
|
||||||
import org.dyndns.vahagn.sokoban.R;
|
import org.dyndns.vahagn.sokoban.R;
|
||||||
import org.dyndns.vahagn.sokoban.R;
|
|
||||||
import static org.dyndns.vahagn.sokoban.App.theApp;
|
import static org.vostan.sokoban.App.theApp;
|
||||||
import org.dyndns.vahagn.sokoban.play.PlayActivity;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
@@ -2,9 +2,8 @@
|
|||||||
* To change this template, choose Tools | Templates
|
* To change this template, choose Tools | Templates
|
||||||
* and open the template in the editor.
|
* and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
package org.dyndns.vahagn.sokoban.play;
|
package org.vostan.sokoban.play;
|
||||||
|
|
||||||
import org.dyndns.vahagn.sokoban.play.PuzzleView;
|
|
||||||
import android.support.v4.view.ViewCompat;
|
import android.support.v4.view.ViewCompat;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
|
|
||||||
@@ -1,35 +1,23 @@
|
|||||||
package org.dyndns.vahagn.sokoban.play;
|
package org.vostan.sokoban.play;
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
import android.app.Dialog;
|
import android.app.Dialog;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.content.Intent;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.app.DialogFragment;
|
import android.support.v4.app.DialogFragment;
|
||||||
import android.support.v4.app.FragmentActivity;
|
import android.support.v4.app.FragmentActivity;
|
||||||
import android.view.ContextMenu;
|
|
||||||
import android.view.ContextMenu.ContextMenuInfo;
|
|
||||||
import android.view.Menu;
|
|
||||||
import android.view.MenuItem;
|
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.view.Window;
|
import android.view.Window;
|
||||||
import android.view.WindowManager;
|
|
||||||
import android.view.animation.Animation;
|
import android.view.animation.Animation;
|
||||||
import android.view.animation.AnimationUtils;
|
import android.view.animation.AnimationUtils;
|
||||||
import android.widget.AbsListView;
|
|
||||||
import android.widget.FrameLayout;
|
import android.widget.FrameLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import java.util.Timer;
|
|
||||||
import java.util.TimerTask;
|
import org.vostan.sokoban.App;
|
||||||
import java.util.zip.Inflater;
|
|
||||||
import org.dyndns.vahagn.sokoban.App;
|
import static org.vostan.sokoban.App.theApp;
|
||||||
import static org.dyndns.vahagn.sokoban.App.TAG;
|
|
||||||
import static org.dyndns.vahagn.sokoban.App.theApp;
|
|
||||||
import org.dyndns.vahagn.sokoban.R;
|
import org.dyndns.vahagn.sokoban.R;
|
||||||
import org.dyndns.vahagn.sokoban.Puzzle;
|
import org.vostan.sokoban.Puzzle;
|
||||||
import org.dyndns.vahagn.sokoban.menu.MainActivity;
|
|
||||||
|
|
||||||
public class PlayActivity extends FragmentActivity
|
public class PlayActivity extends FragmentActivity
|
||||||
implements PuzzleControl.PuzzleControlLister
|
implements PuzzleControl.PuzzleControlLister
|
||||||
@@ -2,18 +2,14 @@
|
|||||||
* To change this template, choose Tools | Templates
|
* To change this template, choose Tools | Templates
|
||||||
* and open the template in the editor.
|
* and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
package org.dyndns.vahagn.sokoban.play;
|
package org.vostan.sokoban.play;
|
||||||
|
|
||||||
import org.dyndns.vahagn.sokoban.play.Animator;
|
|
||||||
import org.dyndns.vahagn.sokoban.play.PuzzleView;
|
|
||||||
import org.dyndns.vahagn.sokoban.play.PuzzleLogic;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.graphics.Point;
|
import android.graphics.Point;
|
||||||
import android.view.GestureDetector;
|
import android.view.GestureDetector;
|
||||||
import android.view.MotionEvent;
|
import android.view.MotionEvent;
|
||||||
import android.view.ScaleGestureDetector;
|
import android.view.ScaleGestureDetector;
|
||||||
import org.dyndns.vahagn.sokoban.Puzzle;
|
import org.vostan.sokoban.Puzzle;
|
||||||
import static org.dyndns.vahagn.sokoban.App.TAG;
|
|
||||||
|
|
||||||
//import android.support.v4.view.GestureDetectorCompat;
|
//import android.support.v4.view.GestureDetectorCompat;
|
||||||
|
|
||||||
@@ -2,12 +2,11 @@
|
|||||||
* To change this template, choose Tools | Templates
|
* To change this template, choose Tools | Templates
|
||||||
* and open the template in the editor.
|
* and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
package org.dyndns.vahagn.sokoban.play;
|
package org.vostan.sokoban.play;
|
||||||
|
|
||||||
import static java.lang.Math.*;
|
import static java.lang.Math.*;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import org.dyndns.vahagn.sokoban.Puzzle;
|
import org.vostan.sokoban.Puzzle;
|
||||||
import static org.dyndns.vahagn.sokoban.App.TAG;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package org.dyndns.vahagn.sokoban.play;
|
package org.vostan.sokoban.play;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
@@ -12,9 +12,9 @@ import android.graphics.RectF;
|
|||||||
import android.support.v4.view.ViewCompat;
|
import android.support.v4.view.ViewCompat;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import static java.lang.Math.*;
|
import static java.lang.Math.*;
|
||||||
import static org.dyndns.vahagn.sokoban.App.TAG;
|
|
||||||
import org.dyndns.vahagn.sokoban.Puzzle;
|
import org.vostan.sokoban.Puzzle;
|
||||||
import static org.dyndns.vahagn.sokoban.Puzzle.*;
|
import static org.vostan.sokoban.Puzzle.*;
|
||||||
import org.dyndns.vahagn.sokoban.R;
|
import org.dyndns.vahagn.sokoban.R;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Reference in New Issue
Block a user