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

Moving to org.vostan.sokoban.

Browse Source
This commit is contained in:
Vahagn Khachatryan
2014-12-09 18:49:03 +04:00
parent 38e36821dc
commit d7d7a84e3a
11 changed files with 75 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/app.iml
View File

@@ -50,13 +50,13 @@
<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/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

59
app/build.gradle
View File

@@ -1,13 +1,45 @@
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="builddate">' << builddate << '</string>' )
versionFile.println( '</resources>' )
versionFile.close()
}
}
preBuild.dependsOn createVersionXML
android {
compileSdkVersion 10
buildToolsVersion "21.1.1"
defaultConfig {
applicationId "org.dyndns.vahagn.sokoban"
applicationId "org.vostan.sokoban"
minSdkVersion 10
targetSdkVersion 14
//applicationLabel="Banvor Debug"
}
buildTypes {
@@ -15,9 +47,34 @@ android {
runProguard true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
}
debug {
applicationIdSuffix ".debug"
}
}
sourceSets {
/*
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
*/
androidTest.setRoot('src/tests')
}
}
//repositories {}
dependencies {
compile 'com.android.support:support-v4:18.0.0'
}

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

@@ -1,6 +1,6 @@
<?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"
@@ -24,7 +24,7 @@
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>

2
app/src/main/java/org/vostan/sokoban/PuzzleContainer.java
View File

@@ -4,7 +4,7 @@ import java.io.InputStream;
import java.io.IOException;
import static org.vostan.sokoban.App.theApp;
import org.dyndns.vahagn.sokoban.R;
import org.vostan.sokoban.R;
public class PuzzleContainer
{

2
app/src/main/java/org/vostan/sokoban/menu/MainActivity.java
View File

@@ -10,7 +10,7 @@ import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.view.Window;
import org.dyndns.vahagn.sokoban.R;
import org.vostan.sokoban.R;
import static org.vostan.sokoban.App.theApp;
public class MainActivity extends FragmentActivity

2
app/src/main/java/org/vostan/sokoban/menu/MainFragment.java
View File

@@ -12,7 +12,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import static org.vostan.sokoban.App.theApp;
import org.dyndns.vahagn.sokoban.R;
import org.vostan.sokoban.R;
/**
*

2
app/src/main/java/org/vostan/sokoban/menu/PuzzleListFragment.java
View File

@@ -24,7 +24,7 @@ import android.widget.BaseAdapter;
import android.widget.GridView;
import android.widget.ImageView;
import org.dyndns.vahagn.sokoban.R;
import org.vostan.sokoban.R;
import static org.vostan.sokoban.App.theApp;

2
app/src/main/java/org/vostan/sokoban/play/PlayActivity.java
View File

@@ -16,7 +16,7 @@ import android.widget.TextView;
import org.vostan.sokoban.App;
import static org.vostan.sokoban.App.theApp;
import org.dyndns.vahagn.sokoban.R;
import org.vostan.sokoban.R;
import org.vostan.sokoban.Puzzle;
public class PlayActivity extends FragmentActivity

2
app/src/main/java/org/vostan/sokoban/play/PuzzleView.java
View File

@@ -15,7 +15,7 @@ import static java.lang.Math.*;
import org.vostan.sokoban.Puzzle;
import static org.vostan.sokoban.Puzzle.*;
import org.dyndns.vahagn.sokoban.R;
import org.vostan.sokoban.R;
/**
*/

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>