diff options
author | Andrew Dolgov <[email protected]> | 2015-03-11 20:37:03 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-03-11 20:37:03 +0300 |
commit | 70d366bcc56c337b34f76c0abc930928e54e19e7 (patch) | |
tree | 2e4f1e0178dd2a2dbacf6777ff52c1e9f6b8f30a /org.fox.ttrss | |
parent | 1967cd39bb7cb92e1915e7c8d29cd9d2d31d9940 (diff) |
bring back articlepager viewpagerindicator
Diffstat (limited to 'org.fox.ttrss')
-rwxr-xr-x | org.fox.ttrss/build.gradle | 1 | ||||
-rwxr-xr-x | org.fox.ttrss/org.fox.ttrss.iml | 5 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/AndroidManifest.xml | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java | 7 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java | 12 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/layout/article_pager.xml | 15 |
6 files changed, 32 insertions, 12 deletions
diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index e320b09c..03beab17 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -35,4 +35,5 @@ dependencies { compile 'ch.acra:acra:4.5.0' compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.1.0@aar' compile 'me.relex:circleindicator:1.1.1@aar' + compile 'com.viewpagerindicator:library:2.4.1' } diff --git a/org.fox.ttrss/org.fox.ttrss.iml b/org.fox.ttrss/org.fox.ttrss.iml index b8e3e37e..48b3a143 100755 --- a/org.fox.ttrss/org.fox.ttrss.iml +++ b/org.fox.ttrss/org.fox.ttrss.iml @@ -84,17 +84,18 @@ <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" exported="" name="cardview-v7-21.0.0" level="project" /> - <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" /> <orderEntry type="library" exported="" name="jsoup-1.6.1" level="project" /> <orderEntry type="library" exported="" name="view-pager-transforms-1.1.0" level="project" /> + <orderEntry type="library" exported="" name="library-2.4.1" level="project" /> <orderEntry type="library" exported="" name="gson-2.3" level="project" /> <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" /> - <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" /> <orderEntry type="library" exported="" name="acra-4.5.0" level="project" /> <orderEntry type="library" exported="" name="circleindicator-1.1.1" level="project" /> <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" /> <orderEntry type="library" exported="" name="dashclock-api-r1.1" level="project" /> <orderEntry type="library" exported="" name="fab-0.0.5" level="project" /> + <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" /> + <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" /> <orderEntry type="module" module-name="taskerlocaleapi" exported="" /> </component> </module> diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index c7af2f4a..d8fb4eb4 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="320" - android:versionName="1.95" > + android:versionCode="321" + android:versionName="1.96" > <uses-sdk android:minSdkVersion="15" diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java index 6a394078..c121d0fb 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java @@ -16,6 +16,7 @@ import android.view.View; import android.view.ViewGroup; import com.google.gson.JsonElement; +import com.viewpagerindicator.UnderlinePageIndicator; import org.fox.ttrss.types.Article; import org.fox.ttrss.types.ArticleList; @@ -92,8 +93,12 @@ public class ArticlePager extends Fragment { pager.setAdapter(m_adapter); + UnderlinePageIndicator indicator = (UnderlinePageIndicator)view.findViewById(R.id.article_pager_indicator); + indicator.setViewPager(pager); + pager.setCurrentItem(position); - pager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { + + indicator.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrollStateChanged(int arg0) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java index 7b842432..a89f57f3 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java @@ -15,6 +15,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import com.viewpagerindicator.UnderlinePageIndicator; + import org.fox.ttrss.R; public class OfflineArticlePager extends Fragment { @@ -167,9 +169,13 @@ public class OfflineArticlePager extends Fragment { ViewPager pager = (ViewPager) view.findViewById(R.id.article_pager); pager.setAdapter(m_adapter); - - pager.setCurrentItem(position); - pager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { + + UnderlinePageIndicator indicator = (UnderlinePageIndicator)view.findViewById(R.id.article_pager_indicator); + indicator.setViewPager(pager); + + pager.setCurrentItem(position); + + indicator.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrollStateChanged(int arg0) { diff --git a/org.fox.ttrss/src/main/res/layout/article_pager.xml b/org.fox.ttrss/src/main/res/layout/article_pager.xml index c85eb8c8..6163c3d9 100644 --- a/org.fox.ttrss/src/main/res/layout/article_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/article_pager.xml @@ -2,14 +2,21 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/article_pager_container" android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_height="fill_parent"> <android.support.v4.view.ViewPager android:id="@+id/article_pager" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_alignParentTop="true" - android:layout_alignParentBottom="true"> - </android.support.v4.view.ViewPager> + android:layout_above="@+id/article_pager_indicator" + android:layout_alignParentTop="true"></android.support.v4.view.ViewPager> + + <com.viewpagerindicator.UnderlinePageIndicator + android:id="@+id/article_pager_indicator" + android:layout_width="fill_parent" + android:layout_height="2dp" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" /> + </RelativeLayout>
\ No newline at end of file |