tweaking UI

jvde-github · jvde-github · commit b5ec6270cfc1 · 2023-07-31T21:55:55.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.jvdegithub.aiscatcher"
         minSdk 23
         targetSdk 32
-        versionCode 58
-        versionName '0.58'
+        versionCode 60
+        versionName '0.60'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
diff --git a/app/src/main/java/com/jvdegithub/aiscatcher/AisCatcherJava.java b/app/src/main/java/com/jvdegithub/aiscatcher/AisCatcherJava.java
@@ -1,6 +1,6 @@
 /*
  *     AIS-catcher for Android
- *     Copyright (C)  2022 jvde.github@gmail.com.
+ *     Copyright (C)  2022-2023 jvde.github@gmail.com.
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/jvdegithub/aiscatcher/AisService.java b/app/src/main/java/com/jvdegithub/aiscatcher/AisService.java
@@ -1,6 +1,6 @@
 /*
  *     AIS-catcher for Android
- *     Copyright (C)  2022 jvde.github@gmail.com.
+ *     Copyright (C)  2022-2023 jvde.github@gmail.com.
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/jvdegithub/aiscatcher/DeviceManager.java b/app/src/main/java/com/jvdegithub/aiscatcher/DeviceManager.java
@@ -1,6 +1,6 @@
 /*
  *     AIS-catcher for Android
- *     Copyright (C)  2022 jvde.github@gmail.com.
+ *     Copyright (C)  2022-2023 jvde.github@gmail.com.
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/jvdegithub/aiscatcher/MainActivity.java b/app/src/main/java/com/jvdegithub/aiscatcher/MainActivity.java
@@ -1,6 +1,6 @@
 /*
  *     AIS-catcher for Android
- *     Copyright (C)  2022 jvde.github@gmail.com.
+ *     Copyright (C)  2022-2023 jvde.github@gmail.com.
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/jvdegithub/aiscatcher/Settings.java b/app/src/main/java/com/jvdegithub/aiscatcher/Settings.java
@@ -1,6 +1,6 @@
 /*
  *     AIS-catcher for Android
- *     Copyright (C)  2022 jvde.github@gmail.com.
+ *     Copyright (C)  2022-2023 jvde.github@gmail.com.
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/jvdegithub/aiscatcher/ui/main/StatisticsFragment.java b/app/src/main/java/com/jvdegithub/aiscatcher/ui/main/StatisticsFragment.java
@@ -1,6 +1,6 @@
 /*
  *     AIS-catcher for Android
- *     Copyright (C)  2022 jvde.github@gmail.com.
+ *     Copyright (C)  2022-2023 jvde.github@gmail.com.
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/jvdegithub/aiscatcher/ui/main/WebViewMapFragment.java b/app/src/main/java/com/jvdegithub/aiscatcher/ui/main/WebViewMapFragment.java
@@ -1,5 +1,6 @@
 package com.jvdegithub.aiscatcher.ui.main;
 
+import android.app.UiModeManager;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.net.ConnectivityManager;
@@ -76,8 +77,15 @@ public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
             }
         });
 
+        String url = "http://localhost:" + MainActivity.port + "?welcome=false&android=true";
 
-        webView.loadUrl("http://localhost:" + MainActivity.port + "?welcome=false&android=true");
+        UiModeManager uiManager = (UiModeManager) getContext().getSystemService(Context.UI_MODE_SERVICE);
+        boolean isDarkMode = (uiManager.getNightMode() == UiModeManager.MODE_NIGHT_YES);
+
+        if (isDarkMode) {
+            url += "&dark_mode=true&map=DarkMatter";
+        }
+        webView.loadUrl(url);
 
         return rootView;
     }
diff --git a/app/src/main/jni/AIS-catcher b/app/src/main/jni/AIS-catcher
@@ -1 +1 @@
-Subproject commit a5c76e7c2d27ef1d2b0687137a3ec279fff2f22f
+Subproject commit 6d81927a0633bcbe148275d14388685f28688e02
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -42,7 +42,7 @@
                 android:id="@+id/bottombar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/maastrichtblue"
+                android:background="?attr/colorPrimaryVariant"
                 app:itemIconTint="@color/white"
                 app:itemTextColor="@color/white"
                 app:labelVisibilityMode="labeled"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -2,27 +2,32 @@
     <!-- Base application theme. -->
     <style name="Theme.MyApplication" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
 
-        <item name="colorPrimary">@color/blue</item>
-        <item name="colorPrimaryVariant">@color/blue</item>
+        <item name="colorPrimary">#323232</item>
+        <item name="colorPrimaryVariant">@color/black</item>
         <item name="colorOnPrimary">@color/white</item>
 
-        <item name="colorSecondary">@color/maastrichtblue</item>
-        <item name="colorSecondaryVariant">@color/maastrichtblue</item>
+        <item name="colorSecondary">#5DD5D5</item>
+        <item name="colorSecondaryVariant">@color/blue</item>
         <item name="colorOnSecondary">@color/white</item>
 
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <item name="actionOverflowMenuStyle">@style/Theme.MyApp.PopupOverlay3</item>
+        <item name="alertDialogTheme">@style/AlertDialogStyle</item>
     </style>
 
     <style name="Theme.MyApp.PopupOverlay3" parent="@style/Widget.MaterialComponents.PopupMenu.Overflow">
-        <item name="android:popupBackground">@color/white</item>
+        <item name="android:textColor">@color/white</item>
     </style>
 
     <style name="Theme.MyApplication.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="AlertDialogStyle" parent="Theme.AppCompat.DayNight.Dialog">
+        <item name="android:colorAccent">#5DD5D5</item>
+    </style>
+
     <style name="Theme.MyApplication.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-    <style name="Theme.MyApplication.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="Theme.MyApplication.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark" />
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -57,7 +57,4 @@ It is specifically forbidden to use this software for any illegal purpose whatso
 ]]>
     </string>
 
-
-
-    <!-- TODO: Remove or change this placeholder text -->
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -3,14 +3,13 @@
     <style name="Theme.MyApplication" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
 
         <item name="colorPrimary">@color/blue</item>
-        <item name="colorPrimaryVariant">@color/blue</item>
+        <item name="colorPrimaryVariant">@color/maastrichtblue</item>
         <item name="colorOnPrimary">@color/white</item>
 
         <item name="colorSecondary">@color/maastrichtblue</item>
         <item name="colorSecondaryVariant">@color/maastrichtblue</item>
         <item name="colorOnSecondary">@color/white</item>
-
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <item name="actionOverflowMenuStyle">@style/Theme.MyApp.PopupOverlay3</item>
     </style>
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`* AIS-catcher for Android`
`3`		`- * Copyright (C) 2022 jvde.github@gmail.com.`
	`3`	`+ * Copyright (C) 2022-2023 jvde.github@gmail.com.`
`4`	`4`	`*`
`5`	`5`	`* This program is free software: you can redistribute it and/or modify`
`6`	`6`	`* it under the terms of the GNU General Public License as published by`