Skip to content

Commit

Permalink
- Fix compatibility with android design support library (change toolb…
Browse files Browse the repository at this point in the history
…arId attr to pullableToolbarId)

- Update Sample to 0.1.1
- Add changelog
  • Loading branch information
Niko Yuwono committed Dec 6, 2015
1 parent 6cdab45 commit f48d71a
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Changelog

### 0.1.1 (05 Dec 2015)
* Fix compatibility with android design support library (change toolbarId attr to pullableToolbarId)

### 0.1 (19 Nov 2015)
* First public release
2 changes: 1 addition & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ dependencies {
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.1.0'
compile 'com.android.support:cardview-v7:23.1.0'
compile 'com.nikoyuwono:toolbar-panel:0.1'
compile 'com.nikoyuwono:toolbar-panel:0.1.1'
}
2 changes: 1 addition & 1 deletion sample/src/main/res/layout/activity_sample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:panelId="@+id/panel"
app:toolbarId="@+id/toolbar">
app:pullableToolbarId="@+id/toolbar">


<RelativeLayout
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public ToolbarPanelLayout(Context context, AttributeSet attrs, int defStyle) {
R.styleable.ToolbarPanelLayout, 0, 0);

try {
toolbarId = a.getResourceId(R.styleable.ToolbarPanelLayout_toolbarId, -1);
toolbarId = a.getResourceId(R.styleable.ToolbarPanelLayout_pullableToolbarId, -1);
panelId = a.getResourceId(R.styleable.ToolbarPanelLayout_panelId, -1);
} finally {
a.recycle();
Expand Down
2 changes: 1 addition & 1 deletion toolbar-panel/src/main/res/values/attrs.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="ToolbarPanelLayout">
<attr name="toolbarId" format="reference" />
<attr name="pullableToolbarId" format="reference" />
<attr name="panelId" format="reference"/>
</declare-styleable>
</resources>

0 comments on commit f48d71a

Please sign in to comment.