diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 17 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_media_pager.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_profile.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_scheduled.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_search_result_tabs.xml | 14 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_profile_timelines.xml | 2 |
6 files changed, 14 insertions, 25 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ae6da0b80..8fd088542 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -75,19 +75,14 @@ </com.google.android.material.appbar.AppBarLayout> - <app.fedilab.android.helper.NestedScrollableHost + <androidx.viewpager.widget.ViewPager + android:id="@+id/view_pager" + android:name="androidx.navigation.fragment.NavHostFragment" android:layout_width="match_parent" android:layout_height="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior"> - - <androidx.viewpager2.widget.ViewPager2 - android:id="@+id/view_pager" - android:name="androidx.navigation.fragment.NavHostFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginBottom="?attr/actionBarSize" - app:defaultNavHost="true" /> - </app.fedilab.android.helper.NestedScrollableHost> + android:layout_marginBottom="?attr/actionBarSize" + app:defaultNavHost="true" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/activity_media_pager.xml b/app/src/main/res/layout/activity_media_pager.xml index 01a5972fb..9ac18524c 100644 --- a/app/src/main/res/layout/activity_media_pager.xml +++ b/app/src/main/res/layout/activity_media_pager.xml @@ -29,7 +29,7 @@ android:animateLayoutChanges="true" android:background="@android:color/transparent"> - <androidx.viewpager2.widget.ViewPager2 + <androidx.viewpager.widget.ViewPager android:id="@+id/media_viewpager" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index 54f6c192d..a3382e4b5 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -377,7 +377,7 @@ app:tabMode="fixed" /> </com.google.android.material.appbar.AppBarLayout> - <androidx.viewpager2.widget.ViewPager2 + <androidx.viewpager.widget.ViewPager android:id="@+id/account_viewpager" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/activity_scheduled.xml b/app/src/main/res/layout/activity_scheduled.xml index 8626ae392..e3baabf6a 100644 --- a/app/src/main/res/layout/activity_scheduled.xml +++ b/app/src/main/res/layout/activity_scheduled.xml @@ -63,7 +63,7 @@ </com.google.android.material.appbar.AppBarLayout> - <androidx.viewpager2.widget.ViewPager2 + <androidx.viewpager.widget.ViewPager android:id="@+id/schedule_viewpager" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/activity_search_result_tabs.xml b/app/src/main/res/layout/activity_search_result_tabs.xml index 43d1c3989..397c8e66b 100644 --- a/app/src/main/res/layout/activity_search_result_tabs.xml +++ b/app/src/main/res/layout/activity_search_result_tabs.xml @@ -30,15 +30,9 @@ app:tabIndicatorColor="@color/cyanea_accent_dark_reference" app:tabMode="scrollable" /> - <app.fedilab.android.helper.NestedScrollableHost + <androidx.viewpager.widget.ViewPager + android:id="@+id/search_viewpager" android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <androidx.viewpager2.widget.ViewPager2 - android:id="@+id/search_viewpager" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - </app.fedilab.android.helper.NestedScrollableHost> - > + android:layout_height="wrap_content" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_profile_timelines.xml b/app/src/main/res/layout/fragment_profile_timelines.xml index c878262d7..225f40722 100644 --- a/app/src/main/res/layout/fragment_profile_timelines.xml +++ b/app/src/main/res/layout/fragment_profile_timelines.xml @@ -27,7 +27,7 @@ app:tabGravity="fill" app:tabMaxWidth="0dp" /> - <androidx.viewpager2.widget.ViewPager2 + <androidx.viewpager.widget.ViewPager android:id="@+id/viewpager" android:layout_width="match_parent" android:layout_height="match_parent" /> |