Skip to content

CheckPuzzle solved? #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

CheckPuzzle solved? #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
54c0b09
Renamed package, use full width for the puzzle.
May 13, 2012
63993ef
TileSlicer refactoring and decrease memory consumption
May 13, 2012
2b8ba7d
borders to tiles
May 13, 2012
077b7fc
refactoring, commenting
May 13, 2012
2f19f71
better click handling
May 14, 2012
294a22e
actionbarsherlock integration
May 14, 2012
9dcbba3
About screen, new icon, refactoring for making saving state possible
May 14, 2012
cac7ee2
preserving tile order when orientation changes
May 14, 2012
d835571
greatly improved responsivness of drag
May 14, 2012
443c771
gray background, better click detection
May 14, 2012
246f479
for SDK < 11
May 14, 2012
7c8ed7a
proper click handling on Android 2.3
May 14, 2012
fff70af
final cleaning
May 14, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
66 changes: 33 additions & 33 deletions .project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>SliderPuzzle</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Slider Puzzle</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
6 changes: 2 additions & 4 deletions .settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.source=1.5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.processAnnotations=disabled
15 changes: 11 additions & 4 deletions AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tackmobile"
package="cz.destil.sliderpuzzle"
android:versionCode="1"
android:versionName="1.0" >

<uses-sdk android:minSdkVersion="12" />
<uses-sdk
android:minSdkVersion="7"
android:targetSdkVersion="15" />

<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar">
android:theme="@style/Theme.Sherlock.ForceOverflow" >
<activity
android:name=".SliderPuzzleActivity"
android:name=".ui.MainActivity"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:name=".ui.AboutActivity"
android:label="@string/about" >
</activity>
</application>

</manifest>
3 changes: 2 additions & 1 deletion project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
# project structure.

# Project target.
target=android-12
target=android-15
android.library.reference.1=..\\\\\\\\ActionBarSherlock\\\\\\\\library
Binary file added readme.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified res/drawable-hdpi/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/settle_up.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/drawable-ldpi/ic_launcher.png
View file
Open in desktop
Binary file not shown.
Binary file modified res/drawable-mdpi/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions res/layout/activity_about.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="5dp" >

<TextView
android:id="@+id/created_by"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/created_by" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="@string/opensource_used" />

<TextView
android:id="@+id/project2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/project1" />

<TextView
android:id="@+id/project1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/project2" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="@string/check_out" />

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/settle_up"
android:src="@drawable/settle_up" />

<TextView
android:id="@+id/settle_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settle_up" />

</LinearLayout>
14 changes: 14 additions & 0 deletions res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:padding="5dp" >

<cz.destil.sliderpuzzle.ui.GameBoardView
android:id="@+id/gameboard"
android:layout_width="match_parent"
android:layout_height="match_parent" >
</cz.destil.sliderpuzzle.ui.GameBoardView>

</LinearLayout>
9 changes: 0 additions & 9 deletions res/layout/main.xml
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions res/menu/main_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >

<item
android:id="@+id/new_game"
android:showAsAction="never"
android:title="@string/new_game"/>
<item
android:id="@+id/about"
android:showAsAction="never"
android:title="@string/about"/>

</menu>
6 changes: 6 additions & 0 deletions res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<color name="background">#3b3b3b</color>

</resources>
21 changes: 18 additions & 3 deletions res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<string name="hello">Hello World, SliderPuzzleActivity!</string>
<string name="app_name">SliderPuzzle</string>

<!-- Application name -->
<string name="app_name">Slider Puzzle</string>
<!-- Main menu item for starting new game -->
<string name="new_game">New Game</string>
<!-- Main menu item for launching about screen -->
<string name="about">About</string>
<!-- First text in about screen -->
<string name="created_by">This app was created by &lt;a href="http://www.destil.cz">David Vávra&lt;/a>.</string>
<!-- Second text in about screen -->
<string name="opensource_used">The following open-source projects were used:</string>
<!-- First opensource project in about screen -->
<string name="project1">- &lt;a href="https://github.com/thillerson/Android-Slider-Puzzle">Android-Slider-Puzzle&lt;/a> by Tony Hillerson (MIT License)</string>
<!-- Second opensource project in about screen -->
<string name="project2">- &lt;a href="http://actionbarsherlock.com/">ActionBarSherlock&lt;/a> by Jake Wharton (Apache License)</string>
<!-- Third text in about screen -->
<string name="check_out">Check out my most successful app:</string>
<!-- Link to the app Settle Up in about screen -->
<string name="settle_up">&lt;a href="https://play.google.com/store/apps/details?id=cz.destil.settleup">Settle Up&lt;/a</string>
</resources>
55 changes: 0 additions & 55 deletions src/com/tackmobile/GameTile.java
View file
Open in desktop

This file was deleted.

Loading