Remove fragment element from layouts

This removes <fragment> tags from XML layouts in favor of programmatically attaching them. This fixes an issue where child fragments may not be inflated correctly if their layout depends on layout params from the container view.
marverenic · Jun 11, 2018 · 4c3985b · 4c3985b
1 parent 8c00340
commit 4c3985b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 41 deletions.
diff --git a/app/src/main/java/com/marverenic/music/ui/BaseLibraryActivity.java b/app/src/main/java/com/marverenic/music/ui/BaseLibraryActivity.java
@@ -13,6 +13,8 @@
 import com.marverenic.music.databinding.ActivityLibraryBaseWrapperBinding;
 import com.marverenic.music.player.PlayerController;
 import com.marverenic.music.ui.BaseLibraryActivityViewModel.OnBottomSheetStateChangeListener.BottomSheetState;
+import com.marverenic.music.ui.nowplaying.MiniplayerFragment;
+import com.marverenic.music.ui.nowplaying.NowPlayingFragment;
 
 import javax.inject.Inject;
 
@@ -28,7 +30,7 @@ public abstract class BaseLibraryActivity extends SingleFragmentActivity {
     private BaseLibraryActivityViewModel mViewModel;
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(@Nullable Bundle savedInstanceState) {
         JockeyApplication.getComponent(this).injectBaseLibraryActivity(this);
         super.onCreate(savedInstanceState);
 
@@ -37,6 +39,16 @@ public void onCreate(Bundle savedInstanceState) {
                     View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
             getWindow().setStatusBarColor(Color.TRANSPARENT);
         }
+
+        if (savedInstanceState == null) {
+            getSupportFragmentManager().beginTransaction()
+                    .add(R.id.miniplayer_container, MiniplayerFragment.newInstance())
+                    .commit();
+
+            getSupportFragmentManager().beginTransaction()
+                    .add(R.id.now_playing_container, NowPlayingFragment.newInstance())
+                    .commit();
+        }
     }
 
     @Override

diff --git a/app/src/main/java/com/marverenic/music/ui/nowplaying/MiniplayerFragment.java b/app/src/main/java/com/marverenic/music/ui/nowplaying/MiniplayerFragment.java
@@ -29,6 +29,10 @@ public class MiniplayerFragment extends BaseFragment {
     @Inject PlayerController mPlayerController;
     @Inject ThemeStore mThemeStore;
 
+    public static MiniplayerFragment newInstance() {
+        return new MiniplayerFragment();
+    }
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/app/src/main/java/com/marverenic/music/ui/nowplaying/NowPlayingFragment.java b/app/src/main/java/com/marverenic/music/ui/nowplaying/NowPlayingFragment.java
@@ -78,6 +78,10 @@ public class NowPlayingFragment extends BaseFragment implements Toolbar.OnMenuIt
 
     private Subscription mSleepTimerSubscription;
 
+    public static NowPlayingFragment newInstance() {
+        return new NowPlayingFragment();
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/app/src/main/res/layout-land/activity_library_base_wrapper.xml b/app/src/main/res/layout-land/activity_library_base_wrapper.xml
@@ -10,7 +10,6 @@
     <com.marverenic.music.view.NestedCoordinatorLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
@@ -40,18 +39,11 @@
             app:behavior_bottomSheetCallback="@{viewModel.bottomSheetCallback}">
 
             <FrameLayout
+                android:id="@+id/now_playing_container"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:toolbar_marginTop="@{viewModel.statusBarHeight}"
-                android:visibility="@{viewModel.nowPlayingContentVisibility}">
-
-                <fragment
-                    android:tag="BaseLibraryActivityWrapper.now_playing_fragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:name="com.marverenic.music.ui.nowplaying.NowPlayingFragment"/>
-
-            </FrameLayout>
+                android:visibility="@{viewModel.nowPlayingContentVisibility}"/>
 
             <!-- Fake status bar -->
             <View
@@ -61,22 +53,14 @@
                 android:background="?attr/colorPrimaryDark"/>
 
             <FrameLayout
+                android:id="@+id/miniplayer_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:foreground="?attr/selectableItemBackgroundBorderless"
                 android:background="@color/background_miniplayer"
                 android:alpha="@{viewModel.miniplayerAlpha}"
                 android:visibility="@{viewModel.miniplayerVisibility}"
-                android:onClick="@{viewModel.miniplayerClickListener}">
-
-                <fragment
-                    android:id="@+id/miniplayer"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:name="com.marverenic.music.ui.nowplaying.MiniplayerFragment"
-                    tools:layout="@layout/fragment_miniplayer"/>
-
-            </FrameLayout>
+                android:onClick="@{viewModel.miniplayerClickListener}"/>
 
         </FrameLayout>
 

diff --git a/app/src/main/res/layout/activity_library_base_wrapper.xml b/app/src/main/res/layout/activity_library_base_wrapper.xml
@@ -10,7 +10,6 @@
     <com.marverenic.music.view.NestedCoordinatorLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
@@ -41,37 +40,22 @@
             app:behavior_bottomSheetCallback="@{viewModel.bottomSheetCallback}">
 
             <FrameLayout
+                android:id="@+id/now_playing_container"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:toolbar_alpha="@{viewModel.toolbarAlpha}"
                 app:toolbar_expanded="@{viewModel.toolbarExpanded}"
-                android:visibility="@{viewModel.nowPlayingContentVisibility}">
-
-                <fragment
-                    android:tag="BaseLibraryActivityWrapper.now_playing_fragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:name="com.marverenic.music.ui.nowplaying.NowPlayingFragment"/>
-
-            </FrameLayout>
+                android:visibility="@{viewModel.nowPlayingContentVisibility}"/>
 
             <FrameLayout
+                android:id="@+id/miniplayer_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:foreground="?attr/selectableItemBackgroundBorderless"
                 android:background="@color/background_miniplayer"
                 android:alpha="@{viewModel.miniplayerAlpha}"
                 android:visibility="@{viewModel.miniplayerVisibility}"
-                android:onClick="@{viewModel.miniplayerClickListener}">
-
-                <fragment
-                    android:id="@+id/miniplayer"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:name="com.marverenic.music.ui.nowplaying.MiniplayerFragment"
-                    tools:layout="@layout/fragment_miniplayer"/>
-
-            </FrameLayout>
+                android:onClick="@{viewModel.miniplayerClickListener}"/>
 
         </FrameLayout>