Closes #1037: Better fix for fullscreen issue that doesn't break norm…

…al viewing
daneren2005 · Dec 30, 2020 · 46986db · 46986db
1 parent e40c1bd
commit 46986db
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -307,6 +307,8 @@ public void finish() {
 	public void setContentView(int viewId) {
 		if(isTv()) {
 			super.setContentView(R.layout.static_drawer_activity);
+		} else if(Util.getPreferences(this).getBoolean(Constants.PREFERENCES_KEY_FULL_SCREEN, false)) {
+			super.setContentView(R.layout.abstract_fullscreen_activity);
 		} else {
 			super.setContentView(R.layout.abstract_activity);
 		}

diff --git a/app/src/main/res/layout/abstract_fullscreen_activity.xml b/app/src/main/res/layout/abstract_fullscreen_activity.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.DrawerLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/drawer_layout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<!-- The main content view -->
+	<FrameLayout
+		android:id="@+id/content_frame"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"/>
+
+	<!-- The navigation drawer -->
+	<android.support.design.widget.NavigationView
+		android:id="@+id/left_drawer"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_gravity="start"/>
+</android.support.v4.widget.DrawerLayout>