Simplify samples build and layout.

18 files changed, 3 insertions, 147 deletions

diff --git a/samples/flickr/ant.properties b/samples/flickr/ant.properties
deleted file mode 100644
index 46e9f668..00000000
--- a/samples/flickr/ant.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked into Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-key.store=glide-release-key.keystore
-key.alias=flickr
-
diff --git a/samples/flickr/build.gradle b/samples/flickr/build.gradle
index 02fbf5c5..e81bea10 100644
--- a/samples/flickr/build.gradle
+++ b/samples/flickr/build.gradle
@@ -7,33 +7,15 @@ dependencies {
     compile 'com.mcxiaoke.volley:library:1.0.+'
 }
 
-ext {
-    versionMajor = 1
-    versionMinor = 0
-    versionPatch = 0
-    versionBuild = 1
-}
-
-def getVersionName() {
-    return "${versionMajor}.${versionMinor}.${versionPatch}a"
-}
-
 android {
     compileSdkVersion 19
     buildToolsVersion = '19.1.0'
 
     defaultConfig {
+        applicationId "com.bumptech.glide.samples.flickr"
         minSdkVersion 10
         targetSdkVersion 19
-        versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
-        versionName getVersionName()
-    }
-
-    sourceSets {
-        main {
-            java.srcDirs         = ['src/main/java']
-            res.srcDirs          = ['res']
-            manifest.srcFile 'AndroidManifest.xml'
-        }
+        versionCode 1
+        versionName "1.0.0"
     }
 }
diff --git a/samples/flickr/build.xml b/samples/flickr/build.xml
deleted file mode 100644
index e64c2204..00000000
--- a/samples/flickr/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="glide-flickr-demo" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/samples/flickr/project.properties b/samples/flickr/project.properties
deleted file mode 100644
index dc336db6..00000000
--- a/samples/flickr/project.properties
+++ /dev/null
@@ -1,15 +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-18
-android.library.reference.1=ActionBarSherlock/library
diff --git a/samples/flickr/AndroidManifest.xml b/samples/flickr/src/main/AndroidManifest.xml
index aed78965..aed78965 100644
--- a/samples/flickr/AndroidManifest.xml
+++ b/samples/flickr/src/main/AndroidManifest.xml
diff --git a/samples/flickr/res/anim/fade_in.xml b/samples/flickr/src/main/res/anim/fade_in.xml
index 15ffe173..15ffe173 100644
--- a/samples/flickr/res/anim/fade_in.xml
+++ b/samples/flickr/src/main/res/anim/fade_in.xml
diff --git a/samples/flickr/res/drawable-hdpi/ic_launcher.png b/samples/flickr/src/main/res/drawable-hdpi/ic_launcher.png
index 96a442e5..96a442e5 100644
--- a/samples/flickr/res/drawable-hdpi/ic_launcher.png
+++ b/samples/flickr/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/flickr/res/drawable-ldpi/ic_launcher.png b/samples/flickr/src/main/res/drawable-ldpi/ic_launcher.png
index 99238729..99238729 100644
--- a/samples/flickr/res/drawable-ldpi/ic_launcher.png
+++ b/samples/flickr/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/samples/flickr/res/drawable-mdpi/ic_launcher.png b/samples/flickr/src/main/res/drawable-mdpi/ic_launcher.png
index 359047df..359047df 100644
--- a/samples/flickr/res/drawable-mdpi/ic_launcher.png
+++ b/samples/flickr/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/flickr/res/drawable-xhdpi/ic_launcher.png b/samples/flickr/src/main/res/drawable-xhdpi/ic_launcher.png
index 71c6d760..71c6d760 100644
--- a/samples/flickr/res/drawable-xhdpi/ic_launcher.png
+++ b/samples/flickr/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/flickr/res/layout/flickr_photo_grid.xml b/samples/flickr/src/main/res/layout/flickr_photo_grid.xml
index 6fb72e22..6fb72e22 100644
--- a/samples/flickr/res/layout/flickr_photo_grid.xml
+++ b/samples/flickr/src/main/res/layout/flickr_photo_grid.xml
diff --git a/samples/flickr/res/layout/flickr_photo_grid_item.xml b/samples/flickr/src/main/res/layout/flickr_photo_grid_item.xml
index 2b6e2223..2b6e2223 100644
--- a/samples/flickr/res/layout/flickr_photo_grid_item.xml
+++ b/samples/flickr/src/main/res/layout/flickr_photo_grid_item.xml
diff --git a/samples/flickr/res/layout/flickr_photo_list.xml b/samples/flickr/src/main/res/layout/flickr_photo_list.xml
index b8442931..b8442931 100644
--- a/samples/flickr/res/layout/flickr_photo_list.xml
+++ b/samples/flickr/src/main/res/layout/flickr_photo_list.xml
diff --git a/samples/flickr/res/layout/flickr_photo_list_item.xml b/samples/flickr/src/main/res/layout/flickr_photo_list_item.xml
index b2b9e27f..b2b9e27f 100644
--- a/samples/flickr/res/layout/flickr_photo_list_item.xml
+++ b/samples/flickr/src/main/res/layout/flickr_photo_list_item.xml
diff --git a/samples/flickr/res/layout/flickr_search_activity.xml b/samples/flickr/src/main/res/layout/flickr_search_activity.xml
index 2572dbab..2572dbab 100644
--- a/samples/flickr/res/layout/flickr_search_activity.xml
+++ b/samples/flickr/src/main/res/layout/flickr_search_activity.xml
diff --git a/samples/flickr/res/values/colors.xml b/samples/flickr/src/main/res/values/colors.xml
index c2968936..c2968936 100644
--- a/samples/flickr/res/values/colors.xml
+++ b/samples/flickr/src/main/res/values/colors.xml
diff --git a/samples/flickr/res/values/dimens.xml b/samples/flickr/src/main/res/values/dimens.xml
index 5fa6e89f..5fa6e89f 100644
--- a/samples/flickr/res/values/dimens.xml
+++ b/samples/flickr/src/main/res/values/dimens.xml
diff --git a/samples/flickr/res/values/strings.xml b/samples/flickr/src/main/res/values/strings.xml
index bd4f925a..bd4f925a 100644
--- a/samples/flickr/res/values/strings.xml
+++ b/samples/flickr/src/main/res/values/strings.xml