diff options
Diffstat (limited to 'org.fox.ttrss/src')
3 files changed, 15 insertions, 12 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 { diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml index 09534bc7..3078f77e 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_detail.xml @@ -57,14 +57,22 @@ app:layout_behavior=".util.DetailActivityScrollingViewBehavior" android:layout_height="match_parent"/> + <com.google.android.material.bottomappbar.BottomAppBar + android:id="@+id/detail_bottom_appbar" + app:backgroundTint="?colorSurfaceContainerHigh" + android:layout_width="match_parent" + android:layout_height="64dp" + android:layout_gravity="bottom" + app:menu="@menu/bottombar_detail" /> + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/detail_fab" + android:layout_gravity="end|bottom" + android:layout_marginEnd="16dp" + android:layout_marginBottom="38dp" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:visibility="gone" - android:src="@drawable/baseline_open_in_browser_24" - android:layout_margin="16dp" /> + app:srcCompat="@drawable/baseline_open_in_browser_24" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> </LinearLayout> |