From 01aca0377a0d0eda6a3f7b95112eda3547361447 Mon Sep 17 00:00:00 2001 From: rekire Date: Fri, 23 May 2014 13:52:55 +0200 Subject: [PATCH 01/14] Added basic dpad support: you can now expand the buttons now Updated values in gradle to use newer software --- library/build.gradle | 4 ++-- library/project.properties | 2 +- .../ActionSlideExpandableListView.java | 20 ++++++++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 59ee737..ea364bf 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.8.+' + classpath 'com.android.tools.build:gradle:0.9.+' } } @@ -11,5 +11,5 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion = '19.0.1' + buildToolsVersion = '19.0.3' } \ No newline at end of file diff --git a/library/project.properties b/library/project.properties index a2de03e..8e4bc5f 100644 --- a/library/project.properties +++ b/library/project.properties @@ -8,5 +8,5 @@ # project structure. # Project target. -target=android-8 +target=android-19 android.library=true diff --git a/library/src/main/java/com/tjerkw/slideexpandable/library/ActionSlideExpandableListView.java b/library/src/main/java/com/tjerkw/slideexpandable/library/ActionSlideExpandableListView.java index ace9f5b..dc4a951 100644 --- a/library/src/main/java/com/tjerkw/slideexpandable/library/ActionSlideExpandableListView.java +++ b/library/src/main/java/com/tjerkw/slideexpandable/library/ActionSlideExpandableListView.java @@ -1,7 +1,9 @@ package com.tjerkw.slideexpandable.library; import android.content.Context; +import android.os.Build; import android.util.AttributeSet; +import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; import android.widget.ListAdapter; @@ -37,7 +39,23 @@ public void setItemActionListener(OnActionClickListener listener, int ... button this.buttonIds = buttonIds; } - /** + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if(keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) { + SlideExpandableListAdapter adapter = (SlideExpandableListAdapter)getAdapter(); + View item = getSelectedView(); + if(item != null) { + adapter.getExpandToggleButton(item).performClick(); + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + item.setActivated(true); + } + } + return true; + } + return super.onKeyDown(keyCode, event); + } + + /** * Interface for callback to be invoked whenever an action is clicked in * the expandle area of the list item. */ From 270fc90cc6f03ae00f4c3b35aef90b00bb5fa6c7 Mon Sep 17 00:00:00 2001 From: rekire Date: Fri, 23 May 2014 14:06:12 +0200 Subject: [PATCH 02/14] Whitespace fix --- .../ActionSlideExpandableListView.java | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/library/src/main/java/com/tjerkw/slideexpandable/library/ActionSlideExpandableListView.java b/library/src/main/java/com/tjerkw/slideexpandable/library/ActionSlideExpandableListView.java index dc4a951..001ed8e 100644 --- a/library/src/main/java/com/tjerkw/slideexpandable/library/ActionSlideExpandableListView.java +++ b/library/src/main/java/com/tjerkw/slideexpandable/library/ActionSlideExpandableListView.java @@ -39,23 +39,24 @@ public void setItemActionListener(OnActionClickListener listener, int ... button this.buttonIds = buttonIds; } - @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { - if(keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) { - SlideExpandableListAdapter adapter = (SlideExpandableListAdapter)getAdapter(); - View item = getSelectedView(); - if(item != null) { - adapter.getExpandToggleButton(item).performClick(); - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { - item.setActivated(true); - } - } - return true; - } - return super.onKeyDown(keyCode, event); - } + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if(keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) { + SlideExpandableListAdapter adapter = (SlideExpandableListAdapter)getAdapter(); + View item = getSelectedView(); + if(item != null) { + // found by monkey + adapter.getExpandToggleButton(item).performClick(); + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + item.setActivated(true); + } + } + return true; + } + return super.onKeyDown(keyCode, event); + } - /** + /** * Interface for callback to be invoked whenever an action is clicked in * the expandle area of the list item. */ From 5072b1f9cd041b7f1ae0b159e711500c0d69ae0a Mon Sep 17 00:00:00 2001 From: rekire Date: Tue, 10 Jun 2014 08:57:19 +0200 Subject: [PATCH 03/14] Update for Android Studio 0.6.0. --- library/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index ea364bf..5c7c150 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.9.+' + classpath 'com.android.tools.build:gradle:0.11.+' } } @@ -11,5 +11,5 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion = '19.0.3' + buildToolsVersion = '19.1.0' } \ No newline at end of file From 82897f0eaf20c80251af4a288d6f08440f9e2d61 Mon Sep 17 00:00:00 2001 From: rekire Date: Tue, 1 Jul 2014 07:55:43 +0200 Subject: [PATCH 04/14] Android Studio 0.8.1 support --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 5c7c150..4ad7c1e 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.+' } } From a16ed22f58b48ce9bb3b5864c1c003e23e4c37a4 Mon Sep 17 00:00:00 2001 From: rekire Date: Thu, 3 Jul 2014 14:11:54 +0200 Subject: [PATCH 05/14] Moved to new plugin name --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 4ad7c1e..3369fe9 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,7 +7,7 @@ buildscript { } } -apply plugin: 'android-library' +apply plugin: 'com.android.library' android { compileSdkVersion 19 From ca1946bfaba202c29ba87b6bfdd9e3bbf0b600a1 Mon Sep 17 00:00:00 2001 From: rekire Date: Fri, 8 Aug 2014 09:30:17 +0200 Subject: [PATCH 06/14] Disabled annoying debug message --- .../slideexpandable/library/ExpandCollapseAnimation.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/library/src/main/java/com/tjerkw/slideexpandable/library/ExpandCollapseAnimation.java b/library/src/main/java/com/tjerkw/slideexpandable/library/ExpandCollapseAnimation.java index 7ebc8fb..bde20bc 100644 --- a/library/src/main/java/com/tjerkw/slideexpandable/library/ExpandCollapseAnimation.java +++ b/library/src/main/java/com/tjerkw/slideexpandable/library/ExpandCollapseAnimation.java @@ -1,6 +1,5 @@ package com.tjerkw.slideexpandable.library; -import android.util.Log; import android.view.View; import android.view.animation.Animation; import android.view.animation.Transformation; @@ -45,7 +44,6 @@ public ExpandCollapseAnimation(View view, int type) { @Override protected void applyTransformation(float interpolatedTime, Transformation t) { - super.applyTransformation(interpolatedTime, t); if (interpolatedTime < 1.0f) { if(mType == EXPAND) { @@ -53,7 +51,7 @@ protected void applyTransformation(float interpolatedTime, Transformation t) { } else { mLayoutParams.bottomMargin = - (int) (mEndHeight * interpolatedTime); } - Log.d("ExpandCollapseAnimation", "anim height " + mLayoutParams.bottomMargin); + //Log.d("ExpandCollapseAnimation", "anim height " + mLayoutParams.bottomMargin); mAnimatedView.requestLayout(); } else { if(mType == EXPAND) { From f925e29913971669546ef6d5b71d2346c4e3fdca Mon Sep 17 00:00:00 2001 From: rekire Date: Tue, 26 Aug 2014 07:45:11 +0200 Subject: [PATCH 07/14] Moved dependencies to the parent project --- build.gradle | 21 +++++++++++++++++++++ library/build.gradle | 13 ++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index e69de29..fab7659 100644 --- a/build.gradle +++ b/build.gradle @@ -0,0 +1,21 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.12.2' + } +} + +allprojects { + repositories { + mavenCentral() + } +} + +ext { + compileSdkVersion = 19 + buildToolsVersion = "20" + + compatibility_JavaVersion = JavaVersion.VERSION_1_6 +} \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index 3369fe9..586bad6 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,15 +1,6 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' - } -} - apply plugin: 'com.android.library' android { - compileSdkVersion 19 - buildToolsVersion = '19.1.0' + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion } \ No newline at end of file From f65884a6ba77c8235a722a730b7ed721e467f90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Kilczan?= Date: Fri, 20 Mar 2015 14:22:44 +0100 Subject: [PATCH 08/14] Upgraded dependencies for Lollipop_M1 --- build.gradle | 8 ++++---- sample/build.gradle | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index fab7659..a2303cb 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.2' + classpath 'com.android.tools.build:gradle:1.1.0' } } @@ -14,8 +14,8 @@ allprojects { } ext { - compileSdkVersion = 19 - buildToolsVersion = "20" + compileSdkVersion = 22 + buildToolsVersion = "22" - compatibility_JavaVersion = JavaVersion.VERSION_1_6 + compatibility_JavaVersion = JavaVersion.VERSION_1_7 } \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index 0293e55..42af7a0 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -3,17 +3,17 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.8.+' + classpath 'com.android.tools.build:gradle:1.1.0' } } -apply plugin: 'android-library' +apply plugin: 'com.android.library' dependencies { compile project(':library') } android { - compileSdkVersion 19 - buildToolsVersion = '19.0.1' + compileSdkVersion 22 + buildToolsVersion = '22' } \ No newline at end of file From ac95bc07fd260f7fed462dcf23f3b99779e46512 Mon Sep 17 00:00:00 2001 From: rekire Date: Thu, 2 Apr 2015 08:31:28 +0200 Subject: [PATCH 09/14] Build tools upgrade --- build.gradle | 2 +- sample/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a2303cb..9538152 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ allprojects { ext { compileSdkVersion = 22 - buildToolsVersion = "22" + buildToolsVersion = "22.0.1" compatibility_JavaVersion = JavaVersion.VERSION_1_7 } \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index 42af7a0..17d0313 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -15,5 +15,5 @@ dependencies { android { compileSdkVersion 22 - buildToolsVersion = '22' + buildToolsVersion = '22.0.1' } \ No newline at end of file From c69410bf9505c183fe43e31906b9a7634c71a844 Mon Sep 17 00:00:00 2001 From: rekire Date: Mon, 8 Jun 2015 08:37:06 +0200 Subject: [PATCH 10/14] Version upgrade --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9538152..e50df20 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' + classpath 'com.android.tools.build:gradle:1.3.0' } } @@ -15,7 +15,7 @@ allprojects { ext { compileSdkVersion = 22 - buildToolsVersion = "22.0.1" + buildToolsVersion = "23.0.0-rc2" compatibility_JavaVersion = JavaVersion.VERSION_1_7 } \ No newline at end of file From 4370eae00fe78651406034c0bdfec88aafbc95be Mon Sep 17 00:00:00 2001 From: rekire Date: Mon, 20 Jul 2015 08:31:35 +0200 Subject: [PATCH 11/14] build tools upgrade --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e50df20..5575d06 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ allprojects { ext { compileSdkVersion = 22 - buildToolsVersion = "23.0.0-rc2" + buildToolsVersion = "23.0.0-rc3" compatibility_JavaVersion = JavaVersion.VERSION_1_7 } \ No newline at end of file From 69406018516e0dc1143c4a0a8a5b53ed8aba680a Mon Sep 17 00:00:00 2001 From: rekire Date: Tue, 18 Aug 2015 13:45:01 +0200 Subject: [PATCH 12/14] Added Android Marshmallow support. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5575d06..72055b2 100644 --- a/build.gradle +++ b/build.gradle @@ -14,8 +14,8 @@ allprojects { } ext { - compileSdkVersion = 22 - buildToolsVersion = "23.0.0-rc3" + compileSdkVersion = 23 + buildToolsVersion = "23.0.0" compatibility_JavaVersion = JavaVersion.VERSION_1_7 } \ No newline at end of file From 9d9ec4c0aef0533c05749398111eb7271e76208c Mon Sep 17 00:00:00 2001 From: rekire Date: Mon, 31 Aug 2015 07:47:27 +0200 Subject: [PATCH 13/14] Build tools upgrade --- sample/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample/build.gradle b/sample/build.gradle index 17d0313..05f3789 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' + classpath 'com.android.tools.build:gradle:1.3.0' } } From 0ab4aeaf78c8b7fa8a45da378c35ddacb68f5449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Kilczan?= Date: Tue, 19 Jan 2016 08:09:09 +0100 Subject: [PATCH 14/14] Dependency update --- build.gradle | 2 +- sample/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 72055b2..669a59a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:2.0.0-alpha5' } } diff --git a/sample/build.gradle b/sample/build.gradle index 05f3789..8744cd5 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:2.0.0-alpha5' } }