Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

StupidL-pr #6

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

StupidL-pr #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da3df09
增加collapsedHeight属性和方法
StupidL Feb 23, 2017
047b3ba
增加toolbar的向上键点击事件监听
StupidL Feb 23, 2017
c074437
移除多余属性mCollapsedHeight
StupidL Feb 23, 2017
a24e04b
增加CoordinatorLayoutListener
StupidL Feb 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
/local.properties
/.idea/workspace.xml
.DS_Store
/build
coordiantortablayout/build/
sample/build/
# built application files
*.apk
*.ap_
Expand Down
1 change: 1 addition & 0 deletions coordinatortablayout/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ dependencies {
})
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:design:25.1.0'
compile 'com.android.support:palette-v7:25.1.0'
testCompile 'junit:junit:4.12'
}

Expand Down
284 changes: 142 additions & 142 deletions ...dinatortablayout/build/generated/source/r/androidTest/debug/android/support/design/R.java
View file
Open in desktop

Large diffs are not rendered by default.

158 changes: 79 additions & 79 deletions ...rtablayout/build/generated/source/r/androidTest/debug/android/support/v7/appcompat/R.java
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions ...blayout/build/generated/source/r/androidTest/debug/android/support/v7/recyclerview/R.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

public final class R {
public static final class attr {
public static final int layoutManager = 0x7f0100e9;
public static final int reverseLayout = 0x7f0100eb;
public static final int spanCount = 0x7f0100ea;
public static final int stackFromEnd = 0x7f0100ec;
public static final int layoutManager = 0x7f0100ea;
public static final int reverseLayout = 0x7f0100ec;
public static final int spanCount = 0x7f0100eb;
public static final int stackFromEnd = 0x7f0100ed;
}
public static final class dimen {
public static final int item_touch_helper_max_drag_scroll_per_frame = 0x7f07007d;
Expand All @@ -22,7 +22,7 @@ public static final class id {
public static final int item_touch_helper_previous_elevation = 0x7f0c0005;
}
public static final class styleable {
public static final int[] RecyclerView = { 0x010100c4, 0x010100f1, 0x7f0100e9, 0x7f0100ea, 0x7f0100eb, 0x7f0100ec };
public static final int[] RecyclerView = { 0x010100c4, 0x010100f1, 0x7f0100ea, 0x7f0100eb, 0x7f0100ec, 0x7f0100ed };
public static final int RecyclerView_android_descendantFocusability = 1;
public static final int RecyclerView_android_orientation = 0;
public static final int RecyclerView_layoutManager = 2;
Expand Down
288 changes: 145 additions & 143 deletions ...ayout/build/generated/source/r/androidTest/debug/cn/hugeterry/coordinatortablayout/R.java
View file
Open in desktop

Large diffs are not rendered by default.

364 changes: 196 additions & 168 deletions .../build/generated/source/r/androidTest/debug/cn/hugeterry/coordinatortablayout/test/R.java
View file
Open in desktop

Large diffs are not rendered by default.

284 changes: 142 additions & 142 deletions coordinatortablayout/build/generated/source/r/debug/android/support/design/R.java
View file
Open in desktop

Large diffs are not rendered by default.

158 changes: 79 additions & 79 deletions coordinatortablayout/build/generated/source/r/debug/android/support/v7/appcompat/R.java
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions coordinatortablayout/build/generated/source/r/debug/android/support/v7/recyclerview/R.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

public final class R {
public static final class attr {
public static int layoutManager = 0x7f0100e9;
public static int reverseLayout = 0x7f0100eb;
public static int spanCount = 0x7f0100ea;
public static int stackFromEnd = 0x7f0100ec;
public static int layoutManager = 0x7f0100ea;
public static int reverseLayout = 0x7f0100ec;
public static int spanCount = 0x7f0100eb;
public static int stackFromEnd = 0x7f0100ed;
}
public static final class dimen {
public static int item_touch_helper_max_drag_scroll_per_frame = 0x7f07007d;
Expand All @@ -22,7 +22,7 @@ public static final class id {
public static int item_touch_helper_previous_elevation = 0x7f0c0005;
}
public static final class styleable {
public static int[] RecyclerView = { 0x010100c4, 0x010100f1, 0x7f0100e9, 0x7f0100ea, 0x7f0100eb, 0x7f0100ec };
public static int[] RecyclerView = { 0x010100c4, 0x010100f1, 0x7f0100ea, 0x7f0100eb, 0x7f0100ec, 0x7f0100ed };
public static int RecyclerView_android_descendantFocusability = 1;
public static int RecyclerView_android_orientation = 0;
public static int RecyclerView_layoutManager = 2;
Expand Down
364 changes: 196 additions & 168 deletions coordinatortablayout/build/generated/source/r/debug/cn/hugeterry/coordinatortablayout/R.java
View file
Open in desktop

Large diffs are not rendered by default.

284 changes: 142 additions & 142 deletions coordinatortablayout/build/generated/source/r/release/android/support/design/R.java
View file
Open in desktop

Large diffs are not rendered by default.

158 changes: 79 additions & 79 deletions coordinatortablayout/build/generated/source/r/release/android/support/v7/appcompat/R.java
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions coordinatortablayout/build/generated/source/r/release/android/support/v7/recyclerview/R.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

public final class R {
public static final class attr {
public static int layoutManager = 0x7f0100e9;
public static int reverseLayout = 0x7f0100eb;
public static int spanCount = 0x7f0100ea;
public static int stackFromEnd = 0x7f0100ec;
public static int layoutManager = 0x7f0100ea;
public static int reverseLayout = 0x7f0100ec;
public static int spanCount = 0x7f0100eb;
public static int stackFromEnd = 0x7f0100ed;
}
public static final class dimen {
public static int item_touch_helper_max_drag_scroll_per_frame = 0x7f07007d;
Expand All @@ -22,7 +22,7 @@ public static final class id {
public static int item_touch_helper_previous_elevation = 0x7f0c0005;
}
public static final class styleable {
public static int[] RecyclerView = { 0x010100c4, 0x010100f1, 0x7f0100e9, 0x7f0100ea, 0x7f0100eb, 0x7f0100ec };
public static int[] RecyclerView = { 0x010100c4, 0x010100f1, 0x7f0100ea, 0x7f0100eb, 0x7f0100ec, 0x7f0100ed };
public static int RecyclerView_android_descendantFocusability = 1;
public static int RecyclerView_android_orientation = 0;
public static int RecyclerView_layoutManager = 2;
Expand Down
364 changes: 196 additions & 168 deletions ...inatortablayout/build/generated/source/r/release/cn/hugeterry/coordinatortablayout/R.java
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions coordinatortablayout/build/intermediates/blame/res/androidTest/debug/multi/values-af.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"outputFile": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/incremental/mergeDebugAndroidTestResources/merged.dir/values-af/values-af.xml",
"outputFile": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\incremental\\mergeDebugAndroidTestResources\\merged.dir\\values-af\\values-af.xml",
"map": [
{
"to": {
Expand All @@ -11,7 +11,7 @@
"endOffset": 154
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 2,
"startColumn": 4,
Expand All @@ -30,7 +30,7 @@
"endOffset": 262
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 3,
"startColumn": 4,
Expand All @@ -49,7 +49,7 @@
"endOffset": 385
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 4,
"startColumn": 4,
Expand All @@ -68,7 +68,7 @@
"endOffset": 485
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 5,
"startColumn": 4,
Expand All @@ -87,7 +87,7 @@
"endOffset": 591
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 6,
"startColumn": 4,
Expand All @@ -106,7 +106,7 @@
"endOffset": 676
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 7,
"startColumn": 4,
Expand All @@ -125,7 +125,7 @@
"endOffset": 779
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 8,
"startColumn": 4,
Expand All @@ -144,7 +144,7 @@
"endOffset": 897
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 9,
"startColumn": 4,
Expand All @@ -163,7 +163,7 @@
"endOffset": 973
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 10,
"startColumn": 4,
Expand All @@ -182,7 +182,7 @@
"endOffset": 1050
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 11,
"startColumn": 4,
Expand All @@ -201,7 +201,7 @@
"endOffset": 1131
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 12,
"startColumn": 4,
Expand All @@ -220,7 +220,7 @@
"endOffset": 1238
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 13,
"startColumn": 4,
Expand All @@ -239,7 +239,7 @@
"endOffset": 1341
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 14,
"startColumn": 4,
Expand All @@ -258,7 +258,7 @@
"endOffset": 1438
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 15,
"startColumn": 4,
Expand All @@ -277,7 +277,7 @@
"endOffset": 1546
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 16,
"startColumn": 4,
Expand All @@ -296,7 +296,7 @@
"endOffset": 1648
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 17,
"startColumn": 4,
Expand All @@ -315,7 +315,7 @@
"endOffset": 1750
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 18,
"startColumn": 4,
Expand All @@ -334,7 +334,7 @@
"endOffset": 1867
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 19,
"startColumn": 4,
Expand All @@ -353,7 +353,7 @@
"endOffset": 1965
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 20,
"startColumn": 4,
Expand All @@ -372,7 +372,7 @@
"endOffset": 2045
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 21,
"startColumn": 4,
Expand All @@ -391,7 +391,7 @@
"endOffset": 2146
},
"from": {
"file": "/Users/admin/AndroidStudioProjects/CoordinatorTabLayout/coordinatortablayout/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/res/values-af/values-af.xml",
"file": "F:\\AndroidProjects\\CoordinatorTabLayout\\coordinatortablayout\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\25.1.0\\res\\values-af\\values-af.xml",
"position": {
"startLine": 22,
"startColumn": 4,
Expand Down
Loading