Skip to content

Commit

Permalink
RELEASE 1.3;
Browse files Browse the repository at this point in the history
- The app can now be build with Gradle 1.9;
- removed 'font' and 'interactions.ini' from ponies-list;
- removed 'cloud_bounce' behaviour from Derpy Hooves;
- removed 'truck' behaviour from Applejack;
- Snowflake is now called Snowflake/Horse Power/Roid Rage;
  • Loading branch information
frankkienl committed Jan 9, 2014
1 parent ff16bfd commit 5a54cab
Show file tree
Hide file tree
Showing 36 changed files with 193 additions and 34 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/libraries/Gradle__opencsv_2_3.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/libraries/Gradle__support_v4_19_0_1.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions BronyLiveWallpaper.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

78 changes: 78 additions & 0 deletions BronyLiveWallpaper/BronyLiveWallpaper-BronyLiveWallpaper.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="BronyLiveWallpaper" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.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" />
</configuration>
</facet>
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":BronyLiveWallpaper" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" generated="true" />
<excludeFolder url="file://$MODULE_DIR$/build/apk" />
<excludeFolder url="file://$MODULE_DIR$/build/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/res" />
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="Gradle: opencsv-2.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: support-v4-19.0.1" level="project" />
<orderEntry type="library" exported="" name="Gradle: ComAndroidSupportAppcompatV71901.aar" level="project" />
</component>
</module>

36 changes: 17 additions & 19 deletions BronyLiveWallpaper/build.gradle
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
}
}
apply plugin: 'android'

repositories {
mavenCentral()
android {
compileSdkVersion 19
buildToolsVersion "19.0.0"

defaultConfig {
minSdkVersion 7
targetSdkVersion 19
versionCode 9
versionName "1.3"
}
buildTypes {
release {
runProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
}

dependencies {
compile files ('libs/opencsv-2.3.jar')
compile 'com.android.support:support-v4:13.0.+'
compile 'com.android.support:appcompat-v7:+'
}

android {
compileSdkVersion 17
buildToolsVersion "17.0.0"

defaultConfig {
minSdkVersion 7
targetSdkVersion 16
}
}
4 changes: 2 additions & 2 deletions BronyLiveWallpaper/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ http://austiniousi.deviantart.com/art/Ponyville-Background-324408425
//-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="nl.frankkie.bronylivewallpaper"
android:versionCode="8"
android:versionCode="9"
android:installLocation="auto"
android:versionName="1.2.2">
android:versionName="1.3">


<uses-sdk
Expand Down
10 changes: 5 additions & 5 deletions BronyLiveWallpaper/src/main/assets/Applejack/pony.ini
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ Behavior,"giddyup",0.01,1,1,1,"rear_right.gif","rear_left.gif",None,"gallop","gi
Behavior,"gallop",0.05,3,1,6,"gallop_right.gif","gallop_left.gif",Diagonal_Only,"","gallop_sound","",True,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"theme 1",0,16,16,3,"trotcycle_aj_right.gif","trotcycle_aj_left.gif",Diagonal_horizontal,"","","theme 1",True,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"Galla_Dress",0.0005,20,15,0,"aj_galla_right.gif","aj_galla_left.gif",None,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"truck_drive",0.0005,60,60,3,"truck_drive_right.gif","truck_drive_left.gif",Diagonal_horizontal,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"truck_twilight",0,6,6,0,"truck_drive_right.gif","truck_drive_left.gif",None,"truck_twilight2","","",True,0,0,"Twilight Sparkle",False,truck_twilight,truck_twilight,"0,0","0,0",False,0
Behavior,"truck_twilight2",0,6,6,0,"truck_drive_right.gif","truck_drive_left.gif",None,"truck_twilight3","truck1","",True,0,0,"Twilight Sparkle",False,truck_twilight,truck_twilight,"0,0","0,0",False,0
Behavior,"truck_twilight3",0,6,6,0,"truck_drive_right.gif","truck_drive_left.gif",None,"truck_twilight4","truck2","",True,0,0,"Twilight Sparkle",False,truck_twilight,truck_twilight,"0,0","0,0",False,0
Behavior,"truck_twilight4",0,6,6,0,"truck_drive_right.gif","truck_drive_left.gif",None,"truck_drive","truck3","",True,0,0,"Twilight Sparkle",False,truck_twilight,truck_twilight,"0,0","0,0",False,0
'Behavior,"truck_drive",0.0005,60,60,3,"truck_drive_right.gif","truck_drive_left.gif",Diagonal_horizontal,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
'Behavior,"truck_twilight",0,6,6,0,"truck_drive_right.gif","truck_drive_left.gif",None,"truck_twilight2","","",True,0,0,"Twilight Sparkle",False,truck_twilight,truck_twilight,"0,0","0,0",False,0
'Behavior,"truck_twilight2",0,6,6,0,"truck_drive_right.gif","truck_drive_left.gif",None,"truck_twilight3","truck1","",True,0,0,"Twilight Sparkle",False,truck_twilight,truck_twilight,"0,0","0,0",False,0
'Behavior,"truck_twilight3",0,6,6,0,"truck_drive_right.gif","truck_drive_left.gif",None,"truck_twilight4","truck2","",True,0,0,"Twilight Sparkle",False,truck_twilight,truck_twilight,"0,0","0,0",False,0
'Behavior,"truck_twilight4",0,6,6,0,"truck_drive_right.gif","truck_drive_left.gif",None,"truck_drive","truck3","",True,0,0,"Twilight Sparkle",False,truck_twilight,truck_twilight,"0,0","0,0",False,0
Behavior,"tree_buck",0.01,2.9,2.9,0,"buck.gif","buck.gif",None,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"ApploJock",0,10.24,10.24,0,"stand_aj_right.gif","stand_aj_left.gif",None,"","","",True,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"pose",0.07,7,4,0,"aj_pose_right.gif","aj_pose_left.gif",None,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Expand Down
4 changes: 2 additions & 2 deletions BronyLiveWallpaper/src/main/assets/Derpy Hooves/pony.ini
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ Behavior,"muffin",0.2,6.52,6.52,0,"derpy_muffin_right.gif","derpy_muffin_left.gi
Behavior,"follow",0.2,60,30,3,"derpy_walking_right.gif","derpy_walking_left.gif",All,"","Hello","",False,100,100,"Raindrops",True,,,"0,0","0,0",False,0
Behavior,"Sit",0.2,38.24,19.12,0,"derpy_sit_left_short.gif","derpy_sit_right_short.gif",Sleep,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"Drag",0,60,60,0,"drag_right.png","drag_left.png",Dragged,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"cloud_start",0.25,5.26,5.26,0,"derpy_cloud_start_right.gif","derpy_cloud_start_left.gif",None,"cloud_bounce","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"cloud_bounce",0.25,8.65,8.65,0,"derpy_cloud_right.gif","derpy_cloud_left.gif",None,"","wrong","",True,0,0,"",True,,,"0,0","0,0",False,0
'Behavior,"cloud_start",0.25,5.26,5.26,0,"derpy_cloud_start_right.gif","derpy_cloud_start_left.gif",None,"cloud_bounce","","",False,0,0,"",True,,,"0,0","0,0",False,0
'Behavior,"cloud_bounce",0.25,8.65,8.65,0,"derpy_cloud_right.gif","derpy_cloud_left.gif",None,"","wrong","",True,0,0,"",True,,,"0,0","0,0",False,0
Effect,"drop_mail1","fly_mail_1","mail_right.gif","mail_left.gif",5,1,Center,Center,Center,Center,False,False
Effect,"drop_mail2","fly_mail_2","mail_right.gif","mail_left.gif",5,1,Center,Center,Center,Center,False,False
Effect,"drop_mail3","fly_mail_3","mail_right.gif","mail_left.gif",5,1,Center,Center,Center,Center,False,False
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions BronyLiveWallpaper/src/main/assets/Horse Power/pony.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
'Horse Power
'Idle, trot, flight, hover, yeah by Bot-chan
Name,Horse Power
Categories,"supporting ponies","stallions","pegasi"
Behavior,"stand",0.5,20,15,0,"horse_power_idle_right.gif","horse_power_idle_left.gif",MouseOver,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"trot",0.5,20,10,2.5,"horse_power_trot_right.gif","horse_power_trot_left.gif",Diagonal_horizontal,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"fly",0.5,20,5,3,"horse_power_flight_right.gif","horse_power_flight_left.gif",Diagonal_horizontal,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"hover",0.5,15,5,2,"horse_power_hover_right.gif","horse_power_hover_left.gif",Diagonal_Vertical,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"yeah",0.2,5,5,0,"horse_power_yeah_right.gif","horse_power_yeah_left.gif",None,"","yeah","",False,0,0,"",True,,,"0,0","0,0",True,0
Speak,"Yeah","Yeah!",{"yeah.mp3","yeah.ogg"},True,0
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions BronyLiveWallpaper/src/main/assets/Roid Rage/pony.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
'Horse Power
'Idle, trot, flight, hover, yeah by Bot-chan
Name,Horse Power
Categories,"supporting ponies","stallions","pegasi"
Behavior,"stand",0.5,20,15,0,"horse_power_idle_right.gif","horse_power_idle_left.gif",MouseOver,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"trot",0.5,20,10,2.5,"horse_power_trot_right.gif","horse_power_trot_left.gif",Diagonal_horizontal,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"fly",0.5,20,5,3,"horse_power_flight_right.gif","horse_power_flight_left.gif",Diagonal_horizontal,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"hover",0.5,15,5,2,"horse_power_hover_right.gif","horse_power_hover_left.gif",Diagonal_Vertical,"","","",False,0,0,"",True,,,"0,0","0,0",False,0
Behavior,"yeah",0.2,5,5,0,"horse_power_yeah_right.gif","horse_power_yeah_left.gif",None,"","yeah","",False,0,0,"",True,,,"0,0","0,0",True,0
Speak,"Yeah","Yeah!",{"yeah.mp3","yeah.ogg"},True,0
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ protected Void doInBackground(Void... voids) {
try {
String[] list = getAssets().list("");
for (final String s : list) {
if (s.equals("images") || s.equals("kioskmode") || s.equals("sounds") || s.equals("webkit")) {
if (s.equals("images") || s.equals("kioskmode") || s.equals("sounds")
|| s.equals("webkit") || s.equals("fonts") || s.equals("interactions.ini")) {
continue;
}
ponySettings.add(new PonySetting(s, Util.LOCATION_ASSETS));
Expand Down
5 changes: 3 additions & 2 deletions Building
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
This application is made with Android Studio. (version 0.2.9)
This application is made with Android Studio.
<strike>(version 0.2.9)</strike> (version 0.4.2)
Therefor this app should be build using Gradle.
(Gradle 1.9)

The source from the GifDecoder is included with the source from the application itself.
This is because the source has been modified.
Expand All @@ -8,7 +10,6 @@ The app also uses the OpenCSV library. The jar is included in the libs-folder.
Make sure the following is present in your gradle file:
dependencies {
compile files ('libs/opencsv-2.3.jar')
compile 'com.android.support:support-v4:13.0.+'
}

Good luck building this app !
Expand Down
7 changes: 7 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
1.3:
- The app can now be build with Gradle 1.9
- removed 'font' and 'interactions.ini' from ponies-list
- removed 'cloud_bounce' behaviour from Derpy Hooves
- removed 'truck' behaviour from Applejack
- Snowflake is now called Snowflake/Horse Power/Roid Rage

1.2.2:
- Changed the name 'Horse Power' has been change to 'Snowflake'
- Added Credits section
Expand Down
15 changes: 15 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.7.+'
}
}

allprojects {
repositories {
mavenCentral()
}
}
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
#Wed Jul 31 13:58:37 CEST 2013
#Wed Apr 10 15:27:10 PDT 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip

0 comments on commit 5a54cab

Please sign in to comment.