Merge pull request askerov#54 from hzsweers/master

Refresh gradle configurations

.gitignore

@@ -12,36 +12,22 @@
 bin/
 gen/
 
-# Local configuration file (sdk path, etc)
-local.properties
+*.properties
 
 # Eclipse project files
 .classpath
 .project
 
+.idea/
+build/
 *.iml
 
-dynamicgrid/.idea/workspace.xml
-
-dynamicgrid/.idea/
-dynamicgrid/project.properties
-
-dynamicgrid/project.properties
-
-*.properties
-
 dynamicgrid/proguard-project.txt
 
 dynamicgrid/build.xml
 
 dynamicgrid/ant.properties
 
-dynamicgrid/.idea/
-
-dynamicgrid/.idea/codeStyleSettings.xml
-
-example/.idea/
-
 example/build.xml
 
 example/proguard-project.txt

README.md

@@ -21,32 +21,41 @@ All the same as for normal GridView. Adapter must extends
 [AbstractDynamicGridAdapter](https://github.com/askerov/DynamicGrid/blob/master/dynamicgrid/src/org/askerov/dynamicgid/AbstractDynamicGridAdapter.java "AbstractDynamicGridAdapter")
 or [BaseDynamicGridAdapter](https://github.com/askerov/DynamicGrid/blob/master/dynamicgrid/src/org/askerov/dynamicgid/BaseDynamicGridAdapter.java "BaseDynamicGridAdapter")   
 
-    gridView = (DynamicGridView) findViewById(R.id.dynamic_grid);
-    // pass to adapter context, list of items and number of columns count
-    gridView.setAdapter(new MyDynamicGridAdapter(this, itemsList, 3));
+```java
+gridView = (DynamicGridView) findViewById(R.id.dynamic_grid);
+// pass to adapter context, list of items and number of columns count
+gridView.setAdapter(new MyDynamicGridAdapter(this, itemsList, 3));
+```
 
 To start Drag'n'drop mode:
 
-    gridView.startEditMode();
+```java
+gridView.startEditMode();
+```
 
 Or from onItemClik() and onItemLongClick()
 
-    gridView.startEditMode(position);
-
+```java
+gridView.startEditMode(position);
+```
 
 To stop:
 
-    gridView.stopEditMode();
+```java
+gridView.stopEditMode();
+```
 
 Adding drop listener:
 
-    gridView.setOnDropListener(new DynamicGridView.OnDropListener(){
-        @Override
-        public void onActionDrop(){
-            // stop edit mode immediately after drop item
-            gridView.stopEditMode();
-            }
-        });
+```java
+gridView.setOnDropListener(new DynamicGridView.OnDropListener(){
+    @Override
+    public void onActionDrop(){
+        // stop edit mode immediately after drop item
+        gridView.stopEditMode();
+        }
+    });
+```
 
 You can find more detailed usage example [here](https://github.com/askerov/DynamicGrid/tree/master/example).  
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.+'
+        classpath 'com.android.tools.build:gradle:1.0.0-rc4'
     }
 }
 

dynamicgrid/AndroidManifest.xml

@@ -6,6 +6,6 @@
 
     <uses-sdk
             android:minSdkVersion="8"
-            android:targetSdkVersion="18"/>
+            android:targetSdkVersion="21"/>
 
 </manifest>

dynamicgrid/build.gradle

@@ -1,32 +1,23 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.+'
-    }
-}
-
-apply plugin: 'android-library'
-
-repositories {
-  mavenCentral()
-}
+apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.1"
+    compileSdkVersion 21
+    buildToolsVersion "21.1.1"
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 21
+    }
 
     sourceSets {
-       main {
-                manifest.srcFile 'AndroidManifest.xml'
-                java.srcDirs = ['src']
-                resources.srcDirs = ['src']
-                aidl.srcDirs = ['src']
-                renderscript.srcDirs = ['src']
-                res.srcDirs = ['res']
-                assets.srcDirs = ['assets']
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
         }
     }
 }

dynamicgrid/src/org/askerov/dynamicgrid/DynamicGridView.java

@@ -305,7 +305,7 @@ private void animateWobbleInverse(View v) {
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     private ObjectAnimator createBaseWobble(final View v) {
 
-        if (!isPreL())
+        if (!isPreLollipop())
             v.setLayerType(LAYER_TYPE_SOFTWARE, null);
 
         ObjectAnimator animator = new ObjectAnimator();
@@ -657,18 +657,13 @@ private boolean isPostHoneycomb() {
     }
 
     /**
-     * The GridView from Android L requires some different setVisibility() logic
-     * when switching cells. Unfortunately, both 4.4W and the pre-release L
-     * report 20 for the SDK_INT, but we want to return true for 4.4W and false
-     * for Android L. So, we check the release name for "L" if we see SDK 20.
-     * Hopefully, Android L will actually be SDK 21 or later when it ships.
+     * The GridView from Android Lollipoop requires some different
+     * setVisibility() logic when switching cells.
      *
-     * @return
+     * @return true if OS version is less than Lollipop, false if not
      */
-    public static boolean isPreL() {
-        final int KITKAT_WATCH = 20;
-        return (Build.VERSION.SDK_INT < KITKAT_WATCH) ||
-                ((Build.VERSION.SDK_INT == KITKAT_WATCH) && !"L".equals(Build.VERSION.RELEASE));
+    public static boolean isPreLollipop() {
+        return Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP;
     }
 
     private void touchEventsCancelled() {
@@ -742,9 +737,9 @@ private void handleCellSwitch() {
 
             SwitchCellAnimator switchCellAnimator;
 
-            if (isPostHoneycomb() && isPreL())   //Between Android 3.0 and Android L
+            if (isPostHoneycomb() && isPreLollipop())   //Between Android 3.0 and Android L
                 switchCellAnimator = new KitKatSwitchCellAnimator(deltaX, deltaY);
-            else if (isPreL())                   //Before Android 3.0
+            else if (isPreLollipop())                   //Before Android 3.0
                 switchCellAnimator = new PreHoneycombCellAnimator(deltaX, deltaY);
             else                                //Android L
                 switchCellAnimator = new LSwitchCellAnimator(deltaX, deltaY);

example/AndroidManifest.xml

@@ -4,7 +4,7 @@
           android:versionCode="1"
           android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="18"/>
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="21"/>
     <application
             android:label="@string/app_name"
             android:icon="@drawable/ic_launcher">

example/build.gradle

@@ -1,25 +1,13 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.+'
-    }
-}
-
-apply plugin: 'android'
-
-repositories {
-    mavenCentral()
-}
+apply plugin: 'com.android.application'
 
 dependencies {
+    compile project(':dynamicgrid')
     compile 'com.android.support:support-v4:19.+'
 }
+
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.1"
+    compileSdkVersion 21
+    buildToolsVersion "21.1.1"
 
     sourceSets {
         main {
@@ -32,8 +20,4 @@ android {
             assets.srcDirs = ['assets']
         }
     }
-
-    dependencies {
-        compile project(':dynamicgrid')
-    }
 }