From 09550b253246e3ddf1055e7b69e1e06b2556df15 Mon Sep 17 00:00:00 2001
From: David Luhmer <david-dev@live.de>
Date: Sat, 14 Sep 2019 10:31:56 +0200
Subject: [PATCH 1/9] first implementation of incognito mode

---
 .../NewsDetailFragment.java                   | 31 ++++++++++++++-----
 .../src/main/res/drawable/incognito.xml       |  8 +++++
 .../main/res/layout/fragment_news_detail.xml  |  7 +++++
 .../src/main/res/menu/news_detail.xml         |  6 ++++
 4 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100755 News-Android-App/src/main/res/drawable/incognito.xml

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
index 0d6a2cd4..d2f17eb9 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
@@ -41,6 +41,7 @@ import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -84,6 +85,8 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
     protected @BindView(R.id.progressBarLoading) ProgressBar mProgressBarLoading;
     protected @BindView(R.id.progressbar_webview) ProgressBar mProgressbarWebView;
     protected @BindView(R.id.tv_offline_version) TextView mTvOfflineVersion;
+    protected @BindView(R.id.btn_disable_incognito) Button mBtnDisableIncognito;
+
 
     protected @Inject SharedPreferences mPrefs;
 
@@ -184,6 +187,12 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
 
         setUpGestureDetector();
 
+        mBtnDisableIncognito.setOnClickListener(v -> {
+            mWebView.getSettings().setBlockNetworkLoads(false);
+            mWebView.getSettings().setBlockNetworkImage(false);
+            mWebView.reload();
+        });
+
 		return rootView;
 	}
 
@@ -285,16 +294,22 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
 
         WebSettings webSettings = mWebView.getSettings();
         //webSettings.setPluginState(WebSettings.PluginState.ON);
-	    webSettings.setJavaScriptEnabled(true);
-	    webSettings.setAllowContentAccess(true);
-	    webSettings.setAllowFileAccess(true);
-	    webSettings.setDomStorageEnabled(true);
-	    webSettings.setJavaScriptCanOpenWindowsAutomatically(false);
-	    webSettings.setSupportMultipleWindows(false);
-	    webSettings.setSupportZoom(false);
+        webSettings.setJavaScriptEnabled(true);
+        webSettings.setAllowContentAccess(true);
+        webSettings.setAllowFileAccess(true);
+        webSettings.setDomStorageEnabled(true);
+        webSettings.setJavaScriptCanOpenWindowsAutomatically(false);
+        webSettings.setSupportMultipleWindows(false);
+        webSettings.setSupportZoom(false);
         webSettings.setAppCacheEnabled(true);
         webSettings.setMediaPlaybackRequiresUserGesture(true);
 
+        //if(true) {
+        //webSettings.setLoadsImagesAutomatically(false);
+        webSettings.setBlockNetworkImage(true);
+        webSettings.setBlockNetworkLoads(true);
+        //}
+
         registerForContextMenu(mWebView);
 
         mWebView.setWebChromeClient(new ProgressBarWebChromeClient(mProgressbarWebView));
@@ -305,6 +320,8 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
 
             @Override
             public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
+                //Log.d(TAG, "shouldInterceptRequest: " + url);
+
                 boolean isAd;
                 if (!loadedUrls.containsKey(url)) {
                     isAd = AdBlocker.isAd(url);
diff --git a/News-Android-App/src/main/res/drawable/incognito.xml b/News-Android-App/src/main/res/drawable/incognito.xml
new file mode 100755
index 00000000..2ecfa742
--- /dev/null
+++ b/News-Android-App/src/main/res/drawable/incognito.xml
@@ -0,0 +1,8 @@
+<!-- drawable/incognito.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M12,3C9.31,3 7.41,4.22 7.41,4.22L6,9H18L16.59,4.22C16.59,4.22 14.69,3 12,3M12,11C9.27,11 5.39,11.54 5.13,11.59C4.09,11.87 3.25,12.15 2.59,12.41C1.58,12.75 1,13 1,13H23C23,13 22.42,12.75 21.41,12.41C20.75,12.15 19.89,11.87 18.84,11.59C18.84,11.59 14.82,11 12,11M7.5,14A3.5,3.5 0 0,0 4,17.5A3.5,3.5 0 0,0 7.5,21A3.5,3.5 0 0,0 11,17.5C11,17.34 11,17.18 10.97,17.03C11.29,16.96 11.63,16.9 12,16.91C12.37,16.91 12.71,16.96 13.03,17.03C13,17.18 13,17.34 13,17.5A3.5,3.5 0 0,0 16.5,21A3.5,3.5 0 0,0 20,17.5A3.5,3.5 0 0,0 16.5,14C15.03,14 13.77,14.9 13.25,16.19C12.93,16.09 12.55,16 12,16C11.45,16 11.07,16.09 10.75,16.19C10.23,14.9 8.97,14 7.5,14M7.5,15A2.5,2.5 0 0,1 10,17.5A2.5,2.5 0 0,1 7.5,20A2.5,2.5 0 0,1 5,17.5A2.5,2.5 0 0,1 7.5,15M16.5,15A2.5,2.5 0 0,1 19,17.5A2.5,2.5 0 0,1 16.5,20A2.5,2.5 0 0,1 14,17.5A2.5,2.5 0 0,1 16.5,15Z" />
+</vector>
\ No newline at end of file
diff --git a/News-Android-App/src/main/res/layout/fragment_news_detail.xml b/News-Android-App/src/main/res/layout/fragment_news_detail.xml
index d44fa22f..9aa5407e 100644
--- a/News-Android-App/src/main/res/layout/fragment_news_detail.xml
+++ b/News-Android-App/src/main/res/layout/fragment_news_detail.xml
@@ -42,5 +42,12 @@
         android:background="@color/material_red_600"
         android:visibility="gone" />
 
+    <Button
+        android:id="@+id/btn_disable_incognito"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Disable Incognito"
+        android:layout_alignParentBottom="true" />
+
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/News-Android-App/src/main/res/menu/news_detail.xml b/News-Android-App/src/main/res/menu/news_detail.xml
index ca325891..1b023ec4 100644
--- a/News-Android-App/src/main/res/menu/news_detail.xml
+++ b/News-Android-App/src/main/res/menu/news_detail.xml
@@ -53,4 +53,10 @@
         android:icon="@drawable/ic_action_share"
         android:title="@string/action_Share" />
 
+    <item
+        android:id="@+id/action_incognito_mode"
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/incognito"
+        android:title="Incognito Mode"/>
+
 </menu>
\ No newline at end of file

From 227b149ff48062dae784f8613ad23a3dc0734b65 Mon Sep 17 00:00:00 2001
From: David Luhmer <david-dev@live.de>
Date: Thu, 26 Sep 2019 21:55:06 +0200
Subject: [PATCH 2/9] first working implementation of incognito mode

---
 News-Android-App/src/main/assets/web.css      |  5 +-
 .../NewsDetailActivity.java                   | 52 +++++++++++++-
 .../NewsDetailFragment.java                   | 30 ++++-----
 .../async_tasks/RssItemToHtmlTask.java        | 12 +++-
 .../owncloudnewsreader/helper/ThemeUtils.java | 67 +++++++++++++++++++
 .../main/res/layout/activity_news_detail.xml  | 21 +++++-
 .../main/res/layout/fragment_news_detail.xml  | 10 +--
 7 files changed, 162 insertions(+), 35 deletions(-)

diff --git a/News-Android-App/src/main/assets/web.css b/News-Android-App/src/main/assets/web.css
index aa127598..9645f204 100644
--- a/News-Android-App/src/main/assets/web.css
+++ b/News-Android-App/src/main/assets/web.css
@@ -53,16 +53,13 @@ body#darkTheme a:visited {
 }
 */
 
-body, blockquote, img, iframe, video, div, table, tbody, tr, td, pre, code, blockquote, p, em, b {
+body, blockquote, img, iframe, video, div, table, tbody, tr, td, pre, code, blockquote, p, em, b, span {
     width:      auto !important;
     height:     auto !important;
     max-width:  100% !important;
 }
 
 span {
-    width:      auto !important;
-    height:     auto !important;
-    max-width:  100% !important;
     display:    block;
 }
 
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
index e10233ce..9a91d330 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
@@ -26,7 +26,9 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.PersistableBundle;
 import android.text.Html;
 import android.util.Log;
 import android.util.SparseArray;
@@ -34,8 +36,11 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.widget.ImageButton;
 import android.widget.ProgressBar;
 
+import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.core.content.ContextCompat;
@@ -58,6 +63,7 @@ import butterknife.ButterKnife;
 import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
 import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm.SORT_DIRECTION;
 import de.luhmer.owncloudnewsreader.database.model.RssItem;
+import de.luhmer.owncloudnewsreader.helper.ThemeUtils;
 import de.luhmer.owncloudnewsreader.model.PodcastItem;
 import de.luhmer.owncloudnewsreader.model.TTSItem;
 import de.luhmer.owncloudnewsreader.widget.WidgetProvider;
@@ -65,6 +71,7 @@ import de.luhmer.owncloudnewsreader.widget.WidgetProvider;
 public class NewsDetailActivity extends PodcastFragmentActivity {
 
 	private static final String TAG = NewsDetailActivity.class.getCanonicalName();
+	public static final String INCOGNITO_MODE_ENABLED = "INCOGNITO_MODE_ENABLED";
 	/**
 	 * The {@link PagerAdapter} that will provide
 	 * fragments for each of the sections. We use a
@@ -76,6 +83,7 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 	private SectionsPagerAdapter mSectionsPagerAdapter;
     protected @BindView(R.id.toolbar) Toolbar toolbar;
 	protected @BindView(R.id.progressIndicator) ProgressBar progressIndicator;
+	protected @BindView(R.id.btn_disable_incognito) ImageButton mBtnDisableIncognito;
 
 	/**
 	 * The {@link ViewPager} that will host the section contents.
@@ -101,7 +109,14 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_news_detail);
 
-        ButterKnife.bind(this);
+		/*
+		// For Debugging the WebView using Chrome Remote Debugging
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+			WebView.setWebContentsDebuggingEnabled(true);
+		}
+		*/
+
+		ButterKnife.bind(this);
 
         if (toolbar != null) {
             setSupportActionBar(toolbar);
@@ -170,7 +185,21 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 		}
 
         mViewPager.addOnPageChangeListener(onPageChangeListener);
-    }
+
+		mBtnDisableIncognito.setOnClickListener(v -> {
+			// toggle incognito mode
+			setIncognitoEnabled(!isIncognitoEnabled());
+
+			for(int i = currentPosition-1; i <= currentPosition+1; i++) {
+				Log.d(TAG, "change incognito for idx: " + i);
+				WeakReference<NewsDetailFragment> ndf = mSectionsPagerAdapter.items.get(i);
+				if(ndf != null) {
+					ndf.get().syncIncognitoState();
+					ndf.get().startLoadRssItemToWebViewTask();
+				}
+			}
+		});
+	}
 
 	@Override
 	protected void onDestroy() {
@@ -337,7 +366,7 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 		menuItem_Read = menu.findItem(R.id.action_read);
         menuItem_PlayPodcast = menu.findItem(R.id.action_playPodcast);
 
-		Set<String> selections = mPrefs.getStringSet("sp_news_detail_actionbar_icons", new HashSet<String>());
+		Set<String> selections = mPrefs.getStringSet("sp_news_detail_actionbar_icons", new HashSet<>());
 		String[] selected = selections.toArray(new String[] {});
 		for(String selection : selected) {
             switch(selection) {
@@ -358,6 +387,8 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 
         updateActionBarIcons();
 
+		initIncognitoMode();
+
 		return true;
 	}
 
@@ -510,6 +541,21 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 		super.finish();
 	}
 
+	public boolean isIncognitoEnabled() {
+    	return mPrefs.getBoolean(INCOGNITO_MODE_ENABLED, false);
+	}
+
+	public void setIncognitoEnabled(boolean enabled) {
+    	mPrefs.edit().putBoolean(INCOGNITO_MODE_ENABLED, enabled).commit();
+		initIncognitoMode();
+	}
+
+	public void initIncognitoMode() {
+		int color = getResources().getColor(isIncognitoEnabled() ? R.color.material_grey_900 : R.color.colorPrimary);
+		ThemeUtils.colorizeToolbar(toolbar, color);
+		ThemeUtils.changeStatusBarColor(this, color);
+	}
+
 	/**
 	 * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
 	 * one of the sections/tabs/pages.
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
index d2f17eb9..5105b4b9 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
@@ -42,6 +42,7 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -85,8 +86,6 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
     protected @BindView(R.id.progressBarLoading) ProgressBar mProgressBarLoading;
     protected @BindView(R.id.progressbar_webview) ProgressBar mProgressbarWebView;
     protected @BindView(R.id.tv_offline_version) TextView mTvOfflineVersion;
-    protected @BindView(R.id.btn_disable_incognito) Button mBtnDisableIncognito;
-
 
     protected @Inject SharedPreferences mPrefs;
 
@@ -183,19 +182,24 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
         } else {
             mWebView.restoreState(savedInstanceState);
             mProgressBarLoading.setVisibility(View.GONE);
+            // Make sure to sync the incognitio on retained views
+            syncIncognitoState();
         }
 
+
+
         setUpGestureDetector();
 
-        mBtnDisableIncognito.setOnClickListener(v -> {
-            mWebView.getSettings().setBlockNetworkLoads(false);
-            mWebView.getSettings().setBlockNetworkImage(false);
-            mWebView.reload();
-        });
-
 		return rootView;
 	}
 
+	void syncIncognitoState() {
+        NewsDetailActivity ndActivity = ((NewsDetailActivity)getActivity());
+        boolean isIncognito = ndActivity.isIncognitoEnabled();
+        mWebView.getSettings().setBlockNetworkLoads(isIncognito);
+        mWebView.getSettings().setBlockNetworkImage(isIncognito);
+    }
+
 	@Override
     public void onSaveInstanceState(Bundle outState) {
         mWebView.saveState(outState);
@@ -233,7 +237,7 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
         });
     }
 
-    private void startLoadRssItemToWebViewTask() {
+    void startLoadRssItemToWebViewTask() {
         Log.d(TAG, "startLoadRssItemToWebViewTask() called");
         mWebView.setVisibility(View.GONE);
         mProgressBarLoading.setVisibility(View.VISIBLE);
@@ -304,11 +308,7 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
         webSettings.setAppCacheEnabled(true);
         webSettings.setMediaPlaybackRequiresUserGesture(true);
 
-        //if(true) {
-        //webSettings.setLoadsImagesAutomatically(false);
-        webSettings.setBlockNetworkImage(true);
-        webSettings.setBlockNetworkLoads(true);
-        //}
+        syncIncognitoState();
 
         registerForContextMenu(mWebView);
 
@@ -411,7 +411,7 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
                     String imgaltval;
                     String imgsrcval;
 
-                    imgsrcval = imageUrl.substring(imageUrl.lastIndexOf('/') + 1, imageUrl.length());
+                    imgsrcval = imageUrl.substring(imageUrl.lastIndexOf('/') + 1);
                     Elements imgtag = htmlDoc.getElementsByAttributeValueContaining("src", imageUrl);
 
                     try {
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java
index 954cc54c..bed2085e 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java
@@ -24,6 +24,7 @@ import de.luhmer.owncloudnewsreader.database.model.RssItem;
 import de.luhmer.owncloudnewsreader.helper.ImageHandler;
 import de.luhmer.owncloudnewsreader.helper.ThemeChooser;
 
+import static de.luhmer.owncloudnewsreader.NewsDetailActivity.INCOGNITO_MODE_ENABLED;
 import static de.luhmer.owncloudnewsreader.helper.ThemeChooser.THEME;
 
 
@@ -84,6 +85,8 @@ public class RssItemToHtmlTask extends AsyncTask<Void, Void, String> {
      * @return given RSS item as full HTML page
      */
     public static String getHtmlPage(RssItem rssItem, boolean showHeader, SharedPreferences mPrefs, boolean isRightToLeft) {
+        boolean incognitoMode = mPrefs.getBoolean(INCOGNITO_MODE_ENABLED, false);
+
         String favIconUrl = null;
 
         Feed feed = rssItem.getFeed();
@@ -122,7 +125,14 @@ public class RssItemToHtmlTask extends AsyncTask<Void, Void, String> {
         }
 
         String description = rssItem.getBody();
-        description = getDescriptionWithCachedImages(description).trim();
+        if(!incognitoMode) {
+            // If incognito mode is disabled, try getting images from cache
+            description = getDescriptionWithCachedImages(description).trim();
+        } else {
+            // When incognito is on, we need to provide some error handling
+            //description = description.replaceAll("<img", "<img onerror=\"this.style='width: 40px !important; height: 40px !important'\" ");
+            description = description.replaceAll("<img", "<img width=\"40px\" height=\"40px\" ");
+        }
         description = replacePatternInText(PATTERN_PRELOAD_VIDEOS_REMOVE, description, "$1 $3"); // remove whatever preload is there
         description = replacePatternInText(PATTERN_PRELOAD_VIDEOS_INSERT, description, "$1 preload=\"metadata\" $3"); // add preload attribute
         description = replacePatternInText(PATTERN_AUTOPLAY_VIDEOS_1, description, "$1 $3");
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java
index 77a51132..0ea61e79 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java
@@ -1,14 +1,43 @@
+/**
+ * Android ownCloud News
+ *
+ * @author David Luhmer
+ * @copyright 2019 David Luhmer david-dev@live.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package de.luhmer.owncloudnewsreader.helper;
 
+import android.app.Activity;
+import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.util.Log;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.SearchView;
 import android.widget.TextView;
 
 import java.lang.reflect.Field;
 
 import androidx.annotation.ColorInt;
+import androidx.appcompat.widget.ActionMenuView;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import de.luhmer.owncloudnewsreader.R;
 
@@ -67,4 +96,42 @@ public class ThemeUtils {
         }
     }
 
+
+    /**
+     * Use this method to colorize the toolbar to the desired target color
+     * @param toolbarView toolbar view being colored
+     * @param toolbarBackgroundColor the target background color
+     */
+    public static void colorizeToolbar(Toolbar toolbarView, @ColorInt int toolbarBackgroundColor) {
+
+        toolbarView.setBackgroundColor(toolbarBackgroundColor);
+
+        for(int i = 0; i < toolbarView.getChildCount(); i++) {
+            final View v = toolbarView.getChildAt(i);
+
+            v.setBackgroundColor(toolbarBackgroundColor);
+
+            if(v instanceof ActionMenuView) {
+                for(int j = 0; j < ((ActionMenuView)v).getChildCount(); j++) {
+                    v.setBackgroundColor(toolbarBackgroundColor);
+                }
+            }
+        }
+    }
+
+    /**
+     * Use this method to colorize the status bar to the desired target color
+     * @param activity
+     * @param statusBarColor
+     */
+    public static void changeStatusBarColor(Activity activity, @ColorInt int statusBarColor) {
+        Window window = activity.getWindow();
+        // clear FLAG_TRANSLUCENT_STATUS flag:
+        window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        // add FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS flag to the window
+        window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window.setStatusBarColor(statusBarColor);
+        }
+    }
 }
diff --git a/News-Android-App/src/main/res/layout/activity_news_detail.xml b/News-Android-App/src/main/res/layout/activity_news_detail.xml
index be0c5eaa..1d5eb534 100644
--- a/News-Android-App/src/main/res/layout/activity_news_detail.xml
+++ b/News-Android-App/src/main/res/layout/activity_news_detail.xml
@@ -1,8 +1,8 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <!-- SlidingUpPanelLayout doesn't work with layout_behavior, use marginTop -->
     <de.luhmer.owncloudnewsreader.view.PodcastSlidingUpPanelLayout
@@ -48,6 +48,21 @@
 
     </de.luhmer.owncloudnewsreader.view.PodcastSlidingUpPanelLayout>
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center"
+        android:layout_marginBottom="16dp">
+
+        <ImageButton
+            android:id="@+id/btn_disable_incognito"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:srcCompat="@drawable/incognito"/>
+
+    </LinearLayout>
+
+
     <include
         android:id="@+id/toolbar_layout"
         layout="@layout/toolbar_layout" />
diff --git a/News-Android-App/src/main/res/layout/fragment_news_detail.xml b/News-Android-App/src/main/res/layout/fragment_news_detail.xml
index 9aa5407e..5d609ab8 100644
--- a/News-Android-App/src/main/res/layout/fragment_news_detail.xml
+++ b/News-Android-App/src/main/res/layout/fragment_news_detail.xml
@@ -1,10 +1,10 @@
 <RelativeLayout 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_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".NewsDetailFragment" >
 
-
     <WebView
         android:id="@+id/webview"
         android:layout_width="match_parent"
@@ -42,12 +42,4 @@
         android:background="@color/material_red_600"
         android:visibility="gone" />
 
-    <Button
-        android:id="@+id/btn_disable_incognito"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Disable Incognito"
-        android:layout_alignParentBottom="true" />
-
-
 </RelativeLayout>
\ No newline at end of file

From 5671636cae87506732dbcde7a7455d7ffa42b5c4 Mon Sep 17 00:00:00 2001
From: David Luhmer <david-dev@live.de>
Date: Fri, 1 Nov 2019 12:53:23 +0100
Subject: [PATCH 3/9] fix bug that app crashed when feature is not available

---
 .../owncloudnewsreader/PiPVideoPlaybackActivity.java       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java
index 848eb0f3..6cf2ea2e 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java
@@ -1,7 +1,9 @@
 package de.luhmer.owncloudnewsreader;
 
+import android.app.AppOpsManager;
 import android.app.PictureInPictureParams;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Point;
@@ -49,7 +51,7 @@ public class PiPVideoPlaybackActivity extends AppCompatActivity {
 
         setContentView(R.layout.activity_pip_video_playback);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
             //moveTaskToBack(false);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 PictureInPictureParams.Builder pictureInPictureParamsBuilder = new PictureInPictureParams.Builder();
@@ -59,9 +61,6 @@ public class PiPVideoPlaybackActivity extends AppCompatActivity {
             } else {
                 enterPictureInPictureMode();
             }
-
-
-            enterPictureInPictureMode();
         } else {
             Toast.makeText(this, "This device does not support video playback.", Toast.LENGTH_LONG).show();
             finish();

From ee3f50d543495bcd5d33960c1d3db485628ad333 Mon Sep 17 00:00:00 2001
From: David Luhmer <david-dev@live.de>
Date: Fri, 1 Nov 2019 12:55:06 +0100
Subject: [PATCH 4/9] use bottom navigation

---
 .../NewsDetailActivity.java                   | 100 +++++++++++++++---
 .../main/res/layout/activity_news_detail.xml  |  35 +++---
 2 files changed, 99 insertions(+), 36 deletions(-)

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
index 9a91d330..211e185c 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
@@ -21,10 +21,12 @@
 
 package de.luhmer.owncloudnewsreader;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -35,7 +37,10 @@ import android.util.SparseArray;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
 import android.webkit.WebView;
 import android.widget.ImageButton;
 import android.widget.ProgressBar;
@@ -51,6 +56,8 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import com.google.android.material.bottomappbar.BottomAppBar;
+
 import java.lang.ref.WeakReference;
 import java.util.HashSet;
 import java.util.List;
@@ -81,9 +88,10 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 	 * {@link FragmentStatePagerAdapter}.
 	 */
 	private SectionsPagerAdapter mSectionsPagerAdapter;
-    protected @BindView(R.id.toolbar) Toolbar toolbar;
+    //protected @BindView(R.id.toolbar) Toolbar toolbar;
+	protected @BindView(R.id.bottomAppBar) BottomAppBar bottomAppBar;
 	protected @BindView(R.id.progressIndicator) ProgressBar progressIndicator;
-	protected @BindView(R.id.btn_disable_incognito) ImageButton mBtnDisableIncognito;
+	//protected @BindView(R.id.btn_disable_incognito) ImageButton mBtnDisableIncognito;
 
 	/**
 	 * The {@link ViewPager} that will host the section contents.
@@ -107,6 +115,34 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
         ((NewsReaderApplication) getApplication()).getAppComponent().injectActivity(this);
 
 		super.onCreate(savedInstanceState);
+
+		/*
+		//make full transparent statusBar
+		if (Build.VERSION.SDK_INT >= 19 && Build.VERSION.SDK_INT < 21) {
+			setWindowFlag(this, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, true);
+		}
+		if (Build.VERSION.SDK_INT >= 19) {
+			getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+		}
+		if (Build.VERSION.SDK_INT >= 21) {
+			setWindowFlag(this, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, false);
+			getWindow().setStatusBarColor(Color.TRANSPARENT);
+		}
+
+
+		getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+		getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+		getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN|View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+		*/
+
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+			getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+		}
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			getWindow().setStatusBarColor(Color.WHITE);
+		}
+
+
 		setContentView(R.layout.activity_news_detail);
 
 		/*
@@ -118,9 +154,16 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 
 		ButterKnife.bind(this);
 
+		/*
         if (toolbar != null) {
             setSupportActionBar(toolbar);
-        }
+        }*/
+		if (bottomAppBar != null) {
+			setSupportActionBar(bottomAppBar);
+		}
+
+
+		//getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
 
 		dbConn = new DatabaseConnectionOrm(this);
 		Intent intent = getIntent();
@@ -186,19 +229,36 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 
         mViewPager.addOnPageChangeListener(onPageChangeListener);
 
+        /*
 		mBtnDisableIncognito.setOnClickListener(v -> {
-			// toggle incognito mode
-			setIncognitoEnabled(!isIncognitoEnabled());
-
-			for(int i = currentPosition-1; i <= currentPosition+1; i++) {
-				Log.d(TAG, "change incognito for idx: " + i);
-				WeakReference<NewsDetailFragment> ndf = mSectionsPagerAdapter.items.get(i);
-				if(ndf != null) {
-					ndf.get().syncIncognitoState();
-					ndf.get().startLoadRssItemToWebViewTask();
-				}
-			}
+			toggleIncognitoMode();
 		});
+		*/
+	}
+
+	private void toggleIncognitoMode() {
+		// toggle incognito mode
+		setIncognitoEnabled(!isIncognitoEnabled());
+
+		for(int i = currentPosition-1; i <= currentPosition+1; i++) {
+			Log.d(TAG, "change incognito for idx: " + i);
+			WeakReference<NewsDetailFragment> ndf = mSectionsPagerAdapter.items.get(i);
+			if(ndf != null) {
+				ndf.get().syncIncognitoState();
+				ndf.get().startLoadRssItemToWebViewTask();
+			}
+		}
+	}
+
+	public static void setWindowFlag(Activity activity, final int bits, boolean on) {
+		Window win = activity.getWindow();
+		WindowManager.LayoutParams winParams = win.getAttributes();
+		if (on) {
+			winParams.flags |= bits;
+		} else {
+			winParams.flags &= ~bits;
+		}
+		win.setAttributes(winParams);
 	}
 
 	@Override
@@ -500,6 +560,10 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
                 startActivity(Intent.createChooser(share, "Share Item"));
                 break;
 
+			case R.id.action_incognito_mode:
+				toggleIncognitoMode();
+				break;
+
 
 		}
 
@@ -552,8 +616,12 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 
 	public void initIncognitoMode() {
 		int color = getResources().getColor(isIncognitoEnabled() ? R.color.material_grey_900 : R.color.colorPrimary);
-		ThemeUtils.colorizeToolbar(toolbar, color);
-		ThemeUtils.changeStatusBarColor(this, color);
+		//ThemeUtils.colorizeToolbar(toolbar, color);
+		ThemeUtils.colorizeToolbar(bottomAppBar, color);
+		//ThemeUtils.changeStatusBarColor(this, color);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			getWindow().setNavigationBarColor(getResources().getColor(R.color.material_grey_900));
+		}
 	}
 
 	/**
diff --git a/News-Android-App/src/main/res/layout/activity_news_detail.xml b/News-Android-App/src/main/res/layout/activity_news_detail.xml
index 1d5eb534..acfbe15f 100644
--- a/News-Android-App/src/main/res/layout/activity_news_detail.xml
+++ b/News-Android-App/src/main/res/layout/activity_news_detail.xml
@@ -10,7 +10,7 @@
         android:id="@+id/sliding_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
+        android:layout_marginBottom="?attr/actionBarSize"
         android:gravity="bottom"
         sothree:umanoPanelHeight="68dp"
         sothree:umanoShadowHeight="4dp"
@@ -48,25 +48,6 @@
 
     </de.luhmer.owncloudnewsreader.view.PodcastSlidingUpPanelLayout>
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center"
-        android:layout_marginBottom="16dp">
-
-        <ImageButton
-            android:id="@+id/btn_disable_incognito"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:srcCompat="@drawable/incognito"/>
-
-    </LinearLayout>
-
-
-    <include
-        android:id="@+id/toolbar_layout"
-        layout="@layout/toolbar_layout" />
-
     <de.luhmer.owncloudnewsreader.view.AnimatingProgressBar
         android:id="@+id/progressIndicator"
         android:layout_width="match_parent"
@@ -76,4 +57,18 @@
         android:layoutDirection="ltr"
         style="?android:attr/progressBarStyleHorizontal" />
 
+    <com.google.android.material.bottomappbar.BottomAppBar
+        android:id="@+id/bottomAppBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom">
+
+    </com.google.android.material.bottomappbar.BottomAppBar>
+
+    <!--
+    <include
+        android:id="@+id/toolbar_layout"
+        layout="@layout/toolbar_layout" />
+    -->
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

From 683f3370b6d7ca2141711a0598dfb914a2d51c0a Mon Sep 17 00:00:00 2001
From: David Luhmer <david-dev@live.de>
Date: Fri, 1 Nov 2019 14:05:33 +0100
Subject: [PATCH 5/9] adjust status bar color based on selected theme

---
 .../NewsDetailActivity.java                   | 40 +++++++++++++++++++
 .../main/res/layout/activity_news_detail.xml  |  4 +-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
index 211e185c..75ad3627 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
@@ -45,6 +45,7 @@ import android.webkit.WebView;
 import android.widget.ImageButton;
 import android.widget.ProgressBar;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.browser.customtabs.CustomTabsIntent;
@@ -70,15 +71,19 @@ import butterknife.ButterKnife;
 import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
 import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm.SORT_DIRECTION;
 import de.luhmer.owncloudnewsreader.database.model.RssItem;
+import de.luhmer.owncloudnewsreader.helper.ThemeChooser;
 import de.luhmer.owncloudnewsreader.helper.ThemeUtils;
 import de.luhmer.owncloudnewsreader.model.PodcastItem;
 import de.luhmer.owncloudnewsreader.model.TTSItem;
 import de.luhmer.owncloudnewsreader.widget.WidgetProvider;
+import static de.luhmer.owncloudnewsreader.helper.ThemeChooser.THEME;
+
 
 public class NewsDetailActivity extends PodcastFragmentActivity {
 
 	private static final String TAG = NewsDetailActivity.class.getCanonicalName();
 	public static final String INCOGNITO_MODE_ENABLED = "INCOGNITO_MODE_ENABLED";
+
 	/**
 	 * The {@link PagerAdapter} that will provide
 	 * fragments for each of the sections. We use a
@@ -621,6 +626,41 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 		//ThemeUtils.changeStatusBarColor(this, color);
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 			getWindow().setNavigationBarColor(getResources().getColor(R.color.material_grey_900));
+
+			switch (ThemeChooser.getSelectedTheme()) {
+				case LIGHT:
+					Log.d(TAG, "initIncognitoMode: LIGHT");
+					setLightStatusBar(getWindow().getDecorView());
+					getWindow().setStatusBarColor(Color.WHITE);
+					break;
+				case DARK:
+					clearLightStatusBar(getWindow().getDecorView());
+					Log.d(TAG, "initIncognitoMode: DARK");
+					getWindow().setStatusBarColor(getResources().getColor(R.color.material_grey_900));
+					break;
+				case OLED:
+					clearLightStatusBar(getWindow().getDecorView());
+					Log.d(TAG, "initIncognitoMode: OLED");
+					getWindow().setStatusBarColor(Color.BLACK);
+					break;
+			}
+		}
+
+	}
+
+	private void setLightStatusBar(@NonNull View view) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+			int flags = view.getSystemUiVisibility(); // get current flag
+			flags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;   // add LIGHT_STATUS_BAR to flag
+			view.setSystemUiVisibility(flags);
+		}
+	}
+
+	public static void clearLightStatusBar(@NonNull View view) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+			int flags = view.getSystemUiVisibility();
+			flags &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+			view.setSystemUiVisibility(flags);
 		}
 	}
 
diff --git a/News-Android-App/src/main/res/layout/activity_news_detail.xml b/News-Android-App/src/main/res/layout/activity_news_detail.xml
index acfbe15f..75688d2f 100644
--- a/News-Android-App/src/main/res/layout/activity_news_detail.xml
+++ b/News-Android-App/src/main/res/layout/activity_news_detail.xml
@@ -61,7 +61,9 @@
         android:id="@+id/bottomAppBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom">
+        android:layout_gravity="bottom"
+        android:theme="@style/ToolbarTheme"
+        app:popupTheme="@style/ToolbarOptionMenuBackgroundTheme">
 
     </com.google.android.material.bottomappbar.BottomAppBar>
 

From 42a0230df3a88a580d231c32a26cf75139e0926f Mon Sep 17 00:00:00 2001
From: David Luhmer <david-dev@live.de>
Date: Wed, 27 Nov 2019 20:49:36 +0100
Subject: [PATCH 6/9] use top navigation bar again

---
 .../NewsDetailActivity.java                   | 36 +++++++++----------
 .../main/res/layout/activity_news_detail.xml  | 13 ++++---
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
index 75ad3627..f6dabfd5 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
@@ -26,27 +26,20 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.PersistableBundle;
 import android.text.Html;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.webkit.WebView;
-import android.widget.ImageButton;
 import android.widget.ProgressBar;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.core.content.ContextCompat;
@@ -57,8 +50,6 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
-import com.google.android.material.bottomappbar.BottomAppBar;
-
 import java.lang.ref.WeakReference;
 import java.util.HashSet;
 import java.util.List;
@@ -71,12 +62,10 @@ import butterknife.ButterKnife;
 import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
 import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm.SORT_DIRECTION;
 import de.luhmer.owncloudnewsreader.database.model.RssItem;
-import de.luhmer.owncloudnewsreader.helper.ThemeChooser;
 import de.luhmer.owncloudnewsreader.helper.ThemeUtils;
 import de.luhmer.owncloudnewsreader.model.PodcastItem;
 import de.luhmer.owncloudnewsreader.model.TTSItem;
 import de.luhmer.owncloudnewsreader.widget.WidgetProvider;
-import static de.luhmer.owncloudnewsreader.helper.ThemeChooser.THEME;
 
 
 public class NewsDetailActivity extends PodcastFragmentActivity {
@@ -93,8 +82,8 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 	 * {@link FragmentStatePagerAdapter}.
 	 */
 	private SectionsPagerAdapter mSectionsPagerAdapter;
-    //protected @BindView(R.id.toolbar) Toolbar toolbar;
-	protected @BindView(R.id.bottomAppBar) BottomAppBar bottomAppBar;
+    protected @BindView(R.id.toolbar) Toolbar toolbar;
+	// protected @BindView(R.id.bottomAppBar) BottomAppBar bottomAppBar;
 	protected @BindView(R.id.progressIndicator) ProgressBar progressIndicator;
 	//protected @BindView(R.id.btn_disable_incognito) ImageButton mBtnDisableIncognito;
 
@@ -140,12 +129,15 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 		getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN|View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
 		*/
 
+		/*
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
 		}
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 			getWindow().setStatusBarColor(Color.WHITE);
 		}
+		*/
+
 
 
 		setContentView(R.layout.activity_news_detail);
@@ -159,13 +151,14 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 
 		ButterKnife.bind(this);
 
-		/*
-        if (toolbar != null) {
+		if (toolbar != null) {
             setSupportActionBar(toolbar);
-        }*/
+        }
+		/*
 		if (bottomAppBar != null) {
 			setSupportActionBar(bottomAppBar);
 		}
+		*/
 
 
 		//getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
@@ -621,12 +614,14 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 
 	public void initIncognitoMode() {
 		int color = getResources().getColor(isIncognitoEnabled() ? R.color.material_grey_900 : R.color.colorPrimary);
-		//ThemeUtils.colorizeToolbar(toolbar, color);
-		ThemeUtils.colorizeToolbar(bottomAppBar, color);
+		ThemeUtils.colorizeToolbar(toolbar, color);
+		//ThemeUtils.colorizeToolbar(bottomAppBar, color);
 		//ThemeUtils.changeStatusBarColor(this, color);
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-			getWindow().setNavigationBarColor(getResources().getColor(R.color.material_grey_900));
+			//getWindow().setNavigationBarColor(color);
+			getWindow().setStatusBarColor(color);
 
+			/*
 			switch (ThemeChooser.getSelectedTheme()) {
 				case LIGHT:
 					Log.d(TAG, "initIncognitoMode: LIGHT");
@@ -644,10 +639,12 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 					getWindow().setStatusBarColor(Color.BLACK);
 					break;
 			}
+			*/
 		}
 
 	}
 
+	/*
 	private void setLightStatusBar(@NonNull View view) {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			int flags = view.getSystemUiVisibility(); // get current flag
@@ -663,6 +660,7 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 			view.setSystemUiVisibility(flags);
 		}
 	}
+	*/
 
 	/**
 	 * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
diff --git a/News-Android-App/src/main/res/layout/activity_news_detail.xml b/News-Android-App/src/main/res/layout/activity_news_detail.xml
index 75688d2f..f3ed69cf 100644
--- a/News-Android-App/src/main/res/layout/activity_news_detail.xml
+++ b/News-Android-App/src/main/res/layout/activity_news_detail.xml
@@ -10,13 +10,18 @@
         android:id="@+id/sliding_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="?attr/actionBarSize"
+        android:layout_marginTop="?attr/actionBarSize"
         android:gravity="bottom"
         sothree:umanoPanelHeight="68dp"
         sothree:umanoShadowHeight="4dp"
         sothree:umanoParallaxOffset="100dp"
         sothree:umanoDragView="@+id/name">
 
+        <!--
+        for bottom toolbar, replace marginTop above with marginBottom
+        android:layout_marginBottom="?attr/actionBarSize"
+        -->
+
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
@@ -57,6 +62,7 @@
         android:layoutDirection="ltr"
         style="?android:attr/progressBarStyleHorizontal" />
 
+    <!--
     <com.google.android.material.bottomappbar.BottomAppBar
         android:id="@+id/bottomAppBar"
         android:layout_width="match_parent"
@@ -64,13 +70,12 @@
         android:layout_gravity="bottom"
         android:theme="@style/ToolbarTheme"
         app:popupTheme="@style/ToolbarOptionMenuBackgroundTheme">
-
     </com.google.android.material.bottomappbar.BottomAppBar>
+    -->
+
 
-    <!--
     <include
         android:id="@+id/toolbar_layout"
         layout="@layout/toolbar_layout" />
-    -->
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

From 1d1efe270129fdee108495db722ec3b849f23134 Mon Sep 17 00:00:00 2001
From: David Luhmer <david-dev@live.de>
Date: Wed, 27 Nov 2019 20:51:17 +0100
Subject: [PATCH 7/9] fix that dialog keeps on popping up to install nextcloud
 files app when using manual login

---
 .../de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java
index d3bf6335..d189ea7c 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java
@@ -78,7 +78,9 @@ public class PodcastFragmentActivity extends AppCompatActivity implements IPlayP
         super.onCreate(savedInstanceState);
         ThemeChooser.afterOnCreate(this);
 
-        if (mApi.getAPI() instanceof Proxy) { // Single Sign On
+        //if (mApi.getAPI() instanceof Proxy) { // doesn't work.. retrofit is also a "proxy"
+        boolean useSSO = mPrefs.getBoolean(SettingsActivity.SW_USE_SINGLE_SIGN_ON, false);
+        if(useSSO) {
             VersionCheckHelper.verifyMinVersion(this, MIN_NEXTCLOUD_FILES_APP_VERSION_CODE);
         }
 

From da04299174d9927d9196481a035b09df1d61a8b5 Mon Sep 17 00:00:00 2001
From: David Luhmer <david-dev@live.de>
Date: Wed, 27 Nov 2019 21:08:14 +0100
Subject: [PATCH 8/9] clean up dependencies / fix tables being too wide for
 screen

---
 News-Android-App/src/main/assets/web.css                        | 2 +-
 .../java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/News-Android-App/src/main/assets/web.css b/News-Android-App/src/main/assets/web.css
index 9645f204..4f0c9b3d 100644
--- a/News-Android-App/src/main/assets/web.css
+++ b/News-Android-App/src/main/assets/web.css
@@ -99,7 +99,7 @@ a {
 
 #content table {
     width:100% !important;
-    table-layout:fixed;
+    /* table-layout: fixed; */
 }
 
 #header {
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
index 5105b4b9..9e0b9b65 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
@@ -41,8 +41,6 @@ import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.Button;
-import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 

From 0abca8cc87b16d430eaa065f84bf6d7781968e39 Mon Sep 17 00:00:00 2001
From: David Luhmer <david-dev@live.de>
Date: Wed, 27 Nov 2019 21:11:35 +0100
Subject: [PATCH 9/9] cleanup imports / use explicit visibility of methods

---
 .../de/luhmer/owncloudnewsreader/NewsDetailFragment.java    | 4 ++--
 .../luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java | 2 --
 .../de/luhmer/owncloudnewsreader/helper/ThemeUtils.java     | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
index 9e0b9b65..835ebd05 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
@@ -191,7 +191,7 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
 		return rootView;
 	}
 
-	void syncIncognitoState() {
+	protected void syncIncognitoState() {
         NewsDetailActivity ndActivity = ((NewsDetailActivity)getActivity());
         boolean isIncognito = ndActivity.isIncognitoEnabled();
         mWebView.getSettings().setBlockNetworkLoads(isIncognito);
@@ -235,7 +235,7 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
         });
     }
 
-    void startLoadRssItemToWebViewTask() {
+    protected void startLoadRssItemToWebViewTask() {
         Log.d(TAG, "startLoadRssItemToWebViewTask() called");
         mWebView.setVisibility(View.GONE);
         mProgressBarLoading.setVisibility(View.VISIBLE);
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java
index 6cf2ea2e..f7d685a2 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java
@@ -1,9 +1,7 @@
 package de.luhmer.owncloudnewsreader;
 
-import android.app.AppOpsManager;
 import android.app.PictureInPictureParams;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Point;
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java
index 0ea61e79..e9be39dd 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java
@@ -22,7 +22,6 @@
 package de.luhmer.owncloudnewsreader.helper;
 
 import android.app.Activity;
-import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
@@ -33,12 +32,13 @@ import android.view.WindowManager;
 import android.widget.SearchView;
 import android.widget.TextView;
 
-import java.lang.reflect.Field;
-
 import androidx.annotation.ColorInt;
 import androidx.appcompat.widget.ActionMenuView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
+
+import java.lang.reflect.Field;
+
 import de.luhmer.owncloudnewsreader.R;
 
 public class ThemeUtils {