From 5d278b223045ebda70b6c2f8e11a84589ad2c082 Mon Sep 17 00:00:00 2001
From: Mukul Asija <78532621+mukulasija@users.noreply.github.com>
Date: Sat, 8 Jan 2022 00:38:36 +0530
Subject: [PATCH] Fix #3536: Merged home_activity.xml files (#4053)

* merged home-activity files into single xml file

* directly hardcoded the height to 0dp and removed it from the dimens file

* Update dimens.xml
---
 .../main/res/layout-land/home_activity.xml    | 33 -------------------
 .../res/layout-sw600dp-port/home_activity.xml | 33 -------------------
 2 files changed, 66 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/home_activity.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-port/home_activity.xml

diff --git a/app/src/main/res/layout-land/home_activity.xml b/app/src/main/res/layout-land/home_activity.xml
deleted file mode 100644
index ffb339f5d63..00000000000
--- a/app/src/main/res/layout-land/home_activity.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<androidx.drawerlayout.widget.DrawerLayout 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:id="@+id/home_activity_drawer_layout"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  tools:context=".app.home.HomeActivity">
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <include
-      android:id="@+id/home_activity_toolbar"
-      layout="@layout/toolbar" />
-
-    <FrameLayout
-      android:id="@+id/home_fragment_placeholder"
-      android:layout_width="match_parent"
-      android:layout_height="0dp"
-      android:layout_weight="1" />
-  </LinearLayout>
-
-  <fragment
-    android:id="@+id/home_activity_fragment_navigation_drawer"
-    android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
-    android:layout_width="@dimen/navigation_drawer_width"
-    android:layout_height="match_parent"
-    android:layout_gravity="start"
-    app:layout="@layout/drawer_fragment"
-    tools:layout="@layout/drawer_fragment" />
-</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout-sw600dp-port/home_activity.xml b/app/src/main/res/layout-sw600dp-port/home_activity.xml
deleted file mode 100644
index ffb339f5d63..00000000000
--- a/app/src/main/res/layout-sw600dp-port/home_activity.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<androidx.drawerlayout.widget.DrawerLayout 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:id="@+id/home_activity_drawer_layout"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  tools:context=".app.home.HomeActivity">
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <include
-      android:id="@+id/home_activity_toolbar"
-      layout="@layout/toolbar" />
-
-    <FrameLayout
-      android:id="@+id/home_fragment_placeholder"
-      android:layout_width="match_parent"
-      android:layout_height="0dp"
-      android:layout_weight="1" />
-  </LinearLayout>
-
-  <fragment
-    android:id="@+id/home_activity_fragment_navigation_drawer"
-    android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
-    android:layout_width="@dimen/navigation_drawer_width"
-    android:layout_height="match_parent"
-    android:layout_gravity="start"
-    app:layout="@layout/drawer_fragment"
-    tools:layout="@layout/drawer_fragment" />
-</androidx.drawerlayout.widget.DrawerLayout>