diff --git a/.classpath b/.classpath
deleted file mode 100644
index a4763d1..0000000
--- a/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/.gitignore b/.gitignore
index 3a0561f..5f2a00b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,16 @@
-/bin
-/LICENSE.md
+bin
+build
+gradle
+gradlew
+gradlew.bat
+.gradle
+.project
+.settings
+local.properties
+.classpath
+project.properties
+proguard-project.txt
+gen
+*.iml
+build.xml
+.idea
diff --git a/.project b/.project
deleted file mode 100644
index 0c9667c..0000000
--- a/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- Blockinger
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b080d2d..0000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d0df9d6..3c514b4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,7 +43,7 @@
+ android:targetSdkVersion="18" />
diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
deleted file mode 100644
index d0df9d6..0000000
--- a/bin/AndroidManifest.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/bin/classes/org/blockinger/game/BlockBoardView.class b/bin/classes/org/blockinger/game/BlockBoardView.class
deleted file mode 100644
index 7294603..0000000
Binary files a/bin/classes/org/blockinger/game/BlockBoardView.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/BuildConfig.class b/bin/classes/org/blockinger/game/BuildConfig.class
deleted file mode 100644
index 213991e..0000000
Binary files a/bin/classes/org/blockinger/game/BuildConfig.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$array.class b/bin/classes/org/blockinger/game/R$array.class
deleted file mode 100644
index dc1f443..0000000
Binary files a/bin/classes/org/blockinger/game/R$array.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$attr.class b/bin/classes/org/blockinger/game/R$attr.class
deleted file mode 100644
index cad55bf..0000000
Binary files a/bin/classes/org/blockinger/game/R$attr.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$color.class b/bin/classes/org/blockinger/game/R$color.class
deleted file mode 100644
index 39c8212..0000000
Binary files a/bin/classes/org/blockinger/game/R$color.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$dimen.class b/bin/classes/org/blockinger/game/R$dimen.class
deleted file mode 100644
index b3e29f5..0000000
Binary files a/bin/classes/org/blockinger/game/R$dimen.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$drawable.class b/bin/classes/org/blockinger/game/R$drawable.class
deleted file mode 100644
index ef11955..0000000
Binary files a/bin/classes/org/blockinger/game/R$drawable.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$id.class b/bin/classes/org/blockinger/game/R$id.class
deleted file mode 100644
index 3cd8399..0000000
Binary files a/bin/classes/org/blockinger/game/R$id.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$integer.class b/bin/classes/org/blockinger/game/R$integer.class
deleted file mode 100644
index 9eafcfd..0000000
Binary files a/bin/classes/org/blockinger/game/R$integer.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$layout.class b/bin/classes/org/blockinger/game/R$layout.class
deleted file mode 100644
index 4057637..0000000
Binary files a/bin/classes/org/blockinger/game/R$layout.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$menu.class b/bin/classes/org/blockinger/game/R$menu.class
deleted file mode 100644
index 1da571c..0000000
Binary files a/bin/classes/org/blockinger/game/R$menu.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$raw.class b/bin/classes/org/blockinger/game/R$raw.class
deleted file mode 100644
index 78c7b84..0000000
Binary files a/bin/classes/org/blockinger/game/R$raw.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$string.class b/bin/classes/org/blockinger/game/R$string.class
deleted file mode 100644
index e4eb789..0000000
Binary files a/bin/classes/org/blockinger/game/R$string.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$style.class b/bin/classes/org/blockinger/game/R$style.class
deleted file mode 100644
index 644868c..0000000
Binary files a/bin/classes/org/blockinger/game/R$style.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$styleable.class b/bin/classes/org/blockinger/game/R$styleable.class
deleted file mode 100644
index 2c9a894..0000000
Binary files a/bin/classes/org/blockinger/game/R$styleable.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R$xml.class b/bin/classes/org/blockinger/game/R$xml.class
deleted file mode 100644
index 683b2d8..0000000
Binary files a/bin/classes/org/blockinger/game/R$xml.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/R.class b/bin/classes/org/blockinger/game/R.class
deleted file mode 100644
index 9685d78..0000000
Binary files a/bin/classes/org/blockinger/game/R.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/Row.class b/bin/classes/org/blockinger/game/Row.class
deleted file mode 100644
index 800916c..0000000
Binary files a/bin/classes/org/blockinger/game/Row.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/SeekBarPreference.class b/bin/classes/org/blockinger/game/SeekBarPreference.class
deleted file mode 100644
index f3581a0..0000000
Binary files a/bin/classes/org/blockinger/game/SeekBarPreference.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/Square.class b/bin/classes/org/blockinger/game/Square.class
deleted file mode 100644
index 8e740d3..0000000
Binary files a/bin/classes/org/blockinger/game/Square.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/db/HighscoreOpenHelper.class b/bin/classes/org/blockinger/game/db/HighscoreOpenHelper.class
deleted file mode 100644
index 4fb8b5a..0000000
Binary files a/bin/classes/org/blockinger/game/db/HighscoreOpenHelper.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/db/Score.class b/bin/classes/org/blockinger/game/db/Score.class
deleted file mode 100644
index 05203ea..0000000
Binary files a/bin/classes/org/blockinger/game/db/Score.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/db/ScoreDataSource.class b/bin/classes/org/blockinger/game/db/ScoreDataSource.class
deleted file mode 100644
index 47cef2d..0000000
Binary files a/bin/classes/org/blockinger/game/db/ScoreDataSource.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/pieces/IPiece.class b/bin/classes/org/blockinger/game/pieces/IPiece.class
deleted file mode 100644
index 1b268e8..0000000
Binary files a/bin/classes/org/blockinger/game/pieces/IPiece.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/pieces/JPiece.class b/bin/classes/org/blockinger/game/pieces/JPiece.class
deleted file mode 100644
index a0e9c73..0000000
Binary files a/bin/classes/org/blockinger/game/pieces/JPiece.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/pieces/LPiece.class b/bin/classes/org/blockinger/game/pieces/LPiece.class
deleted file mode 100644
index c0df429..0000000
Binary files a/bin/classes/org/blockinger/game/pieces/LPiece.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/pieces/OPiece.class b/bin/classes/org/blockinger/game/pieces/OPiece.class
deleted file mode 100644
index 4537147..0000000
Binary files a/bin/classes/org/blockinger/game/pieces/OPiece.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/pieces/Piece.class b/bin/classes/org/blockinger/game/pieces/Piece.class
deleted file mode 100644
index 80530d6..0000000
Binary files a/bin/classes/org/blockinger/game/pieces/Piece.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/pieces/Piece3x3.class b/bin/classes/org/blockinger/game/pieces/Piece3x3.class
deleted file mode 100644
index 8e29664..0000000
Binary files a/bin/classes/org/blockinger/game/pieces/Piece3x3.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/pieces/Piece4x4.class b/bin/classes/org/blockinger/game/pieces/Piece4x4.class
deleted file mode 100644
index 73946e9..0000000
Binary files a/bin/classes/org/blockinger/game/pieces/Piece4x4.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/pieces/SPiece.class b/bin/classes/org/blockinger/game/pieces/SPiece.class
deleted file mode 100644
index b230ca8..0000000
Binary files a/bin/classes/org/blockinger/game/pieces/SPiece.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/pieces/TPiece.class b/bin/classes/org/blockinger/game/pieces/TPiece.class
deleted file mode 100644
index f8695d4..0000000
Binary files a/bin/classes/org/blockinger/game/pieces/TPiece.class and /dev/null differ
diff --git a/bin/classes/org/blockinger/game/pieces/ZPiece.class b/bin/classes/org/blockinger/game/pieces/ZPiece.class
deleted file mode 100644
index 5d4f79a..0000000
Binary files a/bin/classes/org/blockinger/game/pieces/ZPiece.class and /dev/null differ
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..6831da1
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,40 @@
+apply plugin: 'android'
+
+buildscript {
+ repositories {
+ mavenCentral()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:0.5.+'
+ }
+}
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ compile 'com.android.support:support-v4:18.0.+'
+}
+
+android {
+ compileSdkVersion 18
+ buildToolsVersion "18.0.1"
+
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src']
+ resources.srcDirs = ['src']
+ aidl.srcDirs = ['src']
+ renderscript.srcDirs = ['src']
+ res.srcDirs = ['res']
+ assets.srcDirs = ['assets']
+ }
+ }
+
+ defaultConfig {
+ minSdkVersion 8
+ targetSdkVersion 18
+ }
+}
diff --git a/gen/org/blockinger/game/BuildConfig.java b/gen/org/blockinger/game/BuildConfig.java
deleted file mode 100644
index 37a55b8..0000000
--- a/gen/org/blockinger/game/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package org.blockinger.game;
-
-public final class BuildConfig {
- public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/gen/org/blockinger/game/R.java b/gen/org/blockinger/game/R.java
deleted file mode 100644
index 3458a53..0000000
--- a/gen/org/blockinger/game/R.java
+++ /dev/null
@@ -1,455 +0,0 @@
-/* AUTO-GENERATED FILE. DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found. It
- * should not be modified by hand.
- */
-
-package org.blockinger.game;
-
-public final class R {
- public static final class array {
- public static final int intervals=0x7f080000;
- public static final int line_thresholds=0x7f080001;
- public static final int randomizer_preference_array=0x7f080002;
- public static final int randomizer_preference_values=0x7f080003;
- }
- public static final class attr {
- /**
Must be a reference to another resource, in the form "@[+][package:]type:name
"
-or to a theme attribute in the form "?[package:][type:]name
".
- */
- public static final int buttonBarButtonStyle=0x7f010001;
- /**
Must be a reference to another resource, in the form "@[+][package:]type:name
"
-or to a theme attribute in the form "?[package:][type:]name
".
- */
- public static final int buttonBarStyle=0x7f010000;
- }
- public static final class color {
- public static final int black_overlay=0x7f06000a;
- public static final int darkbluegreen=0x7f06000b;
- public static final int holo_grey=0x7f06000e;
- public static final int square_blue=0x7f060001;
- public static final int square_cyan=0x7f060007;
- public static final int square_empty=0x7f060008;
- public static final int square_error=0x7f060009;
- public static final int square_green=0x7f060005;
- public static final int square_magenta=0x7f060006;
- public static final int square_orange=0x7f060002;
- public static final int square_red=0x7f060004;
- public static final int square_yellow=0x7f060003;
- public static final int standardGameBackground=0x7f060000;
- public static final int transparent=0x7f06000d;
- public static final int yellow=0x7f06000c;
- }
- public static final class dimen {
- /** Default screen margins, per the Android Design guidelines.
-
- Copyright 2013 Simon Willeke
- contact: hamstercount@hotmail.com
-
-
- This file is part of Blockinger.
-
- Blockinger is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Blockinger is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Blockinger. If not, see .
-
- Diese Datei ist Teil von Blockinger.
-
- Blockinger ist Freie Software: Sie können es unter den Bedingungen
- der GNU General Public License, wie von der Free Software Foundation,
- Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren
- veröffentlichten Version, weiterverbreiten und/oder modifizieren.
-
- Blockinger wird in der Hoffnung, dass es nützlich sein wird, aber
- OHNE JEDE GEWÄHELEISTUNG, bereitgestellt; sogar ohne die implizite
- Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.
- Siehe die GNU General Public License für weitere Details.
-
- Sie sollten eine Kopie der GNU General Public License zusammen mit diesem
- Programm erhalten haben. Wenn nicht, siehe .
-
-
- Customize dimensions originally defined in res/values/dimens.xml (such as
- screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-
- */
- public static final int activity_horizontal_margin=0x7f090000;
- public static final int activity_vertical_margin=0x7f090001;
- }
- public static final class drawable {
- public static final int hard_drop_button_icon_hd=0x7f020000;
- public static final int hard_drop_button_icon_noburn=0x7f020001;
- public static final int ic_settings=0x7f020002;
- public static final int iconinger_v2=0x7f020003;
- public static final int left_button_icon_hd=0x7f020004;
- public static final int left_button_icon_noburn=0x7f020005;
- public static final int right_button_icon_hd=0x7f020006;
- public static final int right_button_icon_noburn=0x7f020007;
- public static final int rotate_left_button_icon_hd=0x7f020008;
- public static final int rotate_left_button_icon_noburn=0x7f020009;
- public static final int rotate_right_button_icon_hd=0x7f02000a;
- public static final int rotate_right_button_icon_noburn=0x7f02000b;
- public static final int soft_drop_button_icon_hd=0x7f02000c;
- public static final int soft_drop_button_icon_noburn=0x7f02000d;
- }
- public static final class id {
- public static final int LinearLayout1=0x7f0d0000;
- public static final int LinearLayout2=0x7f0d000a;
- public static final int TextView1=0x7f0d001e;
- public static final int View01=0x7f0d0011;
- public static final int View02=0x7f0d000d;
- public static final int View03=0x7f0d0007;
- public static final int View04=0x7f0d0003;
- public static final int View05=0x7f0d0001;
- public static final int View06=0x7f0d000b;
- public static final int View07=0x7f0d0008;
- public static final int action_about=0x7f0d002e;
- public static final int action_donate=0x7f0d002f;
- public static final int action_exit=0x7f0d0031;
- public static final int action_help=0x7f0d0030;
- public static final int action_settings=0x7f0d002d;
- public static final int blockinger_list_item=0x7f0d001f;
- public static final int boardView=0x7f0d0009;
- public static final int bottom_right_spacer=0x7f0d000f;
- public static final int hardDropButton=0x7f0d0010;
- public static final int hdivider=0x7f0d0014;
- public static final int holdbutton=0x7f0d0028;
- public static final int leftButton=0x7f0d0002;
- public static final int leveldialogleveldisplay=0x7f0d0026;
- public static final int levelseekbar=0x7f0d0024;
- public static final int nicknameEditView=0x7f0d0019;
- public static final int paddingcenter=0x7f0d0025;
- public static final int paddingleft=0x7f0d0023;
- public static final int paddingright=0x7f0d0027;
- public static final int paddingtop=0x7f0d0022;
- public static final int pausebutton_1=0x7f0d0012;
- public static final int restartButton=0x7f0d001d;
- public static final int resumeButton=0x7f0d001b;
- public static final int rightButton=0x7f0d0004;
- public static final int rotateLeftButton=0x7f0d000c;
- public static final int rotateRightButton=0x7f0d000e;
- public static final int scoredivider=0x7f0d0018;
- public static final int seekBarPrefBarContainer=0x7f0d002c;
- public static final int seekBarPrefUnitsLeft=0x7f0d002b;
- public static final int seekBarPrefUnitsRight=0x7f0d0029;
- public static final int seekBarPrefValue=0x7f0d002a;
- public static final int softDropButton=0x7f0d0006;
- public static final int spacer0=0x7f0d001a;
- public static final int spacer2=0x7f0d001c;
- public static final int spacerl0=0x7f0d0005;
- public static final int text1=0x7f0d0020;
- public static final int text2=0x7f0d0021;
- public static final int textView1=0x7f0d0016;
- public static final int titledivider=0x7f0d0017;
- public static final int top_right_spacer=0x7f0d0013;
- public static final int view2=0x7f0d0015;
- }
- public static final class integer {
- public static final int audio_streams=0x7f070011;
- public static final int clearAnimation_burstDuration=0x7f070019;
- public static final int clearAnimation_enableBurst=0x7f070018;
- public static final int clearAnimation_enableFlash=0x7f070015;
- public static final int clearAnimation_flashCount=0x7f070016;
- public static final int clearAnimation_flashInterval=0x7f070017;
- public static final int doubleLineScore=0x7f07000a;
- /** points per dropped square
- */
- public static final int hardDropBonus=0x7f07000f;
- public static final int levels=0x7f07001a;
- public static final int levelsplusone=0x7f07001b;
- public static final int multiTetrisScore=0x7f07000d;
- public static final int padding_columns=0x7f070004;
- public static final int phantom_alpha=0x7f070005;
- public static final int piece_start_x=0x7f070007;
- public static final int popup_attack=0x7f070012;
- public static final int popup_decay=0x7f070014;
- public static final int popup_sustain=0x7f070013;
- public static final int quadLineScore=0x7f07000c;
- /** points per dropped square
- */
- public static final int shortVibeInterval=0x7f070010;
- public static final int singleLineScore=0x7f070009;
- public static final int softDropBonus=0x7f07000e;
- public static final int spalten=0x7f070000;
- public static final int spaltenoffset=0x7f070002;
- public static final int spawn_delay=0x7f070008;
- public static final int textalpha=0x7f070006;
- public static final int trippleLineScore=0x7f07000b;
- public static final int zeilen=0x7f070001;
- public static final int zeilenoffset=0x7f070003;
- }
- public static final class layout {
- public static final int activity_game=0x7f030000;
- public static final int activity_game_alt=0x7f030001;
- public static final int activity_main=0x7f030002;
- public static final int blockinger_list_item=0x7f030003;
- public static final int seek_bar_dialog=0x7f030004;
- public static final int seek_bar_preference=0x7f030005;
- }
- public static final class menu {
- public static final int main=0x7f0c0000;
- }
- public static final class raw {
- public static final int clear2_free=0x7f050000;
- public static final int drop_free=0x7f050001;
- public static final int gameover2_free=0x7f050002;
- public static final int key_free=0x7f050003;
- public static final int lemmings03=0x7f050004;
- public static final int sadrobot01=0x7f050005;
- public static final int tetris_free=0x7f050006;
- }
- public static final class string {
- public static final int action_about=0x7f0a0003;
- public static final int action_backtomain=0x7f0a0002;
- public static final int action_donate=0x7f0a0004;
- public static final int action_help=0x7f0a0005;
- public static final int action_settings=0x7f0a0001;
- public static final int anonymous=0x7f0a001a;
- public static final int apmLabel=0x7f0a001d;
- public static final int apm_title=0x7f0a0015;
- public static final int app_name=0x7f0a0000;
- public static final int defeatDialogReturn=0x7f0a0018;
- public static final int defeatDialogTitle=0x7f0a0017;
- public static final int donate_button=0x7f0a0056;
- public static final int donation_url=0x7f0a0055;
- public static final int fps_title=0x7f0a0016;
- public static final int highscoreListDescription=0x7f0a000c;
- public static final int highscore_title=0x7f0a001f;
- public static final int hint=0x7f0a001e;
- public static final int holdbuttonstring=0x7f0a000a;
- public static final int level_title=0x7f0a0013;
- public static final int license_url=0x7f0a004c;
- public static final int movespeed_pref_title=0x7f0a002e;
- public static final int musicAuthorNote=0x7f0a0020;
- public static final int music_url=0x7f0a004f;
- public static final int musicvolume_pref_title=0x7f0a0030;
- public static final int pausebutton=0x7f0a0009;
- public static final int playerNameInputFieldHint=0x7f0a000b;
- public static final int pref_accelerationH_summary=0x7f0a0041;
- public static final int pref_accelerationH_title=0x7f0a0042;
- public static final int pref_accelerationV_summary=0x7f0a0043;
- public static final int pref_accelerationV_title=0x7f0a0044;
- public static final int pref_antialiasing_summary=0x7f0a003f;
- public static final int pref_antialiasing_title=0x7f0a0040;
- public static final int pref_author_summary=0x7f0a0050;
- public static final int pref_author_title=0x7f0a0051;
- public static final int pref_author_url=0x7f0a0052;
- /** Advanced Preference Strings
- Advanced Preference Strings
- */
- public static final int pref_button_sound_summary=0x7f0a0035;
- public static final int pref_button_sound_title=0x7f0a0036;
- public static final int pref_category_advanced=0x7f0a005a;
- public static final int pref_category_layout=0x7f0a005b;
- public static final int pref_category_other=0x7f0a0059;
- public static final int pref_category_sound=0x7f0a0057;
- public static final int pref_category_vibration=0x7f0a0058;
- public static final int pref_donate_summary=0x7f0a0054;
- public static final int pref_donate_title=0x7f0a0053;
- public static final int pref_fps_summary=0x7f0a0026;
- public static final int pref_fps_title=0x7f0a0027;
- public static final int pref_fpslimit_summary=0x7f0a0037;
- public static final int pref_fpslimit_title=0x7f0a0038;
- public static final int pref_fpslimittext_default=0x7f0a003b;
- public static final int pref_fpslimittext_summary=0x7f0a0039;
- public static final int pref_fpslimittext_title=0x7f0a003a;
- public static final int pref_help_apm_message=0x7f0a0067;
- public static final int pref_help_apm_summary=0x7f0a0066;
- public static final int pref_help_apm_title=0x7f0a0065;
- public static final int pref_help_fps_message=0x7f0a006a;
- public static final int pref_help_fps_summary=0x7f0a0069;
- public static final int pref_help_fps_title=0x7f0a0068;
- public static final int pref_help_levels_message=0x7f0a0061;
- public static final int pref_help_levels_summary=0x7f0a0060;
- public static final int pref_help_levels_title=0x7f0a005f;
- public static final int pref_help_randomizer_message=0x7f0a006d;
- public static final int pref_help_randomizer_summary=0x7f0a006c;
- public static final int pref_help_randomizer_title=0x7f0a006b;
- public static final int pref_help_resumability_message=0x7f0a0070;
- public static final int pref_help_resumability_summary=0x7f0a006f;
- public static final int pref_help_resumability_title=0x7f0a006e;
- public static final int pref_help_scoring_message=0x7f0a005e;
- public static final int pref_help_scoring_summary=0x7f0a005d;
- /** Help Menu Strings
- Help Menu Strings
- */
- public static final int pref_help_scoring_title=0x7f0a005c;
- public static final int pref_help_vibration_message=0x7f0a0064;
- public static final int pref_help_vibration_summary=0x7f0a0063;
- public static final int pref_help_vibration_title=0x7f0a0062;
- public static final int pref_layoutswap_summary=0x7f0a0045;
- public static final int pref_layoutswap_title=0x7f0a0046;
- public static final int pref_license_music_summary=0x7f0a004d;
- public static final int pref_license_music_title=0x7f0a004e;
- public static final int pref_license_summary=0x7f0a004a;
- public static final int pref_license_title=0x7f0a004b;
- /** Preference Strings
- */
- public static final int pref_phantom_summary=0x7f0a0024;
- public static final int pref_phantom_title=0x7f0a0025;
- public static final int pref_popup_summary=0x7f0a0028;
- public static final int pref_popup_title=0x7f0a0029;
- public static final int pref_rng_summary=0x7f0a002c;
- public static final int pref_rng_title=0x7f0a002a;
- public static final int pref_rngs_default=0x7f0a002b;
- public static final int pref_version_summary=0x7f0a0047;
- public static final int pref_version_title=0x7f0a0048;
- public static final int pref_vibDurOffset_default=0x7f0a003e;
- public static final int pref_vibDurOffset_summary=0x7f0a003c;
- public static final int pref_vibDurOffset_title=0x7f0a003d;
- public static final int pref_vibration_button_summary=0x7f0a0032;
- public static final int pref_vibration_button_title=0x7f0a0031;
- public static final int pref_vibration_events_summary=0x7f0a0034;
- public static final int pref_vibration_events_title=0x7f0a0033;
- public static final int quitButtonString=0x7f0a0008;
- public static final int repository_url=0x7f0a0049;
- public static final int resumeButtonString=0x7f0a0007;
- public static final int scoreLabel=0x7f0a001b;
- public static final int score_title=0x7f0a0012;
- public static final int softdropspeed_pref_title=0x7f0a002d;
- public static final int soundvolume_pref_title=0x7f0a002f;
- public static final int startButtonString=0x7f0a0006;
- public static final int startLevelDialogCancel=0x7f0a000e;
- public static final int startLevelDialogStart=0x7f0a000f;
- public static final int startLevelDialogTitle=0x7f0a000d;
- public static final int tab=0x7f0a0019;
- public static final int timeLabel=0x7f0a001c;
- public static final int time_title=0x7f0a0014;
- public static final int title_activity_about=0x7f0a0022;
- public static final int title_activity_donate=0x7f0a0023;
- public static final int title_activity_game=0x7f0a0010;
- public static final int title_activity_help=0x7f0a0011;
- /** Preference Strings
- */
- public static final int title_activity_settings=0x7f0a0021;
- }
- public static final class style {
- /**
- Base application theme, dependent on API level. This theme is replaced
- by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-
-
- Theme customizations available in newer API levels can go in
- res/values-vXX/styles.xml, while customizations related to
- backward-compatibility can go here.
-
-
- Base application theme for API 11+. This theme completely replaces
- AppBaseTheme from res/values/styles.xml on API 11+ devices.
-
-
- API 11 theme customizations can go here.
-
- Copyright 2013 Simon Willeke
- contact: hamstercount@hotmail.com
-
-
- This file is part of Blockinger.
-
- Blockinger is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Blockinger is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Blockinger. If not, see .
-
- Diese Datei ist Teil von Blockinger.
-
- Blockinger ist Freie Software: Sie können es unter den Bedingungen
- der GNU General Public License, wie von der Free Software Foundation,
- Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren
- veröffentlichten Version, weiterverbreiten und/oder modifizieren.
-
- Blockinger wird in der Hoffnung, dass es nützlich sein wird, aber
- OHNE JEDE GEWÄHELEISTUNG, bereitgestellt; sogar ohne die implizite
- Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.
- Siehe die GNU General Public License für weitere Details.
-
- Sie sollten eine Kopie der GNU General Public License zusammen mit diesem
- Programm erhalten haben. Wenn nicht, siehe .
-
-
- Base application theme for API 14+. This theme completely replaces
- AppBaseTheme from BOTH res/values/styles.xml and
- res/values-v11/styles.xml on API 14+ devices.
-
- API 14 theme customizations can go here.
- */
- public static final int AppBaseTheme=0x7f0b0000;
- /** Application theme.
- All customizations that are NOT specific to a particular API-level can go here.
- */
- public static final int AppTheme=0x7f0b0001;
- public static final int ButtonBar=0x7f0b0003;
- public static final int ButtonBarButton=0x7f0b0004;
- public static final int FullscreenActionBarStyle=0x7f0b0005;
- /** - @style/ButtonBar
-- @style/ButtonBarButton
- */
- public static final int FullscreenTheme=0x7f0b0002;
- }
- public static final class xml {
- public static final int about_menu=0x7f040000;
- public static final int advanced_preferences=0x7f040001;
- public static final int help_menu=0x7f040002;
- public static final int simple_preferences=0x7f040003;
- }
- public static final class styleable {
- /**
- Declare custom theme attributes that allow changing which styles are
- used for button bars depending on the API level.
- ?android:attr/buttonBarStyle is new as of API 11 so this is
- necessary to support previous API levels.
-
-
Includes the following attributes:
-
-
-
- Attribute | Description |
- {@link #ButtonBarContainerTheme_buttonBarButtonStyle org.blockinger.game:buttonBarButtonStyle} | |
- {@link #ButtonBarContainerTheme_buttonBarStyle org.blockinger.game:buttonBarStyle} | |
-
- @see #ButtonBarContainerTheme_buttonBarButtonStyle
- @see #ButtonBarContainerTheme_buttonBarStyle
- */
- public static final int[] ButtonBarContainerTheme = {
- 0x7f010000, 0x7f010001
- };
- /**
- This symbol is the offset where the {@link org.blockinger.game.R.attr#buttonBarButtonStyle}
- attribute's value can be found in the {@link #ButtonBarContainerTheme} array.
-
-
-
Must be a reference to another resource, in the form "@[+][package:]type:name
"
-or to a theme attribute in the form "?[package:][type:]name
".
- @attr name android:buttonBarButtonStyle
- */
- public static final int ButtonBarContainerTheme_buttonBarButtonStyle = 1;
- /**
-
This symbol is the offset where the {@link org.blockinger.game.R.attr#buttonBarStyle}
- attribute's value can be found in the {@link #ButtonBarContainerTheme} array.
-
-
-
Must be a reference to another resource, in the form "@[+][package:]type:name
"
-or to a theme attribute in the form "?[package:][type:]name
".
- @attr name android:buttonBarStyle
- */
- public static final int ButtonBarContainerTheme_buttonBarStyle = 0;
- };
-}
diff --git a/proguard-project.txt b/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/project.properties b/project.properties
deleted file mode 100644
index a3ee5ab..0000000
--- a/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-17
diff --git a/src/org/blockinger/game/activities/MainActivity.java b/src/org/blockinger/game/activities/MainActivity.java
index 68b32cc..d18f818 100644
--- a/src/org/blockinger/game/activities/MainActivity.java
+++ b/src/org/blockinger/game/activities/MainActivity.java
@@ -21,15 +21,15 @@
Diese Datei ist Teil von Blockinger.
- Blockinger ist Freie Software: Sie können es unter den Bedingungen
+ Blockinger ist Freie Software: Sie k�nnen es unter den Bedingungen
der GNU General Public License, wie von der Free Software Foundation,
- Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren
- veröffentlichten Version, weiterverbreiten und/oder modifizieren.
+ Version 3 der Lizenz oder (nach Ihrer Option) jeder sp�teren
+ ver�ffentlichten Version, weiterverbreiten und/oder modifizieren.
- Blockinger wird in der Hoffnung, dass es nützlich sein wird, aber
- OHNE JEDE GEWÄHELEISTUNG, bereitgestellt; sogar ohne die implizite
- Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.
- Siehe die GNU General Public License für weitere Details.
+ Blockinger wird in der Hoffnung, dass es n�tzlich sein wird, aber
+ OHNE JEDE GEW�HELEISTUNG, bereitgestellt; sogar ohne die implizite
+ Gew�hrleistung der MARKTF�HIGKEIT oder EIGNUNG F�R EINEN BESTIMMTEN ZWECK.
+ Siehe die GNU General Public License f�r weitere Details.
Sie sollten eine Kopie der GNU General Public License zusammen mit diesem
Programm erhalten haben. Wenn nicht, siehe .
@@ -37,30 +37,29 @@
package org.blockinger.game.activities;
-import org.blockinger.game.R;
-import org.blockinger.game.components.GameState;
-import org.blockinger.game.components.Sound;
-import org.blockinger.game.db.HighscoreOpenHelper;
-import org.blockinger.game.db.ScoreDataSource;
-
-import android.net.Uri;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
import android.app.AlertDialog;
import android.app.ListActivity;
-import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.support.v4.widget.SimpleCursorAdapter;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
-import android.widget.SeekBar;
import android.widget.Button;
+import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.TextView;
+import org.blockinger.game.R;
+import org.blockinger.game.components.GameState;
+import org.blockinger.game.components.Sound;
+import org.blockinger.game.db.HighscoreOpenHelper;
+import org.blockinger.game.db.ScoreDataSource;
+
public class MainActivity extends ListActivity {
public static final int SCORE_REQUEST = 0x0;
@@ -80,9 +79,7 @@ public class MainActivity extends ListActivity {
private AlertDialog.Builder startLevelDialog;
private AlertDialog.Builder donateDialog;
private int startLevel;
- private View dialogView;
- private SeekBar leveldialogBar;
- private TextView leveldialogtext;
+ private TextView leveldialogtext;
private Sound sound;
@Override
@@ -104,7 +101,7 @@ protected void onCreate(Bundle savedInstanceState) {
// Use the SimpleCursorAdapter to show the
// elements in a ListView
adapter = new SimpleCursorAdapter(
- (Context)this,
+ this,
R.layout.blockinger_list_item,
mc,
new String[] {HighscoreOpenHelper.COLUMN_SCORE, HighscoreOpenHelper.COLUMN_PLAYERNAME},
@@ -184,8 +181,25 @@ public boolean onOptionsItemSelected(MenuItem item) {
return super.onOptionsItemSelected(item);
}
}
+
+ private void persistNickname(){
+ TextView nickNameEditText = (TextView) findViewById(R.id.nicknameEditView);
+ if(null != nickNameEditText){
+ PreferenceManager.getDefaultSharedPreferences(this)
+ .edit().putString(PLAYERNAME_KEY, nickNameEditText.getText().toString()).commit();
+ }
+ }
+
+ private void restoreNickname(){
+ TextView nickNameEditText = (TextView) findViewById(R.id.nicknameEditView);
+ if(null != nickNameEditText){
+ nickNameEditText.setText(PreferenceManager.getDefaultSharedPreferences(this)
+ .getString(PLAYERNAME_KEY, null));
+ }
+ }
public void start() {
+ persistNickname();
Intent intent = new Intent(this, GameActivity.class);
Bundle b = new Bundle();
b.putInt("mode", GameActivity.NEW_GAME); //Your id
@@ -211,26 +225,26 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
public void onClickStart(View view) {
- dialogView = getLayoutInflater().inflate(R.layout.seek_bar_dialog, null);
- leveldialogtext = ((TextView)dialogView.findViewById(R.id.leveldialogleveldisplay));
- leveldialogBar = ((SeekBar)dialogView.findViewById(R.id.levelseekbar));
+ View dialogView = getLayoutInflater().inflate(R.layout.seek_bar_dialog, null);
+ leveldialogtext = ((TextView) dialogView.findViewById(R.id.leveldialogleveldisplay));
+ SeekBar leveldialogBar = ((SeekBar) dialogView.findViewById(R.id.levelseekbar));
leveldialogBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
- @Override
- public void onProgressChanged(SeekBar arg0, int arg1, boolean arg2) {
- leveldialogtext.setText("" + arg1);
- startLevel = arg1;
- }
+ @Override
+ public void onProgressChanged(SeekBar arg0, int arg1, boolean arg2) {
+ leveldialogtext.setText("" + arg1);
+ startLevel = arg1;
+ }
- @Override
- public void onStartTrackingTouch(SeekBar arg0) {
- }
+ @Override
+ public void onStartTrackingTouch(SeekBar arg0) {
+ }
- @Override
- public void onStopTrackingTouch(SeekBar arg0) {
- }
-
- });
+ @Override
+ public void onStopTrackingTouch(SeekBar arg0) {
+ }
+
+ });
leveldialogBar.setProgress(startLevel);
leveldialogtext.setText("" + startLevel);
startLevelDialog.setView(dialogView);
@@ -238,6 +252,7 @@ public void onStopTrackingTouch(SeekBar arg0) {
}
public void onClickResume(View view) {
+ persistNickname();
Intent intent = new Intent(this, GameActivity.class);
Bundle b = new Bundle();
b.putInt("mode", GameActivity.RESUME_GAME); //Your id
@@ -272,6 +287,7 @@ protected void onDestroy() {
@Override
protected void onResume() {
super.onResume();
+ restoreNickname();
sound.setInactive(false);
sound.resume();
datasource.open();
@@ -279,10 +295,10 @@ protected void onResume() {
adapter.changeCursor(cursor);
if(!GameState.isFinished()) {
- ((Button)findViewById(R.id.resumeButton)).setEnabled(true);
+ findViewById(R.id.resumeButton).setEnabled(true);
((Button)findViewById(R.id.resumeButton)).setTextColor(getResources().getColor(R.color.square_error));
} else {
- ((Button)findViewById(R.id.resumeButton)).setEnabled(false);
+ findViewById(R.id.resumeButton).setEnabled(false);
((Button)findViewById(R.id.resumeButton)).setTextColor(getResources().getColor(R.color.holo_grey));
}
};