Slightly darken night mode but trying to stay tolerable levels. Adjus…

…t icons to work with light and dark modes
mendhak · Sep 28, 2021 · b132ab6 · b132ab6
1 parent 677ae70
commit b132ab6
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 7 deletions.
diff --git a/...ogger/src/main/java/com/mendhak/gpslogger/ui/fragments/display/GpsSimpleViewFragment.java b/...ogger/src/main/java/com/mendhak/gpslogger/ui/fragments/display/GpsSimpleViewFragment.java
@@ -413,7 +413,6 @@ private void clearLocationDisplay() {
 
         TextView txtAccuracy = (TextView) rootView.findViewById(R.id.simpleview_txtAccuracy);
         txtAccuracy.setText("");
-        txtAccuracy.setTextColor(ContextCompat.getColor(context, android.R.color.black));
 
         ImageView imgAltitude = (ImageView)rootView.findViewById(R.id.simpleview_imgAltitude);
         clearColor(imgAltitude);

diff --git a/gpslogger/src/main/res/drawable-mdpi/csv.png b/gpslogger/src/main/res/drawable-mdpi/csv.png
diff --git a/gpslogger/src/main/res/drawable-mdpi/customurl.png b/gpslogger/src/main/res/drawable-mdpi/customurl.png
diff --git a/gpslogger/src/main/res/drawable-mdpi/distance.png b/gpslogger/src/main/res/drawable-mdpi/distance.png
diff --git a/gpslogger/src/main/res/drawable-mdpi/geojson.png b/gpslogger/src/main/res/drawable-mdpi/geojson.png
diff --git a/gpslogger/src/main/res/drawable-mdpi/gpx.png b/gpslogger/src/main/res/drawable-mdpi/gpx.png
diff --git a/gpslogger/src/main/res/drawable-mdpi/kml.png b/gpslogger/src/main/res/drawable-mdpi/kml.png
diff --git a/gpslogger/src/main/res/drawable-mdpi/link.png b/gpslogger/src/main/res/drawable-mdpi/link.png
diff --git a/gpslogger/src/main/res/drawable-mdpi/nmea.png b/gpslogger/src/main/res/drawable-mdpi/nmea.png
diff --git a/gpslogger/src/main/res/drawable-mdpi/points.png b/gpslogger/src/main/res/drawable-mdpi/points.png
diff --git a/gpslogger/src/main/res/layout/fragment_simple_view.xml b/gpslogger/src/main/res/layout/fragment_simple_view.xml
@@ -322,6 +322,7 @@
 
                         <ImageView
                             android:id="@+id/simpleview_imgGpx"
+                            android:paddingRight="2dp"
                             android:layout_width="25dp"
                             android:layout_height="25dp"
                             android:contentDescription="@string/log_gpx_title"
@@ -330,6 +331,7 @@
 
                         <ImageView
                             android:id="@+id/simpleview_imgKml"
+                            android:paddingRight="2dp"
                             android:layout_width="25dp"
                             android:layout_height="25dp"
                             android:contentDescription="@string/log_kml_title"
@@ -338,6 +340,7 @@
 
                         <ImageView
                             android:id="@+id/simpleview_imgCsv"
+                            android:paddingRight="2dp"
                             android:layout_width="25dp"
                             android:layout_height="25dp"
                             android:contentDescription="@string/log_plain_text_title"
@@ -346,27 +349,31 @@
 
                         <ImageView
                             android:id="@+id/simpleview_imgNmea"
+                            android:paddingRight="4dp"
                             android:layout_width="25dp"
                             android:layout_height="25dp"
                             android:contentDescription="@string/log_nmea_title"
                             android:src="@drawable/nmea"
                             android:visibility="invisible" />
 
                         <ImageView
-                            android:id="@+id/simpleview_imgLink"
+                            android:id="@+id/simpleview_imgjson"
+                            android:paddingRight="2dp"
                             android:layout_width="25dp"
                             android:layout_height="25dp"
-                            android:contentDescription="@string/log_customurl_title"
-                            android:src="@drawable/link"
+                            android:contentDescription="@string/log_json_title"
+                            android:src="@drawable/geojson"
                             android:visibility="invisible" />
 
                         <ImageView
-                            android:id="@+id/simpleview_imgjson"
+                            android:id="@+id/simpleview_imgLink"
                             android:layout_width="25dp"
                             android:layout_height="25dp"
-                            android:contentDescription="@string/log_json_title"
-                            android:src="@drawable/geojson"
+                            android:contentDescription="@string/log_customurl_title"
+                            android:src="@drawable/customurl"
                             android:visibility="invisible" />
+
+
                     </LinearLayout>
 
                     <Space

diff --git a/gpslogger/src/main/res/values-night/styles.xml b/gpslogger/src/main/res/values-night/styles.xml
@@ -4,6 +4,7 @@
     <!--    https://stackoverflow.com/a/52289175/974369 to avoid errors about MeasureSpec.EXACT  -->
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
 
+        <item name="android:windowBackground">@color/surfaceDark</item>
         <!-- Material Drawer Colors, not all can be set via XML though, some are in code. -->
         <item name="material_drawer_background">@color/primaryColor</item>
         <item name="material_drawer_primary_text">@color/primaryColorLight</item>

diff --git a/gpslogger/src/main/res/values/styles.xml b/gpslogger/src/main/res/values/styles.xml
@@ -78,4 +78,12 @@
     <color name="icons">#FFFFFF</color>
     <color name="divider">#B6B6B6</color>
     <color name="golden">#ffff8100</color>
+
+
+    <color name="colorPrimaryBlack">#000000</color>
+    <color name="colorPrimaryBlackDark">#000000</color>
+    <color name="colorAccentBlack">#427add</color>
+    <color name="surfaceDark">#121212</color>
+
+
 </resources>