[Picross-commit] SF.net SVN: picross:[110] branches/engine_split
Status: Pre-Alpha
Brought to you by:
yvan_norsa
Menu
▾
▴
[Picross-commit] SF.net SVN: picross:[110] branches/engine_split
|
From: <yva...@us...> - 2013-01-11 09:20:46
|
Revision: 110
http://sourceforge.net/p/picross/code/110
Author: yvan_norsa
Date: 2013-01-11 09:20:41 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
first android stuff
Modified Paths:
--------------
branches/engine_split/build.xml
branches/engine_split/common/src/picross/specific/game/ui/GameMediator.java
branches/engine_split/common/src/picross/specific/ui/MainMenuUI.java
branches/engine_split/common/src/picross/specific/ui/MenuController.java
branches/engine_split/common/src/picross/specific/ui/MenuUI.java
branches/engine_split/src/picross/applet/MainMenuAppletUI.java
branches/engine_split/swing/src/picross/specific/ui/MenuController.java
branches/engine_split/swing/src/picross/specific/ui/MenuUI.java
branches/engine_split/swing/src/picross/specific/ui/PicrossMediator.java
Added Paths:
-----------
branches/engine_split/android/
branches/engine_split/android/AndroidManifest.xml
branches/engine_split/android/ant.properties
branches/engine_split/android/assets/
branches/engine_split/android/build.xml
branches/engine_split/android/libs/
branches/engine_split/android/libs/bundleHelper.jar
branches/engine_split/android/libs/mmvcs.jar
branches/engine_split/android/libs/picross-common.jar
branches/engine_split/android/libs/picross-engine.jar
branches/engine_split/android/libs/simpleButton.jar
branches/engine_split/android/res/
branches/engine_split/android/res/drawable/
branches/engine_split/android/res/drawable/background.png
branches/engine_split/android/res/drawable-hdpi/
branches/engine_split/android/res/drawable-hdpi/ic_launcher.png
branches/engine_split/android/res/drawable-ldpi/
branches/engine_split/android/res/drawable-ldpi/ic_launcher.png
branches/engine_split/android/res/drawable-mdpi/
branches/engine_split/android/res/drawable-mdpi/ic_launcher.png
branches/engine_split/android/res/drawable-xhdpi/
branches/engine_split/android/res/drawable-xhdpi/ic_launcher.png
branches/engine_split/android/res/layout/
branches/engine_split/android/res/layout/main.xml
branches/engine_split/android/res/values/
branches/engine_split/android/res/values/strings.xml
branches/engine_split/android/src/
branches/engine_split/android/src/picross/
branches/engine_split/android/src/picross/properties/
branches/engine_split/android/src/picross/properties/messages_picross.properties
branches/engine_split/android/src/picross/properties/messages_picross_en.properties
branches/engine_split/android/src/picross/properties/messages_picross_fr.properties
branches/engine_split/android/src/picross/specific/
branches/engine_split/android/src/picross/specific/activities/
branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java
branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java
branches/engine_split/android/src/picross/specific/activities/PicrossMainActivity.java
branches/engine_split/android/src/picross/specific/game/
branches/engine_split/android/src/picross/specific/game/ui/
branches/engine_split/android/src/picross/specific/game/ui/GameMediator.java
branches/engine_split/android/src/picross/specific/ui/
branches/engine_split/android/src/picross/specific/ui/MainMenuMediator.java
branches/engine_split/android/src/picross/specific/ui/MainMenuUI.java
branches/engine_split/android/src/picross/specific/ui/MenuController.java
branches/engine_split/android/src/picross/specific/ui/MenuUI.java
branches/engine_split/android/src/picross/specific/ui/PicrossAndroidLogger.java
branches/engine_split/android/src/picross/specific/ui/PicrossAndroidView.java
branches/engine_split/android/src/picross/specific/ui/PicrossMediator.java
branches/engine_split/android/src/picross/specific/ui/PicrossUIHelper.java
branches/engine_split/common/src/picross/common/ui/AbstractMenuController.java
branches/engine_split/common/src/picross/common/ui/AbstractPicrossMediator.java
branches/engine_split/common/src/picross/common/ui/MainMenuUI.java
branches/engine_split/common/src/picross/specific/ui/MainMenuMediator.java
branches/engine_split/src/picross/app/MainMenuAppUI.java
branches/engine_split/swing/src/picross/specific/ui/MainMenuMediator.java
Removed Paths:
-------------
branches/engine_split/common/src/picross/common/ui/MainMenuMediator.java
branches/engine_split/src/picross/app/MainMenuAppUI.java
branches/engine_split/swing/src/picross/specific/ui/MainMenuUI.java
Added: branches/engine_split/android/AndroidManifest.xml
===================================================================
--- branches/engine_split/android/AndroidManifest.xml (rev 0)
+++ branches/engine_split/android/AndroidManifest.xml 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="picross.specific.activities"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
+ <activity android:name="PicrossMainActivity"
+ android:label="@string/app_name">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ </application>
+</manifest>
Added: branches/engine_split/android/ant.properties
===================================================================
--- branches/engine_split/android/ant.properties (rev 0)
+++ branches/engine_split/android/ant.properties 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+# 'source.dir' for the location of your java source folder and
+# 'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+# 'key.store' for the location of your keystore and
+# 'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
Added: branches/engine_split/android/build.xml
===================================================================
--- branches/engine_split/android/build.xml (rev 0)
+++ branches/engine_split/android/build.xml 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="PicrossDroid" default="help">
+
+ <!-- The local.properties file is created and updated by the 'android' tool.
+ It contains the path to the SDK. It should *NOT* be checked into
+ Version Control Systems. -->
+ <property file="local.properties" />
+
+ <!-- The ant.properties file can be created by you. It is only edited by the
+ 'android' tool to add properties to it.
+ This is the place to change some Ant specific build properties.
+ Here are some properties you may want to change/update:
+
+ source.dir
+ The name of the source directory. Default is 'src'.
+ out.dir
+ The name of the output directory. Default is 'bin'.
+
+ For other overridable properties, look at the beginning of the rules
+ files in the SDK, at tools/ant/build.xml
+
+ Properties related to the SDK location or the project target should
+ be updated using the 'android' tool with the 'update' action.
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems.
+
+ -->
+ <property file="ant.properties" />
+
+ <!-- if sdk.dir was not set from one of the property file, then
+ get it from the ANDROID_HOME env var.
+ This must be done before we load project.properties since
+ the proguard config can use sdk.dir -->
+ <property environment="env" />
+ <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+ <isset property="env.ANDROID_HOME" />
+ </condition>
+
+ <!-- The project.properties file is created and updated by the 'android'
+ tool, as well as ADT.
+
+ This contains project specific properties such as project target, and library
+ dependencies. Lower level build properties are stored in ant.properties
+ (or in .classpath for Eclipse projects).
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems. -->
+ <loadproperties srcFile="project.properties" />
+
+ <!-- quick check on sdk.dir -->
+ <fail
+ message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+ unless="sdk.dir"
+ />
+
+ <!--
+ Import per project custom build rules if present at the root of the project.
+ This is the place to put custom intermediary targets such as:
+ -pre-build
+ -pre-compile
+ -post-compile (This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir})
+ -post-package
+ -post-build
+ -pre-clean
+ -->
+ <import file="custom_rules.xml" optional="true" />
+
+ <!-- Import the actual build file.
+
+ To customize existing targets, there are two options:
+ - Customize only one target:
+ - copy/paste the target into this file, *before* the
+ <import> task.
+ - customize it to your needs.
+ - Customize the whole content of build.xml
+ - copy/paste the content of the rules files (minus the top node)
+ into this file, replacing the <import> task.
+ - customize to your needs.
+
+ ***********************
+ ****** IMPORTANT ******
+ ***********************
+ In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+ in order to avoid having your file be overridden by tools such as "android update project"
+ -->
+ <!-- version-tag: 1 -->
+ <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
Added: branches/engine_split/android/libs/bundleHelper.jar
===================================================================
(Binary files differ)
Index: branches/engine_split/android/libs/bundleHelper.jar
===================================================================
--- branches/engine_split/android/libs/bundleHelper.jar 2013-01-10 12:27:19 UTC (rev 109)
+++ branches/engine_split/android/libs/bundleHelper.jar 2013-01-11 09:20:41 UTC (rev 110)
Property changes on: branches/engine_split/android/libs/bundleHelper.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/engine_split/android/libs/mmvcs.jar
===================================================================
(Binary files differ)
Index: branches/engine_split/android/libs/mmvcs.jar
===================================================================
--- branches/engine_split/android/libs/mmvcs.jar 2013-01-10 12:27:19 UTC (rev 109)
+++ branches/engine_split/android/libs/mmvcs.jar 2013-01-11 09:20:41 UTC (rev 110)
Property changes on: branches/engine_split/android/libs/mmvcs.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/engine_split/android/libs/picross-common.jar
===================================================================
(Binary files differ)
Index: branches/engine_split/android/libs/picross-common.jar
===================================================================
--- branches/engine_split/android/libs/picross-common.jar 2013-01-10 12:27:19 UTC (rev 109)
+++ branches/engine_split/android/libs/picross-common.jar 2013-01-11 09:20:41 UTC (rev 110)
Property changes on: branches/engine_split/android/libs/picross-common.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/engine_split/android/libs/picross-engine.jar
===================================================================
(Binary files differ)
Index: branches/engine_split/android/libs/picross-engine.jar
===================================================================
--- branches/engine_split/android/libs/picross-engine.jar 2013-01-10 12:27:19 UTC (rev 109)
+++ branches/engine_split/android/libs/picross-engine.jar 2013-01-11 09:20:41 UTC (rev 110)
Property changes on: branches/engine_split/android/libs/picross-engine.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/engine_split/android/libs/simpleButton.jar
===================================================================
(Binary files differ)
Index: branches/engine_split/android/libs/simpleButton.jar
===================================================================
--- branches/engine_split/android/libs/simpleButton.jar 2013-01-10 12:27:19 UTC (rev 109)
+++ branches/engine_split/android/libs/simpleButton.jar 2013-01-11 09:20:41 UTC (rev 110)
Property changes on: branches/engine_split/android/libs/simpleButton.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/engine_split/android/res/drawable/background.png
===================================================================
(Binary files differ)
Index: branches/engine_split/android/res/drawable/background.png
===================================================================
--- branches/engine_split/android/res/drawable/background.png 2013-01-10 12:27:19 UTC (rev 109)
+++ branches/engine_split/android/res/drawable/background.png 2013-01-11 09:20:41 UTC (rev 110)
Property changes on: branches/engine_split/android/res/drawable/background.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/engine_split/android/res/drawable-hdpi/ic_launcher.png
===================================================================
(Binary files differ)
Index: branches/engine_split/android/res/drawable-hdpi/ic_launcher.png
===================================================================
--- branches/engine_split/android/res/drawable-hdpi/ic_launcher.png 2013-01-10 12:27:19 UTC (rev 109)
+++ branches/engine_split/android/res/drawable-hdpi/ic_launcher.png 2013-01-11 09:20:41 UTC (rev 110)
Property changes on: branches/engine_split/android/res/drawable-hdpi/ic_launcher.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/engine_split/android/res/drawable-ldpi/ic_launcher.png
===================================================================
(Binary files differ)
Index: branches/engine_split/android/res/drawable-ldpi/ic_launcher.png
===================================================================
--- branches/engine_split/android/res/drawable-ldpi/ic_launcher.png 2013-01-10 12:27:19 UTC (rev 109)
+++ branches/engine_split/android/res/drawable-ldpi/ic_launcher.png 2013-01-11 09:20:41 UTC (rev 110)
Property changes on: branches/engine_split/android/res/drawable-ldpi/ic_launcher.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/engine_split/android/res/drawable-mdpi/ic_launcher.png
===================================================================
(Binary files differ)
Index: branches/engine_split/android/res/drawable-mdpi/ic_launcher.png
===================================================================
--- branches/engine_split/android/res/drawable-mdpi/ic_launcher.png 2013-01-10 12:27:19 UTC (rev 109)
+++ branches/engine_split/android/res/drawable-mdpi/ic_launcher.png 2013-01-11 09:20:41 UTC (rev 110)
Property changes on: branches/engine_split/android/res/drawable-mdpi/ic_launcher.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/engine_split/android/res/drawable-xhdpi/ic_launcher.png
===================================================================
(Binary files differ)
Index: branches/engine_split/android/res/drawable-xhdpi/ic_launcher.png
===================================================================
--- branches/engine_split/android/res/drawable-xhdpi/ic_launcher.png 2013-01-10 12:27:19 UTC (rev 109)
+++ branches/engine_split/android/res/drawable-xhdpi/ic_launcher.png 2013-01-11 09:20:41 UTC (rev 110)
Property changes on: branches/engine_split/android/res/drawable-xhdpi/ic_launcher.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: branches/engine_split/android/res/layout/main.xml
===================================================================
--- branches/engine_split/android/res/layout/main.xml (rev 0)
+++ branches/engine_split/android/res/layout/main.xml 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ >
+<TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="Hello World, PicrossMainActivity"
+ />
+</LinearLayout>
+
Added: branches/engine_split/android/res/values/strings.xml
===================================================================
--- branches/engine_split/android/res/values/strings.xml (rev 0)
+++ branches/engine_split/android/res/values/strings.xml 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">PicrossMainActivity</string>
+</resources>
Added: branches/engine_split/android/src/picross/properties/messages_picross.properties
===================================================================
--- branches/engine_split/android/src/picross/properties/messages_picross.properties (rev 0)
+++ branches/engine_split/android/src/picross/properties/messages_picross.properties 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,9 @@
+# picross.PicrossMediator
+victory = Congratulations !
+
+# picross.game.GameUI
+gridSize = Size
+menuButton = Back to menu
+
+# picross.game.random.RandomGameUI
+anotherGrid = Another grid
Added: branches/engine_split/android/src/picross/properties/messages_picross_en.properties
===================================================================
--- branches/engine_split/android/src/picross/properties/messages_picross_en.properties (rev 0)
+++ branches/engine_split/android/src/picross/properties/messages_picross_en.properties 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1 @@
+link messages_picross.properties
\ No newline at end of file
Property changes on: branches/engine_split/android/src/picross/properties/messages_picross_en.properties
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/engine_split/android/src/picross/properties/messages_picross_fr.properties
===================================================================
--- branches/engine_split/android/src/picross/properties/messages_picross_fr.properties (rev 0)
+++ branches/engine_split/android/src/picross/properties/messages_picross_fr.properties 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,10 @@
+# picross.PicrossMediator
+victory = F\xE9licitations !
+
+# picross.game.GameUI
+gridSize = Taille
+menuButton = Retour au menu
+
+# picross.game.random.RandomGameUI
+anotherGrid = Une autre grille
+
Added: branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java (rev 0)
+++ branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,79 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2007-2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.activities;
+
+import picross.specific.ui.MainMenuUI;
+
+import android.content.Context;
+
+/**
+ * UI for the main menu.
+ *
+ * @author Y. Norsa
+ */
+public final class MainMenuActivityUI extends MainMenuUI {
+ /*** Constants ***/
+
+ /** Serialisation ID. */
+ private static final long serialVersionUID = -505088917693050187L;
+
+ /** "Play" button X coordinate. */
+ private static final int PLAY_BUTTON_X = 50;
+
+ /** "Play" button Y coordinate. */
+ private static final int PLAY_BUTTON_Y = 225;
+
+ //private Context context;
+
+ public MainMenuActivityUI(Context androidContext) {
+ super(androidContext);
+
+ picross.engine.PicrossLogHelper.getLogger().debug("MainMenuActivityUI(" + androidContext + ")");
+ //this.context = androidContext;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected int getPlayButtonX() {
+ return MainMenuActivityUI.PLAY_BUTTON_X;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected int getPlayButtonY() {
+ return MainMenuActivityUI.PLAY_BUTTON_Y;
+ }
+
+}
+
Property changes on: branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java (rev 0)
+++ branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,117 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2007-2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.activities;
+
+import picross.engine.PicrossLogHelper;
+
+import android.app.Activity;
+
+import android.app.AlertDialog;
+
+import picross.common.ui.PicrossUI;
+import picross.common.ui.PicrossView;
+
+/**
+ * Main window of the application version.
+ *
+ * @author Y. Norsa
+ */
+public final class PicrossActivityUI /*extends android.view.View*/ implements PicrossUI {
+ /*** Constants ***/
+
+ /** Main menu class. */
+ private static final String MAIN_MENU_CLASS = "picross.specific.activities.MainMenuActivityUI";
+
+ private Activity activity;
+
+ PicrossActivityUI(Activity picrossActivity) {
+ PicrossLogHelper.getLogger().debug("PicrossActivityUI(" + picrossActivity + ")");
+ this.activity = picrossActivity;
+ }
+
+ /*** Methods implanted from the interface PicrossUI ***/
+
+ /** {@inheritDoc} */
+ @Override
+ public void setContent(PicrossView content) {
+ //this.setContentPane((Container) content);
+ //this.pack();
+
+ PicrossLogHelper.getLogger().debug("setContent(" + content + ")");
+ this.activity.setContentView((picross.specific.ui.PicrossAndroidView) content);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void displayMessage(String msg) {
+ PicrossLogHelper.getLogger().debug("displayMessage(" + msg + ")");
+ //JOptionPane.showMessageDialog(this, msg);
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(this.activity);
+ builder.setMessage(msg)
+ .setTitle("Picross");
+ AlertDialog dialog = builder.create();
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void displayError(String msg) {
+ /*
+ JOptionPane.showMessageDialog(this, msg,
+ "Picross", JOptionPane.ERROR_MESSAGE);
+ */
+ // FIXME error style ?
+ this.displayMessage("ERROR: " + msg);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void showUI() {
+ PicrossLogHelper.getLogger().debug("TODO showUI()");
+ //this.setVisible(true);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void exit() {
+ //this.dispose();
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public String getMainMenuClass() {
+ return PicrossActivityUI.MAIN_MENU_CLASS;
+ }
+}
+
Property changes on: branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: branches/engine_split/android/src/picross/specific/activities/PicrossMainActivity.java
===================================================================
--- branches/engine_split/android/src/picross/specific/activities/PicrossMainActivity.java (rev 0)
+++ branches/engine_split/android/src/picross/specific/activities/PicrossMainActivity.java 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,54 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2007-2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.activities;
+
+import android.app.Activity;
+
+import android.os.Bundle;
+
+import picross.specific.ui.PicrossMediator;
+import picross.specific.ui.PicrossAndroidLogger;
+import picross.engine.PicrossLogHelper;
+
+public class PicrossMainActivity extends Activity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ PicrossLogHelper.setLogger(new PicrossAndroidLogger());
+ PicrossLogHelper.getLogger().debug("TEST ##################");
+
+ new PicrossMediator(this, new PicrossActivityUI(this));
+ }
+}
Property changes on: branches/engine_split/android/src/picross/specific/activities/PicrossMainActivity.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: branches/engine_split/android/src/picross/specific/game/ui/GameMediator.java
===================================================================
--- branches/engine_split/android/src/picross/specific/game/ui/GameMediator.java (rev 0)
+++ branches/engine_split/android/src/picross/specific/game/ui/GameMediator.java 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,146 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2007-2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.game.ui;
+
+import fr.cle.mmvcs.Mediateur;
+import fr.cle.mmvcs.SimpleEvent;
+
+import picross.engine.PicrossLogger;
+import picross.engine.PicrossLogHelper;
+import picross.engine.PicrossException;
+
+import picross.engine.grid.PicrossGrid;
+
+//import picross.specific.grid.ui.GridMediator;
+import picross.common.grid.ui.GridView;
+import picross.common.grid.ui.IGridMediator;
+
+import picross.common.game.ui.GameView;
+
+public abstract class GameMediator extends Mediateur {
+ /*** Static field ***/
+
+ /** The class' logger. */
+ private static PicrossLogger log = PicrossLogHelper.getLogger();
+
+ /*** Fields ***/
+
+ /** The game view. */
+ //private GameUI view;
+
+ /** The game grid. */
+ private IGridMediator grid;
+
+ /*** Abstrac method ***/
+
+ /**
+ * Creates the model.
+ *
+ * @return grid model
+ * @throws PicrossException if there is a problem
+ */
+ protected abstract PicrossGrid initModel() throws PicrossException;
+
+ /*** Method overloaded from the class Mediator ***/
+
+ /** {@inheritDoc} */
+ @Override
+ public void eventPerformed(SimpleEvent e) {
+ //GameMediator.log.debug("eventPerformed(" + e + ")");
+
+ this.fireEventPerformed(e);
+ }
+
+ /*** Methods ***/
+
+ /**
+ * Inits the game.
+ *
+ * @throws PicrossException if there is a problem loading the grid model
+ * or building the view
+ */
+ public final void init() throws PicrossException {
+ PicrossGrid model = this.initModel();
+
+ final int width = model.getWidth();
+ final int height = model.getHeight();
+ /*
+ this.grid = new GridMediator(width, height,
+ model.getData());
+ */
+ // FIXME
+ //this.grid.addSimpleListener(this);
+
+ //final GameController controller = this.initController();
+ // FIXME
+ //controller.addSimpleListener(this);
+
+ // The view has to be init'ed on the EDT
+ //this.view = this.initView(width, height, this.grid.getView(), controller);
+ }
+
+ /**
+ * Creates the view.
+ *
+ * @param width the grid width
+ * @param height the grid height
+ * @param gridView the grid itself
+ * @param controller controller for the grid buttons
+ * @return view containing the grid
+ */
+ /*
+ protected GameUI initView(int width, int height, GridView gridView,
+ ActionListener controller) {
+ return new GameUI(width, height, gridView, controller);
+ }
+*/
+ /**
+ * Initialises the controller.
+ *
+ * @return the created controller
+ */
+ /*
+ protected GameController initController() {
+ return new GameController();
+ }
+ */
+ /**
+ * Returns the game view.
+ *
+ * @return the view
+ */
+ /* public final GameView getView() {
+ return this.view;
+ }*/
+ }
Property changes on: branches/engine_split/android/src/picross/specific/game/ui/GameMediator.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: branches/engine_split/android/src/picross/specific/ui/MainMenuMediator.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/MainMenuMediator.java (rev 0)
+++ branches/engine_split/android/src/picross/specific/ui/MainMenuMediator.java 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,96 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2007-2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.ui;
+
+import java.lang.reflect.InvocationTargetException;
+
+import picross.engine.PicrossException;
+
+import picross.common.ui.MenuMediator;
+import picross.common.ui.PicrossUI;
+import picross.specific.ui.MainMenuUI;
+
+import android.content.Context;
+
+/**
+ * Mediator for the main menu.
+ *
+ * @author Y. Norsa
+ */
+public final class MainMenuMediator extends MenuMediator {
+ private Context context;
+
+ public MainMenuMediator(Context androidContext) {
+ picross.engine.PicrossLogHelper.getLogger().debug("MainMenuMediator(" + androidContext + ")");
+
+ if (androidContext == null) {
+ throw new IllegalArgumentException("\"androidContext\" cannot be null");
+ }
+
+ this.context = androidContext;
+ }
+
+ /*** Method overloaded from the class MenuMediator ***/
+
+ /** {@inheritDoc} */
+ @Override
+ protected MenuUI initView(PicrossUI ui, MenuController controller)
+ throws PicrossException {
+
+ picross.engine.PicrossLogHelper.getLogger().debug("initView(" + ui + ", " + controller + ")");
+
+ MainMenuUI view = null;
+
+ try {
+ view = (MainMenuUI) Class.forName(ui.getMainMenuClass())
+ .getConstructor(Context.class).newInstance(this.context);
+ } catch (ClassNotFoundException classEx) {
+ throw new PicrossException(classEx);
+ } catch (NoSuchMethodException methodEx) {
+ throw new PicrossException(methodEx);
+ } catch (InstantiationException instantiationEx) {
+ throw new PicrossException(instantiationEx);
+ } catch (IllegalAccessException accessEx) {
+ throw new PicrossException(accessEx);
+ } catch (InvocationTargetException targetEx) {
+ targetEx.printStackTrace();
+ throw new PicrossException(targetEx.getCause());
+ }
+
+ view.init(controller);
+
+ return view;
+ }
+}
+
Property changes on: branches/engine_split/android/src/picross/specific/ui/MainMenuMediator.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: branches/engine_split/android/src/picross/specific/ui/MainMenuUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/MainMenuUI.java (rev 0)
+++ branches/engine_split/android/src/picross/specific/ui/MainMenuUI.java 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,90 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2007-2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.ui;
+
+import picross.common.ui.PicrossController;
+
+import picross.specific.ui.MenuController;
+import picross.specific.ui.MenuUI;
+
+import android.content.Context;
+
+/**
+ * UI for the main menu.
+ *
+ * @author Y. Norsa
+ */
+public abstract class MainMenuUI extends MenuUI {
+ /*** Constants ***/
+
+ /** Serialisation ID. */
+ private static final long serialVersionUID = -505088917693050187L;
+
+ /** Image for the "play" button. */
+ private static final String PLAY_BUTTON_IMAGE = "button-play.png";
+
+ public MainMenuUI(Context androidContext) {
+ super(androidContext);
+ }
+
+ /*** Abstract methods ***/
+
+ /**
+ * Returns the "play" button X position.
+ *
+ * @return X position of the "play" button
+ */
+ protected abstract int getPlayButtonX();
+
+ /**
+ * Returns the "play" button Y position.
+ *
+ * @return Y position of the "play" button
+ */
+ protected abstract int getPlayButtonY();
+
+ /*** Method ***/
+
+ /**
+ * Initialises the menu.
+ *
+ * @param controller controller for the menu's buttons
+ */
+ public void init(MenuController controller) {
+ this.addButton(MainMenuUI.PLAY_BUTTON_IMAGE,
+ PicrossController.PLAY_CMD, controller,
+ this.getPlayButtonX(), this.getPlayButtonY());
+ }
+}
+
Property changes on: branches/engine_split/android/src/picross/specific/ui/MainMenuUI.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: branches/engine_split/android/src/picross/specific/ui/MenuController.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/MenuController.java (rev 0)
+++ branches/engine_split/android/src/picross/specific/ui/MenuController.java 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,62 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.ui;
+
+import fr.cle.mmvcs.Controller;
+import fr.cle.mmvcs.SimpleEvent;
+
+import picross.engine.PicrossLogger;
+import picross.engine.PicrossLogHelper;
+
+import picross.common.ui.AbstractMenuController;
+
+/**
+ * Generic controller for the menus.
+ *
+ * @author Y. Norsa
+ */
+public class MenuController extends AbstractMenuController /*implements ActionListener*/ {
+ /*** Method implanted from the interface ActionListener ***/
+
+ /** {@inheritDoc} */
+
+ // FIXME
+ /*
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ String cmd = e.getActionCommand();
+ this.fireEventPerformed(cmd);
+ }*/
+}
+
Property changes on: branches/engine_split/android/src/picross/specific/ui/MenuController.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: branches/engine_split/android/src/picross/specific/ui/MenuUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/MenuUI.java (rev 0)
+++ branches/engine_split/android/src/picross/specific/ui/MenuUI.java 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,376 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and, more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package picross.specific.ui;
+
+import fr.cle.core.gui.SimpleButton;
+
+import fr.cle.mmvcs.SimpleEvent;
+import fr.cle.mmvcs.SimpleListener;
+
+import picross.common.ui.PicrossView;
+
+import picross.engine.PicrossLogger;
+import picross.engine.PicrossLogHelper;
+
+//import picross.specific.ui.PicrossUIHelper;
+
+import picross.common.ui.MissingImageException;
+
+import android.view.SurfaceView;
+import android.net.Uri;
+import java.io.File;
+import android.content.Context;
+
+import android.graphics.Bitmap;
+
+import picross.specific.activities.R;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.view.SurfaceHolder;
+
+/**
+ * Base class for menus.
+ *
+ * @author Y. Norsa
+ */
+public abstract class MenuUI extends PicrossAndroidView implements SurfaceHolder.Callback, Runnable {//SurfaceView implements PicrossView {
+ /*** Constants ***/
+
+ /** Background image. */
+ private static final String BACKGROUND_IMAGE = "background.png";
+
+ /** Default width to be used if the background file can't be found. */
+ private static final int DEFAULT_WIDTH = 450;
+
+ /** Default height to be used if the background file can't be found. */
+ private static final int DEFAULT_HEIGHT = 375;
+
+ /** Size for buttons' text. */
+ private static final float BUTTON_TEXT_SIZE = 16;
+
+ /*** Static field ***/
+
+ /** This class' logger. */
+ private static PicrossLogger log = PicrossLogHelper.getLogger();
+
+ /*** Field ***/
+
+ /** Background image. */
+ private Bitmap image;
+
+ /*** Constructor ***/
+
+ /** Constructor. */
+
+ protected Context context;
+ private SurfaceHolder surface;
+
+
+ //private MenuUI thread;
+
+ public MenuUI(Context context) {
+ super(context);
+
+ MenuUI.log.debug("MenuUI(" + context + ")");
+
+ this.context = context;
+
+ // FIXME
+ /*
+ try {
+ ImageIcon icon = PicrossUIHelper.getImage(MenuUI.BACKGROUND_IMAGE);
+ this.setPreferredSize(new Dimension(icon.getIconWidth(),
+ icon.getIconHeight()));
+ this.image = icon.getImage();
+ } catch (MissingImageException imageEx) {
+ MenuUI.log.info(imageEx.getMessage());
+ this.setPreferredSize(new Dimension(MenuUI.DEFAULT_WIDTH,
+ MenuUI.DEFAULT_HEIGHT));
+ }
+
+ this.setLayout(null);
+ */
+
+
+ Resources res = context.getResources();
+
+ this.image = PicrossUIHelper.getImage(res, R.drawable.background);//BitmapFactory.decodeResource(res,
+ //R.drawable.earthrise);
+
+ MenuUI.log.debug("this.image: " + this.image);
+
+ this.surface = this.getHolder();
+ this.surface.addCallback(this);
+
+ //Thread thread = new Thread(this);
+ //thread.start();
+ //this.start();
+ }
+
+
+ /*** Method overloaded from the class JPanel ***/
+
+ /** {@inheritDoc} */
+ //FIXME
+ /*
+ protected final void paintComponent(Graphics g) {
+ super.paintComponent(g);
+
+ g.drawImage(this.image, 0, 0, null);
+ }
+ */
+
+@Override
+ public void surfaceCreated(SurfaceHolder holder) {
+ MenuUI.log.debug("surfaceCreated()");
+
+ //this.surface = holder;
+
+
+ /*thread*/this.setRunning(true);
+ /*thread*///this.start();
+ Thread thread = new Thread(this);
+ thread.start();
+
+}
+
+@Override
+public void surfaceChanged(SurfaceHolder holder, int format, int width,
+ int height) {
+ MenuUI.log.debug("surfaceChanged");
+
+ //thread.setSurfaceSize(width, height);
+
+}
+ private boolean running;
+
+ private void setRunning(boolean run) {
+ this.running = run;
+ }
+
+@Override
+
+ public void surfaceDestroyed(SurfaceHolder holder) {
+ MenuUI.log.debug("surfaceDestroyed");
+
+
+ boolean retry = true;
+ /*thread*/this.setRunning(false);
+ /*
+ while (retry) {
+ try {
+ //thread.join();
+ retry = false;
+ } catch (InterruptedException e) {
+ }
+ }*/
+}
+
+@Override
+ public void run() {
+ MenuUI.log.debug("run()");
+
+ /*
+ if (!this.running) {
+ return;
+ }
+ */
+ Canvas c;
+ while (this.running) {
+ c = null;
+ try {
+ c = surface.lockCanvas(null);
+ synchronized (surface) {
+ onDraw(c);
+
+ }
+ } finally {
+ // do this in a finally so that if an exception is thrown
+ // during the above, we don't leave the Surface in an
+ // inconsistent state
+ if (c != null) {
+ surface.unlockCanvasAndPost(c);
+ }
+ }
+ }
+
+ }
+
+ public void onDraw(Canvas canvas) {
+ MenuUI.log.debug("onDraw(" + canvas + ")");
+
+ if (canvas == null) {
+ return;
+ }
+
+ canvas.drawBitmap(this.image, 0, 0, null);
+
+ /*
+ canvas.drawColor(Color.BLACK);
+
+ Paint p = new Paint();
+ p.setColor(Color.RED);
+ canvas.drawCircle(x, 10, 10, p);
+ x += 1;*/
+ }
+
+ /*** Methods ***/
+
+ /**
+ * Helper method to add a button to the menu.
+ *
+ * @param image the image name
+ * @param command the command linked to the button
+ * @param controller listener for the button
+ * @param x X coordinate for the button
+ * @param y Y coordinate for the button
+ * @throws MissingImageException if a button image can't be found
+ */
+
+ protected final void addButton(String image, String command,
+ MenuController controller, int x, int y) {
+ /*
+ ImageIcon buttonIcon = PicrossUIHelper.getLocalizedImage(image);
+ JButton button = new JButton(buttonIcon);
+ button.setActionCommand(command);
+ button.addActionListener(controller);
+ button.setBorder(null);
+
+ this.putButton(button, x, y,
+ buttonIcon.getIconWidth(), buttonIcon.getIconHeight());
+ */
+ }
+
+
+ /**
+ * Helper method to add a button to the menu.
+ *
+ * @param label the button's label
+ * @param event the event linked to the button
+ * @param listener listener for the button
+ * @param x X coordinate for the button
+ * @param y Y coordinate for the button
+ */
+ protected final void addSimpleButton(String label, SimpleEvent event,
+ SimpleListener listener,
+ int x, int y) {
+ // FIXME
+ /*
+ PicrossButton button =
+ this.createSimpleButton(label, event, listener);
+ this.putButton(button.getButton(), x, y, 150, 50);
+ */
+ }
+
+ /**
+ * Helper method to create a button.
+ *
+ * @param label the button's label
+ * @param event the event linked to the button
+ * @param listener listener for the button
+ * @return the created button
+ */
+ // FIXME
+ /*
+ protected final PicrossButton createSimpleButton(String label,
+ SimpleEvent event,
+ SimpleListener listener) {
+ PicrossButton button =
+ new PicrossButton(label,
+ PicrossUIHelper.getImage("empty-button.png"),
+ event);
+ button.addSimpleListener(listener);
+
+ JButton realButton = button.getButton();
+
+ realButton.setHorizontalTextPosition(JButton.CENTER);
+ realButton.setVerticalTextPosition(JButton.CENTER);
+
+ realButton.setFont(realButton.getFont()
+ .deriveFont(MenuUI.BUTTON_TEXT_SIZE));
+ realButton.setForeground(Color.WHITE);
+
+ Dimension dim = new Dimension(150, 50);
+ realButton.setMinimumSize(dim);
+ realButton.setMaximumSize(dim);
+ realButton.setPreferredSize(dim);
+
+ return button;
+
+ }
+ */
+ /**
+ * Helper method to add a button.
+ *
+ * @param button the button to add
+ * @param listener listener for the button
+ * @param x X ccordinate for the button
+ * @param y Y coordinate for the button
+ */
+ // FIXME
+
+ /*
+ protected final void addButton(SimpleButton<JButton> button,
+ SimpleListener listener,
+ int x, int y) {
+
+ button.addSimpleListener(listener);
+
+ JButton realButton = button.getButton();
+ Icon icon = realButton.getIcon();
+
+ realButton.setBorder(null);
+ this.putButton(realButton, x, y,
+ icon.getIconWidth(), icon.getIconHeight());
+ }
+ */
+
+ /**
+ * Finalizes the button's setup.
+ *
+ * @param button the button to add
+ * @param x X coordinate for the button
+ * @param y Y coordinate for the button
+ * @param width the button's width
+ * @param height the button's height
+ */
+ // FIXME
+ /*
+ private void putButton(JButton button, int x, int y,
+ int width, int height) {
+ button.setBounds(x, y, width, height);
+ this.add(button);
+ }
+ */
+}
Property changes on: branches/engine_split/android/src/picross/specific/ui/MenuUI.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: branches/engine_split/android/src/picross/specific/ui/PicrossAndroidLogger.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/PicrossAndroidLogger.java (rev 0)
+++ branches/engine_split/android/src/picross/specific/ui/PicrossAndroidLogger.java 2013-01-11 09:20:41 UTC (rev 110)
@@ -0,0 +1,54 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2007-2008
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software. You can use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty and the software's author, the holder of the
+ * economic rights, and the successive licensors have only limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading, using, modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean that it is complicated to manipulate, and that also
+ * therefore means that it is reserved for developers and experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * e...
[truncated message content] |
