diff --git a/.gitignore b/.gitignore index 54aa55e..3b9ef86 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,14 @@ +# ignore OSX clutter .DS_* -/bin -/gen -/.checkstyle -/.classpath -/.project -/.settings -/.metadata -/lint.xml + +# ignore some local context +/local.properties + +# ignore gradle artifacts +/.gradle +/build + +# ignore Studio artifacts +/.idea +/*.iml diff --git a/AndroidManifest.xml b/AndroidManifest.xml deleted file mode 100644 index 20df03e..0000000 --- a/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..4e4c905 --- /dev/null +++ b/app/.gitignore @@ -0,0 +1,6 @@ +# ignore gradle artifacts +/build + +# ignore Studio artifacts +/*.iml + diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..7f7ad2d --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,21 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 15 + buildToolsVersion "21.1.2" + + defaultConfig { + applicationId "com.oreilly.demo.android.pa.asynctask" + minSdkVersion 15 + targetSdkVersion 21 + versionCode 1 + versionName "1.0" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..e22863a --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000..9ef6b1d Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ diff --git a/src/com/oreilly/demo/android/pa/asynctask/AsyncTaskDemo.java b/app/src/main/java/com/oreilly/demo/android/pa/asynctask/AsyncTaskDemo.java similarity index 100% rename from src/com/oreilly/demo/android/pa/asynctask/AsyncTaskDemo.java rename to app/src/main/java/com/oreilly/demo/android/pa/asynctask/AsyncTaskDemo.java diff --git a/src/com/oreilly/demo/android/pa/asynctask/AsyncTaskDemoWithProgress.java b/app/src/main/java/com/oreilly/demo/android/pa/asynctask/AsyncTaskDemoWithProgress.java similarity index 100% rename from src/com/oreilly/demo/android/pa/asynctask/AsyncTaskDemoWithProgress.java rename to app/src/main/java/com/oreilly/demo/android/pa/asynctask/AsyncTaskDemoWithProgress.java diff --git a/src/com/oreilly/demo/android/pa/asynctask/AsyncTaskSample.java b/app/src/main/java/com/oreilly/demo/android/pa/asynctask/AsyncTaskSample.java similarity index 100% rename from src/com/oreilly/demo/android/pa/asynctask/AsyncTaskSample.java rename to app/src/main/java/com/oreilly/demo/android/pa/asynctask/AsyncTaskSample.java diff --git a/src/com/oreilly/demo/android/pa/asynctask/game/Game.java b/app/src/main/java/com/oreilly/demo/android/pa/asynctask/game/Game.java similarity index 100% rename from src/com/oreilly/demo/android/pa/asynctask/game/Game.java rename to app/src/main/java/com/oreilly/demo/android/pa/asynctask/game/Game.java diff --git a/src/com/oreilly/demo/android/pa/asynctask/game/MockGame.java b/app/src/main/java/com/oreilly/demo/android/pa/asynctask/game/MockGame.java similarity index 100% rename from src/com/oreilly/demo/android/pa/asynctask/game/MockGame.java rename to app/src/main/java/com/oreilly/demo/android/pa/asynctask/game/MockGame.java diff --git a/src/com/oreilly/demo/android/pa/asynctask/game/PersistentModel.java b/app/src/main/java/com/oreilly/demo/android/pa/asynctask/game/PersistentModel.java similarity index 100% rename from src/com/oreilly/demo/android/pa/asynctask/game/PersistentModel.java rename to app/src/main/java/com/oreilly/demo/android/pa/asynctask/game/PersistentModel.java diff --git a/res/anim/dots.xml b/app/src/main/res/anim/dots.xml similarity index 100% rename from res/anim/dots.xml rename to app/src/main/res/anim/dots.xml diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..9bcf4af Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..ab12e6f Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..4fc6e0e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..94a0b47 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable/dots_f0.png b/app/src/main/res/drawable/dots_f0.png new file mode 100644 index 0000000..c6f2f0b Binary files /dev/null and b/app/src/main/res/drawable/dots_f0.png differ diff --git a/app/src/main/res/drawable/dots_f1.png b/app/src/main/res/drawable/dots_f1.png new file mode 100644 index 0000000..706f345 Binary files /dev/null and b/app/src/main/res/drawable/dots_f1.png differ diff --git a/app/src/main/res/drawable/dots_f2.png b/app/src/main/res/drawable/dots_f2.png new file mode 100644 index 0000000..37efe92 Binary files /dev/null and b/app/src/main/res/drawable/dots_f2.png differ diff --git a/app/src/main/res/drawable/dots_f3.png b/app/src/main/res/drawable/dots_f3.png new file mode 100644 index 0000000..5af20af Binary files /dev/null and b/app/src/main/res/drawable/dots_f3.png differ diff --git a/app/src/main/res/drawable/dots_f4.png b/app/src/main/res/drawable/dots_f4.png new file mode 100644 index 0000000..b6ca62b Binary files /dev/null and b/app/src/main/res/drawable/dots_f4.png differ diff --git a/res/layout/asyncdemo.xml b/app/src/main/res/layout/asyncdemo.xml similarity index 64% rename from res/layout/asyncdemo.xml rename to app/src/main/res/layout/asyncdemo.xml index 2d2f72a..72d265a 100644 --- a/res/layout/asyncdemo.xml +++ b/app/src/main/res/layout/asyncdemo.xml @@ -1,10 +1,10 @@ -