From 69974964491f1d5e9fe571a9f3b3a2cc82148cf7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 12 Feb 2015 19:34:40 +0300
Subject: remove viewpager indicator

---
 .idea/gradle.xml                                               |  2 +-
 org.fox.ttrss/build.gradle                                     |  1 -
 org.fox.ttrss/org.fox.ttrss.iml                                |  1 -
 .../main/java/org/fox/ttrss/ArticleImagesPagerActivity.java    |  4 ----
 org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java    |  7 +------
 .../main/java/org/fox/ttrss/offline/OfflineArticlePager.java   |  7 +------
 org.fox.ttrss/src/main/res/layout/article_images_pager.xml     |  7 -------
 org.fox.ttrss/src/main/res/layout/article_pager.xml            | 10 ++--------
 8 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8c8430bc..59ab3835 100755
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,7 +3,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="C:\Users\fox\android-studio\gradle\gradle-2.2.1" />
         <option name="modules">
diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle
index e96a63f9..70098f2c 100755
--- a/org.fox.ttrss/build.gradle
+++ b/org.fox.ttrss/build.gradle
@@ -27,7 +27,6 @@ dependencies {
     compile files('libs/dashclock-api-r1.1.jar')
     compile files('libs/jsoup-1.6.1.jar')
     compile files('libs/universal-image-loader-1.9.3.jar')
-    compile 'com.viewpagerindicator:library:2.4.1'
     compile 'com.android.support:cardview-v7:21.0.0'
     compile 'com.android.support:support-v4:21.0.3'
     compile 'com.google.code.gson:gson:2.3'
diff --git a/org.fox.ttrss/org.fox.ttrss.iml b/org.fox.ttrss/org.fox.ttrss.iml
index 140aa714..441628a7 100755
--- a/org.fox.ttrss/org.fox.ttrss.iml
+++ b/org.fox.ttrss/org.fox.ttrss.iml
@@ -87,7 +87,6 @@
     <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" />
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
index 7912233c..8a011c6c 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
@@ -33,7 +33,6 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
-import com.viewpagerindicator.UnderlinePageIndicator;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -308,9 +307,6 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
         ViewPager pager = (ViewPager) findViewById(R.id.article_images_pager);
         pager.setAdapter(m_adapter);
         pager.setPageTransformer(true, new DepthPageTransformer());
-
-        UnderlinePageIndicator indicator = (UnderlinePageIndicator)findViewById(R.id.article_images_indicator);
-        indicator.setViewPager(pager);
     }
 
     @SuppressLint("NewApi")
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 8e3ffbc0..00d0e536 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,7 +16,6 @@ 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;
@@ -93,12 +92,8 @@ public class ArticlePager extends Fragment {
 
 		pager.setAdapter(m_adapter);
 
-		UnderlinePageIndicator indicator = (UnderlinePageIndicator)view.findViewById(R.id.article_titles);
-		indicator.setViewPager(pager);
-
 		pager.setCurrentItem(position);
-
-		indicator.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+		pager.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 37b6f8b5..7b842432 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,8 +15,6 @@ 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 {
@@ -170,11 +168,8 @@ public class OfflineArticlePager extends Fragment {
 		
 		pager.setAdapter(m_adapter);
 		
-		UnderlinePageIndicator indicator = (UnderlinePageIndicator)view.findViewById(R.id.article_titles);
-		indicator.setViewPager(pager);
-		
 		pager.setCurrentItem(position);
-		indicator.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+		pager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
 			@Override
 			public void onPageScrollStateChanged(int arg0) {
diff --git a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
index 52791932..fb9d5312 100644
--- a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
+++ b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
@@ -16,11 +16,4 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" />
 
-    <com.viewpagerindicator.UnderlinePageIndicator
-        android:id="@+id/article_images_indicator"
-        android:layout_width="fill_parent"
-        android:layout_height="2dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true" />
-
 </RelativeLayout>
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 679fb36b..c85eb8c8 100644
--- a/org.fox.ttrss/src/main/res/layout/article_pager.xml
+++ b/org.fox.ttrss/src/main/res/layout/article_pager.xml
@@ -8,14 +8,8 @@
         android:id="@+id/article_pager"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_alignParentTop="true">
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true">
     </android.support.v4.view.ViewPager>
 
-    <com.viewpagerindicator.UnderlinePageIndicator
-        android:id="@+id/article_titles"
-        android:layout_width="fill_parent"
-        android:layout_height="2dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true" />
-
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3