Skip to content

Commit 6901841

Browse files
committed
Update Version to 1.0.1, Upgrade gradle to 2.1.3, Improve status bar, Change image source to unsplash.
1 parent 6127873 commit 6901841

File tree

5 files changed

+11
-45
lines changed

5 files changed

+11
-45
lines changed

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 24
5-
buildToolsVersion "24.0.1"
5+
buildToolsVersion "24.0.2"
66

77
defaultConfig {
88
applicationId "hearsilent.universalcollapsingtoolbarlayouttablayoutexample"
99
minSdkVersion 9
1010
targetSdkVersion 24
11-
versionCode 1
12-
versionName "1.0"
11+
versionCode 101
12+
versionName "1.0.1"
1313
}
1414
buildTypes {
1515
release {

app/src/main/java/hearsilent/universalcollapsingtoolbarlayouttablayoutexample/MainActivity.java

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ private void setUpViews() {
9090
mToolbarTextView.setText("Demo");
9191
actionBarResponsive();
9292
mAppBarLayout.addOnOffsetChangedListener(new AppBarStateChangeListener() {
93+
9394
@Override
9495
public void onStateChanged(AppBarLayout appBarLayout, State state) {
9596
if (mToolbarTextView != null) {
@@ -140,45 +141,9 @@ public void onOffsetChanged(State state, float offset) {
140141
mAdapter = new ViewPagerAdapter(getSupportFragmentManager());
141142
mViewPager.setOffscreenPageLimit(mAdapter.getCount());
142143
mViewPager.setAdapter(mAdapter);
143-
mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
144-
@Override
145-
public void onPageScrolled(int position, float positionOffset,
146-
int positionOffsetPixels) {
147-
switch (position) {
148-
case 0:
149-
ImageLoader.getInstance().displayImage(
150-
"https://fs01.androidpit.info/a/63/0e/android-l-wallpapers-630ea6-h900.jpg",
151-
mHeaderImageView, Utils.getDisplayImageBuilder().build());
152-
break;
153-
case 1:
154-
ImageLoader.getInstance().displayImage(
155-
"http://cdn1.tnwcdn.com/wp-content/blogs.dir/1/files/2014/06/wallpaper_51.jpg",
156-
mHeaderImageView, Utils.getDisplayImageBuilder().build());
157-
break;
158-
case 2:
159-
ImageLoader.getInstance().displayImage(
160-
"http://www.droid-life.com/wp-content/uploads/2014/10/lollipop-wallpapers10.jpg",
161-
mHeaderImageView, Utils.getDisplayImageBuilder().build());
162-
break;
163-
case 3:
164-
ImageLoader.getInstance().displayImage(
165-
"http://www.tothemobile.com/wp-content/uploads/2014/07/original.jpg",
166-
mHeaderImageView, Utils.getDisplayImageBuilder().build());
167-
break;
168-
}
169-
}
170-
171-
@Override
172-
public void onPageSelected(int position) {
173-
174-
}
175-
176-
@Override
177-
public void onPageScrollStateChanged(int state) {
178-
179-
}
180-
});
181144
mTabLayout.setupWithViewPager(mViewPager);
145+
ImageLoader.getInstance().displayImage("https://unsplash.it/1024/768", mHeaderImageView,
146+
Utils.getDisplayImageBuilder().build());
182147
}
183148

184149
private void setAlphaForView(View v, float alpha) {

app/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
android:layout_height="226.5dp"
2020
android:fitsSystemWindows="true"
2121
app:contentScrim="?attr/colorPrimary"
22-
app:layout_scrollFlags="scroll|exitUntilCollapsed">
22+
app:layout_scrollFlags="scroll|exitUntilCollapsed"
23+
app:statusBarScrim="@android:color/transparent">
2324

2425
<com.flaviofaria.kenburnsview.KenBurnsView
2526
android:id="@+id/imageView_header"

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.2'
8+
classpath 'com.android.tools.build:gradle:2.1.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Dec 28 10:00:20 PST 2015
1+
#Sun Aug 28 21:10:19 GMT+08:00 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 commit comments

Comments
 (0)