-[](https://play.google.com/store/apps/details?id=com.github.ksoichiro.android.observablescrollview.samples2)
+Please note that the app on the Play store is not always the latest version.
-### wercker
+### Download from wercker
-If you are a wercker user, you can download the latest build artifact.
-[See here for details](https://github.com/ksoichiro/Android-ObservableScrollView/tree/master/docs/wercker.md).
+If you are a wercker user, you can download the latest build artifact.
+[See here for details](docs/example/wercker.md).
[](https://app.wercker.com/project/bykey/8d1e27d9f4a662b25dbe70402733582b)
-### Install manually with Gradle
+### Install manually
-Clone this repository and build the app using Gradle wrapper.
-
-```sh
-$ git clone https://github.com/ksoichiro/Android-ObservableScrollView.git
-$ cd Android-ObservableScrollView
-$ ./gradlew installDevDebug
-```
+Just clone and execute `installDevDebug` task with Gradle.
+[See here for details](docs/example/android-studio.md).
## Usage
-### Add to your dependencies
-
-AAR is distributed on the Maven Central repository.
-
-```groovy
-repositories {
- mavenCentral()
-}
-
-dependencies {
- compile 'com.github.ksoichiro:android-observablescrollview:1.4.0'
-}
-```
-
-Eclipse is not supported but if you really want to build on Eclipse, [see here](https://github.com/ksoichiro/Android-ObservableScrollView/tree/master/docs/eclipse.md).
+1. Add `com.github.ksoichiro:android-observablescrollview` to your `dependencies` in `build.gradle`.
+1. Add `ObservableListView` or other views you'd like to use.
+1. Write some animation codes to the callbacks such as `onScrollChanged`, `onUpOrCancelMotionEvent`, etc.
+See [the quick start guide for details](docs/quick-start/index.md),
+and [the documentation](docs/overview.md) for further more.
-### Add widgets to your layout
-
-Use one of the `ObservableListView`, `ObservableScrollView`, `ObservableWebView`, `ObservableRecyclerView`, `ObservableGridView` in your XML layout file.
-
-### Control scroll events with callbacks
-
-Widgets above provides callbacks with `ObservableScrollViewCallbacks` interface.
-You can listen scroll events of the widgets by using `setScrollViewCallbacks()`.
-
-```java
- ObservableListView listView = (ObservableListView) findViewById(R.id.list);
- listView.setScrollViewCallbacks(this);
-```
-
-Then implement your interaction codes to the callbacks.
-Example:
-
-```java
- @Override
- public void onUpOrCancelMotionEvent(ScrollState scrollState) {
- ActionBar ab = getSupportActionBar();
- if (scrollState == ScrollState.UP) {
- if (ab.isShowing()) {
- ab.hide();
- }
- } else if (scrollState == ScrollState.DOWN) {
- if (!ab.isShowing()) {
- ab.show();
- }
- }
- }
-```
+## Reference
-See [sample app's Activity codes](https://github.com/ksoichiro/Android-ObservableScrollView/tree/master/observablescrollview-samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples) for more details.
+* [Supported widgets](docs/reference/supported-widgets.md)
+* [Environment](docs/reference/environment.md)
+* [Release notes](docs/reference/release-notes.md)
+* [FAQ](docs/faq.md)
-
-## Supported widgets
-
-Widgets are named with `Observable` prefix.
-(e.g. `ListView` → `ObservableListView`)
-You can handle these widgets with `Scrollable` interface.
-
-| Widget | Since | Note |
-|:------:|:-----:| ---- |
-| ListView | v1.0.0 | |
-| ScrollView | v1.0.0 | |
-| WebView | v1.0.0 | |
-| RecyclerView | v1.1.0 | It's supported but RecyclerView provides scroll states and position with [OnScrollListener](https://developer.android.com/reference/android/support/v7/widget/RecyclerView.OnScrollListener.html). You should use it if you don't have any reason. |
-| GridView | v1.2.0 | |
-
-
-## Environment
-
-This project is built and tested under the following environment.
-
-| OS | IDE | JDK |
-| -------------- | ------------------ | --- |
-| Mac OS X 10.10 | Android Studio 1.0 | 1.7 |
-
-## Release notes
-
-* v1.4.0
- * Add a custom view named `TouchInterceptionFrameLayout` and a new API `setTouchInterceptionViewGroup()` for `Scrollable`.
- With these class and API, you can move `Scrollable` itself using its scrolling events.
- * Add a helper class `ScrollUtils` for implementing scrolling effects.
-* v1.3.2
- * Fix that `ObservableRecyclerView` causes `BadParcelableException` on `onRestoreInstanceState`.
-* v1.3.1
- * Fix that `onDownMotionEvent` not called and parameters of `onScrollChanged` are incorrect
- when children views handle touch events.
-* v1.3.0
- * Add new interface `Scrollable` to provide common API for scrollable widgets.
-* v1.2.1
- * Fix that the scroll states and other internal information are lost after `onSaveInstanceState()`.
- * Fix that the scrollY is incorrect if the ListView/RecyclerView don't scroll from the top.
- (It's just approximating the scroll offset and not the complete solution but better than before.)
-* v1.2.0
- * Add GridView support.
- * Fix ObservableListView cannot detect onScrollChanged on Android 2.3.
- * Fix ObservableScrollView cannot detect UP and DOWN state in onUpOrCancelMotionEvent before Android 4.4.
-* v1.1.0
- * Add RecyclerView support.
-* v1.0.0
- * Initial release.
-
-
-## Apps that uses this library
+## Apps that use this library
+[](http://www.libtastic.com/technology/4/)
* [Jair Player](https://play.google.com/store/apps/details?id=aj.jair.music) by Akshay Chordiya
+* [My Gradle](https://play.google.com/store/apps/details?id=se.project.generic.mygradle) by Erick Chavez Alcarraz
+* [ThemeDIY](https://play.google.com/store/apps/details?id=net.darkion.theme.maker) by Darkion Avey
+* [{Soft} Skills](https://play.google.com/store/apps/details?id=com.fanaticdevs.androider) by Fanatic Devs
If you're using this library in your app and you'd like to list it here,
-please let me know via [email](soichiro.kashima@gmail.com) or pull requests or issues.
+please let me know via [email](mailto:soichiro.kashima@gmail.com) or [pull requests](https://github.com/ksoichiro/Android-ObservableScrollView/pulls) or [issues](https://github.com/ksoichiro/Android-ObservableScrollView/issues).
## Contributions
Any contributions are welcome!
-Please check the [contributing guideline](https://github.com/ksoichiro/Android-ObservableScrollView/tree/master/CONTRIBUTING.md) before submitting a new issue.
+Please check the [FAQ](docs/faq.md) and [contributing guideline](https://github.com/ksoichiro/Android-ObservableScrollView/tree/master/CONTRIBUTING.md) before submitting a new issue.
## Developed By
-* Soichiro Kashima - + +
++ * To use the component, simply add it to your view hierarchy. Then in your + * {@link android.app.Activity} or {@link android.support.v4.app.Fragment} call + * {@link #setViewPager(android.support.v4.view.ViewPager)} providing it the ViewPager this layout is being used for. + *
+ * The colors can be customized in two ways. The first and simplest is to provide an array of colors + * via {@link #setSelectedIndicatorColors(int...)}. The + * alternative is via the {@link com.google.samples.apps.iosched.ui.widget.SlidingTabLayout.TabColorizer} interface which provides you complete control over + * which color is used for any individual position. + *
+ * The views used as tabs can be customized by calling {@link #setCustomTabView(int, int)},
+ * providing the layout ID of your custom layout.
+ */
+public class SlidingTabLayout extends HorizontalScrollView {
+ /**
+ * Allows complete control over the colors drawn in the tab layout. Set with
+ * {@link #setCustomTabColorizer(com.google.samples.apps.iosched.ui.widget.SlidingTabLayout.TabColorizer)}.
+ */
+ public interface TabColorizer {
+
+ /**
+ * @return return the color of the indicator used when {@code position} is selected.
+ */
+ int getIndicatorColor(int position);
+
+ }
+
+ private static final int TITLE_OFFSET_DIPS = 24;
+ private static final int TAB_VIEW_PADDING_DIPS = 16;
+ private static final int TAB_VIEW_TEXT_SIZE_SP = 12;
+
+ private int mTitleOffset;
+
+ private int mTabViewLayoutId;
+ private int mTabViewTextViewId;
+ private boolean mDistributeEvenly;
+
+ private ViewPager mViewPager;
+ private SparseArray FragmentStatePagerAdapter is also originally caches pages,
* but its keys are not public nor documented, so depending
- * on how it create cache key is dangerous.
- * This adapter caches pages by itself and provide getter method to the cache.
+ * on how it create cache key is dangerous. This adapter caches pages by itself and provide getter method to the cache. Each fragments are automatically cached in this method,
* so you don't have to do it by yourself.
* If you want to implement instantiation of Fragments,
- * you should override {@link #createItem(int)} instead.
- *
+ * you should override {@link #createItem(int)} instead. Same as {@linkplain #scrollToPosition(int)} but it scrolls to the position not only make
+ * the position visible. It depends on {@code LayoutManager} how {@linkplain #scrollToPosition(int)} works,
+ * and currently we know that {@linkplain LinearLayoutManager#scrollToPosition(int)} just
+ * make the position visible. In LinearLayoutManager, scrollToPositionWithOffset() is provided for scrolling to the position.
+ * This method checks which LayoutManager is set,
+ * and handles which method should be called for scrolling. Other know classes (StaggeredGridLayoutManager and GridLayoutManager) are not tested. This won't be called just after the view is laid out, so if you'd like to
* initialize the position of your views with this method, you should call this manually
- * or invoke scroll as appropriate.
+ * or invoke scroll as appropriate. This is just a wrapper for Math.min() and Math.max().
+ * This may be useful if you feel it confusing ("Which is min and which is max?"). This may be useful to change alpha value of background color. This is just a convenience method for using {@code ViewTreeObserver.OnGlobalLayoutListener()}.
+ * This also handles removing listener when onGlobalLayout is called. {@code toColor} will be {@code toAlpha/1} percent,
+ * and {@code fromColor} will be {@code (1-toAlpha)/1} percent. Same as {@linkplain #scrollToPosition(int)} but it scrolls to the position not only make
- * the position visible. It depends on {@code LayoutManager} how {@linkplain #scrollToPosition(int)} works,
- * and currently we know that {@linkplain LinearLayoutManager#scrollToPosition(int)} just
- * make the position visible. In LinearLayoutManager, scrollToPositionWithOffset() is provided for scrolling to the position.
- * This method checks which LayoutManager is set,
- * and handles which method should be called for scrolling. Other know classes (StaggeredGridLayoutManager and GridLayoutManager) are not tested. Lorem ipsum dolor sit amet, ut duis lorem provident sed felis blandit, condimentum donec lectus ipsum et mauris, morbi porttitor interdum feugiat nulla donec sodales, vestibulum nisl primis a molestie vestibulum quam, sapien mauris metus risus suspendisse magnis. Augue viverra nulla faucibus egestas eu, a etiam id congue rutrum ante, arcu tincidunt donec quam felis at ornare, iaculis ligula sodales venenatis commodo volutpat neque, suspendisse elit praesent tellus felis mi amet. Inceptos amet tempor lectus lorem est non, ac donec ac libero neque mauris, tellus ante metus eget leo consequat. Scelerisque dolor curabitur pretium blandit ut feugiat, amet lacus pulvinar justo convallis ut, sed natoque ipsum urna posuere nibh eu. Sed at sed vulputate sit orci, facilisis a aliquam tellus quam aliquam, eu aliquam donec at molestie ante, pellentesque mauris lorem ultrices libero faucibus porta, imperdiet adipiscing sit hac diam ut nulla. Lacus enim elit pulvinar donec vehicula dapibus, accumsan purus officia cursus dolor sapien, eu amet dis mauris mi nulla ut. Non accusamus etiam pede non urna tempus, vestibulum aliquam tortor eget pharetra sodales, in vestibulum ut justo orci nulla, lobortis purus sem semper consectetuer magni purus. Dolor a leo vestibulum amet ut sit, arcu ut eaque urna fusce aliquet turpis, sed fermentum sed vestibulum nisl pede, tristique enim lorem posuere in laborum ut. Vestibulum id id justo leo nulla, magna lobortis ullamcorper et dignissim pellentesque, duis suspendisse quis id lorem ante. Vivamus a nullam ante adipiscing amet, mi vel consectetuer nunc aenean pede quisque, eget rhoncus dis porttitor habitant nunc vivamus, duis cubilia blandit non donec justo dictumst, praesent vitae nulla nam pulvinar urna. Adipiscing adipiscing justo urna pulvinar imperdiet nullam, vitae fusce rhoncus proin nonummy suscipit, ullamcorper amet et non potenti platea ultrices, mauris nullam sapien nunc justo vel, eu semper pellentesque arcu fusce augue. Malesuada mauris nibh sit a a scelerisque, velit sem lectus tellus convallis consectetuer, ultricies auctor a ante eros amet sed. Risus lacus duis leo platea wisi, felis maecenas rutrum in id in donec, non id a potenti libero eget, posuere elit ea sed pellentesque quis. Sunt lacus urna lorem elit duis, nibh donec purus quisque consectetuer dolor, neque vestibulum proin ornare eros nonummy phasellus. Iaculis cras eu at egestas dolor montes, viverra quisque malesuada consectetuer semper maecenas, a sed vitae donec tempor aliqua metus, ornare mollis suscipit et erat fusce, sit orci aut auctor elementum fames aliquam. Platea dui integer magnis non metus, minus dignissimos ante massa nostra et, rutrum sapien egestas quis sapien donec donec. Erat sit a eros aenean natoque, quam libero id lorem enim proin, lorem ipsum fermentum mattis metus et. Aliquam aliquet suscipit purus conubia at neque, platea vivamus vestibulum nulla quibusdam senectus, et morbi lectus malesuada gravida donec, elementum sit convallis pellentesque velit amet. Et eveniet viverra vehicula consectetuer justo, provident sed commodo non lacinia velit, tempor phasellus vel leo nisl cras, vivamus et arcu interdum dui eu amet. Volutpat wisi rhoncus vel turpis diam quibusdam, dapibus elit est quisque cubilia mauris, nulla elit magna tempor accumsan bibendum, lorem varius sed interdum eget mattis, scelerisque egestas feugiat donec dui molestie. Leo facilisis nisl sit montes ligula sed, enim commodo consectetuer nunc est et, ut sed vehicula dolor luctus elit. Fermentum cras donec eget nibh est vel, sed justo risus et pharetra diam, eu vivamus egestas ligula risus diam, sed justo eget hac ut mauris. Vestibulum diam nec vitae mi eget suspendisse, aenean arcu purus facilisis purus class in, id aliquam sit id scelerisque sapien etiam. Ut nullam sit sed at mauris lobortis, consequat dolor autem ipsum euismod nulla, elit quis proin eget conubia varius, erat arcu massa mus in mauris, scelerisque ut eu sollicitudin libero leo urna. Consectetuer luctus tempor elit ut dolor ligula, quis dui per dui hendrerit ante sagittis, in quisque pretium in eleifend enim. Condimentum iaculis vitae feugiat dis tellus vel, lectus dolor nec dui nulla nascetur, et pellentesque curabitur lorem leo velit eget. Id nascetur arcu lobortis suspendisse imperdiet urna, natoque nascetur ante in porta a, interdum hendrerit mi bibendum platea tellus, urna in enim ornare vestibulum faucibus enim. Leo fusce egestas ante nec volutpat, in tempor vel facilisis potenti ut, pede at non lorem a commodo, nulla dolor orci interdum vestibulum nulla. Dui nulla vestibulum quisque a pharetra porta, integer nec ipsum nec sed dui pharetra, magna et dignissim ipsum sed dictum, litora eros vivamus scelerisque libero ipsum. Sed ac ac lorem molestie adipiscing morbi, pellentesque imperdiet nunc quis morbi amet ante, libero dui ligula nec risus neque et, velit nonummy phasellus et facilisi amet, ligula in elementum non sapien pulvinar faucibus. Eu leo ut posuere sed aliquet, tincidunt vel urna volutpat tempus sem, sit felis aliquet vestibulum condimentum sit, amet nibh vel tellus purus ullamcorper libero, nulla vestibulum pede ut vestibulum pretium. Eu nulla vestibulum a neque in metus, quisquam nam sed cursus eget luctus, pede ultrices nec sed dignissim pellentesque, sit class cursus metus nulla placerat mauris, consequat mollis neque vivamus amet pede. Mauris dolor nulla diam eros bibendum, quam ante vestibulum morbi non ligula vel, molestie curabitur rhoncus nulla euismod interdum non. Nulla fringilla lorem mollis ad massa, sit molestie nibh lorem arcu volutpat, accumsan commodo lectus eu et donec, sit tempor tempus rutrum in curabitur amet. Nec urna euismod a tincidunt commodo, eu pede turpis libero vitae viverra, ante vestibulum nam non habitasse potenti, mauris imperdiet in in nunc convallis. Et nostra wisi in est accumsan vehicula, quisque vitae felis mauris sed vulputate nec, ante imperdiet sollicitudin massa iaculis massa sit. Quam libero nulla netus eu porta curae, ut nulla bibendum facilisis et urna sed, quis congue vestibulum aliquam interdum etiam. Nulla vel lobortis ullamcorper vitae excepturi, neque urna feugiat lectus vel lacinia, massa pretium orci eu metus neque vulputate. Imperdiet ac velit rhoncus nulla malesuada nullam, nec pulvinar justo gravida lorem rutrum magna, habitasse repudiandae mi eros vestibulum ante, nec euismod dui iaculis in turpis pretium, ac id metus egestas proin lacus lectus. Laoreet lorem nec vitae risus erat arcu, vitae quam ut in ante tristique, porta dolor pede quam et odio nam, arcu lacus sem congue ante cursus massa. Et mattis sagittis erat accumsan fusce quam, vehicula ligula beatae natoque fusce sodales conubia, habitasse metus cum magnis viverra nam cursus, egestas urna wisi primis blandit eu magna, eget libero elit lacus lorem dis aliquam. Ut mauris ante natoque lacus massa, justo a lectus sodales enim adipiscing id, accumsan ut ipsum vestibulum sed enim auctor, vitae congue tincidunt id phasellus lacinia scelerisque, tincidunt sapien nulla euismod volutpat iaculis. Platea sociis nec aliquet nec molestie, in mi et augue sapien in vivamus, integer fames proin vitae in ullamcorper et. Fringilla etiam sapiente rhoncus suspendisse nec id, lobortis cras eget egestas dui ac nec, justo lacus ut lorem bibendum quia eros, eget a gravida id donec nunc suscipit, porta sed in sodales non rutrum. Lectus vel dui elementum pellentesque magna aliquam, vitae non sit pede et fusce nibh, id id deserunt ornare dui sit condimentum, in adipiscing imperdiet turpis nam aliquet, facilisis metus magna lacus wisi facilisis tortor. Vulputate elit accumsan quam amet ligula, suspendisse lacus mi nonummy integer urna, libero nulla nunc varius in odio, laoreet nulla amet placerat amet nec. Consectetuer vel massa hendrerit vitae iaculis id, sed ut ut laudantium odio in, elit vestibulum duis ante maecenas interdum in, neque vehicula ultrices varius in quam, pede tellus pellentesque sed nullam quis. This uses TouchInterceptionFrameLayout to move Fragments. There is an unsolved problem: it doesn't scroll smoothly
+ * when the flexible space is changing. SlidingTabLayout and SlidingTabStrip are from google/iosched: Another implementation of FlexibleImage pattern + ViewPager. This is a completely different approach comparing to FlexibleImageWithViewPager2Activity.
+ * Descriptions of this pattern: SlidingTabLayout and SlidingTabStrip are from google/iosched:
+ * Developers should use {@link #addScrollViewCallbacks(ObservableScrollViewCallbacks)}
+ * and {@link #removeScrollViewCallbacks(ObservableScrollViewCallbacks)}.
*
- * @param listener listener to set
+ * @param listener Listener to set.
*/
+ @Deprecated
void setScrollViewCallbacks(ObservableScrollViewCallbacks listener);
/**
- * Scrolls vertically to the absolute Y.
+ * Add a callback listener.
+ *
+ * @param listener Listener to add.
+ * @since 1.7.0
+ */
+ void addScrollViewCallbacks(ObservableScrollViewCallbacks listener);
+
+ /**
+ * Remove a callback listener.
+ *
+ * @param listener Listener to remove.
+ * @since 1.7.0
+ */
+ void removeScrollViewCallbacks(ObservableScrollViewCallbacks listener);
+
+ /**
+ * Clear callback listeners.
+ *
+ * @since 1.7.0
+ */
+ void clearScrollViewCallbacks();
+
+ /**
+ * Scroll vertically to the absolute Y.
* Implemented classes are expected to scroll to the exact Y pixels from the top,
* but it depends on the type of the widget.
*
- * @param y vertical position to scroll to
+ * @param y Vertical position to scroll to.
*/
void scrollVerticallyTo(int y);
/**
- * Returns the current Y of the scrollable view.
+ * Return the current Y of the scrollable view.
*
- * @return current Y pixel
+ * @return Current Y pixel.
*/
int getCurrentScrollY();
/**
- * Sets a touch motion event delegation ViewGroup.
+ * Set a touch motion event delegation ViewGroup.
* This is used to pass motion events back to parent view.
* It's up to the implementation classes whether or not it works.
*
- * @param viewGroup ViewGroup object to dispatch motion events
+ * @param viewGroup ViewGroup object to dispatch motion events.
*/
void setTouchInterceptionViewGroup(ViewGroup viewGroup);
}
diff --git a/observablescrollview/src/main/java/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java b/library/src/main/java/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java
similarity index 93%
rename from observablescrollview/src/main/java/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java
rename to library/src/main/java/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java
index 6a5ed557..a4ecf1d7 100644
--- a/observablescrollview/src/main/java/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java
+++ b/library/src/main/java/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java
@@ -40,36 +40,36 @@ public class TouchInterceptionFrameLayout extends FrameLayout {
*/
public interface TouchInterceptionListener {
/**
- * Determines whether the layout should intercept this event.
+ * Determine whether the layout should intercept this event.
*
- * @param ev motion event
- * @param moving true if this event is ACTION_MOVE type
- * @param diffX difference between previous X and current X, if moving is true
- * @param diffY difference between previous Y and current Y, if moving is true
- * @return true if the layout should intercept
+ * @param ev Motion event.
+ * @param moving True if this event is ACTION_MOVE type.
+ * @param diffX Difference between previous X and current X, if moving is true.
+ * @param diffY Difference between previous Y and current Y, if moving is true.
+ * @return True if the layout should intercept.
*/
boolean shouldInterceptTouchEvent(MotionEvent ev, boolean moving, float diffX, float diffY);
/**
* Called if the down motion event is intercepted by this layout.
*
- * @param ev motion event
+ * @param ev Motion event.
*/
void onDownMotionEvent(MotionEvent ev);
/**
* Called if the move motion event is intercepted by this layout.
*
- * @param ev motion event
- * @param diffX difference between previous X and current X
- * @param diffY difference between previous Y and current Y
+ * @param ev Motion event.
+ * @param diffX Difference between previous X and current X.
+ * @param diffY Difference between previous Y and current Y.
*/
void onMoveMotionEvent(MotionEvent ev, float diffX, float diffY);
/**
* Called if the up (or cancel) motion event is intercepted by this layout.
*
- * @param ev motion event
+ * @param ev Motion event.
*/
void onUpOrCancelMotionEvent(MotionEvent ev);
}
@@ -247,8 +247,8 @@ private MotionEvent obtainMotionEvent(MotionEvent base, int action) {
* child views, but calling dispatchTouchEvent() causes StackOverflowError.
* Therefore we do it manually.
*
- * @param ev motion event to be passed to children
- * @param pendingEvents pending events like ACTION_DOWN. This will be passed to the children before ev
+ * @param ev Motion event to be passed to children.
+ * @param pendingEvents Pending events like ACTION_DOWN. This will be passed to the children before ev.
*/
private void duplicateTouchEventForChildren(MotionEvent ev, MotionEvent... pendingEvents) {
if (ev == null) {
diff --git a/observablescrollview/.gitignore b/observablescrollview/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/observablescrollview/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/observablescrollview/build.gradle b/observablescrollview/build.gradle
deleted file mode 100644
index 92ac1196..00000000
--- a/observablescrollview/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
- }
-}
-
-apply plugin: 'com.android.library'
-
-repositories {
- mavenCentral()
-}
-
-dependencies {
- compile 'com.android.support:recyclerview-v7:21.0.0'
-}
-
-android {
- compileSdkVersion 21
- buildToolsVersion "21.1.1"
-
- defaultConfig {
- minSdkVersion 9
- }
-}
-
-// This is from 'https://github.com/chrisbanes/gradle-mvn-push'
-apply from: 'gradle-mvn-push.gradle'
diff --git a/observablescrollview/src/androidTest/java/com/github/ksoichiro/android/observablescrollview/ApplicationTest.java b/observablescrollview/src/androidTest/java/com/github/ksoichiro/android/observablescrollview/ApplicationTest.java
deleted file mode 100644
index ff68ca2d..00000000
--- a/observablescrollview/src/androidTest/java/com/github/ksoichiro/android/observablescrollview/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.github.ksoichiro.android.observablescrollview;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * Testing Fundamentals
- */
-public class ApplicationTest extends ApplicationTestCase
+
+
+
\ No newline at end of file
diff --git a/observablescrollview-samples/build.gradle b/samples/build.gradle
similarity index 71%
rename from observablescrollview-samples/build.gradle
rename to samples/build.gradle
index cafea876..571807b4 100644
--- a/observablescrollview-samples/build.gradle
+++ b/samples/build.gradle
@@ -1,35 +1,17 @@
-buildscript {
- repositories {
- mavenCentral()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
- }
-}
-
-// Get git commit hash for naming the APK file if 'git' is available
-try {
- project.ext.gitHash = "git rev-parse --short HEAD".execute().text.trim()
-} catch (all) {
- project.ext.gitHash = "unknown"
-}
-
apply plugin: 'com.android.application'
-repositories {
- mavenCentral()
-
- // for using SNAPSHOT
- //maven {
- // url uri('https://oss.sonatype.org/content/repositories/snapshots/')
- //}
-}
+// for using SNAPSHOT
+//repositories {
+// maven {
+// url uri('https://oss.sonatype.org/content/repositories/snapshots/')
+// }
+//}
dependencies {
- compile 'com.android.support:appcompat-v7:21.0.2'
+ compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.nineoldandroids:library:2.4.0'
compile 'com.melnykov:floatingactionbutton:1.0.7'
- debugCompile project(':observablescrollview')
+ debugCompile project(':library')
// Release build uses the synced latest version
releaseCompile "com.github.ksoichiro:android-observablescrollview:${SYNCED_VERSION_NAME}"
@@ -37,17 +19,17 @@ dependencies {
//compile "com.github.ksoichiro:android-observablescrollview:$VERSION_NAME"
}
+apply from: "${rootDir}/gradle/version.gradle"
+project.ext.versionInfo.releaseVersionName = SYNCED_VERSION_NAME
+
android {
- compileSdkVersion 21
- buildToolsVersion "21.1.1"
+ compileSdkVersion 23
+ buildToolsVersion "23.0.2"
defaultConfig {
applicationId "com.github.ksoichiro.android.observablescrollview.samples"
- minSdkVersion 9
- targetSdkVersion 21
- versionCode 4
- versionName "1.2.1"
- buildConfigField "String", "GIT_HASH", "\"${project.ext.gitHash}\""
+ versionCode 5
+ versionName "1.3.0"
}
productFlavors {
@@ -83,12 +65,9 @@ android {
debug {
applicationIdSuffix ".debug"
versionNameSuffix "-debug"
- buildConfigField "String", "LIB_VERSION", "\"${project.ext.gitHash}\""
}
release {
- buildConfigField "String", "LIB_VERSION", "\"${VERSION_NAME}\""
-
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -99,6 +78,14 @@ android {
}
}
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ res.srcDirs = ['res']
+ assets.srcDirs = ['assets']
+ }
+ }
+
lintOptions {
abortOnError false
}
@@ -107,7 +94,7 @@ android {
applicationVariants.all { variant ->
def output = variant.outputs.get(0)
File apk = output.outputFile
- String newName = output.outputFile.name.replace(".apk", "-${variant.mergedFlavor.versionCode}-${variant.mergedFlavor.versionName}-${project.ext.gitHash}.apk")
+ String newName = output.outputFile.name.replace(".apk", "-${variant.mergedFlavor.versionCode}-${variant.mergedFlavor.versionName}-${project.ext.versionInfo.build}.apk")
.replace("app-", "${variant.mergedFlavor.applicationId}-")
output.outputFile = new File(apk.parentFile, newName)
}
diff --git a/observablescrollview-samples/ic_launcher-web.png b/samples/ic_launcher-web.png
similarity index 100%
rename from observablescrollview-samples/ic_launcher-web.png
rename to samples/ic_launcher-web.png
diff --git a/observablescrollview-samples/demo1.gif b/samples/images/demo1.gif
similarity index 100%
rename from observablescrollview-samples/demo1.gif
rename to samples/images/demo1.gif
diff --git a/observablescrollview-samples/demo10.gif b/samples/images/demo10.gif
similarity index 100%
rename from observablescrollview-samples/demo10.gif
rename to samples/images/demo10.gif
diff --git a/observablescrollview-samples/demo11.gif b/samples/images/demo11.gif
similarity index 100%
rename from observablescrollview-samples/demo11.gif
rename to samples/images/demo11.gif
diff --git a/observablescrollview-samples/demo12.gif b/samples/images/demo12.gif
similarity index 100%
rename from observablescrollview-samples/demo12.gif
rename to samples/images/demo12.gif
diff --git a/observablescrollview-samples/demo13.gif b/samples/images/demo13.gif
similarity index 100%
rename from observablescrollview-samples/demo13.gif
rename to samples/images/demo13.gif
diff --git a/observablescrollview-samples/demo2.gif b/samples/images/demo2.gif
similarity index 100%
rename from observablescrollview-samples/demo2.gif
rename to samples/images/demo2.gif
diff --git a/observablescrollview-samples/demo3.gif b/samples/images/demo3.gif
similarity index 100%
rename from observablescrollview-samples/demo3.gif
rename to samples/images/demo3.gif
diff --git a/observablescrollview-samples/demo4.gif b/samples/images/demo4.gif
similarity index 100%
rename from observablescrollview-samples/demo4.gif
rename to samples/images/demo4.gif
diff --git a/observablescrollview-samples/demo5.gif b/samples/images/demo5.gif
similarity index 100%
rename from observablescrollview-samples/demo5.gif
rename to samples/images/demo5.gif
diff --git a/observablescrollview-samples/demo6.gif b/samples/images/demo6.gif
similarity index 100%
rename from observablescrollview-samples/demo6.gif
rename to samples/images/demo6.gif
diff --git a/observablescrollview-samples/demo7.gif b/samples/images/demo7.gif
similarity index 100%
rename from observablescrollview-samples/demo7.gif
rename to samples/images/demo7.gif
diff --git a/observablescrollview-samples/demo8.gif b/samples/images/demo8.gif
similarity index 100%
rename from observablescrollview-samples/demo8.gif
rename to samples/images/demo8.gif
diff --git a/observablescrollview-samples/demo9.gif b/samples/images/demo9.gif
similarity index 100%
rename from observablescrollview-samples/demo9.gif
rename to samples/images/demo9.gif
diff --git a/observablescrollview-samples/proguard-rules.pro b/samples/proguard-rules.pro
similarity index 100%
rename from observablescrollview-samples/proguard-rules.pro
rename to samples/proguard-rules.pro
diff --git a/samples/res/color/tab_text_color.xml b/samples/res/color/tab_text_color.xml
new file mode 100644
index 00000000..48f21f86
--- /dev/null
+++ b/samples/res/color/tab_text_color.xml
@@ -0,0 +1,21 @@
+
+ extends FillGapBaseActivity {
protected float getHeaderTranslationY(int scrollY) {
- final int headerHeight = mHeaderBar.getHeight();
- int headerTranslationY = 0;
- if (0 <= -scrollY + mFlexibleSpaceImageHeight - headerHeight) {
- headerTranslationY = -scrollY + mFlexibleSpaceImageHeight - headerHeight;
- }
- return headerTranslationY;
+ return ScrollUtils.getFloat(-scrollY + mFlexibleSpaceImageHeight - mHeaderBar.getHeight(), 0, Float.MAX_VALUE);
}
}
diff --git a/observablescrollview-samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FillGap2ListViewActivity.java b/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FillGap2ListViewActivity.java
similarity index 96%
rename from observablescrollview-samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FillGap2ListViewActivity.java
rename to samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FillGap2ListViewActivity.java
index d1bf69dd..b7e551bd 100644
--- a/observablescrollview-samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FillGap2ListViewActivity.java
+++ b/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FillGap2ListViewActivity.java
@@ -20,6 +20,9 @@
import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks;
import com.nineoldandroids.view.ViewHelper;
+/**
+ * Warning: This example does not work on Android 2.3.
+ */
public class FillGap2ListViewActivity extends FillGap2BaseActivity Scrollable
+ */
public abstract class FillGapBaseActivity extends BaseActivity implements ObservableScrollViewCallbacks {
protected View mHeader;
@@ -40,7 +44,7 @@ public abstract class FillGapBaseActivity extends BaseActi
protected int mActionBarSize;
protected int mIntersectionHeight;
- private View mImageHolder;
+ private View mImage;
private View mHeaderBackground;
private int mPrevScrollY;
private boolean mGapIsChanging;
@@ -52,8 +56,6 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(getLayoutResId());
- setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
-
mFlexibleSpaceImageHeight = getResources().getDimensionPixelSize(R.dimen.flexible_space_image_height);
mActionBarSize = getActionBarSize();
@@ -61,7 +63,7 @@ protected void onCreate(Bundle savedInstanceState) {
// within mIntersectionHeight.
mIntersectionHeight = getResources().getDimensionPixelSize(R.dimen.intersection_height);
- mImageHolder = findViewById(R.id.image_holder);
+ mImage = findViewById(R.id.image);
mHeader = findViewById(R.id.header);
mHeaderBar = findViewById(R.id.header_bar);
mHeaderBackground = findViewById(R.id.header_background);
@@ -75,14 +77,6 @@ protected void onCreate(Bundle savedInstanceState) {
ScrollUtils.addOnGlobalLayoutListener((View) scrollable, new Runnable() {
@Override
public void run() {
- // mListBackgroundView makes ListView's background except header view.
- if (mListBackgroundView != null) {
- final View contentView = getWindow().getDecorView().findViewById(android.R.id.content);
- // mListBackgroundView's should fill its parent vertically
- // but the height of the content view is 0 on 'onCreate'.
- mListBackgroundView.getLayoutParams().height = contentView.getHeight();
- }
-
mReady = true;
updateViews(scrollable.getCurrentScrollY(), false);
}
@@ -113,7 +107,7 @@ protected void updateViews(int scrollY, boolean animated) {
return;
}
// Translate image
- ViewHelper.setTranslationY(mImageHolder, -scrollY / 2);
+ ViewHelper.setTranslationY(mImage, -scrollY / 2);
// Translate header
ViewHelper.setTranslationY(mHeader, getHeaderTranslationY(scrollY));
diff --git a/observablescrollview-samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FillGapListViewActivity.java b/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FillGapListViewActivity.java
similarity index 96%
rename from observablescrollview-samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FillGapListViewActivity.java
rename to samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FillGapListViewActivity.java
index a06f2d05..d7b7f5c9 100644
--- a/observablescrollview-samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FillGapListViewActivity.java
+++ b/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FillGapListViewActivity.java
@@ -20,6 +20,9 @@
import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks;
import com.nineoldandroids.view.ViewHelper;
+/**
+ * Warning: This example does not work on Android 2.3.
+ */
public class FillGapListViewActivity extends FillGapBaseActivity extends BaseFragment
+ implements ObservableScrollViewCallbacks {
+
+ public static final String ARG_SCROLL_Y = "ARG_SCROLL_Y";
+
+ public void setArguments(int scrollY) {
+ if (0 <= scrollY) {
+ Bundle args = new Bundle();
+ args.putInt(ARG_SCROLL_Y, scrollY);
+ setArguments(args);
+ }
+ }
+
+ public void setScrollY(int scrollY, int threshold) {
+ View view = getView();
+ if (view == null) {
+ return;
+ }
+ Scrollable scrollView = (Scrollable) view.findViewById(R.id.scroll);
+ if (scrollView == null) {
+ return;
+ }
+ scrollView.scrollVerticallyTo(scrollY);
+ }
+
+ protected void updateFlexibleSpace(int scrollY) {
+ updateFlexibleSpace(scrollY, getView());
+ }
+
+ protected abstract void updateFlexibleSpace(int scrollY, View view);
+
+ @Override
+ public void onScrollChanged(int scrollY, boolean firstScroll, boolean dragging) {
+ if (getView() == null) {
+ return;
+ }
+ updateFlexibleSpace(scrollY, getView());
+ }
+
+ @Override
+ public final void onDownMotionEvent() {
+ // We don't use this callback in this pattern.
+ }
+
+ @Override
+ public final void onUpOrCancelMotionEvent(ScrollState scrollState) {
+ // We don't use this callback in this pattern.
+ }
+
+ protected S getScrollable() {
+ View view = getView();
+ return view == null ? null : (S) view.findViewById(R.id.scroll);
+ }
+}
diff --git a/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FlexibleSpaceWithImageGridViewActivity.java b/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FlexibleSpaceWithImageGridViewActivity.java
new file mode 100644
index 00000000..4b1a2987
--- /dev/null
+++ b/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FlexibleSpaceWithImageGridViewActivity.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2014 Soichiro Kashima
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.ksoichiro.android.observablescrollview.samples;
+
+import android.annotation.TargetApi;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AbsListView;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.github.ksoichiro.android.observablescrollview.ObservableGridView;
+import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks;
+import com.github.ksoichiro.android.observablescrollview.ScrollState;
+import com.github.ksoichiro.android.observablescrollview.ScrollUtils;
+import com.nineoldandroids.view.ViewHelper;
+import com.nineoldandroids.view.ViewPropertyAnimator;
+
+/**
+ * This example depends on {@code ObservableGridView#addHeaderView()} method introduced in v1.6.0.
+ */
+public class FlexibleSpaceWithImageGridViewActivity extends BaseActivity implements ObservableScrollViewCallbacks {
+
+ private static final float MAX_TEXT_SCALE_DELTA = 0.3f;
+
+ private View mImageView;
+ private View mOverlayView;
+ private View mListBackgroundView;
+ private TextView mTitleView;
+ private View mFab;
+ private int mActionBarSize;
+ private int mFlexibleSpaceShowFabOffset;
+ private int mFlexibleSpaceImageHeight;
+ private int mFabMargin;
+ private boolean mFabIsShown;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_flexiblespacewithimagegridview);
+
+ mFlexibleSpaceImageHeight = getResources().getDimensionPixelSize(R.dimen.flexible_space_image_height);
+ mFlexibleSpaceShowFabOffset = getResources().getDimensionPixelSize(R.dimen.flexible_space_show_fab_offset);
+ mActionBarSize = getActionBarSize();
+ mImageView = findViewById(R.id.image);
+ mOverlayView = findViewById(R.id.overlay);
+ ObservableGridView gridView = (ObservableGridView) findViewById(R.id.list);
+ gridView.setScrollViewCallbacks(this);
+
+ // Set padding view for ListView. This is the flexible space.
+ View paddingView = new View(this);
+ AbsListView.LayoutParams lp = new AbsListView.LayoutParams(AbsListView.LayoutParams.MATCH_PARENT,
+ mFlexibleSpaceImageHeight);
+ paddingView.setLayoutParams(lp);
+
+ // This is required to disable header's list selector effect
+ paddingView.setClickable(true);
+
+ gridView.addHeaderView(paddingView);
+ setDummyData(gridView);
+ mTitleView = (TextView) findViewById(R.id.title);
+ mTitleView.setText(getTitle());
+ setTitle(null);
+ mFab = findViewById(R.id.fab);
+ mFab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Toast.makeText(FlexibleSpaceWithImageGridViewActivity.this, "FAB is clicked", Toast.LENGTH_SHORT).show();
+ }
+ });
+ mFabMargin = getResources().getDimensionPixelSize(R.dimen.margin_standard);
+ ViewHelper.setScaleX(mFab, 0);
+ ViewHelper.setScaleY(mFab, 0);
+
+ // mListBackgroundView makes ListView's background except header view.
+ mListBackgroundView = findViewById(R.id.list_background);
+ }
+
+ @Override
+ public void onScrollChanged(int scrollY, boolean firstScroll, boolean dragging) {
+ // Translate overlay and image
+ float flexibleRange = mFlexibleSpaceImageHeight - mActionBarSize;
+ int minOverlayTransitionY = mActionBarSize - mOverlayView.getHeight();
+ ViewHelper.setTranslationY(mOverlayView, ScrollUtils.getFloat(-scrollY, minOverlayTransitionY, 0));
+ ViewHelper.setTranslationY(mImageView, ScrollUtils.getFloat(-scrollY / 2, minOverlayTransitionY, 0));
+
+ // Translate list background
+ ViewHelper.setTranslationY(mListBackgroundView, Math.max(0, -scrollY + mFlexibleSpaceImageHeight));
+
+ // Change alpha of overlay
+ ViewHelper.setAlpha(mOverlayView, ScrollUtils.getFloat((float) scrollY / flexibleRange, 0, 1));
+
+ // Scale title text
+ float scale = 1 + ScrollUtils.getFloat((flexibleRange - scrollY) / flexibleRange, 0, MAX_TEXT_SCALE_DELTA);
+ setPivotXToTitle();
+ ViewHelper.setPivotY(mTitleView, 0);
+ ViewHelper.setScaleX(mTitleView, scale);
+ ViewHelper.setScaleY(mTitleView, scale);
+
+ // Translate title text
+ int maxTitleTranslationY = (int) (mFlexibleSpaceImageHeight - mTitleView.getHeight() * scale);
+ int titleTranslationY = maxTitleTranslationY - scrollY;
+ ViewHelper.setTranslationY(mTitleView, titleTranslationY);
+
+ // Translate FAB
+ int maxFabTranslationY = mFlexibleSpaceImageHeight - mFab.getHeight() / 2;
+ float fabTranslationY = ScrollUtils.getFloat(
+ -scrollY + mFlexibleSpaceImageHeight - mFab.getHeight() / 2,
+ mActionBarSize - mFab.getHeight() / 2,
+ maxFabTranslationY);
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+ // On pre-honeycomb, ViewHelper.setTranslationX/Y does not set margin,
+ // which causes FAB's OnClickListener not working.
+ FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) mFab.getLayoutParams();
+ lp.leftMargin = mOverlayView.getWidth() - mFabMargin - mFab.getWidth();
+ lp.topMargin = (int) fabTranslationY;
+ mFab.requestLayout();
+ } else {
+ ViewHelper.setTranslationX(mFab, mOverlayView.getWidth() - mFabMargin - mFab.getWidth());
+ ViewHelper.setTranslationY(mFab, fabTranslationY);
+ }
+
+ // Show/hide FAB
+ if (fabTranslationY < mFlexibleSpaceShowFabOffset) {
+ hideFab();
+ } else {
+ showFab();
+ }
+ }
+
+ @Override
+ public void onDownMotionEvent() {
+ }
+
+ @Override
+ public void onUpOrCancelMotionEvent(ScrollState scrollState) {
+ }
+
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+ private void setPivotXToTitle() {
+ Configuration config = getResources().getConfiguration();
+ if (Build.VERSION_CODES.JELLY_BEAN_MR1 <= Build.VERSION.SDK_INT
+ && config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+ ViewHelper.setPivotX(mTitleView, findViewById(android.R.id.content).getWidth());
+ } else {
+ ViewHelper.setPivotX(mTitleView, 0);
+ }
+ }
+
+ private void showFab() {
+ if (!mFabIsShown) {
+ ViewPropertyAnimator.animate(mFab).cancel();
+ ViewPropertyAnimator.animate(mFab).scaleX(1).scaleY(1).setDuration(200).start();
+ mFabIsShown = true;
+ }
+ }
+
+ private void hideFab() {
+ if (mFabIsShown) {
+ ViewPropertyAnimator.animate(mFab).cancel();
+ ViewPropertyAnimator.animate(mFab).scaleX(0).scaleY(0).setDuration(200).start();
+ mFabIsShown = false;
+ }
+ }
+}
diff --git a/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FlexibleSpaceWithImageGridViewFragment.java b/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FlexibleSpaceWithImageGridViewFragment.java
new file mode 100644
index 00000000..91b9716d
--- /dev/null
+++ b/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/FlexibleSpaceWithImageGridViewFragment.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2014 Soichiro Kashima
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.ksoichiro.android.observablescrollview.samples;
+
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import com.github.ksoichiro.android.observablescrollview.ObservableGridView;
+import com.github.ksoichiro.android.observablescrollview.ScrollUtils;
+import com.nineoldandroids.view.ViewHelper;
+
+public class FlexibleSpaceWithImageGridViewFragment extends FlexibleSpaceWithImageBaseFragment
+ * If it's a big problem to you, please also check
+ * FlexibleSpaceWithImageWithViewPagerTabActivity.
+ * https://github.com/google/iosched
+ *
+ *
+ *
+ * (This is just an example, so we won't do it here.)
+ * https://github.com/google/iosched extends BaseAc
private boolean mHeaderColorChangedToBottom;
private boolean mHeaderIsAtBottom;
private boolean mHeaderIsNotAtBottom;
+ private View.OnClickListener fabClickListener = new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Toast.makeText(SlidingUpBaseActivity.this, "floating action button clicked", Toast.LENGTH_SHORT).show();
+ }
+ };
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -89,9 +97,12 @@ protected void onCreate(Bundle savedInstanceState) {
setSupportActionBar(mToolbar);
ViewHelper.setScaleY(mToolbar, 0);
- getSupportActionBar().setHomeButtonEnabled(true);
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
- getSupportActionBar().setTitle("");
+ ActionBar ab = getSupportActionBar();
+ if (ab != null) {
+ ab.setHomeButtonEnabled(true);
+ ab.setDisplayHomeAsUpEnabled(true);
+ ab.setTitle("");
+ }
mToolbarColor = getResources().getColor(R.color.primary);
mToolbar.setBackgroundColor(Color.TRANSPARENT);
@@ -119,6 +130,7 @@ public void onClick(View v) {
mScrollable = createScrollable();
mFab = findViewById(R.id.fab);
+ mFab.setOnClickListener(fabClickListener);
mFabMargin = getResources().getDimensionPixelSize(R.dimen.margin_standard);
mInterceptionLayout = (TouchInterceptionFrameLayout) findViewById(R.id.scroll_wrapper);
@@ -179,8 +191,17 @@ public void onUpOrCancelMotionEvent(ScrollState scrollState) {
@Override
public boolean shouldInterceptTouchEvent(MotionEvent ev, boolean moving, float diffX, float diffY) {
final int minInterceptionLayoutY = -mIntersectionHeight;
- return minInterceptionLayoutY < (int) ViewHelper.getY(mInterceptionLayout)
- || (moving && mScrollable.getCurrentScrollY() - diffY < 0);
+
+ // slight fix for untappable floating action button for larger screens
+ Rect fabRect = new Rect();
+ mFab.getHitRect(fabRect);
+ // if the user's touch is within the floating action button's touch area, don't intercept
+ if (fabRect.contains((int) ev.getX(), (int) ev.getY())) {
+ return false;
+ } else {
+ return minInterceptionLayoutY < (int) ViewHelper.getY(mInterceptionLayout)
+ || (moving && mScrollable.getCurrentScrollY() - diffY < 0);
+ }
}
@Override
diff --git a/observablescrollview-samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/SlidingUpGridViewActivity.java b/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/SlidingUpGridViewActivity.java
similarity index 100%
rename from observablescrollview-samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/SlidingUpGridViewActivity.java
rename to samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/SlidingUpGridViewActivity.java
diff --git a/observablescrollview-samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/SlidingUpListViewActivity.java b/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/SlidingUpListViewActivity.java
similarity index 95%
rename from observablescrollview-samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/SlidingUpListViewActivity.java
rename to samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/SlidingUpListViewActivity.java
index f355bcca..3b2790fa 100644
--- a/observablescrollview-samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/SlidingUpListViewActivity.java
+++ b/samples/src/main/java/com/github/ksoichiro/android/observablescrollview/samples/SlidingUpListViewActivity.java
@@ -18,15 +18,11 @@
import android.view.View;
import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
import android.widget.Toast;
import com.github.ksoichiro.android.observablescrollview.ObservableListView;
import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks;
-import java.util.ArrayList;
-import java.util.List;
-
public class SlidingUpListViewActivity extends SlidingUpBaseActivity404
+Page Not Found
diff --git a/website/public/_data.json b/website/public/_data.json
new file mode 100644
index 00000000..b6a7fe24
--- /dev/null
+++ b/website/public/_data.json
@@ -0,0 +1,24 @@
+{
+ "index": {
+ "title": "Android-ObservableScrollView",
+ "layout": false
+ },
+ "quick-start": {
+ "title": "Quick start"
+ },
+ "example": {
+ "title": "Try the example app"
+ },
+ "basic": {
+ "title": "Basic techniques"
+ },
+ "advanced": {
+ "title": "Advanced techniques"
+ },
+ "contributor": {
+ "title": "For contributors"
+ },
+ "reference": {
+ "title": "Reference"
+ }
+}
diff --git a/website/public/_footer.ejs b/website/public/_footer.ejs
new file mode 100644
index 00000000..bb47b70c
--- /dev/null
+++ b/website/public/_footer.ejs
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/website/public/_head.ejs b/website/public/_head.ejs
new file mode 100644
index 00000000..4ebe9af4
--- /dev/null
+++ b/website/public/_head.ejs
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+<%- partial("_footer") %>
+
+
diff --git a/website/public/_nav.ejs b/website/public/_nav.ejs
new file mode 100644
index 00000000..3a02ffc9
--- /dev/null
+++ b/website/public/_nav.ejs
@@ -0,0 +1,20 @@
+
diff --git a/website/public/android-icon-144x144.png b/website/public/android-icon-144x144.png
new file mode 100755
index 00000000..504f74db
Binary files /dev/null and b/website/public/android-icon-144x144.png differ
diff --git a/website/public/android-icon-192x192.png b/website/public/android-icon-192x192.png
new file mode 100755
index 00000000..a6a10ce8
Binary files /dev/null and b/website/public/android-icon-192x192.png differ
diff --git a/website/public/android-icon-36x36.png b/website/public/android-icon-36x36.png
new file mode 100755
index 00000000..c770edde
Binary files /dev/null and b/website/public/android-icon-36x36.png differ
diff --git a/website/public/android-icon-48x48.png b/website/public/android-icon-48x48.png
new file mode 100755
index 00000000..66e484a7
Binary files /dev/null and b/website/public/android-icon-48x48.png differ
diff --git a/website/public/android-icon-72x72.png b/website/public/android-icon-72x72.png
new file mode 100755
index 00000000..d127245e
Binary files /dev/null and b/website/public/android-icon-72x72.png differ
diff --git a/website/public/android-icon-96x96.png b/website/public/android-icon-96x96.png
new file mode 100755
index 00000000..0afa873a
Binary files /dev/null and b/website/public/android-icon-96x96.png differ
diff --git a/website/public/apple-icon-114x114.png b/website/public/apple-icon-114x114.png
new file mode 100755
index 00000000..813b306f
Binary files /dev/null and b/website/public/apple-icon-114x114.png differ
diff --git a/website/public/apple-icon-120x120.png b/website/public/apple-icon-120x120.png
new file mode 100755
index 00000000..ff3eec0a
Binary files /dev/null and b/website/public/apple-icon-120x120.png differ
diff --git a/website/public/apple-icon-144x144.png b/website/public/apple-icon-144x144.png
new file mode 100755
index 00000000..504f74db
Binary files /dev/null and b/website/public/apple-icon-144x144.png differ
diff --git a/website/public/apple-icon-152x152.png b/website/public/apple-icon-152x152.png
new file mode 100755
index 00000000..abef3ed4
Binary files /dev/null and b/website/public/apple-icon-152x152.png differ
diff --git a/website/public/apple-icon-180x180.png b/website/public/apple-icon-180x180.png
new file mode 100755
index 00000000..dbedc0b2
Binary files /dev/null and b/website/public/apple-icon-180x180.png differ
diff --git a/website/public/apple-icon-57x57.png b/website/public/apple-icon-57x57.png
new file mode 100755
index 00000000..49feffd5
Binary files /dev/null and b/website/public/apple-icon-57x57.png differ
diff --git a/website/public/apple-icon-60x60.png b/website/public/apple-icon-60x60.png
new file mode 100755
index 00000000..aad6dc65
Binary files /dev/null and b/website/public/apple-icon-60x60.png differ
diff --git a/website/public/apple-icon-72x72.png b/website/public/apple-icon-72x72.png
new file mode 100755
index 00000000..d127245e
Binary files /dev/null and b/website/public/apple-icon-72x72.png differ
diff --git a/website/public/apple-icon-76x76.png b/website/public/apple-icon-76x76.png
new file mode 100755
index 00000000..3d902389
Binary files /dev/null and b/website/public/apple-icon-76x76.png differ
diff --git a/website/public/apple-icon-precomposed.png b/website/public/apple-icon-precomposed.png
new file mode 100755
index 00000000..40454e05
Binary files /dev/null and b/website/public/apple-icon-precomposed.png differ
diff --git a/website/public/apple-icon.png b/website/public/apple-icon.png
new file mode 100755
index 00000000..40454e05
Binary files /dev/null and b/website/public/apple-icon.png differ
diff --git a/website/public/browserconfig.xml b/website/public/browserconfig.xml
new file mode 100755
index 00000000..c5541482
--- /dev/null
+++ b/website/public/browserconfig.xml
@@ -0,0 +1,2 @@
+
+
+
+
+<%- yield %>
+
+s
+table {
+ .table;
+}
+
+.container {
+ .override-container;
+}
+
+#sidebar-main-content {
+ h1 {
+ margin-bottom: 16px;
+ }
+ h2 {
+ margin-top: 34px;
+ margin-bottom: 18px;
+ }
+ h3 {
+ margin-top: 26px;
+ margin-bottom: 16px;
+ }
+ h4 {
+ margin-top: 22px;
+ margin-bottom: 16px;
+ }
+ h5 {
+ margin-top: 20px;
+ margin-bottom: 16px;
+ }
+ p, ol, ul, pre {
+ margin-bottom: 16px;
+ }
+}
diff --git a/website/public/css/_misc.less b/website/public/css/_misc.less
new file mode 100644
index 00000000..c2816960
--- /dev/null
+++ b/website/public/css/_misc.less
@@ -0,0 +1,47 @@
+// Showing fragment links
+#sidebar-main-content {
+ h2, h3, h4, h5 {
+ position: relative;
+ .anchor {
+ visibility: hidden;
+ padding-left: 4px;
+ }
+ &:hover {
+ .anchor {
+ visibility: visible;
+ }
+ }
+ }
+ .marker {
+ position: absolute;
+ top: -70px;
+ left: 0;
+ padding: 0;
+ margin: 0;
+ }
+ h2 .anchor {
+ font-size: 20px;
+ }
+ h3 .anchor {
+ font-size: 16px;
+ color: #212121;
+ }
+ h4 .anchor {
+ font-size: 14px;
+ color: #212121;
+ }
+ h5 .anchor {
+ font-size: 12px;
+ color: #212121;
+ }
+ img {
+ -webkit-box-shadow: 0 2px 4px 2px rgba(0, 0, 0, 0.3);
+ -moz-box-shadow: 0 2px 4px 2px rgba(0, 0, 0, 0.3);
+ box-shadow: 0 2px 4px 2px rgba(0, 0, 0, 0.3);
+ }
+ a>img {
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+ }
+}
diff --git a/website/public/css/_mixins.less b/website/public/css/_mixins.less
new file mode 100644
index 00000000..b65e40bd
--- /dev/null
+++ b/website/public/css/_mixins.less
@@ -0,0 +1,8 @@
+// Overwrite bootstrap's default
+.override-container(@width: 970px) {
+ @media (min-width: 1200px) {
+ & {
+ width: @width;
+ }
+ }
+}
diff --git a/website/public/css/_navbar.less b/website/public/css/_navbar.less
new file mode 100644
index 00000000..7e031f8a
--- /dev/null
+++ b/website/public/css/_navbar.less
@@ -0,0 +1,35 @@
+.navbar-shadow() {
+ @shadow-h-offset: 0px;
+ @shadow-v-offset: -3px;
+ @shadow-blur-radius: 6px;
+ @shadow-spread-radius: 6px;
+ @shadow-color: rgba(32, 32, 32, 0.4);
+ -moz-box-shadow: @shadow-h-offset @shadow-v-offset @shadow-blur-radius @shadow-spread-radius @shadow-color;
+ -webkit-box-shadow: @shadow-h-offset @shadow-v-offset @shadow-blur-radius @shadow-spread-radius @shadow-color;
+ box-shadow: @shadow-h-offset @shadow-v-offset @shadow-blur-radius @shadow-spread-radius @shadow-color;
+}
+.navbar-shadow-clear() {
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
+nav.navbar {
+ .navbar-shadow();
+ .navbar-brand {
+ background-image: url('../images/logo.svg');
+ background-repeat: no-repeat;
+ background-position: 12px center;
+ padding-left: 64px;
+ }
+}
+
+@media screen and (max-width: 767px) {
+ nav.navbar {
+ .navbar-brand {
+ background-position: 4px center;
+ padding-left: 56px;
+ padding-right: 8px;
+ }
+ }
+}
diff --git a/website/public/css/_roboto-fonts.less b/website/public/css/_roboto-fonts.less
new file mode 100644
index 00000000..72f4f47e
--- /dev/null
+++ b/website/public/css/_roboto-fonts.less
@@ -0,0 +1,34 @@
+@roboto-font-path: '../lib/roboto-fontface/fonts';
+
+.roboto-font(@type, @weight, @style) {
+ @font-face {
+ font-family: 'Roboto';
+ src: url('@{roboto-font-path}/Roboto-@{type}.eot');
+ src: url('@{roboto-font-path}/Roboto-@{type}.eot?#iefix') format('embedded-opentype'),
+ url('@{roboto-font-path}/Roboto-@{type}.woff2') format('woff2'),
+ url('@{roboto-font-path}/Roboto-@{type}.woff') format('woff'),
+ url('@{roboto-font-path}/Roboto-@{type}.ttf') format('truetype'),
+ url('@{roboto-font-path}/Roboto-@{type}.svg#Roboto') format('svg');
+ font-weight: @weight;
+ font-style: @style;
+ }
+
+ @font-face {
+ font-family: 'Roboto-@{type}';
+ src: url('@{roboto-font-path}/Roboto-@{type}.eot');
+ src: url('@{roboto-font-path}/Roboto-@{type}.eot?#iefix') format('embedded-opentype'),
+ url('@{roboto-font-path}/Roboto-@{type}.woff2') format('woff2'),
+ url('@{roboto-font-path}/Roboto-@{type}.woff') format('woff'),
+ url('@{roboto-font-path}/Roboto-@{type}.ttf') format('truetype'),
+ url('@{roboto-font-path}/Roboto-@{type}.svg#Roboto') format('svg');
+ }
+}
+
+.roboto-font-pair(@type, @weight) {
+ .roboto-font('@{type}', @weight, normal);
+ .roboto-font('@{type}Italic', @weight, italic);
+}
+
+.roboto-font-pair('Thin', 100);
+.roboto-font-pair('Light', 300);
+.roboto-font-pair('Regular', 400);
diff --git a/website/public/css/_sidebar.less b/website/public/css/_sidebar.less
new file mode 100644
index 00000000..cdb2d354
--- /dev/null
+++ b/website/public/css/_sidebar.less
@@ -0,0 +1,72 @@
+@import (reference) '../../bower_components/bootstrap/less/bootstrap.less';
+
+// Page with sidebar
+.btn-sidebar-toggle {
+ .btn;
+ .btn-default;
+ .btn-xs;
+}
+#grid-content {
+ .make-row();
+ #sidebar {
+ .make-xs-column(6);
+ .make-sm-column(3);
+
+ ul {
+ padding-left: 0px;
+ }
+ &>ul {
+ border-right: 1px solid #E0E0E0;
+ padding-right: 15px;
+ li {
+ position: relative;
+ display: block;
+ }
+ &>li {
+ padding: 8px;
+ }
+ .section {
+ font-size: 14px;
+ font-weight: 400;
+ margin: 0px;
+ margin-bottom: 8px;
+ &,
+ &>a {
+ color: #009688;
+ text-decoration: none;
+ }
+ }
+ .topic {
+ &>a {
+ color: #212121;
+ }
+ }
+ }
+ }
+ #sidebar-main-content {
+ .make-xs-column(12);
+ .make-sm-column(9);
+ }
+}
+
+@media screen and (max-width: 767px) {
+ #grid-content {
+ position: relative;
+ -webkit-transition: all .25s ease-out;
+ -o-transition: all .25s ease-out;
+ transition: all .25s ease-out;
+ left: 0;
+
+ &.active {
+ left: 50%;
+ }
+
+ #sidebar {
+ left: -50%;
+ position: absolute;
+ top: 0;
+ width: 50%;
+ }
+ }
+}
+
diff --git a/website/public/css/_site-top.less b/website/public/css/_site-top.less
new file mode 100644
index 00000000..2124ace3
--- /dev/null
+++ b/website/public/css/_site-top.less
@@ -0,0 +1,75 @@
+@import (reference) '_mixins.less';
+@import (reference) '_colors.less';
+
+@content-header-height: 300px;
+body#site-top {
+ padding-top: 0px;
+ #content-header {
+ padding-top: 100px;
+ height: @content-header-height;
+ background-color: #ffffff;
+ #site-title {
+ font-weight: 100;
+ padding-top: 50px;
+ color: @theme-main-color;
+ }
+ }
+ #main-content {
+ padding-top: 30px;
+ h1 {
+ display: none;
+ }
+ }
+}
+
+@media screen and (min-width: 768px) {
+ body#site-top {
+ padding-top: 0px;
+ nav.navbar {
+ background: none;
+ border-color: transparent;
+ .navbar-shadow-clear();
+ &.sticky {
+ background-color: @theme-main-color;
+ .navbar-shadow();
+ }
+ .navbar-brand {
+ background-image: none;
+ background-position: left center;
+ padding-left: 0px;
+ visibility: hidden;
+ &.visible {
+ visibility: visible;
+ padding-left: 15px;
+ }
+ }
+ }
+ nav.navbar {
+ #navbar {
+ &.right {
+ @translate-amount: -250px;
+ -moz-transform: translateX(@translate-amount);
+ -webkit-transform: translateX(@translate-amount);
+ -o-transform: translateX(@translate-amount);
+ -ms-transform: translateX(@translate-amount);
+ }
+ }
+ }
+
+ padding-top: 0px;
+ #content-header {
+ display: block;
+ padding-top: 100px;
+ height: @content-header-height;
+ background-color: @theme-main-color;
+ #site-title {
+ font-size: 48px;
+ color: #ffffff;
+ visibility: hidden;
+ &.visible {
+ visibility: visible;
+ }
+ }
+ }
+ }
+}
diff --git a/website/public/css/main.less b/website/public/css/main.less
new file mode 100644
index 00000000..9c7a8ebe
--- /dev/null
+++ b/website/public/css/main.less
@@ -0,0 +1,11 @@
+@import (reference) '../../bower_components/bootstrap/less/bootstrap.less';
+@import (reference) '_mixins.less';
+@import '_fonts.less';
+@import '_colors.less';
+@import '_layout.less';
+@import '_navbar.less';
+@import '_footer.less';
+@import '_sidebar.less';
+@import '_site-top.less';
+@import '_code.less';
+@import '_misc.less';
diff --git a/website/public/favicon-16x16.png b/website/public/favicon-16x16.png
new file mode 100755
index 00000000..cb5c8f81
Binary files /dev/null and b/website/public/favicon-16x16.png differ
diff --git a/website/public/favicon-32x32.png b/website/public/favicon-32x32.png
new file mode 100755
index 00000000..bd8e204d
Binary files /dev/null and b/website/public/favicon-32x32.png differ
diff --git a/website/public/favicon-96x96.png b/website/public/favicon-96x96.png
new file mode 100755
index 00000000..0afa873a
Binary files /dev/null and b/website/public/favicon-96x96.png differ
diff --git a/website/public/favicon.ico b/website/public/favicon.ico
new file mode 100755
index 00000000..f2f510d1
Binary files /dev/null and b/website/public/favicon.ico differ
diff --git a/website/public/images/logo.svg b/website/public/images/logo.svg
new file mode 100644
index 00000000..3ee47e47
--- /dev/null
+++ b/website/public/images/logo.svg
@@ -0,0 +1,40 @@
+
+
+
diff --git a/website/public/index.ejs b/website/public/index.ejs
new file mode 100644
index 00000000..78a9603e
--- /dev/null
+++ b/website/public/index.ejs
@@ -0,0 +1,46 @@
+
+
+
+<%- partial("_head") %>
+
+
+
+
+
+
+
+
+
+
+<%- title %>
+
+
+
+<%- partial("_footer") %>
+
+
diff --git a/website/public/js/main.coffee b/website/public/js/main.coffee
new file mode 100644
index 00000000..21f983c5
--- /dev/null
+++ b/website/public/js/main.coffee
@@ -0,0 +1,43 @@
+# Disable highlight for license quotation
+$('.language-license').addClass 'nohighlight'
+
+# Remove .md, except external links
+$("a[href$='.md']").not("[href^='http']").each ->
+ @.href = @.href.replace /\.md$/, ""
+
+# Insert subdirectory for links
+base = $("meta[name='base']").attr('content')
+if base != ""
+ $("a[href$='.md']").not("[href^='http']").each ->
+ @.href = @.href.replace 'docs/', "#{base}/docs/"
+
+# Toggling sidebar
+$(document).ready ->
+ $('[data-toggle="offcanvas"]').click ->
+ $('#grid-content').toggleClass('active')
+ if $('#grid-content').hasClass('active')
+ $('[data-toggle="offcanvas"]').text 'Hide menu'
+ else
+ $('[data-toggle="offcanvas"]').text 'Show menu'
+
+if $('#site-top')
+ $(window).scroll ->
+ if 70 < $(document).scrollTop()
+ $('.navbar-brand').addClass('visible')
+ $('#site-title').removeClass('visible')
+ $('#navbar').removeClass('right')
+ else
+ $('.navbar-brand').removeClass('visible')
+ $('#site-title').addClass('visible')
+ $('#navbar').addClass('right')
+
+ if 250 < $(document).scrollTop()
+ $('nav').addClass('sticky')
+ else
+ $('nav').removeClass('sticky')
+
+# Create fragment links
+$(document).ready ->
+ $('#sidebar-main-content h2, #sidebar-main-content h3, #sidebar-main-content h4, #sidebar-main-content h5').each ->
+ fragment = $(@).text().toLowerCase().replace(/[ _\.\/]/g, '-').replace(/--+/g, '-').replace(/([,':()\?!]|-+ |-+$)/g, '')
+ $(@).html($(@).html() + '#')
diff --git a/website/public/manifest.json b/website/public/manifest.json
new file mode 100755
index 00000000..013d4a6a
--- /dev/null
+++ b/website/public/manifest.json
@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+ {
+ "src": "\/android-icon-36x36.png",
+ "sizes": "36x36",
+ "type": "image\/png",
+ "density": "0.75"
+ },
+ {
+ "src": "\/android-icon-48x48.png",
+ "sizes": "48x48",
+ "type": "image\/png",
+ "density": "1.0"
+ },
+ {
+ "src": "\/android-icon-72x72.png",
+ "sizes": "72x72",
+ "type": "image\/png",
+ "density": "1.5"
+ },
+ {
+ "src": "\/android-icon-96x96.png",
+ "sizes": "96x96",
+ "type": "image\/png",
+ "density": "2.0"
+ },
+ {
+ "src": "\/android-icon-144x144.png",
+ "sizes": "144x144",
+ "type": "image\/png",
+ "density": "3.0"
+ },
+ {
+ "src": "\/android-icon-192x192.png",
+ "sizes": "192x192",
+ "type": "image\/png",
+ "density": "4.0"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/website/public/ms-icon-144x144.png b/website/public/ms-icon-144x144.png
new file mode 100755
index 00000000..504f74db
Binary files /dev/null and b/website/public/ms-icon-144x144.png differ
diff --git a/website/public/ms-icon-150x150.png b/website/public/ms-icon-150x150.png
new file mode 100755
index 00000000..83eb4c9e
Binary files /dev/null and b/website/public/ms-icon-150x150.png differ
diff --git a/website/public/ms-icon-310x310.png b/website/public/ms-icon-310x310.png
new file mode 100755
index 00000000..140fc141
Binary files /dev/null and b/website/public/ms-icon-310x310.png differ
diff --git a/website/public/ms-icon-70x70.png b/website/public/ms-icon-70x70.png
new file mode 100755
index 00000000..2beaca27
Binary files /dev/null and b/website/public/ms-icon-70x70.png differ
diff --git a/website/public/thumbnail.png b/website/public/thumbnail.png
new file mode 100644
index 00000000..4cd0e772
Binary files /dev/null and b/website/public/thumbnail.png differ
diff --git a/wercker.yml b/wercker.yml
index 3f6a915f..d4fe44a7 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -13,7 +13,9 @@ build:
echo $ANDROID_UPDATE_FILTER
echo $ANDROID_NDK_HOME
- android-sdk-update:
- filter: tools,platform-tools,android-21,build-tools-21.1.1,extra-android-support,extra-android-m2repository
+ filter: tools,platform-tools
+ - android-sdk-update:
+ filter: android-21,android-22,android-23,build-tools-23.0.2,extra-android-support,extra-android-m2repository
# A step that executes `gradle build` command
- script:
name: run gradle
@@ -23,6 +25,6 @@ build:
- script:
name: inspect build result
code: |
- ls -la ./observablescrollview-samples/build/outputs/apk
- cp ./observablescrollview-samples/build/outputs/apk/*.apk $WERCKER_REPORT_ARTIFACTS_DIR
+ ls -la ./samples/build/outputs/apk
+ cp ./samples/build/outputs/apk/*.apk $WERCKER_REPORT_ARTIFACTS_DIR
rm -f $WERCKER_REPORT_ARTIFACTS_DIR/*-unaligned.apk
+
+
+
+<%- partial('../../README') %>
+
+