diff --git a/.classpath b/.classpath deleted file mode 100644 index 5176974..0000000 --- a/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.gitignore b/.gitignore index a22392a..ba35de5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,75 @@ -/bin -/gen +# Built application files +*.apk +*.ap_ + +# Files for the Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties +*.iml +.idea + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# ========================= +# Operating System Files +# ========================= + +# OSX +# ========================= + +.DS_Store +.AppleDouble +.LSOverride + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows +# ========================= + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk diff --git a/.project b/.project deleted file mode 100644 index 6ca1504..0000000 --- a/.project +++ /dev/null @@ -1,68 +0,0 @@ - - - - -Acrylic_Paint - - - - - - - - - - - - - -com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - - - - - -com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - - - - - -org.eclipse.jdt.core.javabuilder - - - - - - - - - -com.android.ide.eclipse.adt.ApkBuilder - - - - - - - - - - -com.android.ide.eclipse.adt.AndroidNature - - - -org.eclipse.jdt.core.javanature - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..706a1a9 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,19 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 21 + buildToolsVersion "23.0.2" + + defaultConfig { + applicationId "anupam.acrylic" + minSdkVersion 14 + targetSdkVersion 21 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/src/anupam/acrylic/AboutActivity.java b/app/src/main/java/anupam/acrylic/AboutActivity.java similarity index 100% rename from src/anupam/acrylic/AboutActivity.java rename to app/src/main/java/anupam/acrylic/AboutActivity.java diff --git a/src/anupam/acrylic/ColorPickerDialog.java b/app/src/main/java/anupam/acrylic/ColorPickerDialog.java similarity index 100% rename from src/anupam/acrylic/ColorPickerDialog.java rename to app/src/main/java/anupam/acrylic/ColorPickerDialog.java diff --git a/src/anupam/acrylic/EasyPaint.java b/app/src/main/java/anupam/acrylic/EasyPaint.java similarity index 100% rename from src/anupam/acrylic/EasyPaint.java rename to app/src/main/java/anupam/acrylic/EasyPaint.java diff --git a/src/anupam/acrylic/GraphicsActivity.java b/app/src/main/java/anupam/acrylic/GraphicsActivity.java similarity index 100% rename from src/anupam/acrylic/GraphicsActivity.java rename to app/src/main/java/anupam/acrylic/GraphicsActivity.java diff --git a/src/anupam/acrylic/PictureLayout.java b/app/src/main/java/anupam/acrylic/PictureLayout.java similarity index 100% rename from src/anupam/acrylic/PictureLayout.java rename to app/src/main/java/anupam/acrylic/PictureLayout.java diff --git a/src/anupam/acrylic/Places.java b/app/src/main/java/anupam/acrylic/Places.java similarity index 100% rename from src/anupam/acrylic/Places.java rename to app/src/main/java/anupam/acrylic/Places.java diff --git a/src/anupam/acrylic/Splash.java b/app/src/main/java/anupam/acrylic/Splash.java similarity index 100% rename from src/anupam/acrylic/Splash.java rename to app/src/main/java/anupam/acrylic/Splash.java diff --git a/res/drawable-hdpi/about.png b/app/src/main/res/drawable-hdpi/about.png similarity index 100% rename from res/drawable-hdpi/about.png rename to app/src/main/res/drawable-hdpi/about.png diff --git a/res/drawable-hdpi/blur.png b/app/src/main/res/drawable-hdpi/blur.png similarity index 100% rename from res/drawable-hdpi/blur.png rename to app/src/main/res/drawable-hdpi/blur.png diff --git a/res/drawable-hdpi/clear_all.png b/app/src/main/res/drawable-hdpi/clear_all.png similarity index 100% rename from res/drawable-hdpi/clear_all.png rename to app/src/main/res/drawable-hdpi/clear_all.png diff --git a/res/drawable-hdpi/color.png b/app/src/main/res/drawable-hdpi/color.png similarity index 100% rename from res/drawable-hdpi/color.png rename to app/src/main/res/drawable-hdpi/color.png diff --git a/res/drawable-hdpi/emboss.png b/app/src/main/res/drawable-hdpi/emboss.png similarity index 100% rename from res/drawable-hdpi/emboss.png rename to app/src/main/res/drawable-hdpi/emboss.png diff --git a/res/drawable-hdpi/erase.png b/app/src/main/res/drawable-hdpi/erase.png similarity index 100% rename from res/drawable-hdpi/erase.png rename to app/src/main/res/drawable-hdpi/erase.png diff --git a/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-hdpi/save.png b/app/src/main/res/drawable-hdpi/save.png similarity index 100% rename from res/drawable-hdpi/save.png rename to app/src/main/res/drawable-hdpi/save.png diff --git a/res/drawable-hdpi/share.png b/app/src/main/res/drawable-hdpi/share.png similarity index 100% rename from res/drawable-hdpi/share.png rename to app/src/main/res/drawable-hdpi/share.png diff --git a/res/drawable-hdpi/size.png b/app/src/main/res/drawable-hdpi/size.png similarity index 100% rename from res/drawable-hdpi/size.png rename to app/src/main/res/drawable-hdpi/size.png diff --git a/res/drawable-hdpi/splash.png b/app/src/main/res/drawable-hdpi/splash.png similarity index 100% rename from res/drawable-hdpi/splash.png rename to app/src/main/res/drawable-hdpi/splash.png diff --git a/res/drawable-mdpi/about.png b/app/src/main/res/drawable-mdpi/about.png similarity index 100% rename from res/drawable-mdpi/about.png rename to app/src/main/res/drawable-mdpi/about.png diff --git a/res/drawable-mdpi/blur.png b/app/src/main/res/drawable-mdpi/blur.png similarity index 100% rename from res/drawable-mdpi/blur.png rename to app/src/main/res/drawable-mdpi/blur.png diff --git a/res/drawable-mdpi/clear_all.png b/app/src/main/res/drawable-mdpi/clear_all.png similarity index 100% rename from res/drawable-mdpi/clear_all.png rename to app/src/main/res/drawable-mdpi/clear_all.png diff --git a/res/drawable-mdpi/color.png b/app/src/main/res/drawable-mdpi/color.png similarity index 100% rename from res/drawable-mdpi/color.png rename to app/src/main/res/drawable-mdpi/color.png diff --git a/res/drawable-mdpi/emboss.png b/app/src/main/res/drawable-mdpi/emboss.png similarity index 100% rename from res/drawable-mdpi/emboss.png rename to app/src/main/res/drawable-mdpi/emboss.png diff --git a/res/drawable-mdpi/erase.png b/app/src/main/res/drawable-mdpi/erase.png similarity index 100% rename from res/drawable-mdpi/erase.png rename to app/src/main/res/drawable-mdpi/erase.png diff --git a/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-mdpi/save.png b/app/src/main/res/drawable-mdpi/save.png similarity index 100% rename from res/drawable-mdpi/save.png rename to app/src/main/res/drawable-mdpi/save.png diff --git a/res/drawable-mdpi/share.png b/app/src/main/res/drawable-mdpi/share.png similarity index 100% rename from res/drawable-mdpi/share.png rename to app/src/main/res/drawable-mdpi/share.png diff --git a/res/drawable-mdpi/size.png b/app/src/main/res/drawable-mdpi/size.png similarity index 100% rename from res/drawable-mdpi/size.png rename to app/src/main/res/drawable-mdpi/size.png diff --git a/res/drawable-mdpi/splash.png b/app/src/main/res/drawable-mdpi/splash.png similarity index 100% rename from res/drawable-mdpi/splash.png rename to app/src/main/res/drawable-mdpi/splash.png diff --git a/res/drawable-xhdpi/about.png b/app/src/main/res/drawable-xhdpi/about.png similarity index 100% rename from res/drawable-xhdpi/about.png rename to app/src/main/res/drawable-xhdpi/about.png diff --git a/res/drawable-xhdpi/blur.png b/app/src/main/res/drawable-xhdpi/blur.png similarity index 100% rename from res/drawable-xhdpi/blur.png rename to app/src/main/res/drawable-xhdpi/blur.png diff --git a/res/drawable-xhdpi/clear_all.png b/app/src/main/res/drawable-xhdpi/clear_all.png similarity index 100% rename from res/drawable-xhdpi/clear_all.png rename to app/src/main/res/drawable-xhdpi/clear_all.png diff --git a/res/drawable-xhdpi/color.png b/app/src/main/res/drawable-xhdpi/color.png similarity index 100% rename from res/drawable-xhdpi/color.png rename to app/src/main/res/drawable-xhdpi/color.png diff --git a/res/drawable-xhdpi/emboss.png b/app/src/main/res/drawable-xhdpi/emboss.png similarity index 100% rename from res/drawable-xhdpi/emboss.png rename to app/src/main/res/drawable-xhdpi/emboss.png diff --git a/res/drawable-xhdpi/erase.png b/app/src/main/res/drawable-xhdpi/erase.png similarity index 100% rename from res/drawable-xhdpi/erase.png rename to app/src/main/res/drawable-xhdpi/erase.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/res/drawable-xhdpi/save.png b/app/src/main/res/drawable-xhdpi/save.png similarity index 100% rename from res/drawable-xhdpi/save.png rename to app/src/main/res/drawable-xhdpi/save.png diff --git a/res/drawable-xhdpi/share.png b/app/src/main/res/drawable-xhdpi/share.png similarity index 100% rename from res/drawable-xhdpi/share.png rename to app/src/main/res/drawable-xhdpi/share.png diff --git a/res/drawable-xhdpi/size.png b/app/src/main/res/drawable-xhdpi/size.png similarity index 100% rename from res/drawable-xhdpi/size.png rename to app/src/main/res/drawable-xhdpi/size.png diff --git a/res/drawable-xhdpi/splash.png b/app/src/main/res/drawable-xhdpi/splash.png similarity index 100% rename from res/drawable-xhdpi/splash.png rename to app/src/main/res/drawable-xhdpi/splash.png diff --git a/res/drawable-xxhdpi/about.png b/app/src/main/res/drawable-xxhdpi/about.png similarity index 100% rename from res/drawable-xxhdpi/about.png rename to app/src/main/res/drawable-xxhdpi/about.png diff --git a/res/drawable-xxhdpi/blur.png b/app/src/main/res/drawable-xxhdpi/blur.png similarity index 100% rename from res/drawable-xxhdpi/blur.png rename to app/src/main/res/drawable-xxhdpi/blur.png diff --git a/res/drawable-xxhdpi/clear_all.png b/app/src/main/res/drawable-xxhdpi/clear_all.png similarity index 100% rename from res/drawable-xxhdpi/clear_all.png rename to app/src/main/res/drawable-xxhdpi/clear_all.png diff --git a/res/drawable-xxhdpi/color.png b/app/src/main/res/drawable-xxhdpi/color.png similarity index 100% rename from res/drawable-xxhdpi/color.png rename to app/src/main/res/drawable-xxhdpi/color.png diff --git a/res/drawable-xxhdpi/emboss.png b/app/src/main/res/drawable-xxhdpi/emboss.png similarity index 100% rename from res/drawable-xxhdpi/emboss.png rename to app/src/main/res/drawable-xxhdpi/emboss.png diff --git a/res/drawable-xxhdpi/erase.png b/app/src/main/res/drawable-xxhdpi/erase.png similarity index 100% rename from res/drawable-xxhdpi/erase.png rename to app/src/main/res/drawable-xxhdpi/erase.png diff --git a/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/res/drawable-xxhdpi/save.png b/app/src/main/res/drawable-xxhdpi/save.png similarity index 100% rename from res/drawable-xxhdpi/save.png rename to app/src/main/res/drawable-xxhdpi/save.png diff --git a/res/drawable-xxhdpi/share.png b/app/src/main/res/drawable-xxhdpi/share.png similarity index 100% rename from res/drawable-xxhdpi/share.png rename to app/src/main/res/drawable-xxhdpi/share.png diff --git a/res/drawable-xxhdpi/size.png b/app/src/main/res/drawable-xxhdpi/size.png similarity index 100% rename from res/drawable-xxhdpi/size.png rename to app/src/main/res/drawable-xxhdpi/size.png diff --git a/res/drawable-xxhdpi/splash.png b/app/src/main/res/drawable-xxhdpi/splash.png similarity index 100% rename from res/drawable-xxhdpi/splash.png rename to app/src/main/res/drawable-xxhdpi/splash.png diff --git a/res/drawable-xxxhdpi/about.png b/app/src/main/res/drawable-xxxhdpi/about.png similarity index 100% rename from res/drawable-xxxhdpi/about.png rename to app/src/main/res/drawable-xxxhdpi/about.png diff --git a/res/drawable-xxxhdpi/actionbar_background.png b/app/src/main/res/drawable-xxxhdpi/actionbar_background.png similarity index 100% rename from res/drawable-xxxhdpi/actionbar_background.png rename to app/src/main/res/drawable-xxxhdpi/actionbar_background.png diff --git a/res/drawable-xxxhdpi/blur.png b/app/src/main/res/drawable-xxxhdpi/blur.png similarity index 100% rename from res/drawable-xxxhdpi/blur.png rename to app/src/main/res/drawable-xxxhdpi/blur.png diff --git a/res/drawable-xxxhdpi/clear_all.png b/app/src/main/res/drawable-xxxhdpi/clear_all.png similarity index 100% rename from res/drawable-xxxhdpi/clear_all.png rename to app/src/main/res/drawable-xxxhdpi/clear_all.png diff --git a/res/drawable-xxxhdpi/color.png b/app/src/main/res/drawable-xxxhdpi/color.png similarity index 100% rename from res/drawable-xxxhdpi/color.png rename to app/src/main/res/drawable-xxxhdpi/color.png diff --git a/res/drawable-xxxhdpi/emboss.png b/app/src/main/res/drawable-xxxhdpi/emboss.png similarity index 100% rename from res/drawable-xxxhdpi/emboss.png rename to app/src/main/res/drawable-xxxhdpi/emboss.png diff --git a/res/drawable-xxxhdpi/erase.png b/app/src/main/res/drawable-xxxhdpi/erase.png similarity index 100% rename from res/drawable-xxxhdpi/erase.png rename to app/src/main/res/drawable-xxxhdpi/erase.png diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/res/drawable-xxxhdpi/save.png b/app/src/main/res/drawable-xxxhdpi/save.png similarity index 100% rename from res/drawable-xxxhdpi/save.png rename to app/src/main/res/drawable-xxxhdpi/save.png diff --git a/res/drawable-xxxhdpi/share.png b/app/src/main/res/drawable-xxxhdpi/share.png similarity index 100% rename from res/drawable-xxxhdpi/share.png rename to app/src/main/res/drawable-xxxhdpi/share.png diff --git a/res/drawable-xxxhdpi/size.png b/app/src/main/res/drawable-xxxhdpi/size.png similarity index 100% rename from res/drawable-xxxhdpi/size.png rename to app/src/main/res/drawable-xxxhdpi/size.png diff --git a/res/drawable-xxxhdpi/splash.png b/app/src/main/res/drawable-xxxhdpi/splash.png similarity index 100% rename from res/drawable-xxxhdpi/splash.png rename to app/src/main/res/drawable-xxxhdpi/splash.png diff --git a/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml similarity index 100% rename from res/layout/activity_about.xml rename to app/src/main/res/layout/activity_about.xml diff --git a/res/layout/brush.xml b/app/src/main/res/layout/brush.xml similarity index 100% rename from res/layout/brush.xml rename to app/src/main/res/layout/brush.xml diff --git a/res/layout/main.xml b/app/src/main/res/layout/main.xml similarity index 100% rename from res/layout/main.xml rename to app/src/main/res/layout/main.xml diff --git a/res/menu/main.xml b/app/src/main/res/menu/main.xml similarity index 100% rename from res/menu/main.xml rename to app/src/main/res/menu/main.xml diff --git a/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml similarity index 64% rename from res/values-fr/strings.xml rename to app/src/main/res/values-fr/strings.xml index f71d6fd..ccd1185 100644 --- a/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,58 +1,58 @@ Acrylic Paint - Acrylic Paint est un logiciel libre qui libère votre créativité !\n\nAppuie sur menu pour plus d'options.\n\nMerci à Anupam Shrivastava pour l'idée, à Valerio Bozzolan pour avoir ressuscité le projet et au physicien Marco Gagino pour le formidable soutien. Merci à tous les contributeurs !\n\nBonne peinture :) + Acrylic Paint est un logiciel libre qui libère votre créativité !\n\nAppuie sur menu pour plus d\'options.\n\nMerci à Anupam Shrivastava pour l\'idée, à Valerio Bozzolan pour avoir ressuscité le projet et au physicien Marco Gagino pour le formidable soutien. Merci à tous les contributeurs !\n\nBonne peinture :) Voici ta toile. Commence à peindre ! Couleur Gras Flou Taille de brosse Effacer Effacer tout Enregistrer Partager À propos Taille sélectionnée : %1$s Taille de brosse Peinture sauvegardée sous %1$s Sélectionner Continuer OK Choisir une couleur Partager - Regardez ce que j'ai peint avec Acrylic Paint! --- Acrylic Paint (peinture simple avec le doigt) - https://f-droid.org/app/anupam.acrylic + Regardez ce que j\'ai peint avec Acrylic Paint! --- Acrylic Paint (peinture simple avec le doigt) - https://f-droid.org/app/anupam.acrylic Partager comme du texte Impossible de trouver une application pour partager… Crayon À propos Appuie sur retour une nouvelle fois pour quitter !\n(en perdant tout le travail non enregistré) Acrylic Paint -

Merci d'utiliser Acrylic Paint!
Un logiciel libre pour libérer votre créativité !

+

Merci d\'utiliser Acrylic Paint!
Un logiciel libre pour libérer votre créativité !

Crédits

Un grand merci à :
Valerio Bozzolan pour le bon travail de relecture et d'optimisation du code source. Il continue actuellement le travail pour cette version de AcrylicPaint.
+Valerio Bozzolan pour le bon travail de relecture et d\'optimisation du code source. Il continue actuellement le travail pour cette version de AcrylicPaint.
Marco Gagino for le restylage complet et sa grande participation !

Licences

Cette version de Acrylic Paint et son code source sont fournis par Valerio Bozzolan sous les termes de la licence GNU GPLv3+. -Cette licence permet à tout monde d'utiliser, étudier, améliorer et partager cette application par tous les moyens et pour tout usage tant que vous offrez les mêmes droits à vos utilisateurs.

-

Cette application est distribuée dans l'espoir qu'elle sera utile à tous, mais sans aucune garantie ; sans même la garantie implicite de -COMMERCIALISATION ou D'ADAPTATION A UN USAGE PARTICULIER. Voir la Licence Publique Générale GNU pour plus de détails.

+Cette licence permet à tout monde d\'utiliser, étudier, améliorer et partager cette application par tous les moyens et pour tout usage tant que vous offrez les mêmes droits à vos utilisateurs.

+

Cette application est distribuée dans l\'espoir qu\'elle sera utile à tous, mais sans aucune garantie ; sans même la garantie implicite de +COMMERCIALISATION ou D\'ADAPTATION A UN USAGE PARTICULIER. Voir la Licence Publique Générale GNU pour plus de détails.

Note

-

Si vous rencontrez des problèmes ou avez des idées, n'hésitez pas à utiliser le bug tracker.

+

Si vous rencontrez des problèmes ou avez des idées, n\'hésitez pas à utiliser le bug tracker.

Contribuer au code source : valerio-bozzolan/AcrylicPaint @GitHub.

-

Lisez le fichier README pour plus d'informations.

+

Lisez le fichier README pour plus d\'informations.

Amusez-vous bien !

]]>
diff --git a/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml similarity index 100% rename from res/values-it/strings.xml rename to app/src/main/res/values-it/strings.xml diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/res/values/ids.xml b/app/src/main/res/values/ids.xml similarity index 100% rename from res/values/ids.xml rename to app/src/main/res/values/ids.xml diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/res/values/theme.xml b/app/src/main/res/values/theme.xml similarity index 100% rename from res/values/theme.xml rename to app/src/main/res/values/theme.xml diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..f4d8c54 --- /dev/null +++ b/build.gradle @@ -0,0 +1,15 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.5.0' + } +} + +allprojects { + repositories { + jcenter() + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..05ef575 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..f23df6e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Oct 21 11:34:03 PDT 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/project.properties b/project.properties deleted file mode 100644 index 6e18427..0000000 --- a/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-21 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'