banvor/android_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'devel'

Browse Source
This commit is contained in:
Vahagn Khachatryan
2014-12-21 23:18:29 +04:00
parent 6c59f740f0 f7d527a6e9
commit a4b86a7df5
64 changed files with 592 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -7,13 +7,15 @@ arch
nbandroid
private
build
res/values/version.xml
app/src/main/res/values/version.xml
compiler/compiler.obj
compiler/compiler.exe
compiler/test/compiler.exe
compiler/puzzles.bin
local.properties
import-summary.txt
.keystore.jks
.secret.gradle
*.swp

18
app/app.iml
View File

@@ -15,7 +15,7 @@
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest-debug.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
@@ -50,13 +50,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/tests/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/tests/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/tests/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/tests/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/tests/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/tests/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/tests/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/art" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -77,6 +78,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 10 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />

78
app/build.gradle
View File

@@ -1,23 +1,97 @@
apply plugin: 'com.android.application'
//
// Creates version.xml
//
task createVersionXML {
doLast {
def versionP = 'git describe --tags --long --dirty=-x --abbrev=8'
.execute()
def version = versionP.text.trim()
if ( versionP.exitValue() )
throw new GradleException("Couldn't extract version. Git exited unexpectedly.")
def githashP = 'git rev-parse HEAD'.execute()
def githash = githashP.text.trim()
if ( githashP.exitValue() )
throw new GradleException("Couldn't extract git_hash. Git exited unexpectedly.")
def builddate = new Date()
def versionFile = new FileWriter("app/src/main/res/values/version.xml")
versionFile.println( '<?xml version="1.0" encoding="utf-8"?>' )
versionFile.println( '<resources>' )
versionFile.println( '<string name="git_version">' << version << '</string>' )
versionFile.println( '<string name="git_hash">' << githash << '</string>' )
versionFile.println( '<string name="build_date">' << builddate << '</string>' )
versionFile.println( '<string name="version_code">0x00010001</string>' )
versionFile.println( '</resources>' )
versionFile.close()
}
}
preBuild.dependsOn createVersionXML
//
// Convert SVG images from art directory into PNG files.
//
task generateDrawablesFromArt {
doLast {
def buildDir = (new File(project.buildDir,'art')).toString()
def p = ('make -C app/src/main/art RES=../res TMP='+buildDir).execute()
p.consumeProcessOutput()
p.waitFor()
if ( p.exitValue() )
throw new GradleException("Generation of art failed.")
}
}
preBuild.dependsOn generateDrawablesFromArt
android {
compileSdkVersion 10
buildToolsVersion "21.1.1"
defaultConfig {
applicationId "org.dyndns.vahagn.sokoban"
applicationId "org.vostan.sokoban"
minSdkVersion 10
targetSdkVersion 14
}
apply from: new File(getRootDir(),'/.secret.gradle')
buildTypes {
release {
runProguard true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
signingConfig signingConfigs.sokoban_release
}
debug {
applicationIdSuffix ".debug"
}
}
sourceSets {
/*
main {
java.srcDirs = ['src']
resources.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
*/
debug {
main.manifest.srcFile "src/main/AndroidManifest-debug.xml"
}
androidTest.setRoot("src/tests")
}
}
//repositories {}
dependencies {
compile 'com.android.support:support-v4:18.0.0'
}

30
app/src/main/AndroidManifest-debug.xml Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.vostan.sokoban"
android:versionCode="@string/version_code"
android:versionName="@string/git_version">
<uses-sdk android:minSdkVersion="10"
android:targetSdkVersion="14"/>
<application android:label="@string/app_name_debug"
android:icon="@drawable/icon_debug"
android:name="org.vostan.sokoban.App"
android:theme="@android:style/Theme">
<activity android:name="org.vostan.sokoban.menu.MainActivity"
android:label="@string/app_name_debug"
android:configChanges="keyboardHidden|orientation"
android:screenOrientation="portrait" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="org.vostan.sokoban.play.PlayActivity"
android:label="@string/play_activity"
android:configChanges="keyboardHidden|orientation"
android:screenOrientation="portrait" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.vostan.sokoban.MainMenu" />
</activity>
</application>
</manifest>

10
app/src/main/AndroidManifest.xml
View File

@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.dyndns.vahagn.sokoban"
package="org.vostan.sokoban"
android:versionCode="0x00010001"
android:versionName="@string/git_version">
<uses-sdk android:minSdkVersion="10"
android:targetSdkVersion="14"/>
<application android:label="@string/app_name"
android:icon="@drawable/icon"
android:name="org.dyndns.vahagn.sokoban.App"
android:name="org.vostan.sokoban.App"
android:theme="@android:style/Theme">
<activity android:name="org.dyndns.vahagn.sokoban.menu.MainActivity"
<activity android:name="org.vostan.sokoban.menu.MainActivity"
android:label="@string/app_name"
android:configChanges="keyboardHidden|orientation"
android:screenOrientation="portrait" >
@@ -18,13 +18,13 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="org.dyndns.vahagn.sokoban.play.PlayActivity"
<activity android:name="org.vostan.sokoban.play.PlayActivity"
android:label="@string/play_activity"
android:configChanges="keyboardHidden|orientation"
android:screenOrientation="portrait" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.dyndns.vahagn.sokoban.MainMenu" />
android:value="org.vostan.sokoban.MainMenu" />
</activity>
</application>
</manifest>

100
app/src/main/art/Makefile Normal file
View File

@@ -0,0 +1,100 @@
XMLS = xmlstarlet ed -P -N svg=http://www.w3.org/2000/svg
LAYER_ON = -u //*/svg:g[@inkscape:label=\"$(1)\"]/@style -v display:inline
LAYER_OFF = -u //*/svg:g[@inkscape:label=\"$(1)\"]/@style -v display:none
S2P = inkscape --without-gui
SIZE = --export-width=$(1) --export-height=$(2)
#S2P = imagemagick -background none
#SIZE = -resize $(1)x$(2)
TMP = tmp
RES = res
DIR = $(TMP) $(RES) $(RES)/drawable $(RES)/drawable-ldpi \
$(RES)/drawable-mdpi $(RES)/drawable-hdpi $(RES)/drawable-xhdpi
png = bingo.png box.png floor.png goal.png splash.png \
wall.png worker.png worker_select.png
pngx = icon.png icon_debug.png next.png prev.png reset.png undo.png \
lock.png unlock.png unlocking.png
all: $(DIR)\
$(addprefix $(RES)/drawable/,$(png)) \
$(addprefix $(RES)/drawable-ldpi/,$(pngx)) \
$(addprefix $(RES)/drawable-mdpi/,$(pngx)) \
$(addprefix $(RES)/drawable-hdpi/,$(pngx)) \
$(addprefix $(RES)/drawable-xhdpi/,$(pngx))
$(DIR) :
mkdir $@
$(RES)/drawable/%.png : $(TMP)/%.svg
$(S2P) --export-png=$@ --file=$<
$(RES)/drawable-ldpi/%.png : $(TMP)/%.svg
$(S2P) $(call SIZE,36,36) --export-png=$@ --file=$<
$(RES)/drawable-mdpi/%.png : $(TMP)/%.svg
$(S2P) $(call SIZE,48,48) --export-png=$@ --file=$<
$(RES)/drawable-hdpi/%.png : $(TMP)/%.svg
$(S2P) $(call SIZE,72,72) --export-png=$@ --file=$<
$(RES)/drawable-xhdpi/%.png : $(TMP)/%.svg
$(S2P) $(call SIZE,96,96) --export-png=$@ --file=$<
$(TMP)/%.svg : %.svg
cp $< $@
$(TMP)/icon.svg : icon.svg
$(XMLS) $(call LAYER_OFF,"Debug") $< > $@
$(TMP)/icon_debug.svg : icon.svg
$(XMLS) $(call LAYER_ON,"Debug") $< > $@
$(TMP)/worker.svg : worker.svg
$(XMLS) $(call LAYER_OFF,"Hands") $< > $@
$(TMP)/worker_select.svg : worker.svg
$(XMLS) $(call LAYER_ON,"Hands") $< > $@
$(TMP)/floor.svg : floor.svg
$(XMLS) $(call LAYER_OFF,"Goal") $< > $@
$(TMP)/goal.svg : floor.svg
$(XMLS) $(call LAYER_ON,"Goal") $< > $@
$(TMP)/lock.svg : lock.svg
$(XMLS) $(call LAYER_ON,"lock") $< > $@
$(TMP)/unlock.svg : lock.svg
$(XMLS) $(call LAYER_ON,"unlock") $< > $@
$(TMP)/unlocking.svg : lock.svg
$(XMLS) $(call LAYER_ON,"unlocking") $< > $@
$(TMP)/prev.svg : buttons.svg
$(XMLS) $(call LAYER_ON,"Prev Smooth") $< > $@
$(TMP)/next.svg : buttons.svg
$(XMLS) $(call LAYER_ON,"Next Smooth") $< > $@
$(TMP)/reset.svg : buttons.svg
$(XMLS) $(call LAYER_ON,"Reset Smooth") $< > $@
$(TMP)/undo.svg : buttons.svg
$(XMLS) $(call LAYER_ON,"Undo Smooth") $< > $@
# def cfg = 'imagemagick -background none -resize '+w+'x'+h+' - ' + png
# def sizes = [ 'ldpi':[36,36],
# 'mdpi':[48,48],
# 'hdpi':[72,72],
# 'xhdpi':[96,96] ]
# def sizes2= [ 'ldpi':[22,36],
# 'mdpi':[29,48],
# 'hdpi':[43,72],
# 'xhdpi':[58,96] ]

111
art/bingo.svg → app/src/main/art/bingo.svg
View File

@@ -9,11 +9,11 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="744.09448819"
height="1052.3622047"
width="500"
height="500"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
inkscape:version="0.48.5 r10040"
sodipodi:docname="bingo.svg"
inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\art\bingo.png"
inkscape:export-xdpi="89.873062"
@@ -27,21 +27,25 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4283557"
inkscape:cx="534.28726"
inkscape:cy="478.14229"
inkscape:zoom="0.71417785"
inkscape:cx="153.09914"
inkscape:cy="72.742182"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:snap-global="false"
inkscape:window-width="1920"
inkscape:window-height="1018"
inkscape:window-x="-8"
inkscape:window-width="1680"
inkscape:window-height="1028"
inkscape:window-x="1672"
inkscape:window-y="-8"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid3079" />
id="grid3079"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<metadata
id="metadata7">
@@ -51,115 +55,116 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
id="layer1"
transform="translate(0,-552.36217)">
<rect
style="opacity:0.94999999999999996;fill:#008000"
style="opacity:0.95;fill:#008000"
id="rect2985"
width="500"
height="500"
x="155.03543"
y="312.52313" />
x="-0.22199483"
y="552.52313" />
<rect
style="opacity:0.95;fill:#d3bc5f"
id="rect2987"
width="36.633663"
height="29.702971"
x="172.27722"
y="315.72852" />
x="17.019796"
y="555.72852" />
<rect
style="opacity:0.94999999999999996;fill:#005800"
style="opacity:0.95;fill:#005800"
id="rect2989"
width="500"
height="60"
x="154.8604"
y="312.4631" />
x="-0.39702842"
y="552.46313" />
<rect
style="opacity:0.94999999999999996;fill:#74e400"
style="opacity:0.95;fill:#74e400"
id="rect2989-1"
width="500"
height="60"
x="154.83038"
y="374.60233" />
x="-0.42704245"
y="614.60229" />
<rect
style="opacity:0.94999999999999996;fill:#00b800"
style="opacity:0.95;fill:#00b800"
id="rect2989-7"
width="500"
height="60"
x="154.83038"
y="437.21365" />
x="-0.42704245"
y="677.21362" />
<rect
style="opacity:0.94999999999999996;fill:#8cec00"
style="opacity:0.95;fill:#8cec00"
id="rect2989-4"
width="500"
height="60"
x="154.89044"
y="501.00992" />
x="-0.36698386"
y="741.00989" />
<rect
style="opacity:0.94999999999999996;fill:#0cc800"
style="opacity:0.95;fill:#0cc800"
id="rect2989-0"
width="500"
height="60"
x="154.7352"
y="563.52155" />
x="-0.52222675"
y="803.52155" />
<rect
style="opacity:0.94999999999999996;fill:#00b800"
style="opacity:0.95;fill:#00b800"
id="rect2989-9"
width="500"
height="60"
x="154.90704"
y="626.67078" />
x="-0.3503823"
y="866.67078" />
<rect
style="opacity:0.94999999999999996;fill:#b8f800"
style="opacity:0.95;fill:#b8f800"
id="rect2989-48"
width="500"
height="60"
x="155.0099"
y="690.15588" />
x="-0.24752279"
y="930.15588" />
<rect
style="opacity:0.94999999999999996;fill:#085a02;fill-opacity:0.99607843"
style="opacity:0.95;fill:#085a02;fill-opacity:0.99607843"
id="rect2989-8"
width="500"
height="60"
x="154.81058"
y="752.48291" />
x="-0.44684836"
y="992.48291" />
<rect
style="opacity:0.94999999999999996;fill:#006000"
style="opacity:0.95;fill:#006000"
id="rect2989-2"
width="624.62427"
height="75.683846"
x="-354.92532"
y="650.10168"
x="-628.29071"
y="712.52856"
transform="matrix(0.71278139,-0.70138626,0.63422998,0.77314444,0,0)" />
<rect
style="opacity:0.94999999999999996;fill:#007400"
style="opacity:0.95;fill:#007400"
id="rect2989-45"
width="622.96442"
height="75.746498"
x="363.81247"
y="83.598946"
x="391.40414"
y="365.3205"
transform="matrix(0.7165534,0.69753224,-0.62128484,0.7835848,0,0)" />
<rect
style="opacity:0.94999999999999996;fill:#078300;fill-opacity:1"
style="opacity:0.95;fill:#078300;fill-opacity:1"
id="rect2989-5"
width="499.99573"
height="59.964287"
x="-812.56342"
y="594.79266"
x="-1052.5729"
y="439.54987"
transform="matrix(7.1424932e-5,-1,1,7.1508806e-5,0,0)" />
<rect
style="opacity:0.94999999999999996;fill:#008400"
style="opacity:0.95;fill:#008400"
id="rect2989-17"
width="499.84061"
height="58.686657"
x="-811.9231"
y="157.13138"
x="-1052.3495"
y="2.5042763"
transform="matrix(0.00262797,-0.99999655,0.99999623,0.00274515,0,0)" />
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

95
art/box.svg → app/src/main/art/box.svg
View File

@@ -9,11 +9,11 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="744.09448819"
height="1052.3622047"
width="500"
height="500"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
inkscape:version="0.48.5 r10040"
sodipodi:docname="box.svg"
inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\art\box.png"
inkscape:export-xdpi="89.873062"
@@ -27,21 +27,25 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4283557"
inkscape:cx="313.36866"
inkscape:cy="490.25008"
inkscape:zoom="1.1301775"
inkscape:cx="56.319409"
inkscape:cy="241.66791"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:snap-global="false"
inkscape:window-width="1920"
inkscape:window-height="1018"
inkscape:window-x="-8"
inkscape:window-width="1680"
inkscape:window-height="1028"
inkscape:window-x="1672"
inkscape:window-y="-8"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid3079" />
id="grid3079"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<metadata
id="metadata7">
@@ -58,108 +62,109 @@
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
id="layer1"
transform="translate(0,-552.36217)">
<rect
style="opacity:0.94999999999999996;fill:#a0892c"
style="opacity:0.95;fill:#a0892c"
id="rect2985"
width="500"
height="500"
x="155.03543"
y="312.52313" />
x="-0.12822925"
y="552.77655" />
<rect
style="opacity:0.95;fill:#d3bc5f"
id="rect2987"
width="36.633663"
height="29.702971"
x="172.27722"
y="315.72852" />
x="17.113562"
y="555.98193" />
<rect
style="opacity:0.95;fill:#aa8800"
id="rect2989"
width="500"
height="60"
x="154.8604"
y="312.4631" />
x="-0.3032628"
y="552.71649" />
<rect
style="opacity:0.95;fill:#ffcc00"
id="rect2989-1"
width="500"
height="60"
x="154.83038"
y="374.60233" />
x="-0.33327684"
y="614.85571" />
<rect
style="opacity:0.94999999999999996;fill:#ffdd55"
style="opacity:0.95;fill:#ffdd55"
id="rect2989-7"
width="500"
height="60"
x="154.83038"
y="437.21365" />
x="-0.33327684"
y="677.46704" />
<rect
style="opacity:0.94999999999999996;fill:#d3bc5f;stroke:none"
style="opacity:0.95;fill:#d3bc5f;stroke:none"
id="rect2989-4"
width="500"
height="60"
x="154.89044"
y="501.00992" />
x="-0.27321824"
y="741.26331" />
<rect
style="opacity:0.94999999999999996;fill:#ffd42a"
style="opacity:0.95;fill:#ffd42a"
id="rect2989-0"
width="500"
height="60"
x="154.7352"
y="563.52155" />
x="-0.42846116"
y="803.77496" />
<rect
style="opacity:0.94999999999999996;fill:#d3bc5f"
style="opacity:0.95;fill:#d3bc5f"
id="rect2989-9"
width="500"
height="60"
x="154.90704"
y="626.67078" />
x="-0.25661668"
y="866.92419" />
<rect
style="opacity:0.95;fill:#ffd42a"
id="rect2989-48"
width="500"
height="60"
x="155.0099"
y="690.15588" />
x="-0.1537572"
y="930.4093" />
<rect
style="opacity:0.95;fill:#aa8800"
id="rect2989-8"
width="500"
height="60"
x="154.81058"
y="752.48291" />
x="-0.35308275"
y="992.73633" />
<rect
style="opacity:0.94999999999999996;fill:#a0892c"
style="opacity:0.95;fill:#a0892c"
id="rect2989-2"
width="624.62427"
height="75.683846"
x="-354.92532"
y="650.10168"
x="-628.38"
y="712.7757"
transform="matrix(0.71278139,-0.70138626,0.63422998,0.77314444,0,0)" />
<rect
style="opacity:0.95;fill:#aa8800"
id="rect2989-45"
width="622.96442"
height="75.746498"
x="363.81247"
y="83.598946"
x="391.63779"
y="365.43744"
transform="matrix(0.7165534,0.69753224,-0.62128484,0.7835848,0,0)" />
<rect
style="opacity:0.95;fill:#d4aa00"
id="rect2989-5"
width="499.99573"
height="59.964287"
x="-812.56342"
y="594.79266"
x="-1052.8279"
y="439.64618"
transform="matrix(7.1424932e-5,-1,1,7.1508806e-5,0,0)" />
<rect
style="opacity:0.95;fill:#d4aa00"
id="rect2989-17"
width="499.84061"
height="58.686657"
x="-811.9231"
y="157.13138"
x="-1052.6016"
y="2.5996311"
transform="matrix(0.00262797,-0.99999655,0.99999623,0.00274515,0,0)" />
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

20
art/undo_reset.svg → app/src/main/art/buttons.svg
View File

@@ -14,8 +14,8 @@
height="500"
id="svg3081"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="undo_reset.svg"
inkscape:version="0.48.5 r10040"
sodipodi:docname="buttons.svg"
inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\res\drawable-xhdpi\prev.png"
inkscape:export-xdpi="17.280001"
inkscape:export-ydpi="17.280001">
@@ -27,15 +27,15 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.29"
inkscape:cx="306.39531"
inkscape:cx="128.10073"
inkscape:cy="230.02585"
inkscape:document-units="px"
inkscape:current-layer="layer4"
inkscape:current-layer="g4047"
showgrid="true"
inkscape:snap-global="false"
inkscape:window-width="1920"
inkscape:window-height="1018"
inkscape:window-x="-8"
inkscape:window-width="1680"
inkscape:window-height="1028"
inkscape:window-x="1672"
inkscape:window-y="-8"
inkscape:window-maximized="1"
showguides="true"
@@ -243,7 +243,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -322,7 +322,7 @@
sodipodi:insensitive="true"
inkscape:groupmode="layer"
id="g4047"
inkscape:label="Undo Smoth"
inkscape:label="Undo Smooth"
transform="translate(0,-552.36217)"
style="display:none">
<path
@@ -348,7 +348,7 @@
inkscape:groupmode="layer"
id="g4075"
inkscape:label="Prev Smooth"
style="display:inline">
style="display:none">
<path
transform="matrix(-1,0,0,1,507.80184,-0.31875)"
style="fill:#ffe680;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3837)"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

22
art/floor.svg → app/src/main/art/floor.svg
View File

@@ -14,7 +14,7 @@
height="500"
id="svg3081"
version="1.1"
inkscape:version="0.48.4 r9939"
inkscape:version="0.48.5 r10040"
sodipodi:docname="floor.svg"
inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\res\drawable\goal.png"
inkscape:export-xdpi="90"
@@ -22,10 +22,9 @@
<defs
id="defs3083">
<linearGradient
inkscape:collect="always"
id="linearGradient4035">
<stop
style="stop-color:#44aa00;stop-opacity:1;"
style="stop-color:#44aa00;stop-opacity:0.45535713;"
offset="0"
id="stop4037" />
<stop
@@ -111,8 +110,8 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.3"
inkscape:cx="210.43303"
inkscape:zoom="0.83972969"
inkscape:cx="-95.341037"
inkscape:cy="280.19905"
inkscape:document-units="px"
inkscape:current-layer="layer5"
@@ -122,7 +121,10 @@
inkscape:window-height="1018"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1">
inkscape:window-maximized="1"
borderlayer="true"
inkscape:showpageshadow="false"
showborder="true">
<inkscape:grid
type="xygrid"
id="grid3093"
@@ -139,7 +141,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -253,9 +255,9 @@
inkscape:groupmode="layer"
id="layer5"
inkscape:label="Goal"
style="opacity:0.33628319;display:inline">
style="opacity:1;display:inline">
<rect
style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none"
style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none;opacity:0.59292035"
id="rect3827"
width="676.15387"
height="617.69232"
@@ -266,7 +268,7 @@
inkscape:export-ydpi="90" />
<path
sodipodi:type="arc"
style="fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none"
style="fill:#008000;fill-opacity:0.28042328000000000;fill-rule:nonzero;stroke:none;opacity:0.6460177"
id="path4025"
sodipodi:cx="241.15384"
sodipodi:cy="251.92308"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

95
art/icon.svg → app/src/main/art/icon.svg
View File

@@ -15,8 +15,8 @@
height="500"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="icon_debug.svg"
inkscape:version="0.48.5 r10040"
sodipodi:docname="icon.svg"
enable-background="new"
inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\res\drawable-xhdpi\icon_debug.png"
inkscape:export-xdpi="17.280001"
@@ -203,7 +203,7 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.19"
inkscape:cx="351.60858"
inkscape:cx="27.238825"
inkscape:cy="201.98681"
inkscape:document-units="px"
inkscape:current-layer="layer6"
@@ -213,8 +213,8 @@
inkscape:snap-global="true"
inkscape:object-nodes="false"
inkscape:snap-intersection-paths="false"
inkscape:window-width="1920"
inkscape:window-height="1018"
inkscape:window-width="1680"
inkscape:window-height="988"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
@@ -237,7 +237,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -318,6 +318,28 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
</g>
<g
inkscape:groupmode="layer"
id="layer6"
inkscape:label="Debug"
style="display:inline"
sodipodi:insensitive="true">
<g
id="g3905"
transform="matrix(2.2212804,0,0,2.3274208,-529.54915,-235.51353)"
style="fill:#ff0000;fill-opacity:0.36507939;stroke:none">
<path
id="Selection #4"
d="m 264.53125,126.46875 c -4.33805,-0.0576 -8.61719,3.71125 -8.125,12.53125 0.66,11.68 3.4825,24.69 9.0625,35 3.66634,9.32507 13.0186,14.43224 17.5625,21.4375 1.59,2.61 1.38125,6.5725 1.28125,9.5625 -0.05,1.84 -0.10625,4.0975 -1.15625,5.6875 -1.6,2.38 1.3125,3 -8.6875,3 l -25,0 c -10,0 -10,15 0,15 l 30,0 c 6.4,0.16 7.77,-0.13875 8,8.28125 0.13,4.84 -8.2625,9.5325 -12.0625,11.8125 -15.25031,9.72362 -23.93379,21.43976 -26.625,38.21875 -0.87,5.55 -2.44125,14.81 3.96875,17.25 3.96,1.51 8.89375,-0.255 10.34375,-4.375 L 265.625,284 c 7.68921,-14.25194 18.84375,-25.3125 28.84375,-25.3125 l 5,0 c 5,5 32.4,31.41 45,35 l 0,-75 c 0,-4.214 2.66703,-6.64779 5.75,-7.3125 0.54062,-0.11656 1.10201,-0.18026 1.65625,-0.1875 0.30775,-0.004 0.63136,0.002 0.9375,0.0312 0.0106,10e-4 0.0207,-0.001 0.0312,0 0.0533,0.005 0.10307,0.0248 0.15625,0.0312 0.23376,0.0298 0.48871,0.0754 0.71875,0.125 0.25757,0.0547 0.49953,0.108 0.75,0.1875 2.74711,0.88121 4.96875,3.26291 4.96875,7.125 l 0,75 c 12.6,-3.59 40,-30 45,-35 l 5,0 c 10,0 21.15454,11.06056 28.84375,25.3125 l 2.53125,15.875 c 1.45,4.12 6.38375,5.885 10.34375,4.375 6.41,-2.44 4.83875,-11.7 3.96875,-17.25 -2.69121,-16.77899 -11.37469,-28.49513 -26.625,-38.21875 -3.8,-2.28 -12.1925,-6.9725 -12.0625,-11.8125 0.23,-8.42 1.6,-8.12125 8,-8.28125 l 30,0 c 10,0 10,-15 0,-15 l -25,0 c -10,0 -7.0875,-0.62 -8.6875,-3 -1.05,-1.59 -1.10625,-3.8475 -1.15625,-5.6875 -0.1,-2.99 -0.30875,-6.9525 1.28125,-9.5625 4.5439,-7.00526 13.89616,-12.11243 17.5625,-21.4375 5.58,-10.31 8.4025,-23.32 9.0625,-35 0.49219,-8.82 -3.78695,-12.58885 -8.125,-12.53125 -2.27231,0.0302 -4.565,1.12031 -6.1875,3.0625 C 430.998,132.15125 431.58,140.96 431,145 c -2.22,15.45 -1.515,17.41 -11.625,30 -14.89167,14.29404 -39.82403,21.40669 -64.90625,21.71875 l 0,-0.0312 c -0.83523,0.0197 -1.66396,0.0266 -2.5,0.0312 -0.84123,-0.005 -1.69083,-0.0114 -2.53125,-0.0312 l 0,0.0312 C 324.36577,196.4012 299.41676,189.28813 284.53125,175 c -10.11,-12.59 -9.405,-14.55 -11.625,-30 -0.58,-4.04 0.002,-12.84875 -2.1875,-15.46875 -1.6225,-1.94219 -3.91519,-3.03235 -6.1875,-3.0625 z"
style="fill:#ff0000;fill-opacity:0.36507939;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3862"
d="m 347.65625,103.34375 c -9.48344,2.07571 -16.71892,10.22816 -17.5,20.21875 -17.80948,5.15553 -30.125,16.29235 -30.125,29.1875 0,17.80423 23.48386,32.21875 52.46875,32.21875 28.98489,0 52.46875,-14.41452 52.46875,-32.21875 0,-12.93887 -12.4054,-24.08642 -30.3125,-29.21875 -0.7555,-9.49386 -7.35456,-17.32688 -16.15625,-19.84375 4.12235,2.1741 6.9375,6.61131 6.9375,11.71875 0,7.25653 -5.69061,13.125 -12.71875,13.125 -7.02814,0 -12.71875,-5.86847 -12.71875,-13.125 0,-5.392 3.1563,-10.03743 7.65625,-12.0625 z"
style="fill:#ff0000;fill-opacity:0.36507939;stroke:none"
inkscape:connector-curvature="0" />
</g>
</g>
<g
inkscape:groupmode="layer"
id="layer2"
@@ -350,15 +372,15 @@
height="189.63731"
width="194.64587"
id="rect4119"
style="fill:#ffd42a;fill-opacity:1;stroke:none;display:inline" />
style="fill:#ffd42a;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path4121"
d="m 342.65518,239.83473 -39.6072,39.94872 194.64588,-1e-5 -39.93747,-39.89529 z"
style="fill:#ff9600;fill-opacity:1;stroke:none;display:inline" />
style="fill:#ff9600;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
<path
style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
style="fill:#ffb82a;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 302.35841,279.78344 32.71853,0 -0.67621,188.90069 -31.92777,0 z"
id="path4184"
inkscape:connector-curvature="0"
@@ -368,9 +390,9 @@
inkscape:connector-curvature="0"
id="path4186"
d="m 464.97533,279.78344 32.71853,0 -0.0305,188.90069 -32.36559,0 z"
style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
style="fill:#ffb82a;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
<path
style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1"
style="fill:#ffc52a;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1"
d="m 302.47296,280.191 195.19042,0 0,30.87636 -195.19042,0 z"
id="rect4190"
inkscape:connector-curvature="0"
@@ -380,54 +402,54 @@
inkscape:connector-curvature="0"
id="path4193"
d="m 302.47296,437.80778 195.19042,0 0,30.87635 -195.19042,0 z"
style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1" />
style="fill:#ffc52a;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1" />
<rect
style="fill:#ffdd55;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
style="fill:#ffdd55;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
id="rect4195-4"
width="32.343575"
height="126.74043"
x="367.3085"
y="311.06735" />
<rect
style="fill:#ffcc00;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
id="rect4195"
width="32.343575"
height="126.74043"
x="334.965"
y="311.06738" />
<rect
style="fill:#ffcc00;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
id="rect4195-9"
width="32.343575"
height="126.74043"
x="432.68518"
y="311.06735" />
<path
style="fill:#ffba08;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-opacity:1;display:inline"
style="fill:#ffba08;fill-opacity:1;fill-rule:nonzero;stroke:#ffa600;stroke-width:1.18690801;stroke-opacity:1;display:inline"
d="m 309.96367,311.08035 138.05026,126.73752 44.73381,0 -138.05027,-126.73752 z"
id="rect4222-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#fab826;fill-opacity:1;stroke:#ffaf00;stroke-width:1.18690801;stroke-opacity:1"
style="fill:#fab826;fill-opacity:1;fill-rule:nonzero;stroke:#ffaf00;stroke-width:1.18690801;stroke-opacity:1"
d="m 445.72641,311.08035 -135.83535,126.73752 44.33437,0 135.83538,-126.73752 z"
id="rect4222"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#aa4400;stroke:none"
style="fill:#aa4400;fill-rule:nonzero;stroke:none"
d="m 364.06882,239.84466 -27.85671,40.34634 31.10207,0 17.00384,-40.33693 z"
id="path5801"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#ff6600;stroke:none"
style="fill:#ff6600;fill-rule:nonzero;stroke:none"
d="m 367.84163,280.191 16.78684,-40.33679 21.10779,0.01 -5.90794,40.32709 z"
id="path5803"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#ff7f2a;stroke:none;display:inline"
style="fill:#ff7f2a;fill-rule:nonzero;stroke:none;display:inline"
d="m 431.57529,280.191 -6.40565,-40.23712 -19.12278,-0.0898 -5.86864,40.33002 z"
id="path5803-6"
inkscape:connector-curvature="0"
@@ -439,37 +461,37 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#d4aa00;stroke:none"
style="fill:#d4aa00;fill-rule:nonzero;stroke:none"
d="m 464.4348,280.191 0.0873,-4.67444 32.70213,0.25851 0.24774,4.65329 z"
id="path5855"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#ffcc00;stroke:none"
style="fill:#ffcc00;fill-rule:nonzero;stroke:none"
d="m 464.52216,275.51656 -22.27583,-37.3704 0.0599,1.73482 22.25514,40.32804 z"
id="path5857"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#ff9600;fill-opacity:1;stroke:none"
style="fill:#ff9600;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 464.52216,275.51656 32.70215,0.25851 -39.05814,-37.66825 -15.94328,0 z"
id="path5859"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#d4aa00;fill-opacity:1;stroke:none"
style="fill:#d4aa00;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 303.27493,279.82968 0,0 32.26901,0.40752 -0.20102,-3.20718 -32.03678,-0.46042 z"
id="path5891"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
<path
style="fill:#ff9600;fill-opacity:1;stroke:none"
style="fill:#ff9600;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 335.64188,277.03326 -32.226,-0.34915 40.16321,-38.57729 19.74096,0 z"
id="path5893"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#aa8800;fill-opacity:1;stroke:none"
style="fill:#aa8800;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 335.35265,277.18557 27.9674,-39.07875 0,1.95445 -27.77481,40.41628 z"
id="path5897"
inkscape:connector-curvature="0"
@@ -540,25 +562,4 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="scscs" />
</g>
<g
inkscape:groupmode="layer"
id="layer6"
inkscape:label="Debug"
sodipodi:insensitive="true">
<g
id="g3905"
transform="matrix(0.98040698,0,0,1.1018985,-231.55864,-107.84749)"
style="fill:none;stroke:#f90000;stroke-width:9.36715698;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
<path
id="Selection #4"
d="m 264.53125,126.46875 c -4.33805,-0.0576 -8.61719,3.71125 -8.125,12.53125 0.66,11.68 3.4825,24.69 9.0625,35 3.66634,9.32507 13.0186,14.43224 17.5625,21.4375 1.59,2.61 1.38125,6.5725 1.28125,9.5625 -0.05,1.84 -0.10625,4.0975 -1.15625,5.6875 -1.6,2.38 1.3125,3 -8.6875,3 l -25,0 c -10,0 -10,15 0,15 l 30,0 c 6.4,0.16 7.77,-0.13875 8,8.28125 0.13,4.84 -8.2625,9.5325 -12.0625,11.8125 -15.25031,9.72362 -23.93379,21.43976 -26.625,38.21875 -0.87,5.55 -2.44125,14.81 3.96875,17.25 3.96,1.51 8.89375,-0.255 10.34375,-4.375 L 265.625,284 c 7.68921,-14.25194 18.84375,-25.3125 28.84375,-25.3125 l 5,0 c 5,5 32.4,31.41 45,35 l 0,-75 c 0,-4.214 2.66703,-6.64779 5.75,-7.3125 0.54062,-0.11656 1.10201,-0.18026 1.65625,-0.1875 0.30775,-0.004 0.63136,0.002 0.9375,0.0312 0.0106,10e-4 0.0207,-0.001 0.0312,0 0.0533,0.005 0.10307,0.0248 0.15625,0.0312 0.23376,0.0298 0.48871,0.0754 0.71875,0.125 0.25757,0.0547 0.49953,0.108 0.75,0.1875 2.74711,0.88121 4.96875,3.26291 4.96875,7.125 l 0,75 c 12.6,-3.59 40,-30 45,-35 l 5,0 c 10,0 21.15454,11.06056 28.84375,25.3125 l 2.53125,15.875 c 1.45,4.12 6.38375,5.885 10.34375,4.375 6.41,-2.44 4.83875,-11.7 3.96875,-17.25 -2.69121,-16.77899 -11.37469,-28.49513 -26.625,-38.21875 -3.8,-2.28 -12.1925,-6.9725 -12.0625,-11.8125 0.23,-8.42 1.6,-8.12125 8,-8.28125 l 30,0 c 10,0 10,-15 0,-15 l -25,0 c -10,0 -7.0875,-0.62 -8.6875,-3 -1.05,-1.59 -1.10625,-3.8475 -1.15625,-5.6875 -0.1,-2.99 -0.30875,-6.9525 1.28125,-9.5625 4.5439,-7.00526 13.89616,-12.11243 17.5625,-21.4375 5.58,-10.31 8.4025,-23.32 9.0625,-35 0.49219,-8.82 -3.78695,-12.58885 -8.125,-12.53125 -2.27231,0.0302 -4.565,1.12031 -6.1875,3.0625 C 430.998,132.15125 431.58,140.96 431,145 c -2.22,15.45 -1.515,17.41 -11.625,30 -14.89167,14.29404 -39.82403,21.40669 -64.90625,21.71875 l 0,-0.0312 c -0.83523,0.0197 -1.66396,0.0266 -2.5,0.0312 -0.84123,-0.005 -1.69083,-0.0114 -2.53125,-0.0312 l 0,0.0312 C 324.36577,196.4012 299.41676,189.28813 284.53125,175 c -10.11,-12.59 -9.405,-14.55 -11.625,-30 -0.58,-4.04 0.002,-12.84875 -2.1875,-15.46875 -1.6225,-1.94219 -3.91519,-3.03235 -6.1875,-3.0625 z"
style="fill:none;stroke:#f90000;stroke-width:9.36715698;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3862"
d="m 347.65625,103.34375 c -9.48344,2.07571 -16.71892,10.22816 -17.5,20.21875 -17.80948,5.15553 -30.125,16.29235 -30.125,29.1875 0,17.80423 23.48386,32.21875 52.46875,32.21875 28.98489,0 52.46875,-14.41452 52.46875,-32.21875 0,-12.93887 -12.4054,-24.08642 -30.3125,-29.21875 -0.7555,-9.49386 -7.35456,-17.32688 -16.15625,-19.84375 4.12235,2.1741 6.9375,6.61131 6.9375,11.71875 0,7.25653 -5.69061,13.125 -12.71875,13.125 -7.02814,0 -12.71875,-5.86847 -12.71875,-13.125 0,-5.392 3.1563,-10.03743 7.65625,-12.0625 z"
style="fill:none;stroke:#f90000;stroke-width:9.36715698;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 25 KiB

57
art/lock.svg → app/src/main/art/lock.svg
View File

@@ -12,7 +12,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2985"
version="1.1"
inkscape:version="0.48.4 r9939"
inkscape:version="0.48.5 r10040"
width="500"
height="500"
sodipodi:docname="lock.svg"
@@ -27,14 +27,35 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs2989">
<linearGradient
inkscape:collect="always"
id="linearGradient3803">
<stop
style="stop-color:#0000ff;stop-opacity:1;"
offset="0"
id="stop3805" />
<stop
style="stop-color:#2a2aff;stop-opacity:0;"
offset="1"
id="stop3807" />
</linearGradient>
<linearGradient
id="linearGradient3795">
<stop
style="stop-color:#2a2aff;stop-opacity:1;"
offset="0"
id="stop3797" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop3799" />
</linearGradient>
<linearGradient
id="linearGradient3829">
<stop
style="stop-color:#008000;stop-opacity:1;"
@@ -46,7 +67,6 @@
id="stop3833" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3821">
<stop
style="stop-color:#ff2a2a;stop-opacity:1;"
@@ -129,6 +149,15 @@
x2="94.142265"
y2="59.703876"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3803"
id="linearGradient3809"
x1="399.74252"
y1="423.23785"
x2="143.38591"
y2="24.943653"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
pagecolor="#ffffff"
@@ -144,12 +173,12 @@
id="namedview2987"
showgrid="false"
inkscape:zoom="0.69044441"
inkscape:cx="-311.21222"
inkscape:cy="441.00283"
inkscape:cx="-748.14943"
inkscape:cy="232.66929"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="layer3" />
inkscape:current-layer="g3013" />
<g
inkscape:groupmode="layer"
id="layer1"
@@ -243,7 +272,7 @@
inkscape:groupmode="layer"
id="layer2"
inkscape:label="lock"
style="display:inline"
style="display:none"
sodipodi:insensitive="true">
<path
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3827);fill-opacity:1;stroke:#ff0000;stroke-width:13;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
@@ -251,4 +280,16 @@
id="path3903"
inkscape:connector-curvature="0" />
</g>
<g
style="display:none"
inkscape:label="unlocking"
id="g3013"
inkscape:groupmode="layer"
sodipodi:insensitive="true">
<path
inkscape:connector-curvature="0"
id="path3015"
d="M 279.25,15.34375 C 244.19516,16.280737 205.62169,14.019558 176.28125,36.875 145.74944,58.031778 124.42793,93.306298 125.625,131.09375 c -1.25949,30.25303 -1.54242,60.51254 -2.28125,90.78125 -29.107271,8.83439 -58.911773,28.03569 -66.40625,59.25 -5.949132,47.85073 -5.193718,96.65794 0.84375,144.46875 5.81316,29.47508 34.048591,50.86541 62.09375,57.65625 70.6574,5.2588 141.68427,4.72145 212.5,3.46875 36.0167,-1.89923 79.02601,-1.32552 103.75,-32.375 21.95709,-21.13269 15.57942,-53.75893 17.09375,-81.125 -1.06809,-35.15555 3.16616,-71.38914 -6.75,-105.59375 C 436.50164,241.82253 407.98841,233.30151 386.0625,220.1875 385.31924,179.13486 387.46822,137.91703 383.6875,97 377.68381,59.868714 342.45783,37.770594 311.5625,21.9375 301.55636,16.932984 290.33578,15.305295 279.25,15.34375 z M 254.78125,57.1875 c 35.09884,-0.818972 74.31899,21.760519 82.34375,57.6875 3.94756,36.27398 1.5228,72.90765 2.1875,109.34375 l -163.5625,0 c 0.66778,-35.63012 -2.1258,-71.5459 3.5625,-106.875 4.44807,-36.240113 40.78168,-60.13132 75.46875,-60.15625 z m 6.28125,228.84375 c 4.57444,0.0559 9.10362,1.18725 13.25,3.09375 20.14711,7.7839 34.49677,34.87768 16.59375,52.34375 -20.24236,15.0574 -2.79826,38.70146 -0.0625,57.78125 13.10925,26.0231 -14.10754,37.72869 -35.875,34.0625 -26.15517,4.54421 -33.10596,-19.45003 -23.96875,-39.28125 8.88977,-21.957 12.21901,-45.05648 -7.625,-62 -10.54098,-23.17468 16.0488,-45.52697 37.6875,-46 z"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3809);fill-opacity:1;stroke:#0000ff;stroke-width:13;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
art/prev_next.svg → app/src/main/art/prev_next.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

150
art/splash.svg → app/src/main/art/splash.svg
View File

@@ -12,15 +12,15 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="500"
height="500"
height="800"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="icon.svg"
enable-background="new"
inkscape:version="0.48.5 r10040"
sodipodi:docname="splash.svg"
inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\art\icon3_36.png"
inkscape:export-xdpi="6.48"
inkscape:export-ydpi="6.48">
inkscape:export-ydpi="6.48"
style="enable-background:new">
<defs
id="defs4">
<linearGradient
@@ -153,7 +153,7 @@
x2="356.59912"
y2="109.88838"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.437626,0,0,1.2124367,-213.79316,-77.945365)" />
gradientTransform="matrix(1.437626,0,0,1.2124367,-213.79316,-215.94536)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3820"
@@ -163,7 +163,7 @@
x2="239.30128"
y2="169.15221"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.161917,0,0,1.2124367,-24.542962,-80.37753)" />
gradientTransform="matrix(1.161917,0,0,1.2124367,-24.542962,-218.37753)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3873"
@@ -173,7 +173,7 @@
x2="159.09091"
y2="979.63489"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.161917,0,0,1.2124367,-24.087456,-178.707)" />
gradientTransform="matrix(1.161917,0,0,1.2124367,-24.087456,-316.707)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3889"
@@ -183,7 +183,7 @@
x2="330.11365"
y2="814.86218"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.161917,0,0,1.2124367,-24.087456,-178.707)" />
gradientTransform="matrix(1.161917,0,0,1.2124367,-24.087456,-316.707)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3907"
@@ -193,7 +193,7 @@
x2="206.80421"
y2="230.84761"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.161917,0,0,1.2124367,-24.087456,-61.365035)" />
gradientTransform="matrix(1.161917,0,0,1.2124367,-24.087456,-199.36504)" />
</defs>
<sodipodi:namedview
id="base"
@@ -203,19 +203,19 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.17"
inkscape:cx="181.6373"
inkscape:cy="169.00407"
inkscape:cx="210.243"
inkscape:cy="455.05609"
inkscape:document-units="px"
inkscape:current-layer="layer7"
inkscape:current-layer="layer6"
showgrid="false"
inkscape:snap-smooth-nodes="false"
inkscape:object-paths="true"
inkscape:snap-global="false"
inkscape:object-nodes="false"
inkscape:snap-intersection-paths="false"
inkscape:window-width="1920"
inkscape:window-height="1018"
inkscape:window-x="-8"
inkscape:window-width="1680"
inkscape:window-height="1028"
inkscape:window-x="1672"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:snap-nodes="true"
@@ -237,17 +237,18 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:groupmode="layer"
id="layer7"
inkscape:label="BigBox"
style="opacity:0.2964602;display:none">
inkscape:label="big_box"
style="opacity:0.2964602;display:none"
transform="translate(0,300)">
<rect
y="2.2209995"
y="-145.77899"
x="4.2691622"
height="499.0787"
width="496.88708"
@@ -255,7 +256,7 @@
style="fill:#ffd42a;fill-opacity:1;stroke:none;display:inline" />
<path
style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
d="m 2.5088277,2.2210102 83.5230193,0 -1.726158,497.1399998 -81.5044619,0 z"
d="m 2.5088277,-145.77899 83.5230193,0 -1.726158,497.14 -81.5044619,0 z"
id="path4184-5"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
@@ -263,11 +264,11 @@
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path4186-8"
d="m 417.63317,2.2210102 83.52302,0 -0.0777,497.1399998 -82.62207,0 z"
d="m 417.63317,-145.77899 83.52302,0 -0.0777,497.14 -82.62207,0 z"
style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline" />
<path
style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-linejoin:round;stroke-opacity:1;display:inline"
d="m 2.8012271,3.2936415 498.2771329,0 0,81.2589055 -498.2771329,0 z"
d="m 2.8012271,-144.70636 498.2771329,0 0,81.258907 -498.2771329,0 z"
id="rect4190-8"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
@@ -275,7 +276,7 @@
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path4193-1"
d="m 2.8012271,418.10211 498.2771329,0 0,81.2589 -498.2771329,0 z"
d="m 2.8012271,270.10211 498.2771329,0 0,81.2589 -498.2771329,0 z"
style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-linejoin:round;stroke-opacity:1;display:inline" />
<rect
style="fill:#ffdd55;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-linejoin:round;stroke-opacity:1;display:inline"
@@ -283,56 +284,74 @@
width="82.565849"
height="333.54956"
x="168.31187"
y="84.552574" />
y="-63.447426" />
<rect
style="fill:#ffcc00;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-linejoin:round;stroke-opacity:1;display:inline"
id="rect4195-1"
width="82.565849"
height="333.54956"
x="85.745911"
y="84.552666" />
y="-63.447334" />
<rect
style="fill:#ffcc00;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-linejoin:round;stroke-opacity:1;display:inline"
id="rect4195-9-4"
width="82.565849"
height="333.54956"
x="335.20364"
y="84.552574" />
y="-63.447426" />
<path
style="fill:#ffba08;fill-opacity:1;stroke:#ffa600;stroke-width:3.07642198;stroke-opacity:1;display:inline"
d="m 21.923338,84.586749 352.411182,333.541901 114.19532,0 L 136.11865,84.586749 z"
d="m 21.923338,-63.413251 352.411182,333.541901 114.19532,0 -352.41119,-333.541901 z"
id="rect4222-6-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#fab826;fill-opacity:1;stroke:#ffaf00;stroke-width:3.07642198;stroke-opacity:1;display:inline"
d="M 368.49499,84.586749 21.737955,418.12865 l 113.175725,0 346.75703,-333.541901 z"
d="M 368.49499,-63.413251 21.737955,270.12865 l 113.175725,0 346.75703,-333.541901 z"
id="rect4222-8"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:none;stroke:none;display:inline"
d="M 369.20984,2.296704 416.70485,89.400231 333.23091,88.837671 317.31962,2.3628486 z"
d="m 369.20984,-145.7033 47.49501,87.103531 -83.47394,-0.56256 -15.91129,-86.474821 z"
id="path5801-2-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
</g>
<g
inkscape:groupmode="layer"
id="layer6"
inkscape:label="title">
<text
xml:space="preserve"
style="font-size:74.00489044px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff9600;fill-opacity:1;stroke:none;font-family:Sans"
x="0.66347247"
y="120.67854"
id="text3062"
sodipodi:linespacing="125%"
transform="scale(0.93246631,1.0724248)"><tspan
sodipodi:role="line"
id="tspan3064"
x="0.66347247"
y="120.67854"
style="font-size:133.20880127px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;fill:#ff9600;fill-opacity:1;font-family:FreeSans;-inkscape-font-specification:FreeSans Semi-Bold">Բանվոր</tspan></text>
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="second_plane"
style="display:inline"
transform="translate(0,-552.36218)"
transform="translate(0,-252.36218)"
sodipodi:insensitive="true">
<path
style="fill:url(#linearGradient3879);fill-opacity:1;stroke:none"
d="m 85.698199,797.77074 c 0,0 37.665621,58.70316 45.507341,92.33064 8.69161,37.27203 0.26059,115.07862 0.26059,115.07862 9.64081,25.3101 37.13051,18.0683 40.08464,-0.048 0,0 7.6977,-77.30978 -0.25948,-114.59484 -8.5677,-40.14589 -49.92401,-111.85138 -49.92401,-111.85138 z"
d="m 85.698199,659.77074 c 0,0 37.665621,58.70316 45.507341,92.33064 8.69161,37.27203 0.26059,115.07862 0.26059,115.07862 9.64081,25.3101 37.13051,18.0683 40.08464,-0.048 0,0 7.6977,-77.30978 -0.25948,-114.59484 -8.5677,-40.14589 -49.92401,-111.85138 -49.92401,-111.85138 z"
id="path4015"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csccscc" />
<path
style="fill:url(#linearGradient3895);fill-opacity:1;stroke:none"
d="m 183.53876,703.07558 30.90388,-26.63904 c 0,0 29.3937,65.77281 57.9456,87.14893 27.16621,20.33869 77.40935,20.44538 77.40935,20.44538 16.64517,9.49353 16.61054,38.884 -14.37674,34.19491 -11.80483,-1.78633 -60.98194,-1.75168 -92.5934,-26.30905 -28.75005,-22.33442 -59.28869,-88.84113 -59.28869,-88.84113 z"
d="m 183.53876,565.07558 30.90388,-26.63904 c 0,0 29.3937,65.77281 57.9456,87.14893 27.16621,20.33869 77.40935,20.44538 77.40935,20.44538 16.64517,9.49353 16.61054,38.884 -14.37674,34.19491 -11.80483,-1.78633 -60.98194,-1.75168 -92.5934,-26.30905 -28.75005,-22.33442 -59.28869,-88.84113 -59.28869,-88.84113 z"
id="path4017"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccscssc" />
@@ -340,11 +359,12 @@
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="Box"
inkscape:label="box"
style="display:inline"
transform="translate(0,300)"
sodipodi:insensitive="true">
<rect
y="279.78345"
y="141.78345"
x="303.048"
height="189.63731"
width="194.64587"
@@ -354,11 +374,11 @@
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path4121"
d="m 342.65518,239.83473 -39.6072,39.94872 194.64588,-1e-5 -39.93747,-39.89529 z"
d="m 342.65518,101.83473 -39.6072,39.94872 194.64588,-10e-6 -39.93747,-39.89529 z"
style="fill:#ff9600;fill-opacity:1;stroke:none;display:inline" />
<path
style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 302.35841,279.78344 32.71853,0 -0.67621,188.90069 -31.92777,0 z"
d="m 302.35841,141.78344 32.71853,0 -0.67621,188.90069 -31.92777,0 z"
id="path4184"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
@@ -366,11 +386,11 @@
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path4186"
d="m 464.97533,279.78344 32.71853,0 -0.0305,188.90069 -32.36559,0 z"
d="m 464.97533,141.78344 32.71853,0 -0.0305,188.90069 -32.36559,0 z"
style="fill:#ffb82a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
<path
style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1"
d="m 302.47296,280.191 195.19042,0 0,30.87636 -195.19042,0 z"
d="m 302.47296,142.191 195.19042,0 0,30.87636 -195.19042,0 z"
id="rect4190"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
@@ -378,7 +398,7 @@
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="path4193"
d="m 302.47296,437.80778 195.19042,0 0,30.87635 -195.19042,0 z"
d="m 302.47296,299.80778 195.19042,0 0,30.87635 -195.19042,0 z"
style="fill:#ffc52a;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1" />
<rect
style="fill:#ffdd55;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
@@ -386,90 +406,90 @@
width="32.343575"
height="126.74043"
x="367.3085"
y="311.06735" />
y="173.06735" />
<rect
style="fill:#ffcc00;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
id="rect4195"
width="32.343575"
height="126.74043"
x="334.965"
y="311.06738" />
y="173.06738" />
<rect
style="fill:#ffcc00;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-linejoin:round;stroke-opacity:1;display:inline"
id="rect4195-9"
width="32.343575"
height="126.74043"
x="432.68518"
y="311.06735" />
y="173.06735" />
<path
style="fill:#ffba08;fill-opacity:1;stroke:#ffa600;stroke-width:1.18690801;stroke-opacity:1;display:inline"
d="m 309.96367,311.08035 138.05026,126.73752 44.73381,0 -138.05027,-126.73752 z"
d="m 309.96367,173.08035 138.05026,126.73752 44.73381,0 -138.05027,-126.73752 z"
id="rect4222-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#fab826;fill-opacity:1;stroke:#ffaf00;stroke-width:1.18690801;stroke-opacity:1"
d="m 445.72641,311.08035 -135.83535,126.73752 44.33437,0 135.83538,-126.73752 z"
d="m 445.72641,173.08035 -135.83535,126.73752 44.33437,0 135.83538,-126.73752 z"
id="rect4222"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#aa4400;stroke:none"
d="m 364.06882,239.84466 -27.85671,40.34634 31.10207,0 17.00384,-40.33693 z"
d="m 364.06882,101.84466 -27.85671,40.34634 31.10207,0 17.00384,-40.33693 z"
id="path5801"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#ff6600;stroke:none"
d="m 367.84163,280.191 16.78684,-40.33679 21.10779,0.01 -5.90794,40.32709 z"
d="m 367.84163,142.191 16.78684,-40.33679 21.10779,0.01 -5.90794,40.32709 z"
id="path5803"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#ff7f2a;stroke:none;display:inline"
d="m 431.57529,280.191 -6.40565,-40.23712 -19.12278,-0.0898 -5.86864,40.33002 z"
d="m 431.57529,142.191 -6.40565,-40.23712 -19.12278,-0.0898 -5.86864,40.33002 z"
id="path5803-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:none;stroke:none;display:inline"
d="m 445.9808,240.182 18.59488,40.02713 -32.68108,-0.25851 -6.22946,-39.73823 z"
d="m 445.9808,102.182 18.59488,40.02713 -32.68108,-0.25851 -6.22946,-39.73823 z"
id="path5801-2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#d4aa00;stroke:none"
d="m 464.4348,280.191 0.0873,-4.67444 32.70213,0.25851 0.24774,4.65329 z"
d="m 464.4348,142.191 0.0873,-4.67444 32.70213,0.25851 0.24774,4.65329 z"
id="path5855"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#ffcc00;stroke:none"
d="m 464.52216,275.51656 -22.27583,-37.3704 0.0599,1.73482 22.25514,40.32804 z"
d="m 464.52216,137.51656 -22.27583,-37.3704 0.0599,1.73482 22.25514,40.32804 z"
id="path5857"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#ff9600;fill-opacity:1;stroke:none"
d="m 464.52216,275.51656 32.70215,0.25851 -39.05814,-37.66825 -15.94328,0 z"
d="m 464.52216,137.51656 32.70215,0.25851 -39.05814,-37.66825 -15.94328,0 z"
id="path5859"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#d4aa00;fill-opacity:1;stroke:none"
d="m 303.27493,279.82968 0,0 32.26901,0.40752 -0.20102,-3.20718 -32.03678,-0.46042 z"
d="m 303.27493,141.82968 0,0 32.26901,0.40752 -0.20102,-3.20718 -32.03678,-0.46042 z"
id="path5891"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
<path
style="fill:#ff9600;fill-opacity:1;stroke:none"
d="m 335.64188,277.03326 -32.226,-0.34915 40.16321,-38.57729 19.74096,0 z"
d="m 335.64188,139.03326 -32.226,-0.34915 40.16321,-38.57729 19.74096,0 z"
id="path5893"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#aa8800;fill-opacity:1;stroke:none"
d="m 335.35265,277.18557 27.9674,-39.07875 0,1.95445 -27.77481,40.41628 z"
d="m 335.35265,139.18557 27.9674,-39.07875 0,1.95445 -27.77481,40.41628 z"
id="path5897"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
@@ -479,11 +499,11 @@
inkscape:groupmode="layer"
id="layer1"
style="display:inline"
transform="translate(0,-552.36218)"
transform="translate(0,-252.36218)"
sodipodi:insensitive="true">
<path
style="fill:#ffcc00;fill-opacity:1;stroke:none;display:inline"
d="m 254.37902,590.82417 c -28.81097,4.95816 -35.62107,17.32969 -38.59418,42.98726 -0.84369,7.28135 -6.72484,12.94213 -10.94805,18.80498 -34.04568,47.26343 -82.69132,82.04844 -115.022188,130.60522 -1.640852,2.46434 -2.928048,5.20323 -3.916653,8.02112 -12.002443,34.21113 -8.880442,73.53413 -23.943021,106.40081 -16.992642,37.07811 -58.6448905,90.01657 -58.6448905,90.01657 -7.8761698,25.83267 13.8057235,36.09707 31.5990425,25.73567 0,0 46.419511,-53.94426 64.45365,-92.66343 17.21715,-36.96515 20.86431,-67.23006 39.59603,-103.38438 15.49462,-29.90624 63.56196,-70.62478 63.56196,-70.62478 0,0 18.918,39.34961 35.24386,60.45235 24.152,18.9697 55.39841,34.75724 72.87061,40.51414 21.55786,-0.69033 24.3167,-29.10645 11.68481,-33.65069 -26.56735,-9.55738 -33.37885,-13.88582 -59.71068,-38.31372 -21.84827,-20.26861 -40.54096,-81.15157 -40.54096,-81.15157 0,0 9.23873,-15.60517 14.46726,-18.63833 5.97992,-3.46914 8.93604,1.02613 18.0281,0.47777 30.36625,-3.12338 38.40952,-22.96684 38.40952,-42.60173 1.73462,-30.49483 -8.26611,-36.24423 -38.59422,-42.98726 z"
d="m 254.37902,452.82417 c -28.81097,4.95816 -35.62107,17.32969 -38.59418,42.98726 -0.84369,7.28135 -6.72484,12.94213 -10.94805,18.80498 -34.04568,47.26343 -82.69132,82.04844 -115.022188,130.60522 -1.640852,2.46434 -2.928048,5.20323 -3.916653,8.02112 C 73.895506,687.45388 77.017507,726.77688 61.954928,759.64356 44.962286,796.72167 3.3100375,849.66013 3.3100375,849.66013 -4.5661323,875.4928 17.115761,885.7572 34.90908,875.3958 c 0,0 46.419511,-53.94426 64.45365,-92.66343 17.21715,-36.96515 20.86431,-67.23006 39.59603,-103.38438 15.49462,-29.90624 63.56196,-70.62478 63.56196,-70.62478 0,0 18.918,39.34961 35.24386,60.45235 24.152,18.9697 55.39841,34.75724 72.87061,40.51414 21.55786,-0.69033 24.3167,-29.10645 11.68481,-33.65069 -26.56735,-9.55738 -33.37885,-13.88582 -59.71068,-38.31372 -21.84827,-20.26861 -40.54096,-81.15157 -40.54096,-81.15157 0,0 9.23873,-15.60517 14.46726,-18.63833 5.97992,-3.46914 8.93604,1.02613 18.0281,0.47777 30.36625,-3.12338 38.40952,-22.96684 38.40952,-42.60173 1.73462,-30.49483 -8.26611,-36.24423 -38.59422,-42.98726 z"
id="path3933-1"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csssssccssccccscsccc" />
@@ -493,23 +513,24 @@
width="25.747025"
height="1.6119893e-006"
x="362.77811"
y="824.87097" />
y="686.87097" />
</g>
<g
inkscape:groupmode="layer"
id="layer5"
inkscape:label="face"
style="display:inline"
transform="translate(0,300)"
sodipodi:insensitive="true">
<path
style="fill:url(#linearGradient3826);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 291.71618,88.218239 c 2.12289,19.119621 -18.80171,35.817181 -35.27952,35.817181 -16.47782,0 -22.96478,-5.15605 -27.26471,-11.27249 -6.29753,-8.95796 10.76394,17.41252 40.22748,4.45232 11.6126,-5.10804 22.03985,-18.452092 22.31675,-28.997011 z"
d="m 291.71618,-49.781761 c 2.12289,19.119621 -18.80171,35.817181 -35.27952,35.817181 -16.47782,0 -22.96478,-5.15605 -27.26471,-11.27249 -6.29753,-8.95796 10.76394,17.41252 40.22748,4.45232 11.6126,-5.10804 22.03985,-18.452092 22.31675,-28.997011 z"
id="path3033"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csssc" />
<path
style="fill:url(#linearGradient3913);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 206.85784,203.07824 c -7.50913,-13.91844 -6.72686,-12.25509 -8.48593,-16.15108 -0.5375,-1.19044 -2.81412,-7.4956 -4.5498,-17.18416 3.34901,10.02437 7.89294,19.9273 13.03573,33.33524 z"
d="m 206.85784,65.07824 c -7.50913,-13.91844 -6.72686,-12.25509 -8.48593,-16.15108 -0.5375,-1.19044 -2.81412,-7.4956 -4.5498,-17.18416 3.34901,10.02437 7.89294,19.9273 13.03573,33.33524 z"
id="path3830"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cscc" />
@@ -517,24 +538,25 @@
<g
inkscape:groupmode="layer"
id="layer4"
inkscape:label="Hat"
inkscape:label="hat"
style="display:inline"
transform="translate(0,300)"
sodipodi:insensitive="true">
<path
style="fill:#d45500;fill-opacity:1;stroke:none"
d="m 299.34257,60.914907 c 0,22.32034 -22.43256,6.217625 -44.37134,6.217625 -21.93876,0 -42.0475,16.102715 -42.0475,-6.217625 0,-22.320347 20.10874,-40.414559 42.0475,-40.414559 21.93878,0 44.37134,18.094212 44.37134,40.414559 z"
d="m 299.34257,-77.08509 c 0,22.320337 -22.43256,6.21762 -44.37134,6.21762 -21.93876,0 -42.0475,16.102717 -42.0475,-6.21762 0,-22.32035 20.10874,-40.41456 42.0475,-40.41456 21.93878,0 44.37134,18.09421 44.37134,40.41456 z"
id="path4163"
inkscape:connector-curvature="0"
sodipodi:nodetypes="sssss" />
<path
style="fill:url(#linearGradient4180);fill-opacity:1;stroke:none"
d="m 293.5429,58.842357 c 0,17.1695 -16.99832,6.157176 -37.01744,6.157176 -20.01914,0 -40.12588,11.012324 -40.12588,-6.157176 0,-17.16949 18.55253,-35.937863 38.57166,-35.937863 20.01913,0 38.57166,18.768373 38.57166,35.937863 z"
d="m 293.5429,-79.15764 c 0,17.1695 -16.99832,6.15717 -37.01744,6.15717 -20.01914,0 -40.12588,11.01233 -40.12588,-6.15717 0,-17.16949 18.55253,-35.93787 38.57166,-35.93787 20.01913,0 38.57166,18.76838 38.57166,35.93787 z"
id="path4167"
inkscape:connector-curvature="0"
sodipodi:nodetypes="sssss" />
<path
style="fill:#d45500;fill-opacity:1;stroke:none"
d="m 314.86087,71.692645 c 1.99925,3.795356 2.46806,4.249077 -10.42746,2.124092 -11.1239,-2.856519 -15.3929,1.101513 -15.3929,-8.341708 0,-9.44322 16.00482,-2.277054 20.35836,0.518143 2.93281,2.24407 4.33459,3.55921 5.462,5.699473 z"
d="m 314.86087,-66.30736 c 1.99925,3.79536 2.46806,4.24908 -10.42746,2.1241 -11.1239,-2.85652 -15.3929,1.10151 -15.3929,-8.34171 0,-9.44322 16.00482,-2.27706 20.35836,0.51814 2.93281,2.24407 4.33459,3.55921 5.462,5.69947 z"
id="path4171"
inkscape:connector-curvature="0"
sodipodi:nodetypes="scscs" />
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
art/wall.svg → app/src/main/art/wall.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 852 KiB

After

Width:  |  Height:  |  Size: 852 KiB

14
art/worker.svg → app/src/main/art/worker.svg
View File

@@ -13,7 +13,7 @@
height="500"
id="svg3081"
version="1.1"
inkscape:version="0.48.4 r9939"
inkscape:version="0.48.5 r10040"
sodipodi:docname="worker.svg"
inkscape:export-filename="C:\Users\vahagnk\devel\_private\org.dyndns.vahagn.sokoban\art\worker_select.png"
inkscape:export-xdpi="90"
@@ -36,10 +36,10 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.1313708"
inkscape:cx="66.823146"
inkscape:cx="-34.823458"
inkscape:cy="275.12227"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:current-layer="layer3"
showgrid="true"
inkscape:snap-global="false"
inkscape:window-width="1920"
@@ -70,7 +70,7 @@
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="Foot"
inkscape:label="Hands"
transform="translate(0,-552.36217)"
style="display:inline">
<rect
@@ -136,7 +136,7 @@
sodipodi:cy="573.2973"
sodipodi:rx="247.48738"
sodipodi:ry="83.968933"
d="m 639.04778,573.2973 c 0,46.37476 -110.80388,83.96894 -247.48739,83.96894 -136.6835,0 -247.48738,-37.59418 -247.48738,-83.96894 0,-46.37476 110.80388,-83.96893 247.48738,-83.96893 136.68351,0 247.48739,37.59417 247.48739,83.96893 z"
d="m 639.04778,573.2973 a 247.48738,83.968933 0 1 1 -494.97477,0 247.48738,83.968933 0 1 1 494.97477,0 z"
transform="matrix(1,0,0,1.5210527,-142.72466,-21.059042)" />
<path
sodipodi:type="arc"
@@ -146,7 +146,7 @@
sodipodi:cy="450.87946"
sodipodi:rx="94.575539"
sodipodi:ry="90.598061"
d="m 502.04585,450.87946 c 0,50.03592 -42.34292,90.59806 -94.57554,90.59806 -52.23263,0 -94.57554,-40.56214 -94.57554,-90.59806 0,-50.03593 42.34291,-90.59807 94.57554,-90.59807 52.23262,0 94.57554,40.56214 94.57554,90.59807 z"
d="m 502.04585,450.87946 a 94.575539,90.598061 0 1 1 -189.15108,0 94.575539,90.598061 0 1 1 189.15108,0 z"
transform="matrix(1.0093458,0,0,1,-154.95221,263.07496)" />
<path
sodipodi:type="arc"
@@ -156,7 +156,7 @@
sodipodi:cy="568.87793"
sodipodi:rx="156.00545"
sodipodi:ry="157.33127"
d="m 559.49828,568.87793 c 0,86.89166 -69.84602,157.33127 -156.00545,157.33127 -86.15943,0 -156.00545,-70.43961 -156.00545,-157.33127 0,-86.89166 69.84602,-157.33127 156.00545,-157.33127 86.15943,0 156.00545,70.43961 156.00545,157.33127 z"
d="m 559.49828,568.87793 a 156.00545,157.33127 0 1 1 -312.0109,0 156.00545,157.33127 0 1 1 312.0109,0 z"
transform="matrix(0.8838527,0,0,1,-103.83753,251.39729)" />
<rect
style="opacity:0.99557525;fill:#d4aa00;fill-opacity:0.99607843;fill-rule:nonzero"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

4
app/src/main/java/org/dyndns/vahagn/sokoban/App.java → app/src/main/java/org/vostan/sokoban/App.java
View File

@@ -1,9 +1,7 @@
package org.dyndns.vahagn.sokoban;
package org.vostan.sokoban;
import android.app.Application;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.util.Log;
public class App extends Application

9
app/src/main/java/org/dyndns/vahagn/sokoban/Puzzle.java → app/src/main/java/org/vostan/sokoban/Puzzle.java
View File

@@ -1,14 +1,13 @@
package org.dyndns.vahagn.sokoban;
package org.vostan.sokoban;
//import java.lang.Exception;
import java.io.*;
import static java.lang.Math.*;
import android.util.Log;
import android.graphics.Point;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import static org.dyndns.vahagn.sokoban.App.TAG;
import static org.vostan.sokoban.App.TAG;
public class Puzzle
{

7
app/src/main/java/org/dyndns/vahagn/sokoban/PuzzleContainer.java → app/src/main/java/org/vostan/sokoban/PuzzleContainer.java
View File

@@ -1,9 +1,10 @@
package org.dyndns.vahagn.sokoban;
package org.vostan.sokoban;
import java.io.InputStream;
import java.io.IOException;
import static org.dyndns.vahagn.sokoban.App.theApp;
import android.util.Log;
import static org.vostan.sokoban.App.theApp;
import org.vostan.sokoban.R;
public class PuzzleContainer
{

27
app/src/main/java/org/dyndns/vahagn/sokoban/menu/MainActivity.java → app/src/main/java/org/vostan/sokoban/menu/MainActivity.java
View File

@@ -1,32 +1,17 @@
package org.dyndns.vahagn.sokoban.menu;
package org.vostan.sokoban.menu;
import org.vostan.sokoban.play.PlayActivity;
import org.dyndns.vahagn.sokoban.play.PlayActivity;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Rect;
import android.view.View;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.util.TypedValue;
import android.view.Display;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.BaseAdapter;
import android.widget.GridView;
import android.widget.ImageView;
import org.dyndns.vahagn.sokoban.R;
import static org.dyndns.vahagn.sokoban.App.theApp;
import org.vostan.sokoban.R;
import static org.vostan.sokoban.App.theApp;
public class MainActivity extends FragmentActivity
{

6
app/src/main/java/org/dyndns/vahagn/sokoban/menu/MainFragment.java → app/src/main/java/org/vostan/sokoban/menu/MainFragment.java
View File

@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package org.dyndns.vahagn.sokoban.menu;
package org.vostan.sokoban.menu;
import android.os.Bundle;
import android.support.v4.app.Fragment;
@@ -11,8 +11,8 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import static org.dyndns.vahagn.sokoban.App.theApp;
import org.dyndns.vahagn.sokoban.R;
import static org.vostan.sokoban.App.theApp;
import org.vostan.sokoban.R;
/**
*

14
app/src/main/java/org/dyndns/vahagn/sokoban/menu/PuzzleListFragment.java → app/src/main/java/org/vostan/sokoban/menu/PuzzleListFragment.java
View File

@@ -2,11 +2,9 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package org.dyndns.vahagn.sokoban.menu;
package org.vostan.sokoban.menu;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
@@ -23,14 +21,12 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.GridView;
import android.widget.ImageView;
import android.widget.TextView;
import org.dyndns.vahagn.sokoban.R;
import org.dyndns.vahagn.sokoban.R;
import static org.dyndns.vahagn.sokoban.App.theApp;
import org.dyndns.vahagn.sokoban.play.PlayActivity;
import org.vostan.sokoban.R;
import static org.vostan.sokoban.App.theApp;
/**
*

3
app/src/main/java/org/dyndns/vahagn/sokoban/play/Animator.java → app/src/main/java/org/vostan/sokoban/play/Animator.java
View File

@@ -2,9 +2,8 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package org.dyndns.vahagn.sokoban.play;
package org.vostan.sokoban.play;
import org.dyndns.vahagn.sokoban.play.PuzzleView;
import android.support.v4.view.ViewCompat;
import java.util.LinkedList;

26
app/src/main/java/org/dyndns/vahagn/sokoban/play/PlayActivity.java → app/src/main/java/org/vostan/sokoban/play/PlayActivity.java
View File

@@ -1,35 +1,23 @@
package org.dyndns.vahagn.sokoban.play;
package org.vostan.sokoban.play;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentActivity;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.AbsListView;
import android.widget.FrameLayout;
import android.widget.TextView;
import java.util.Timer;
import java.util.TimerTask;
import java.util.zip.Inflater;
import org.dyndns.vahagn.sokoban.App;
import static org.dyndns.vahagn.sokoban.App.TAG;
import static org.dyndns.vahagn.sokoban.App.theApp;
import org.dyndns.vahagn.sokoban.R;
import org.dyndns.vahagn.sokoban.Puzzle;
import org.dyndns.vahagn.sokoban.menu.MainActivity;
import org.vostan.sokoban.App;
import static org.vostan.sokoban.App.theApp;
import org.vostan.sokoban.R;
import org.vostan.sokoban.Puzzle;
public class PlayActivity extends FragmentActivity
implements PuzzleControl.PuzzleControlLister

8
app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleControl.java → app/src/main/java/org/vostan/sokoban/play/PuzzleControl.java
View File

@@ -2,18 +2,14 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package org.dyndns.vahagn.sokoban.play;
package org.vostan.sokoban.play;
import org.dyndns.vahagn.sokoban.play.Animator;
import org.dyndns.vahagn.sokoban.play.PuzzleView;
import org.dyndns.vahagn.sokoban.play.PuzzleLogic;
import android.content.Context;
import android.graphics.Point;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.ScaleGestureDetector;
import org.dyndns.vahagn.sokoban.Puzzle;
import static org.dyndns.vahagn.sokoban.App.TAG;
import org.vostan.sokoban.Puzzle;
//import android.support.v4.view.GestureDetectorCompat;

5
app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleLogic.java → app/src/main/java/org/vostan/sokoban/play/PuzzleLogic.java
View File

@@ -2,12 +2,11 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package org.dyndns.vahagn.sokoban.play;
package org.vostan.sokoban.play;
import static java.lang.Math.*;
import java.util.Arrays;
import org.dyndns.vahagn.sokoban.Puzzle;
import static org.dyndns.vahagn.sokoban.App.TAG;
import org.vostan.sokoban.Puzzle;
/**
*

10
app/src/main/java/org/dyndns/vahagn/sokoban/play/PuzzleView.java → app/src/main/java/org/vostan/sokoban/play/PuzzleView.java
View File

@@ -1,4 +1,4 @@
package org.dyndns.vahagn.sokoban.play;
package org.vostan.sokoban.play;
import android.content.Context;
import android.graphics.Bitmap;
@@ -12,10 +12,10 @@ import android.graphics.RectF;
import android.support.v4.view.ViewCompat;
import android.view.View;
import static java.lang.Math.*;
import static org.dyndns.vahagn.sokoban.App.TAG;
import org.dyndns.vahagn.sokoban.Puzzle;
import static org.dyndns.vahagn.sokoban.Puzzle.*;
import org.dyndns.vahagn.sokoban.R;
import org.vostan.sokoban.Puzzle;
import static org.vostan.sokoban.Puzzle.*;
import org.vostan.sokoban.R;
/**
*/

BIN
app/src/main/res/drawable-hdpi/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
app/src/main/res/drawable-hdpi/icon_debug.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
app/src/main/res/drawable-hdpi/lock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
app/src/main/res/drawable-hdpi/next.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 787 B

After

Width:  |  Height:  |  Size: 798 B

BIN
app/src/main/res/drawable-hdpi/prev.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 942 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/drawable-hdpi/undo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 874 B

BIN
app/src/main/res/drawable-hdpi/unlock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
app/src/main/res/drawable-hdpi/unlocking.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
app/src/main/res/drawable-ldpi/icon_debug.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/drawable-ldpi/lock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/drawable-ldpi/next.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 397 B

After

Width:  |  Height:  |  Size: 441 B

BIN
app/src/main/res/drawable-ldpi/prev.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 710 B

After

Width:  |  Height:  |  Size: 622 B

BIN
app/src/main/res/drawable-ldpi/unlock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/src/main/res/drawable-ldpi/unlocking.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/src/main/res/drawable-mdpi/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
app/src/main/res/drawable-mdpi/icon_debug.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
app/src/main/res/drawable-mdpi/lock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
app/src/main/res/drawable-mdpi/next.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 496 B

After

Width:  |  Height:  |  Size: 545 B

BIN
app/src/main/res/drawable-mdpi/prev.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 692 B

After

Width:  |  Height:  |  Size: 962 B

BIN
app/src/main/res/drawable-mdpi/unlock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
app/src/main/res/drawable-mdpi/unlocking.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
app/src/main/res/drawable-xhdpi/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_debug.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
app/src/main/res/drawable/lock.png → app/src/main/res/drawable-xhdpi/lock.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
app/src/main/res/drawable-xhdpi/next.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 802 B

After

Width:  |  Height:  |  Size: 897 B

BIN
app/src/main/res/drawable-xhdpi/prev.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 939 B

BIN
app/src/main/res/drawable/unlock.png → app/src/main/res/drawable-xhdpi/unlock.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
app/src/main/res/drawable-xhdpi/unlocking.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.7 KiB

BIN
app/src/main/res/drawable/bingo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
app/src/main/res/drawable/box.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
app/src/main/res/drawable/floor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
app/src/main/res/drawable/goal.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 38 KiB

BIN
app/src/main/res/drawable/splash.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 33 KiB

4
app/src/main/res/values/strings.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Free Sokoban</string>
<string name="app_name_debug">Debug Sokoban</string>
<string name="app_name">Banvor</string>
<string name="app_name_debug">Banvor Debug</string>
<string name="menu">Menu</string>
<string name="play_activity">play_activity</string>
<string name="btn_start_begin">Begin</string>

BIN
gradle/wrapper/gradle-wrapper.jar vendored Normal file
View File

Binary file not shown.

6
gradle/wrapper/gradle-wrapper.properties vendored Normal file
View File

@@ -0,0 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip

31
version.bat
View File

@@ -1,31 +0,0 @@
@echo off
rem
rem Copyright 2005-2013 Vahagn Khachatryan.
rem
rem This program is free software; you can redistribute it and/or modify
rem it under the terms of the GNU General Public License as published by
rem the Free Software Foundation; either version 2 of the License, or
rem (at your option) any later version.
rem
rem This program is distributed in the hope that it will be useful,
rem but WITHOUT ANY WARRANTY; without even the implied warranty of
rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
rem GNU General Public License for more details.
rem
rem
rem Generate res\values\version.xml for windows.
rem
set VERSION_XML=app\src\main\res\values\version.xml
echo on
@echo ^<?xml version="1.0" encoding="utf-8"?^> > %VERSION_XML%
@echo ^<resources^> >> %VERSION_XML%
@for /F "delims=" %%i in ('"git describe --tags --long --dirty=-x --abbrev=8"') do set VERSION=%%i
echo ^<string name="git_version"^>%VERSION%^</string^> >> %VERSION_XML%
@for /F "delims=" %%i in ('"git rev-parse HEAD"') do set GITHASH=%%i
echo ^<string name="git_hash"^>%GITHASH%^</string^> >> %VERSION_XML%
@for /F "delims=" %%i in ('"%USERPROFILE%\bin\date.exe -R"') do set BUILDDATE=%%i
echo ^<string name="builddate"^>%BUILDDATE%^</string^> >> %VERSION_XML%
@echo ^</resources^> >> %VERSION_XML%