Skip to content

Commit

Permalink
Fixed severe issue (#6 on github) with prevented the library from wor…
Browse files Browse the repository at this point in the history
…king properly with ListViews; bumped version number to 2.2.0; updated changelog
  • Loading branch information
ManuelPeinado committed Jun 22, 2013
1 parent f340e5f commit cf6c6a2
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 10 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Change Log
=======================================

Version 2.2.0 *(2013-06-22)*
----------------------------
* Fixes severe issue (https://github.com/ManuelPeinado/FadingActionBar/issues/6)
* Adds support for HoloEverywhere (https://github.com/ManuelPeinado/FadingActionBar/issues/4).

Version 2.1.0 *(2013-06-01)*
----------------------------
* Added support for parallax scroll
Expand Down
4 changes: 2 additions & 2 deletions library/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.manuelpeinado.fadingactionbar"
android:versionCode="6"
android:versionName="2.1.0" >
android:versionCode="7"
android:versionName="2.2.0" >

<uses-sdk
android:minSdkVersion="7"
Expand Down
2 changes: 1 addition & 1 deletion library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.github.manuelpeinado.fadingactionbar</groupId>
<artifactId>parent</artifactId>
<version>2.1.1-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ public class FadingActionBarHelper {
private ViewGroup mContentContainer;
private ViewGroup mScrollView;
private boolean mFirstGlobalLayoutPerformed;
private View mMarginView;
private View mListViewBackgroundView;


public FadingActionBarHelper actionBarBackground(int drawableResId) {
mActionBarBackgroundResId = drawableResId;
Expand Down Expand Up @@ -198,7 +201,6 @@ public void scheduleDrawable(Drawable who, Runnable what, long when) {
public void unscheduleDrawable(Drawable who, Runnable what) {
}
};
private View mMarginView;

private View createScrollView() {
mScrollView = (ViewGroup) mInflater.inflate(R.layout.fab__scrollview_container, null);
Expand All @@ -221,7 +223,6 @@ public void onScrollChanged(ScrollView who, int l, int t, int oldl, int oldt) {
onNewScroll(t);
}
};
private View mListViewBackgroundView;

private View createListView(ListView listView) {
mContentContainer = (ViewGroup) mInflater.inflate(R.layout.fab__listview_container, null);
Expand All @@ -235,10 +236,13 @@ private View createListView(ListView listView) {
mMarginView.setLayoutParams(new AbsListView.LayoutParams(LayoutParams.MATCH_PARENT, 0));
listView.addHeaderView(mMarginView, null, false);

// Make the background as high as the screen so that it fills regardless of the amount of scroll.
mListViewBackgroundView = mContentContainer.findViewById(R.id.fab__listview_background);
FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) mListViewBackgroundView.getLayoutParams();
params.height = Utils.getDisplayHeight(listView.getContext());
mListViewBackgroundView.setLayoutParams(params);

listView.setOnScrollListener(mOnScrollListener);

return mContentContainer;
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<groupId>com.github.manuelpeinado.fadingactionbar</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<version>2.1.1-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>

<name>Android-FadingActionBar (Parent)</name>
<description>Android library implementing a fading effect for the action bar, similar to the one found in the Play Music app</description>
Expand Down
4 changes: 2 additions & 2 deletions sample/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.manuelpeinado.fadingactionbar.demo"
android:versionCode="6"
android:versionName="2.1.0" >
android:versionCode="7"
android:versionName="2.2.0" >

<uses-sdk
android:minSdkVersion="7"
Expand Down
2 changes: 1 addition & 1 deletion sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.github.manuelpeinado.fadingactionbar</groupId>
<artifactId>parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit cf6c6a2

Please sign in to comment.