This repository was archived by the owner on Feb 26, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Added page change #1635
Merged
WonderCsabo
merged 3 commits into
androidannotations:develop
from
shiraji:1568_add_page_change
Dec 1, 2015
Merged
Added page change #1635
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
92 changes: 92 additions & 0 deletions
92
...otations-api/src/main/java/org/androidannotations/annotations/PageScrollStateChanged.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /** | ||
| * Copyright (C) 2010-2015 eBusiness Information, Excilys Group | ||
| * | ||
| * 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 org.androidannotations.annotations; | ||
|
|
||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| /** | ||
| * <p> | ||
| * This annotation is intended to be used on methods to receive events defined | ||
| * by | ||
| * <code>android.support.v4.view.ViewPager.OnPageChangeListener.onPageScrollStateChanged</code> | ||
| * when the scroll state changes. | ||
| * </p> | ||
| * <p> | ||
| * The annotation value should be one or several R.id.* fields that refers to | ||
| * ViewPager or subclasses of ViewPager. If not set, the method name will be | ||
| * used as the R.id.* field name. | ||
| * </p> | ||
| * <p> | ||
| * The method MAY have multiple parameter : | ||
| * </p> | ||
| * <ul> | ||
| * <li>A ViewPager parameter to know which view has targeted this event</li> | ||
| * <li>An int parameter is to get new scroll state.</li> | ||
| * </ul> | ||
| * | ||
| * <blockquote> | ||
| * | ||
| * Examples : | ||
| * | ||
| * <pre> | ||
| * @PageScrollStateChanged(<b>R.id.viewpager</b>) | ||
| * void onPageScrollStateChanged(ViewPager view, int state) { | ||
| * // Something Here | ||
| * } | ||
| * | ||
| * @PageScrollStateChanged | ||
| * void viewPager(ViewPager view) { | ||
| * // Something Here | ||
| * } | ||
| * | ||
| * @PageScrollStateChanged(<b>{R.id.viewpager, R.id.viewpager2}</b>) | ||
| * void onPageScrollStateChangedOnMultipleViewPager(ViewPager v, int anything) { | ||
| * // Something Here | ||
| * } | ||
| * | ||
| * @PageScrollStateChanged(<b>R.id.viewpager</b>) | ||
| * void onPageScrollStateChangedNoParam() { | ||
| * // Something Here | ||
| * } | ||
| * </pre> | ||
| * | ||
| * </blockquote> | ||
| * | ||
| * @see PageScrolled | ||
| * @see PageSelected | ||
| */ | ||
| @Retention(RetentionPolicy.CLASS) | ||
| @Target(ElementType.METHOD) | ||
| public @interface PageScrollStateChanged { | ||
|
|
||
| /** | ||
| * The R.id.* fields which refer to the ViewPager. | ||
| * | ||
| * @return the ids of the ViewPager. | ||
| */ | ||
| int[] value() default ResId.DEFAULT_VALUE; | ||
|
|
||
| /** | ||
| * The resource names as a strings which refer to the ViewPagers. | ||
| * | ||
| * @return the resource names of the ViewPagers. | ||
| */ | ||
| String[] resName() default ""; | ||
|
|
||
| } |
99 changes: 99 additions & 0 deletions
99
...androidannotations-api/src/main/java/org/androidannotations/annotations/PageScrolled.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /** | ||
| * Copyright (C) 2010-2015 eBusiness Information, Excilys Group | ||
| * | ||
| * 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 org.androidannotations.annotations; | ||
|
|
||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| /** | ||
| * <p> | ||
| * This annotation is intended to be used on methods to receive events defined | ||
| * by | ||
| * <code>android.support.v4.view.ViewPager.OnPageChangeListener.OnPageScrolled</code> | ||
| * when the current page is scrolled, either as part of a programmatically | ||
| * initiated smooth scroll or a user initiated touch scroll. | ||
| * </p> | ||
| * <p> | ||
| * The annotation value should be one or several R.id.* fields that refers to | ||
| * ViewPager or subclasses of ViewPager. If not set, the method name will be | ||
| * used as the R.id.* field name. | ||
| * </p> | ||
| * <p> | ||
| * The method MAY have multiple parameters, but the order must be following : | ||
| * </p> | ||
| * <ul> | ||
| * <li>A ViewPager parameter to know which view has targeted this event.</li> | ||
| * <li>An int parameter named position to get position index of the first page | ||
| * currently being displayed. Page position+1 will be visible if positionOffset | ||
| * is nonzero.</li> | ||
| * <li>A float parameter is value from [0,1) indicating the offset from the page | ||
| * at position.</li> | ||
| * <li>An int parameter named positionOffsetPixels is value in pixels indicating | ||
| * the offset from position.</li> | ||
| * </ul> | ||
| * | ||
| * <blockquote> | ||
| * | ||
| * Examples : | ||
| * | ||
| * <pre> | ||
| * @PageScrolled(<b>R.id.viewpager</b>) | ||
| * void onPageScrolled(ViewPager view, int position, float positionOffset, int positionOffsetPixels) { | ||
| * // Something Here | ||
| * } | ||
| * | ||
| * @PageScrolled | ||
| * void viewPager(ViewPager view) { | ||
| * // Something Here | ||
| * } | ||
| * | ||
| * @PageScrolled(<b>{R.id.viewpager, R.id.viewpager2}</b>) | ||
| * void onPageScrolledOnMultipleViewPager(ViewPager v, int position) { | ||
| * // Something Here | ||
| * } | ||
| * | ||
| * @PageScrolled(<b>R.id.viewpager</b>) | ||
| * void onPageScrolledNoParam() { | ||
| * // Something Here | ||
| * } | ||
| * </pre> | ||
| * | ||
| * </blockquote> | ||
| * | ||
| * @see PageScrollStateChanged | ||
| * @see PageSelected | ||
| */ | ||
| @Retention(RetentionPolicy.CLASS) | ||
| @Target(ElementType.METHOD) | ||
| public @interface PageScrolled { | ||
|
|
||
| /** | ||
| * The R.id.* fields which refer to the ViewPager. | ||
| * | ||
| * @return the ids of the ViewPager. | ||
| */ | ||
| int[] value() default ResId.DEFAULT_VALUE; | ||
|
|
||
| /** | ||
| * The resource names as a strings which refer to the ViewPagers. | ||
| * | ||
| * @return the resource names of the ViewPagers. | ||
| */ | ||
| String[] resName() default ""; | ||
|
|
||
| } |
92 changes: 92 additions & 0 deletions
92
...androidannotations-api/src/main/java/org/androidannotations/annotations/PageSelected.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /** | ||
| * Copyright (C) 2010-2015 eBusiness Information, Excilys Group | ||
| * | ||
| * 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 org.androidannotations.annotations; | ||
|
|
||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| /** | ||
| * <p> | ||
| * This annotation is intended to be used on methods to receive events defined | ||
| * by | ||
| * <code>android.support.v4.view.ViewPager.OnPageChangeListener.onPageSelected</code> | ||
| * when a new page becomes selected. Animation is not necessarily complete. | ||
| * </p> | ||
| * <p> | ||
| * The annotation value should be one or several R.id.* fields that refers to | ||
| * ViewPager or subclasses of ViewPager. If not set, the method name will be | ||
| * used as the R.id.* field name. | ||
| * </p> | ||
| * <p> | ||
| * The method MAY have multiple parameter : | ||
| * </p> | ||
| * <ul> | ||
| * <li>A ViewPager parameter to know which view has targeted this event.</li> | ||
| * <li>An int parameter is to get position index of the new selected page.</li> | ||
| * </ul> | ||
| * | ||
| * <blockquote> | ||
| * | ||
| * Examples : | ||
| * | ||
| * <pre> | ||
| * @PageSelected(<b>R.id.viewpager</b>) | ||
| * void onPageSelected(ViewPager view, int state) { | ||
| * // Something Here | ||
| * } | ||
| * | ||
| * @PageSelected | ||
| * void viewPager(ViewPager view) { | ||
| * // Something Here | ||
| * } | ||
| * | ||
| * @PageSelected(<b>{R.id.viewpager, R.id.viewpager2}</b>) | ||
| * void onPageSelectedOnMultipleViewPager(ViewPager v, int anything) { | ||
| * // Something Here | ||
| * } | ||
| * | ||
| * @PageSelected(<b>R.id.viewpager</b>) | ||
| * void onPageSelectedNoParam() { | ||
| * // Something Here | ||
| * } | ||
| * </pre> | ||
| * | ||
| * </blockquote> | ||
| * | ||
| * @see PageScrolled | ||
| * @see PageScrollStateChanged | ||
| */ | ||
| @Retention(RetentionPolicy.CLASS) | ||
| @Target(ElementType.METHOD) | ||
| public @interface PageSelected { | ||
|
|
||
| /** | ||
| * The R.id.* fields which refer to the ViewPager. | ||
| * | ||
| * @return the ids of the ViewPager. | ||
| */ | ||
| int[] value() default ResId.DEFAULT_VALUE; | ||
|
|
||
| /** | ||
| * The resource names as a strings which refer to the ViewPagers. | ||
| * | ||
| * @return the resource names of the ViewPagers. | ||
| */ | ||
| String[] resName() default ""; | ||
|
|
||
| } |
91 changes: 91 additions & 0 deletions
91
...nnotations-test/src/main/java/org/androidannotations/test/PageChangeListenerActivity.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /** | ||
| * Copyright (C) 2010-2015 eBusiness Information, Excilys Group | ||
| * | ||
| * 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 org.androidannotations.test; | ||
|
|
||
| import org.androidannotations.annotations.EActivity; | ||
| import org.androidannotations.annotations.PageScrollStateChanged; | ||
| import org.androidannotations.annotations.PageScrolled; | ||
| import org.androidannotations.annotations.PageSelected; | ||
|
|
||
| import android.app.Activity; | ||
| import android.support.v4.view.ViewPager; | ||
|
|
||
| @EActivity(R.layout.viewpagers) | ||
| public class PageChangeListenerActivity extends Activity { | ||
|
|
||
| public ViewPager viewPager = null; | ||
| public int position = 0; | ||
| public float positionOffset = 0f; | ||
| public int positionOffsetPixels = 0; | ||
|
|
||
| public int state = 0; | ||
|
|
||
| @PageScrolled(R.id.viewPager1) | ||
| public void pageScrolled(ViewPager v, int p, float pOffset, int pOffsetPixels) { | ||
| viewPager = v; | ||
| position = p; | ||
| positionOffset = pOffset; | ||
| positionOffsetPixels = pOffsetPixels; | ||
| } | ||
|
|
||
| @PageScrollStateChanged(R.id.viewPager1) | ||
| public void pageScrollStateChanged(ViewPager v, int s) { | ||
| viewPager = v; | ||
| state = s; | ||
| } | ||
|
|
||
| @PageSelected(R.id.viewPager1) | ||
| public void pageSelected(ViewPager v, int p) { | ||
| viewPager = v; | ||
| position = p; | ||
| } | ||
|
|
||
| @PageSelected(R.id.viewPager2) | ||
| public void pageSelected2() { | ||
| } | ||
|
|
||
| @PageScrolled(R.id.viewPager2) | ||
| public void pageScrolled2() { | ||
| } | ||
|
|
||
| @PageScrollStateChanged(R.id.viewPager2) | ||
| public void pageScrollStateChanged2() { | ||
| } | ||
|
|
||
| @PageScrollStateChanged(R.id.viewPager3) | ||
| public void pageScrollStateChanged3(int s, ViewPager v) { | ||
| viewPager = v; | ||
| state = s; | ||
| } | ||
|
|
||
| @PageSelected(R.id.viewPager3) | ||
| public void pageSelected3(int p, ViewPager v) { | ||
| viewPager = v; | ||
| position = p; | ||
| } | ||
|
|
||
| @PageScrolled(R.id.viewPager3) | ||
| public void pageScrolled3(int p) { | ||
| position = p; | ||
| } | ||
|
|
||
| @PageScrolled(R.id.viewPager4) | ||
| public void pageScrolled4(float f, int p) { | ||
| positionOffset = f; | ||
| positionOffsetPixels = p; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add more test cases (when not all parameters are present)? You can use the same variables because the a new
Activityis created for each test.