diff --git a/.gitignore b/.gitignore index 434e960..fcd49c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,53 +1,13 @@ -# Created by https://www.gitignore.io/api/eclipse,android - -### Eclipse ### -*.pydevproject -.metadata -.gradle -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.settings/ -.loadpath - -# Eclipse Core -.project - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# Java annotation processor (APT) -.factorypath - -# PDT-specific -.buildpath - -# sbteclipse plugin -.target - -# TeXlipse plugin -.texlipse - +# Created by https://www.gitignore.io/api/android,eclipse,jetbrains,androidstudio +# Modified by EXL, 01-MAY-2017 ### Android ### + # Built application files *.apk *.ap_ -# Files for the Dalvik VM +# Files for the ART/Dalvik VM *.dex # Java class files @@ -56,6 +16,7 @@ local.properties # Generated files bin/ gen/ +out/ # Gradle files .gradle/ @@ -73,16 +34,146 @@ proguard/ # Android Studio Navigation editor temp files .navigation/ -# NDK libs and binaries -obj/ -*.so +# Android Studio captures folder +captures/ -# Lint config -lint.xml +# Intellij +*.iml +.idea/ -# User-files -*.user* +# Keystore files +*.jks + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild -### Android Patch ### +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# Android Patch gen-external-apklibs +# Gradle files +.gradle + +# Signing files +.signing/ + +# Android Studio +/*/build/ +/*/local.properties +/*/out +/*/*/build +/*/*/production +*.ipr +*~ +*.swp + +# NDK +obj/ + +# IntelliJ IDEA +*.iws +/out/ + +# OS-specific files +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# Legacy Eclipse project files +.classpath +.project + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files +*.jar +*.war +*.ear + +# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml) +hs_err_pid* + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Excludes +!/gradle/wrapper/gradle-wrapper.jar + +### Eclipse ### + +.metadata +tmp/ +*.tmp +*.bak +*~.nib +.settings/ +.loadpath +.recommenders + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet + +# CMake +cmake-build-debug/ + +# End of https://www.gitignore.io/api/android,eclipse,jetbrains,androidstudio + +# Qt Creator builds +build-* +*.user* diff --git a/LICENSE.md b/License.md similarity index 100% rename from LICENSE.md rename to License.md diff --git a/README.md b/ReadMe.md similarity index 100% rename from README.md rename to ReadMe.md diff --git a/astrosmash/build.gradle b/astrosmash/build.gradle new file mode 100644 index 0000000..c5465c7 --- /dev/null +++ b/astrosmash/build.gradle @@ -0,0 +1,19 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 23 + buildToolsVersion "25.0.3" + + defaultConfig { + applicationId "ru.exlmoto.astrosmash" + minSdkVersion 8 + targetSdkVersion 16 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} diff --git a/AndroidManifest.xml b/astrosmash/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to astrosmash/src/main/AndroidManifest.xml diff --git a/src/ru/exlmoto/astrosmash/AstroSmashActivity.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashActivity.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashActivity.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashActivity.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/BackgroundManager.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/BackgroundManager.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/BackgroundManager.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/BackgroundManager.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/Collidable.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/Collidable.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/Collidable.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/Collidable.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/Drawable.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/Drawable.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/Drawable.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/Drawable.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/Enemy.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/Enemy.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/Enemy.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/Enemy.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/EnemyFactory.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/EnemyFactory.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/EnemyFactory.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/EnemyFactory.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/GameWorld.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/GameWorld.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/GameWorld.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/GameWorld.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/GunShip.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/GunShip.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/GunShip.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/GunShip.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/IDeathListener.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/IDeathListener.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/IDeathListener.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/IDeathListener.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/IGameWorldListener.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/IGameWorldListener.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/IGameWorldListener.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/IGameWorldListener.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/InfoStrings.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/InfoStrings.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/InfoStrings.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/InfoStrings.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/MunitionsFactory.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/MunitionsFactory.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/MunitionsFactory.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/MunitionsFactory.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/PerformanceMeter.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/PerformanceMeter.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/PerformanceMeter.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/PerformanceMeter.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/Pulser.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/Pulser.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/Pulser.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/Pulser.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/StarManager.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/StarManager.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/StarManager.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/StarManager.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/SwappableEnemy.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/SwappableEnemy.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/SwappableEnemy.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/SwappableEnemy.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/Ufo.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/Ufo.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/Ufo.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/Ufo.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashEngine/Version.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/Version.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashEngine/Version.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashEngine/Version.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashHighScoreDialog.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashHighScoreDialog.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashHighScoreDialog.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashHighScoreDialog.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashLauncher.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashLauncher.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashLauncher.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashLauncher.java diff --git a/src/ru/exlmoto/astrosmash/AstroSmashView.java b/astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashView.java similarity index 100% rename from src/ru/exlmoto/astrosmash/AstroSmashView.java rename to astrosmash/src/main/java/ru/exlmoto/astrosmash/AstroSmashView.java diff --git a/res/drawable-hdpi/ic_launcher.png b/astrosmash/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to astrosmash/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_launcher.png b/astrosmash/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to astrosmash/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-nodpi/bullet.png b/astrosmash/src/main/res/drawable-nodpi/bullet.png similarity index 100% rename from res/drawable-nodpi/bullet.png rename to astrosmash/src/main/res/drawable-nodpi/bullet.png diff --git a/res/drawable-nodpi/explode1.png b/astrosmash/src/main/res/drawable-nodpi/explode1.png similarity index 100% rename from res/drawable-nodpi/explode1.png rename to astrosmash/src/main/res/drawable-nodpi/explode1.png diff --git a/res/drawable-nodpi/explode2.png b/astrosmash/src/main/res/drawable-nodpi/explode2.png similarity index 100% rename from res/drawable-nodpi/explode2.png rename to astrosmash/src/main/res/drawable-nodpi/explode2.png diff --git a/res/drawable-nodpi/minus.png b/astrosmash/src/main/res/drawable-nodpi/minus.png similarity index 100% rename from res/drawable-nodpi/minus.png rename to astrosmash/src/main/res/drawable-nodpi/minus.png diff --git a/res/drawable-nodpi/mountains.png b/astrosmash/src/main/res/drawable-nodpi/mountains.png similarity index 100% rename from res/drawable-nodpi/mountains.png rename to astrosmash/src/main/res/drawable-nodpi/mountains.png diff --git a/res/drawable-nodpi/no0.png b/astrosmash/src/main/res/drawable-nodpi/no0.png similarity index 100% rename from res/drawable-nodpi/no0.png rename to astrosmash/src/main/res/drawable-nodpi/no0.png diff --git a/res/drawable-nodpi/no1.png b/astrosmash/src/main/res/drawable-nodpi/no1.png similarity index 100% rename from res/drawable-nodpi/no1.png rename to astrosmash/src/main/res/drawable-nodpi/no1.png diff --git a/res/drawable-nodpi/no2.png b/astrosmash/src/main/res/drawable-nodpi/no2.png similarity index 100% rename from res/drawable-nodpi/no2.png rename to astrosmash/src/main/res/drawable-nodpi/no2.png diff --git a/res/drawable-nodpi/no3.png b/astrosmash/src/main/res/drawable-nodpi/no3.png similarity index 100% rename from res/drawable-nodpi/no3.png rename to astrosmash/src/main/res/drawable-nodpi/no3.png diff --git a/res/drawable-nodpi/no4.png b/astrosmash/src/main/res/drawable-nodpi/no4.png similarity index 100% rename from res/drawable-nodpi/no4.png rename to astrosmash/src/main/res/drawable-nodpi/no4.png diff --git a/res/drawable-nodpi/no5.png b/astrosmash/src/main/res/drawable-nodpi/no5.png similarity index 100% rename from res/drawable-nodpi/no5.png rename to astrosmash/src/main/res/drawable-nodpi/no5.png diff --git a/res/drawable-nodpi/no6.png b/astrosmash/src/main/res/drawable-nodpi/no6.png similarity index 100% rename from res/drawable-nodpi/no6.png rename to astrosmash/src/main/res/drawable-nodpi/no6.png diff --git a/res/drawable-nodpi/no7.png b/astrosmash/src/main/res/drawable-nodpi/no7.png similarity index 100% rename from res/drawable-nodpi/no7.png rename to astrosmash/src/main/res/drawable-nodpi/no7.png diff --git a/res/drawable-nodpi/no8.png b/astrosmash/src/main/res/drawable-nodpi/no8.png similarity index 100% rename from res/drawable-nodpi/no8.png rename to astrosmash/src/main/res/drawable-nodpi/no8.png diff --git a/res/drawable-nodpi/no9.png b/astrosmash/src/main/res/drawable-nodpi/no9.png similarity index 100% rename from res/drawable-nodpi/no9.png rename to astrosmash/src/main/res/drawable-nodpi/no9.png diff --git a/res/drawable-nodpi/nox.png b/astrosmash/src/main/res/drawable-nodpi/nox.png similarity index 100% rename from res/drawable-nodpi/nox.png rename to astrosmash/src/main/res/drawable-nodpi/nox.png diff --git a/res/drawable-nodpi/pulser.png b/astrosmash/src/main/res/drawable-nodpi/pulser.png similarity index 100% rename from res/drawable-nodpi/pulser.png rename to astrosmash/src/main/res/drawable-nodpi/pulser.png diff --git a/res/drawable-nodpi/pulser_small.png b/astrosmash/src/main/res/drawable-nodpi/pulser_small.png similarity index 100% rename from res/drawable-nodpi/pulser_small.png rename to astrosmash/src/main/res/drawable-nodpi/pulser_small.png diff --git a/res/drawable-nodpi/rock1.png b/astrosmash/src/main/res/drawable-nodpi/rock1.png similarity index 100% rename from res/drawable-nodpi/rock1.png rename to astrosmash/src/main/res/drawable-nodpi/rock1.png diff --git a/res/drawable-nodpi/rock1_s.png b/astrosmash/src/main/res/drawable-nodpi/rock1_s.png similarity index 100% rename from res/drawable-nodpi/rock1_s.png rename to astrosmash/src/main/res/drawable-nodpi/rock1_s.png diff --git a/res/drawable-nodpi/rock2.png b/astrosmash/src/main/res/drawable-nodpi/rock2.png similarity index 100% rename from res/drawable-nodpi/rock2.png rename to astrosmash/src/main/res/drawable-nodpi/rock2.png diff --git a/res/drawable-nodpi/rock2_s.png b/astrosmash/src/main/res/drawable-nodpi/rock2_s.png similarity index 100% rename from res/drawable-nodpi/rock2_s.png rename to astrosmash/src/main/res/drawable-nodpi/rock2_s.png diff --git a/res/drawable-nodpi/rock3.png b/astrosmash/src/main/res/drawable-nodpi/rock3.png similarity index 100% rename from res/drawable-nodpi/rock3.png rename to astrosmash/src/main/res/drawable-nodpi/rock3.png diff --git a/res/drawable-nodpi/rock3_s.png b/astrosmash/src/main/res/drawable-nodpi/rock3_s.png similarity index 100% rename from res/drawable-nodpi/rock3_s.png rename to astrosmash/src/main/res/drawable-nodpi/rock3_s.png diff --git a/res/drawable-nodpi/rock4.png b/astrosmash/src/main/res/drawable-nodpi/rock4.png similarity index 100% rename from res/drawable-nodpi/rock4.png rename to astrosmash/src/main/res/drawable-nodpi/rock4.png diff --git a/res/drawable-nodpi/rock4_s.png b/astrosmash/src/main/res/drawable-nodpi/rock4_s.png similarity index 100% rename from res/drawable-nodpi/rock4_s.png rename to astrosmash/src/main/res/drawable-nodpi/rock4_s.png diff --git a/res/drawable-nodpi/satellite_flat.png b/astrosmash/src/main/res/drawable-nodpi/satellite_flat.png similarity index 100% rename from res/drawable-nodpi/satellite_flat.png rename to astrosmash/src/main/res/drawable-nodpi/satellite_flat.png diff --git a/res/drawable-nodpi/satellite_updown.png b/astrosmash/src/main/res/drawable-nodpi/satellite_updown.png similarity index 100% rename from res/drawable-nodpi/satellite_updown.png rename to astrosmash/src/main/res/drawable-nodpi/satellite_updown.png diff --git a/res/drawable-nodpi/ship_explode1.png b/astrosmash/src/main/res/drawable-nodpi/ship_explode1.png similarity index 100% rename from res/drawable-nodpi/ship_explode1.png rename to astrosmash/src/main/res/drawable-nodpi/ship_explode1.png diff --git a/res/drawable-nodpi/ship_explode2.png b/astrosmash/src/main/res/drawable-nodpi/ship_explode2.png similarity index 100% rename from res/drawable-nodpi/ship_explode2.png rename to astrosmash/src/main/res/drawable-nodpi/ship_explode2.png diff --git a/res/drawable-nodpi/ship_explode3.png b/astrosmash/src/main/res/drawable-nodpi/ship_explode3.png similarity index 100% rename from res/drawable-nodpi/ship_explode3.png rename to astrosmash/src/main/res/drawable-nodpi/ship_explode3.png diff --git a/res/drawable-nodpi/ship_green.png b/astrosmash/src/main/res/drawable-nodpi/ship_green.png similarity index 100% rename from res/drawable-nodpi/ship_green.png rename to astrosmash/src/main/res/drawable-nodpi/ship_green.png diff --git a/res/drawable-nodpi/ship_small.png b/astrosmash/src/main/res/drawable-nodpi/ship_small.png similarity index 100% rename from res/drawable-nodpi/ship_small.png rename to astrosmash/src/main/res/drawable-nodpi/ship_small.png diff --git a/res/drawable-nodpi/smallsat_flat.png b/astrosmash/src/main/res/drawable-nodpi/smallsat_flat.png similarity index 100% rename from res/drawable-nodpi/smallsat_flat.png rename to astrosmash/src/main/res/drawable-nodpi/smallsat_flat.png diff --git a/res/drawable-nodpi/smallsat_updown.png b/astrosmash/src/main/res/drawable-nodpi/smallsat_updown.png similarity index 100% rename from res/drawable-nodpi/smallsat_updown.png rename to astrosmash/src/main/res/drawable-nodpi/smallsat_updown.png diff --git a/res/drawable-nodpi/ufo.png b/astrosmash/src/main/res/drawable-nodpi/ufo.png similarity index 100% rename from res/drawable-nodpi/ufo.png rename to astrosmash/src/main/res/drawable-nodpi/ufo.png diff --git a/res/drawable-nodpi/ufo_bullet.png b/astrosmash/src/main/res/drawable-nodpi/ufo_bullet.png similarity index 100% rename from res/drawable-nodpi/ufo_bullet.png rename to astrosmash/src/main/res/drawable-nodpi/ufo_bullet.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/astrosmash/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher.png rename to astrosmash/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/res/drawable-xxhdpi/ic_launcher.png b/astrosmash/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxhdpi/ic_launcher.png rename to astrosmash/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/res/drawable/covers.png b/astrosmash/src/main/res/drawable/covers.png similarity index 100% rename from res/drawable/covers.png rename to astrosmash/src/main/res/drawable/covers.png diff --git a/res/drawable/icon_about_big.png b/astrosmash/src/main/res/drawable/icon_about_big.png similarity index 100% rename from res/drawable/icon_about_big.png rename to astrosmash/src/main/res/drawable/icon_about_big.png diff --git a/res/layout/activity_astrosmashlauncher.xml b/astrosmash/src/main/res/layout/activity_astrosmashlauncher.xml similarity index 100% rename from res/layout/activity_astrosmashlauncher.xml rename to astrosmash/src/main/res/layout/activity_astrosmashlauncher.xml diff --git a/res/layout/activity_dialoghiscore.xml b/astrosmash/src/main/res/layout/activity_dialoghiscore.xml similarity index 100% rename from res/layout/activity_dialoghiscore.xml rename to astrosmash/src/main/res/layout/activity_dialoghiscore.xml diff --git a/res/layout/dialog_about.xml b/astrosmash/src/main/res/layout/dialog_about.xml similarity index 100% rename from res/layout/dialog_about.xml rename to astrosmash/src/main/res/layout/dialog_about.xml diff --git a/res/layout/dialog_help.xml b/astrosmash/src/main/res/layout/dialog_help.xml similarity index 100% rename from res/layout/dialog_help.xml rename to astrosmash/src/main/res/layout/dialog_help.xml diff --git a/res/raw/s_hit.ogg b/astrosmash/src/main/res/raw/s_hit.ogg similarity index 100% rename from res/raw/s_hit.ogg rename to astrosmash/src/main/res/raw/s_hit.ogg diff --git a/res/raw/s_ship.ogg b/astrosmash/src/main/res/raw/s_ship.ogg similarity index 100% rename from res/raw/s_ship.ogg rename to astrosmash/src/main/res/raw/s_ship.ogg diff --git a/res/raw/s_shot.ogg b/astrosmash/src/main/res/raw/s_shot.ogg similarity index 100% rename from res/raw/s_shot.ogg rename to astrosmash/src/main/res/raw/s_shot.ogg diff --git a/res/raw/s_ufo.ogg b/astrosmash/src/main/res/raw/s_ufo.ogg similarity index 100% rename from res/raw/s_ufo.ogg rename to astrosmash/src/main/res/raw/s_ufo.ogg diff --git a/res/values-ru/strings.xml b/astrosmash/src/main/res/values-ru/strings.xml similarity index 100% rename from res/values-ru/strings.xml rename to astrosmash/src/main/res/values-ru/strings.xml diff --git a/res/values-v11/style.xml b/astrosmash/src/main/res/values-v11/style.xml similarity index 100% rename from res/values-v11/style.xml rename to astrosmash/src/main/res/values-v11/style.xml diff --git a/res/values-v14/style.xml b/astrosmash/src/main/res/values-v14/style.xml similarity index 100% rename from res/values-v14/style.xml rename to astrosmash/src/main/res/values-v14/style.xml diff --git a/res/values-v21/style.xml b/astrosmash/src/main/res/values-v21/style.xml similarity index 100% rename from res/values-v21/style.xml rename to astrosmash/src/main/res/values-v21/style.xml diff --git a/res/values/dimens.xml b/astrosmash/src/main/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to astrosmash/src/main/res/values/dimens.xml diff --git a/res/values/strings.xml b/astrosmash/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to astrosmash/src/main/res/values/strings.xml diff --git a/res/values/style.xml b/astrosmash/src/main/res/values/style.xml similarity index 100% rename from res/values/style.xml rename to astrosmash/src/main/res/values/style.xml diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..1c2d068 --- /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:2.3.1' + } +} + +allprojects { + repositories { + jcenter() + } +} diff --git a/docs/ffmpeg.txt b/docs/Ffmpeg_notes.txt similarity index 100% rename from docs/ffmpeg.txt rename to docs/Ffmpeg_notes.txt diff --git a/docs/Import_to_AS_summary.txt b/docs/Import_to_AS_summary.txt new file mode 100644 index 0000000..3d96698 --- /dev/null +++ b/docs/Import_to_AS_summary.txt @@ -0,0 +1,45 @@ +ECLIPSE ANDROID PROJECT IMPORT SUMMARY +====================================== + +Ignored Files: +-------------- +The following files were *not* copied into the new Gradle project; you +should evaluate whether these are still needed in your project and if +so manually move them: + +* .gitignore +* LICENSE.md +* README.md +* docs/ +* docs/Fix_decompiled_sources.patch +* docs/ffmpeg.txt +* ic_launcher-web.png +* images/ +* images/AstroSmash_android_screen.png +* images/AstroSmash_motorola_photon_q.jpg +* images/icon_src.xcf +* proguard-project.txt + +Moved Files: +------------ +Android Gradle projects use a different directory structure than ADT +Eclipse projects. Here's how the projects were restructured: + +* AndroidManifest.xml => app/src/main/AndroidManifest.xml +* res/ => app/src/main/res/ +* src/ => app/src/main/java/ + +Next Steps: +----------- +You can now build the project. The Gradle project needs network +connectivity to download dependencies. + +Bugs: +----- +If for some reason your project does not build, and you determine that +it is due to a bug or limitation of the Eclipse to Gradle importer, +please file a bug at http://b.android.com with category +Component-Tools. + +(This import summary is for your information only, and can be deleted +after import once you are satisfied with the results.) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae 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..edd338e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri May 05 00:19:24 NOVT 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/gradlew b/gradlew new file mode 100755 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/ic_launcher-web.png b/images/ic_launcher-web.png similarity index 100% rename from ic_launcher-web.png rename to images/ic_launcher-web.png diff --git a/images/icon_src.xcf b/images/src/icon_src.xcf similarity index 100% rename from images/icon_src.xcf rename to images/src/icon_src.xcf diff --git a/proguard-project.txt b/proguard-project.txt deleted file mode 100644 index f2fe155..0000000 --- a/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/project.properties b/project.properties deleted file mode 100644 index 916037e..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-23 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..5f38c7f --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':astrosmash'