From 727eb06523c18dda343ead26061c9c8d22e66a93 Mon Sep 17 00:00:00 2001
From: Peter Hasse <peter.hasse@fokus.fraunhofer.de>
Date: Wed, 8 Jan 2025 12:44:33 +0100
Subject: [PATCH] UX cleanup for Android API level35 changes. Bumb target sdk
 to 35

---
 OpenMNT_logo_no_title.svg                     | 31 ++++++++++++++-----
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              | 27 +++++++++-------
 .../MainActivity.java                         |  2 +-
 app/src/main/res/layout/activity_main.xml     | 12 +++++--
 app/src/main/res/values-night/themes.xml      |  2 +-
 app/src/main/res/values-v23/themes.xml        |  9 ++++++
 app/src/main/res/values/themes.xml            |  6 ++--
 8 files changed, 62 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/res/values-v23/themes.xml

diff --git a/OpenMNT_logo_no_title.svg b/OpenMNT_logo_no_title.svg
index 58e5713b..b15bfa61 100644
--- a/OpenMNT_logo_no_title.svg
+++ b/OpenMNT_logo_no_title.svg
@@ -13,8 +13,31 @@
    overflow="hidden"
    version="1.1"
    id="svg114"
+   sodipodi:docname="OpenMNT_logo_no_title.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview23"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.5296563"
+     inkscape:cx="424.6052"
+     inkscape:cy="344.19498"
+     inkscape:window-width="2558"
+     inkscape:window-height="1348"
+     inkscape:window-x="0"
+     inkscape:window-y="72"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g112" />
   <defs
      id="defs100">
     <clipPath
@@ -103,14 +126,6 @@
        fill-rule="evenodd"
        id="path102"
        style="fill:url(#fill1)" />
-    <text
-       fill="#000000"
-       fill-opacity="0"
-       font-family="Arial, Arial_MSFontService, sans-serif"
-       font-size="219.261px"
-       x="1782.72"
-       y="1258.99"
-       id="text104">OMNT</text>
     <path
        d="m 2010.67,630.627 c -104.56,104.631 -104.57,274.28 -0.02,378.923 0.01,0.01 0.02,0.01 0.02,0.02 7.34,7.6 7.13,19.72 -0.47,27.06 -7.41,7.16 -19.16,7.16 -26.57,0 -119.5,-119.581 -119.51,-313.466 -0.01,-433.054 0,-0.003 0.01,-0.007 0.01,-0.011 7.6,-7.343 19.71,-7.132 27.04,0.471 7.16,7.416 7.16,19.175 0,26.591 z m 81.17,81.223 c -59.73,59.789 -59.73,156.706 0,216.494 7.48,7.483 7.48,19.617 0,27.1 -7.48,7.483 -19.6,7.483 -27.08,0 -74.7,-74.73 -74.71,-195.908 -0.04,-270.658 0.01,-0.012 0.03,-0.024 0.04,-0.036 7.48,-7.483 19.6,-7.483 27.08,0 7.48,7.484 7.48,19.617 0,27.1 z m 216.34,-27.1 c 7.46,-7.483 19.57,-7.499 27.05,-0.034 0.01,0.011 0.02,0.023 0.03,0.034 74.7,74.73 74.71,195.908 0.04,270.659 -0.02,0.012 -0.03,0.023 -0.04,0.035 -7.48,7.483 -19.6,7.483 -27.08,0 -7.48,-7.483 -7.48,-19.617 0,-27.1 59.73,-59.788 59.73,-156.705 0,-216.494 -7.48,-7.464 -7.49,-19.582 -0.03,-27.066 0.01,-0.011 0.02,-0.022 0.03,-0.034 z m 81.17,-81.146 c 7.46,-7.472 19.57,-7.472 27.04,0 119.48,119.581 119.48,313.445 0,433.026 -7.6,7.34 -19.71,7.13 -27.04,-0.47 -7.16,-7.42 -7.16,-19.17 0,-26.59 104.56,-104.632 104.57,-274.282 0.02,-378.923 -0.01,-0.007 -0.02,-0.014 -0.02,-0.02 -7.47,-7.474 -7.47,-19.588 0,-27.062 z"
        fill="url(#fill2)"
diff --git a/app/build.gradle b/app/build.gradle
index 9f341f08..674807f6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@ android {
     defaultConfig {
         applicationId "de.fraunhofer.fokus.OpenMobileNetworkToolkit"
         minSdk 31
-        targetSdk 34
+        targetSdk 35
         versionCode 5
         versionName "0.5"
         resValue("string", "git_hash", getGitHash())
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6a7f0749..71f709fe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,10 +12,11 @@
     <uses-feature
         android:name="android.hardware.telephony"
         android:required="false" />
-
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE"
+    <uses-permission
+        android:name="android.permission.MODIFY_PHONE_STATE"
         tools:ignore="ProtectedPermissions" />
-    <uses-permission android:name="android.permission.READ_PRECISE_PHONE_STATE"
+    <uses-permission
+        android:name="android.permission.READ_PRECISE_PHONE_STATE"
         tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -25,7 +26,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission
         android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"
         tools:ignore="ProtectedPermissions" />
@@ -39,12 +40,12 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
     <application
+        android:description="@string/app_description"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:description="@string/app_description"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppCompat.NoActionBar"
+        android:theme="@style/Theme.OpenMobileNetworkToolkit"
         android:usesCleartextTraffic="true">
         <service
             android:name="de.fraunhofer.fokus.OpenMobileNetworkToolkit.OpenMobileNetworkToolkit"
@@ -63,13 +64,15 @@
         <service
             android:name="de.fraunhofer.fokus.OpenMobileNetworkToolkit.LoggingService"
             android:foregroundServiceType="location" />
-        <service
-            android:name="de.fraunhofer.fokus.OpenMobileNetworkToolkit.Ping.PingService" />
+        <service android:name="de.fraunhofer.fokus.OpenMobileNetworkToolkit.Ping.PingService" />
 
 
-        <service android:name="androidx.work.impl.foreground.SystemForegroundService" android:foregroundServiceType="specialUse">
-            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="explanation_for_special_use"/>
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="specialUse">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="explanation_for_special_use" />
         </service>
 
 
@@ -85,7 +88,7 @@
         <activity
             android:name="de.fraunhofer.fokus.OpenMobileNetworkToolkit.MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.OpenMobileNetworkToolkitCarrierSettings.NoActionBar">
+            android:theme="@style/Theme.OpenMobileNetworkToolkit.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/MainActivity.java b/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/MainActivity.java
index ff15e620..3062356b 100644
--- a/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/MainActivity.java
+++ b/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/MainActivity.java
@@ -118,12 +118,12 @@ protected void onCreate(Bundle savedInstanceState) {
         // initialize android UX related thing the app needs
         setContentView(R.layout.activity_main);
         Toolbar toolbar = findViewById(R.id.toolbar);
-        toolbar.setTitle("");
         setSupportActionBar(toolbar);
         gv.setLog_status(findViewById(R.id.log_status_icon));
 
         NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView);
         navController = Objects.requireNonNull(navHostFragment).getNavController();
+
         // create notification channel
         CharSequence name = getString(R.string.channel_name);
         String description = getString(R.string.channel_description);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1d8a00d4..173bd3b4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -13,6 +13,7 @@
     android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:keepScreenOn="true"
     tools:context=".MainActivity">
 
@@ -25,13 +26,18 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/openmnt_logo_no_title">
+            android:layout_height="26dp"
+            android:visibility="visible"
+            app:navigationIcon="@drawable/openmnt_logo_symbol"
+            app:title="OMNT"
+            app:titleCentered="false"
+            app:titleMargin="0dp"
+            app:titleTextColor="@color/purple_200">
 
             <ImageView
                 android:id="@+id/log_status_icon"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:tint="#40C0C0C0"
                 app:srcCompat="@drawable/ic_baseline_code_24"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 8e0a5f94..5906c81b 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -8,7 +8,7 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.OpenMobileNetworkToolkit" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.OpenMobileNetworkToolkit" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
new file mode 100644
index 00000000..bb0f9c95
--- /dev/null
+++ b/app/src/main/res/values-v23/themes.xml
@@ -0,0 +1,9 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="Theme.OpenMobileNetworkToolkit" parent="Base.Theme.OpenMobileNetworkToolkit">
+        <!-- Transparent system bars for edge-to-edge. -->
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index be09016b..34eede4b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -8,12 +8,12 @@
 
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.OpenMobileNetworkToolkitCarrierSettings" parent="Theme.MaterialComponents.DayNight">
+    <style name="Base.Theme.OpenMobileNetworkToolkit" parent="Theme.Material3.DayNight.NoActionBar">
 
     </style>
 
-    <style name="Theme.OpenMobileNetworkToolkitCarrierSettings.NoActionBar">
-        <item name="windowActionBar">false</item>
+    <style name="Theme.OpenMobileNetworkToolkit.NoActionBar">
+        <item name="windowActionBar">true</item>
         <item name="windowNoTitle">true</item>
     </style>
 </resources>
\ No newline at end of file