From 33e65f669ca40a5c1f6f14655e697d91e4dbd519 Mon Sep 17 00:00:00 2001
From: Cyb3rKo <niko@cyb3rko.de>
Date: Wed, 1 Jul 2020 22:34:38 +0200
Subject: [PATCH] implemented feature to switch between 3 orientation modes
 (#12)

---
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |  20 +----
 .../{Credits.java => About.java}              |  12 ++-
 .../logviewer_for_openHAB/IconCredits.java    |   5 ++
 .../logviewer_for_openHAB/MainActivity.java   |  10 +--
 .../logviewer_for_openHAB/MainFragment.java   |  75 +++++++++++++-----
 .../logviewer_for_openHAB/PrivacyPolicy.java  |   5 ++
 .../logviewer_for_openHAB/TermsOfUse.java     |   5 ++
 .../WebViewFragment.java                      |   3 +
 .../icon_landscape_orientation.webp           | Bin 0 -> 512 bytes
 .../icon_portrait_orientation.webp            | Bin 0 -> 562 bytes
 app/src/main/res/values/strings.xml           |  35 ++++----
 app/src/main/res/values/styles.xml            |   2 +-
 13 files changed, 110 insertions(+), 64 deletions(-)
 rename app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/{Credits.java => About.java} (89%)
 create mode 100644 app/src/main/res/drawable-v24/icon_landscape_orientation.webp
 create mode 100644 app/src/main/res/drawable-v24/icon_portrait_orientation.webp

diff --git a/app/build.gradle b/app/build.gradle
index ba065f5..973172b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     implementation 'com.amitshekhar.android:android-networking:1.0.2'
     implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
     implementation 'com.github.GrenderG:Toasty:1.4.2'
-    implementation 'com.github.medyo:android-about-page:1.2.6'
+    implementation 'com.github.medyo:android-about-page:1.3'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'com.google.firebase:firebase-analytics:17.4.3'
     implementation 'com.google.firebase:firebase-core:17.4.3'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1f8b510..2ba7824 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,28 +14,16 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
-        <activity
-            android:name=".MainActivity"
-            android:configChanges="orientation|screenSize">
+        <activity android:name=".MainActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".Credits"
-            android:screenOrientation="portrait" >
-        </activity>
+        <activity android:name=".About" />
         <activity android:name=".IconCredits" />
-        <activity
-            android:name=".PrivacyPolicy"
-            android:screenOrientation="portrait" >
-        </activity>
-        <activity android:name=".TermsOfUse"
-            android:screenOrientation="portrait" >
-        </activity>
-        <activity android:name=".EndUserConsent" />
-        <activity android:name=".EndUserConsent2" />
+        <activity android:name=".PrivacyPolicy" />
+        <activity android:name=".TermsOfUse" />
 
         <meta-data
             android:name="firebase_analytics_collection_enabled"
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/Credits.java b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/About.java
similarity index 89%
rename from app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/Credits.java
rename to app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/About.java
index 22633cf..ea50d82 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/Credits.java
+++ b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/About.java
@@ -1,26 +1,30 @@
 package com.thegreek.niko.logviewer_for_openHAB;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.mikepenz.aboutlibraries.LibsBuilder;
 
+import java.util.Objects;
+
 import mehdi.sakout.aboutpage.AboutPage;
 import mehdi.sakout.aboutpage.Element;
 
-public class Credits extends AppCompatActivity {
+public class About extends AppCompatActivity {
 
     @Override
-    protected void onCreate(@NonNull Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        SharedPreferences mySPR = this.getSharedPreferences("Safe", 0);
+        MainActivity.changeOrientation(Objects.requireNonNull(this), mySPR.getInt("orientation", 0));
+
         View aboutPage = new AboutPage(this)
-                .isRTL(false)
                 .setImage(R.mipmap.ic_launcher_foreground)
                 .setDescription(getString(R.string.about_description))
                 .addItem(new Element().setTitle("Version " + BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ")").setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/IconCredits.java b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/IconCredits.java
index de4e65e..b91c2ce 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/IconCredits.java
+++ b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/IconCredits.java
@@ -1,6 +1,7 @@
 package com.thegreek.niko.logviewer_for_openHAB;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.SpannableString;
@@ -13,11 +14,15 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
+import java.util.Objects;
+
 public class IconCredits extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        SharedPreferences mySPR = this.getSharedPreferences("Safe", 0);
+        MainActivity.changeOrientation(Objects.requireNonNull(this), mySPR.getInt("orientation", 0));
         setContentView(R.layout.activity_icon_credits);
 
         TextView[] textViews = new TextView[9];
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainActivity.java b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainActivity.java
index eda088d..7051f99 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainActivity.java
+++ b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainActivity.java
@@ -6,7 +6,6 @@
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.app.ActivityCompat;
 
 import com.androidnetworking.AndroidNetworking;
@@ -14,25 +13,24 @@
 import com.androidnetworking.interfaces.StringRequestListener;
 import com.google.firebase.analytics.FirebaseAnalytics;
 
-import es.dmoral.toasty.Toasty;
+import java.util.Objects;
 
 public class MainActivity extends AppCompatActivity {
 
     static FirebaseAnalytics firebaseAnalytics;
-    private SharedPreferences mySPR;
     private SharedPreferences.Editor editor;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
         setContentView(R.layout.activity_main);
 
         firebaseAnalytics = FirebaseAnalytics.getInstance(this);
-        mySPR = this.getSharedPreferences("Safe", 0);
+        SharedPreferences mySPR = this.getSharedPreferences("Safe", 0);
         editor = mySPR.edit();
         editor.apply();
-        Toasty.Config.getInstance().allowQueue(false).apply();
+//        Toasty.Config.getInstance().allowQueue(false).apply();
+        MainActivity.changeOrientation(Objects.requireNonNull(this), mySPR.getInt("orientation", 0));
 
         getSupportFragmentManager().beginTransaction().replace(R.id.start, new MainFragment()).commit();
 
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainFragment.java b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainFragment.java
index b69082d..af497e2 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainFragment.java
+++ b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/MainFragment.java
@@ -5,6 +5,7 @@
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -33,6 +34,7 @@ public class MainFragment extends Fragment {
     private EditText port;
     private ImageButton hostnameIPAddressEdit;
     private ImageButton portEdit;
+    private ImageView settings;
     private SharedPreferences mySPR;
     private SharedPreferences.Editor editor;
     private String hostnameIPAddressString;
@@ -42,7 +44,7 @@ public class MainFragment extends Fragment {
     private int portInt;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(final LayoutInflater inflater, final ViewGroup container, Bundle savedInstanceState) {
         final View v = inflater.inflate(R.layout.fragment_main, container, false);
 
         hostnameIPAddress = v.findViewById(R.id.hostname_ip_address);
@@ -57,7 +59,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         TextView endUserConsent = v.findViewById(R.id.end_user_consent);
         TextView credits_text = v.findViewById(R.id.credits);
         TextView versionView = v.findViewById(R.id.version_view);
-        ImageView settings = v.findViewById(R.id.imageView);
+        settings = v.findViewById(R.id.imageView);
 
         mySPR = v.getContext().getSharedPreferences("Safe", 0);
         editor = mySPR.edit();
@@ -69,13 +71,31 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         settings.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                int newOrientation = mySPR.getInt("orientation", 0) == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE ? ActivityInfo.SCREEN_ORIENTATION_PORTRAIT :
-                        ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+                int newOrientation = 0;
+                String newOrientationName = "";
+
+                switch (mySPR.getInt("orientation", ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE)) {
+                    case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:
+                        newOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+                        newOrientationName = "portrait";
+                        break;
+                    case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT:
+                        newOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
+                        newOrientationName = "auto";
+                        settings.setImageResource(R.drawable.icon_auto_orientation);
+                        break;
+                    case ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED:
+                        newOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+                        newOrientationName = "landscape";
+                    default:
+                        break;
+                }
+
+                editor.putInt("orientation", newOrientation);
+                editor.putBoolean("tempDisableStart", true).apply();
                 MainActivity.changeOrientation(Objects.requireNonNull(getActivity()), newOrientation);
-                editor.putInt("orientation", newOrientation).apply();
 
-                String orientation = mySPR.getInt("orientation", 0) == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE ? "landscape" : "portrait";
-                Toasty.info(Objects.requireNonNull(getContext()), "Orientation changed to " + orientation, Toasty.LENGTH_SHORT).show();
+                Toasty.info(Objects.requireNonNull(getContext()), "Orientation changed to " + newOrientationName, Toasty.LENGTH_SHORT).show();
             }
         });
 
@@ -175,7 +195,7 @@ public void onClick(View view) {
         credits_text.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent termsOfUseIntent = new Intent(getContext(), Credits.class);
+                Intent termsOfUseIntent = new Intent(getContext(), About.class);
                 view.getContext().startActivity(termsOfUseIntent);
             }
         });
@@ -192,20 +212,39 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
     }
 
     private void statusWiederherstellung() {
-        MainActivity.changeOrientation(Objects.requireNonNull(getActivity()), mySPR.getInt("orientation", 0));
-
         connectCheck.setChecked(mySPR.getBoolean("connectCheck", false));
 
-        if (mySPR.getBoolean("autoStart", false) && connectCheck.isChecked()) {
-            assert getFragmentManager() != null;
-            getFragmentManager().beginTransaction()
-                    .replace(R.id.start, new WebViewFragment())
-                    .addToBackStack(null)
-                    .commit();
+        if (!mySPR.getBoolean("tempDisableStart", false)) {
+            if (mySPR.getBoolean("autoStart", false) && connectCheck.isChecked()) {
+                assert getFragmentManager() != null;
+                getFragmentManager().beginTransaction()
+                        .replace(R.id.start, new WebViewFragment())
+                        .addToBackStack(null)
+                        .commit();
+
+                Toasty.info(Objects.requireNonNull(getContext()), getString(R.string.connecting), Toasty.LENGTH_SHORT).show();
+            }
+        } else {
+            Runnable runnable = new Runnable() {
+                @Override
+                public void run() {
+                    editor.putBoolean("tempDisableStart", false).apply();
+                }
+            };
 
-            Toasty.info(getActivity().getApplicationContext(), getString(R.string.connecting), Toasty.LENGTH_SHORT).show();
+            new Handler().postDelayed(runnable, 10);
+        }
 
-            return;
+        switch (mySPR.getInt("orientation", 0)) {
+            case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:
+                settings.setImageResource(R.drawable.icon_landscape_orientation);
+                break;
+            case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT:
+                settings.setImageResource(R.drawable.icon_portrait_orientation);
+                break;
+            case ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED:
+                settings.setImageResource(R.drawable.icon_auto_orientation);
+                break;
         }
 
         if (mySPR.getString("hostnameIPAddressString", "").equals("") || mySPR.getString("hostnameIPAddressString", "").equals("0")) {
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/PrivacyPolicy.java b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/PrivacyPolicy.java
index 3f46aeb..b0cc3f3 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/PrivacyPolicy.java
+++ b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/PrivacyPolicy.java
@@ -1,6 +1,7 @@
 package com.thegreek.niko.logviewer_for_openHAB;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
@@ -10,11 +11,15 @@
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
+import java.util.Objects;
+
 public class PrivacyPolicy extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        SharedPreferences mySPR = this.getSharedPreferences("Safe", 0);
+        MainActivity.changeOrientation(Objects.requireNonNull(this), mySPR.getInt("orientation", 0));
         setContentView(R.layout.activity_privacy_policy);
 
         TextView[] textViews = new TextView[21];
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/TermsOfUse.java b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/TermsOfUse.java
index 7354dfc..92150b8 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/TermsOfUse.java
+++ b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/TermsOfUse.java
@@ -1,6 +1,7 @@
 package com.thegreek.niko.logviewer_for_openHAB;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
@@ -10,11 +11,15 @@
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
+import java.util.Objects;
+
 public class TermsOfUse extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        SharedPreferences mySPR = this.getSharedPreferences("Safe", 0);
+        MainActivity.changeOrientation(Objects.requireNonNull(this), mySPR.getInt("orientation", 0));
         setContentView(R.layout.activity_terms_of_use);
 
         TextView[] textViews = new TextView[7];
diff --git a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/WebViewFragment.java b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/WebViewFragment.java
index 756dfcc..0b55f50 100644
--- a/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/WebViewFragment.java
+++ b/app/src/main/java/com/thegreek/niko/logviewer_for_openHAB/WebViewFragment.java
@@ -152,6 +152,7 @@ public void run() {
             new TapTargetSequence(getActivity())
                     .targets(
                             TapTarget.forView(v.findViewById(R.id.view_button), getString(R.string.tap_target_title_1), getString(R.string.tap_target_message_1))
+                                    .transparentTarget(true)
                                     .tintTarget(false)
                                     .outerCircleColor(R.color.colorAccent)
                                     .tintTarget(false)
@@ -160,6 +161,7 @@ public void run() {
                                     .drawShadow(true)
                                     .cancelable(false),
                             TapTarget.forView(v.findViewById(R.id.text_button), getString(R.string.tap_target_title_2), getString(R.string.tap_target_message_2))
+                                    .transparentTarget(true)
                                     .tintTarget(false)
                                     .outerCircleColor(R.color.colorAccent)
                                     .tintTarget(false)
@@ -168,6 +170,7 @@ public void run() {
                                     .drawShadow(true)
                                     .cancelable(false),
                             TapTarget.forView(v.findViewById(R.id.back_utton), getString(R.string.tap_target_title_3), getString(R.string.tap_target_message_3))
+                                    .transparentTarget(true)
                                     .tintTarget(false)
                                     .outerCircleColor(R.color.colorAccent)
                                     .tintTarget(false)
diff --git a/app/src/main/res/drawable-v24/icon_landscape_orientation.webp b/app/src/main/res/drawable-v24/icon_landscape_orientation.webp
new file mode 100644
index 0000000000000000000000000000000000000000..ba00f7aada5af9d47567626dfd4440637ca3cb6a
GIT binary patch
literal 512
zcmV+b0{{I|Nk&Ha0RRA3MM6+kP&iEN0RR9me*rTPfY?ZqA}RcLd!hTNRgWDZ2eNI`
zw&t^K+qV5eWwveGjO@rSvu)e_wrwmYkR&Nm)-kA4&miGGvci<>G;iyfIYULh*vcoH
zCUq#}g&&#`l4l=<oImD7Vr{@F*C&*8?(@M=Vd4o&J1fNQ@$wzzoyQFCh(VF(JIgE1
z{$vh$N&1YE_bB!3VLLH`a!=ZUH42^&1OdQm@{k$;@+f+qV*p9nL(IWq_*8-q;WLQ?
zRU8Ro_N1soH)i3)T$Y#RWu{p1j~t{MpNiK^EA}B?SS$WBuh_~LlqatL)_?226_}{<
zt-JFk09F0I!8U&M;>RKX&A<M!|Mth@+y8bqgNn1j<^Q<b`fvTW{#*a8|JHx&zxChx
zZ~ga!h*|uoSA4@4FZLB5@u4dH)YBd9Ra}B^Xwtkgu9)0I2*@(vF`72>;0O(y&mtbc
z-3v5uT0t2aH+5~2(a3QD#`E%@eG@f5M&>Jaz~DX_H+L9%ETEC;0|5SL-l(<U^mpce
z;D{OkV01JuzAdcK$TYzbJAcQeq(#WcydVOnB&I&`iv?WL5&CAqaD_>2;-~p32yPSR
zcigu-ykHJRv`u7vyW1a4M4*n7Ie%il-^o|~)SwqZ{(7vs^F7@AU43+EUMm;ua1#K9
CY6tcJ

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-v24/icon_portrait_orientation.webp b/app/src/main/res/drawable-v24/icon_portrait_orientation.webp
new file mode 100644
index 0000000000000000000000000000000000000000..00ce21704a50beb116937362f038f9279b05b72c
GIT binary patch
literal 562
zcmV-20?qwWNk&F00ssJ4MM6+kP&iB;0ssIn%)nm|fY>&YBZ>K^y?fL5uIhb9NP;BW
zw5@)&ZQHhO+s4SYZQJh+zir#LZR2810G#3%Y|0^bd__THd+(|}I@#lZr_!_OC(7Jw
zJtSvjjANkOeNl#Qz{wkwy^EBO<oSov_m<;<d{m&{tR8UnzX9YWg&T6-qYj<Hc`=1r
zlmY<sF>3G>FMv(dqddUxXAus9U{oXqaZ^no@eWm?(VdBl+#zVZ61|<6^>xA>vQ{;*
z2TdVt_7i8iaCZH-{#*a8|JHx&zxCgWgU-Z`@NoD(&=ejxJ`j|im@~KVrw2ApFjzr+
zBpiR_k8H>fa4Pfn#zltE0041bDh)|zgcC|QUY6l!C!Bf>9Gt~K2>D=$U<0`IVxfBv
zI251>9r{c$KGql~$nN;;Lg!r5^LC&#JPK%NGdy+^XToDYad!Q;{#*a8|8^R5C%U_^
z5gyZthVVpoLB9(gUl?M$VD?>xM>V#5TjAOTi;3az*iUTf!rArT`mYwhC-lRTK5@vy
ziA`crQFC=-*@+4A%h`|CehpG@HC%16#fENYU$IMAXsX@XD0|sbs-Q{|qX?G(94tZ|
z0Iwc=BLx6<*Ps>vfU*B2ctP+2ay#&w4cr^AKs-FeZ7Dwtg>b4EGd!Pp!#OusqqChB
zOmRx_I5sCZ!!vQP*5;~TarxqiBI@vh#OSkQ|G^66D?+S>Q=w!iQ)d5a+0rBcQ}D46
A;Q#;t

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 170adf4..9a659bd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">LogViewer for openHAB</string>
+    <string name="app_name" translatable="false">LogViewer for openHAB</string>
 
     <string name="error_fill_out">Fill out both</string>
     <string name="connecting">Connecting…</string>
@@ -28,20 +28,20 @@
         smartphone.
     </string>
     <string name="about">About</string>
-    <string name="credits_icons_1">\"Eye Open icon\" made by Dave Gandy from flaticon.com</string>
-    <string name="credits_icons_2">\"Files icon\" made by Smartline from flaticon.com</string>
-    <string name="credits_icons_3">\"Lock icon\" made by Those Icons from flaticon.com</string>
-    <string name="credits_icons_4">\"Font icon\" made by Those Icons from flaticon.com</string>
-    <string name="credits_icons_5">\"Left Arrow icon\" made by Lyolya from flaticon.com</string>
-    <string name="credits_icons_6">\"Lock icon\" (2) made by Those Icons from flaticon.com</string>
-    <string name="credits_icons_7">\"Orientation icon\" made by Freepik from flaticon.com</string>
-    <string name="credits_icons_8">\"Book icon\" made by Freepik from flaticon.com</string>
-    <string name="credits_icons_9">\"Question icon\" made by Freepik from flaticon.com</string>
-    <string name="credits_icons_links_1">https://www.flaticon.com/authors/freepik</string>
-    <string name="credits_icons_links_2">https://www.flaticon.com/authors/those-icons</string>
-    <string name="credits_icons_links_3">https://www.flaticon.com/authors/lyolya</string>
-    <string name="credits_icons_links_4">https://www.flaticon.com/authors/smartline</string>
-    <string name="credits_icons_links_5">https://www.flaticon.com/authors/dave-gandy</string>
+    <string name="credits_icons_1" translatable="false">\"Eye Open icon\" made by Dave Gandy from flaticon.com</string>
+    <string name="credits_icons_2" translatable="false">\"Files icon\" made by Smartline from flaticon.com</string>
+    <string name="credits_icons_3" translatable="false">\"Lock icon\" made by Those Icons from flaticon.com</string>
+    <string name="credits_icons_4" translatable="false">\"Font icon\" made by Those Icons from flaticon.com</string>
+    <string name="credits_icons_5" translatable="false">\"Left Arrow icon\" made by Lyolya from flaticon.com</string>
+    <string name="credits_icons_6" translatable="false">\"Lock icon\" (2) made by Those Icons from flaticon.com</string>
+    <string name="credits_icons_7" translatable="false">\"Orientation icon\" made by Freepik from flaticon.com</string>
+    <string name="credits_icons_8" translatable="false">\"Book icon\" made by Freepik from flaticon.com</string>
+    <string name="credits_icons_9" translatable="false">\"Question icon\" made by Freepik from flaticon.com</string>
+    <string name="credits_icons_links_1" translatable="false">https://www.flaticon.com/authors/freepik</string>
+    <string name="credits_icons_links_2" translatable="false">https://www.flaticon.com/authors/those-icons</string>
+    <string name="credits_icons_links_3" translatable="false">https://www.flaticon.com/authors/lyolya</string>
+    <string name="credits_icons_links_4" translatable="false">https://www.flaticon.com/authors/smartline</string>
+    <string name="credits_icons_links_5" translatable="false">https://www.flaticon.com/authors/dave-gandy</string>
 
     <string name="hostname_ipaddress_view">Hostname / IP address</string>
     <string name="hostname_ipaddress">(e.g. 192.168.178.10)</string>
@@ -67,7 +67,7 @@
 
     <string name="send_mail">Send me a mail…</string>
 
-    <string-array name="privacy_policy">
+    <string-array name="privacy_policy" translatable="false">
         <item>Privacy Policy</item>
         <item>I built the LogViewer for openHAB app as a Free app. This SERVICE is provided by me at no cost and is intended for use as is.
         \n\nThis page is used to inform visitors regarding my policies with the collection, use, and disclosure of Personal Information if anyone decided to use this Service.
@@ -114,8 +114,7 @@
         <item>This privacy policy page was created at privacypolicytemplate.net and modified/generated by App Privacy Policy Generator (app-privacy-policy-generator.firebaseapp.com) and me.</item>
     </string-array>
 
-    // Terms of Use
-    <string-array name="terms_of_use">
+    <string-array name="terms_of_use" translatable="false">
         <item>Terms of Use</item>
         <item>By downloading or using the app, these terms will automatically apply to you – you should make sure therefore that you read them carefully before using the app. You\'re not allowed to
         copy, or modify the app, any part of the app. You\'re not allowed to attempt to extract the source code of the app or make derivative versions.
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bdfe33e..74b1ae5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>