From be0a37dbc8221d02aaadbfbfd54cbc3f9ec72f9b Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@fsfe.org>
Date: Fri, 11 Nov 2016 20:17:59 +0100
Subject: [PATCH] Workaround for overlapping fragments. Fixes #116

---
 .../com/github/dfa/diaspora_android/activity/MainActivity.java | 2 +-
 app/src/main/res/layout/about__fragment_about.xml              | 1 +
 app/src/main/res/layout/about__fragment_debug.xml              | 1 +
 app/src/main/res/layout/about__fragment_license.xml            | 1 +
 app/src/main/res/layout/browser__fragment.xml                  | 1 +
 app/src/main/res/layout/recycler_list__fragment.xml            | 3 ++-
 6 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index 5210ba7b..9ed0ef56 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@@ -415,7 +415,7 @@ public class MainActivity extends ThemedActivity
     }
 
     /**
-     * Forward toolbar clicks to onNavigationItemSelected
+     * Open Stream when clicked on top toolbar AND preference stream shortcut is true
      * @param view selected view
      */
     @OnClick(R.id.main__topbar)
diff --git a/app/src/main/res/layout/about__fragment_about.xml b/app/src/main/res/layout/about__fragment_about.xml
index 94f06710..91b86bb5 100644
--- a/app/src/main/res/layout/about__fragment_about.xml
+++ b/app/src/main/res/layout/about__fragment_about.xml
@@ -1,6 +1,7 @@
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:background="@android:color/background_light"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginBottom="@dimen/activity_vertical_margin"
diff --git a/app/src/main/res/layout/about__fragment_debug.xml b/app/src/main/res/layout/about__fragment_debug.xml
index b65a3489..952cc4a7 100644
--- a/app/src/main/res/layout/about__fragment_debug.xml
+++ b/app/src/main/res/layout/about__fragment_debug.xml
@@ -2,6 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@android:color/background_light"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
diff --git a/app/src/main/res/layout/about__fragment_license.xml b/app/src/main/res/layout/about__fragment_license.xml
index ca42b98e..9cada239 100644
--- a/app/src/main/res/layout/about__fragment_license.xml
+++ b/app/src/main/res/layout/about__fragment_license.xml
@@ -3,6 +3,7 @@
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@android:color/background_light"
     android:layout_marginBottom="@dimen/activity_vertical_margin"
     android:layout_marginLeft="@dimen/activity_horizontal_margin"
     android:layout_marginRight="@dimen/activity_horizontal_margin"
diff --git a/app/src/main/res/layout/browser__fragment.xml b/app/src/main/res/layout/browser__fragment.xml
index 9682a505..a7aaf87c 100644
--- a/app/src/main/res/layout/browser__fragment.xml
+++ b/app/src/main/res/layout/browser__fragment.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@android:color/background_light"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".activity.MainActivity">
 
diff --git a/app/src/main/res/layout/recycler_list__fragment.xml b/app/src/main/res/layout/recycler_list__fragment.xml
index a61f9f4c..94b31976 100644
--- a/app/src/main/res/layout/recycler_list__fragment.xml
+++ b/app/src/main/res/layout/recycler_list__fragment.xml
@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@android:color/background_light">
 
     <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"