Skip to content

Replace FrameLayout with FragmentContainerView where applicable #5882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2021
Merged

Replace FrameLayout with FragmentContainerView where applicable #5882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ protected void onCreate(final Bundle savedInstanceBundle) {
SettingsLayoutBinding.inflate(getLayoutInflater());
setContentView(settingsLayoutBinding.getRoot());

setSupportActionBar(settingsLayoutBinding.toolbarLayout.toolbar);
setSupportActionBar(settingsLayoutBinding.settingsToolbarLayout.toolbar);

if (savedInstanceBundle == null) {
getSupportFragmentManager().beginTransaction()
.replace(R.id.fragment_holder, new MainSettingsFragment())
.replace(R.id.settings_fragment_holder, new MainSettingsFragment())
.commit();
}

Expand Down Expand Up @@ -102,7 +102,7 @@ public boolean onPreferenceStartFragment(final PreferenceFragmentCompat caller,
getSupportFragmentManager().beginTransaction()
.setCustomAnimations(R.animator.custom_fade_in, R.animator.custom_fade_out,
R.animator.custom_fade_in, R.animator.custom_fade_out)
.replace(R.id.fragment_holder, fragment)
.replace(R.id.settings_fragment_holder, fragment)
.addToBackStack(null)
.commit();
return true;
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/res/layout-large-land/fragment_video_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,14 +612,12 @@

</org.schabi.newpipe.views.FocusAwareCoordinator>

<FrameLayout
<androidx.fragment.app.FragmentContainerView
android:id="@+id/relatedStreamsLayout"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:layout_weight="3">

</FrameLayout>
android:layout_weight="3" />
</LinearLayout>

<RelativeLayout
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_downloader.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
layout="@layout/toolbar_layout"
android:id="@+id/toolbar_layout" />

<FrameLayout
<androidx.fragment.app.FragmentContainerView
android:id="@+id/frame"
android:layout_width="match_parent"
android:layout_height="match_parent" />
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<FrameLayout
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -18,14 +18,14 @@
layout="@layout/toolbar_layout"
android:id="@+id/toolbar_layout"/>

<FrameLayout
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment_player_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
app:behavior_hideable="true"
app:behavior_peekHeight="0dp"
app:layout_behavior="org.schabi.newpipe.player.event.CustomBottomSheetBehavior"></FrameLayout>
app:layout_behavior="org.schabi.newpipe.player.event.CustomBottomSheetBehavior" />

</org.schabi.newpipe.views.FocusAwareCoordinator>

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/settings_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
android:orientation="vertical"
tools:context="org.schabi.newpipe.MainActivity">

<FrameLayout
android:id="@+id/fragment_holder"
<androidx.fragment.app.FragmentContainerView
android:id="@+id/settings_fragment_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize" />

<include
layout="@layout/toolbar_layout"
android:id="@+id/toolbar_layout"/>
android:id="@+id/settings_toolbar_layout"/>

</RelativeLayout>