Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5882 from TacoTheDank/fragmentcontainerview 

Replace FrameLayout with FragmentContainerView where applicable
This commit is contained in:
Stypox 2021-03-27 08:31:32 +01:00 committed by GitHub
parent 464d0e50b0 6a9d5fd4cc
commit 08d8f2564a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
View File

@ -56,11 +56,11 @@ public class SettingsActivity extends AppCompatActivity
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();
}
@ -102,7 +102,7 @@ public class SettingsActivity extends AppCompatActivity
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;

6
app/src/main/res/layout-large-land/fragment_video_detail.xml
View File

@ -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

2
app/src/main/res/layout/activity_downloader.xml
View File

@ -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" />

6
app/src/main/res/layout/activity_main.xml
View File

@ -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"
@ -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>

6
app/src/main/res/layout/settings_layout.xml
View File

@ -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>