add bottombar to tablet layout and fix several invalid casts to viewpager1

2 files changed, 3 insertions, 8 deletions

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 9b1455f3..ab277ec3 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
@@ -18,7 +18,6 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager.widget.ViewPager;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
 
@@ -196,9 +195,7 @@ public class ArticlePager extends androidx.fragment.app.Fragment {
 				if (isDetached() || !isAdded()) return;
 
 				if (!append) {
-					ViewPager pager = getView().findViewById(R.id.article_pager);
-					pager.setCurrentItem(0);
-
+					m_pager.setCurrentItem(0);
 					m_articles.clear();
 				}
 
@@ -366,9 +363,7 @@ public class ArticlePager extends androidx.fragment.app.Fragment {
 
 			int position = m_articles.indexOf(m_article);
 
-			ViewPager pager = getView().findViewById(R.id.article_pager);
-		
-			pager.setCurrentItem(position);
+			m_pager.setCurrentItem(position);
 		}
 	}
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
index ef3797b3..8da2dfe8 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
@@ -51,7 +51,7 @@ public class GalleryActivity extends CommonActivity {
     protected String m_title;
     private ArticleImagesPagerAdapter m_adapter;
     public String m_content;
-    private ViewPager m_pager;
+    private ViewPager m_pager; // TODO replace with viewpager2
     private ProgressBar m_checkProgress;
 
     private static class ArticleImagesPagerAdapter extends FragmentStatePagerAdapter {