Added support for tags on the contentView

wdullaer · Dec 8, 2014 · 24ff5c5 · 24ff5c5
1 parent efa565a
commit 24ff5c5
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/example/build.gradle b/example/build.gradle
@@ -5,13 +5,13 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 21
     buildToolsVersion "19.1.0"
     useOldManifestMerger true
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 19
+        targetSdkVersion 21
         versionCode 1
         versionName "1.0"
     }

diff --git a/library/build.gradle b/library/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 21
     buildToolsVersion "19.1.0"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 19
-        versionCode 3
-        versionName "1.1.1"
+        targetSdkVersion 21
+        versionCode 4
+        versionName "1.2.0"
     }
     buildTypes {
         release {
@@ -21,6 +21,6 @@ android {
 task jar(type: Jar) {
     dependsOn assembleRelease
     baseName "swipeactionadapter"
-    version "1.1.1"
+    version "1.2.0"
     from fileTree(dir: 'build/intermediates/classes/release/')
 }
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.wdullaer.swipeactionadapter"
-    android:versionCode="3"
-    android:versionName="1.1.1" >
+    android:versionCode="4"
+    android:versionName="1.0.0" >
 
     <uses-sdk
         android:minSdkVersion="8"

diff --git a/library/src/main/java/com/wdullaer/swipeactionadapter/SwipeViewGroup.java b/library/src/main/java/com/wdullaer/swipeactionadapter/SwipeViewGroup.java
@@ -128,4 +128,26 @@ public void translateBackgrounds(){
             value.setTranslationX(-Integer.signum(key)*value.getWidth());
         }
     }
+
+    @Override
+    public Object getTag() {
+        if(contentView != null) return contentView.getTag();
+        else return null;
+    }
+
+    @Override
+    public void setTag(Object tag) {
+        if(contentView != null) contentView.setTag(tag);
+    }
+
+    @Override
+    public Object getTag(int key) {
+        if(contentView != null) return contentView.getTag(key);
+        else return null;
+    }
+
+    @Override
+    public void setTag(int key, Object tag) {
+        if(contentView != null) contentView.setTag(key, tag);
+    }
 }