From 611312de6da5ac8376b0b5b941d5b701139ea840 Mon Sep 17 00:00:00 2001
From: Brian Osborn <bosborn@gmail.com>
Date: Wed, 11 Oct 2023 12:58:51 -0600
Subject: [PATCH 1/2] geopackage-android-map 6.7.2

---
 mapcache/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mapcache/build.gradle b/mapcache/build.gradle
index 336ed1ae..e7ee7fc9 100644
--- a/mapcache/build.gradle
+++ b/mapcache/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     api 'com.google.android.material:material:1.6.0'
     api 'androidx.preference:preference:1.2.1'
     api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    api 'mil.nga.geopackage.map:geopackage-android-map:6.7.1' // comment out to build locally
+    api 'mil.nga.geopackage.map:geopackage-android-map:6.7.2' // comment out to build locally
     //api project(':geopackage-map') // uncomment me to build locally
     api 'mil.nga.mgrs:mgrs-android:2.2.2'
     api 'mil.nga.gars:gars-android:1.2.2'

From c2008d28c5f87c4e5c440ac2d5d86bc14fca12c7 Mon Sep 17 00:00:00 2001
From: Joe Clark <jclark118@gmail.com>
Date: Mon, 16 Oct 2023 14:56:10 -0600
Subject: [PATCH 2/2] add error info label for gpkg errors

---
 mapcache/src/main/res/layout/detail_header_layout.xml | 10 ++++++++++
 mapcache/src/main/res/values-night/colors.xml         |  1 +
 mapcache/src/main/res/values/color.xml                |  4 ++++
 mapcache/src/main/res/values/colors.xml               |  1 +
 mapcache/src/main/res/values/styles.xml               |  6 ++++++
 5 files changed, 22 insertions(+)

diff --git a/mapcache/src/main/res/layout/detail_header_layout.xml b/mapcache/src/main/res/layout/detail_header_layout.xml
index c51fde29..477a2948 100644
--- a/mapcache/src/main/res/layout/detail_header_layout.xml
+++ b/mapcache/src/main/res/layout/detail_header_layout.xml
@@ -80,9 +80,19 @@
         android:id="@+id/header_text_features"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
         android:text="Feature layers"
         android:textAppearance="@style/textAppearanceSubtitle2_light_heavy" />
 
+    <!--Show any potential error messages with this geopackage-->
+    <TextView
+        android:id="@+id/header_text_errors"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="GeoPackage Errors"
+        android:visibility="gone"
+        android:textAppearance="@style/textAppearanceSubtitle2_light_heavy_warning" />
+
 
     <!-- Icon row: info, rename, share, copy, delete -->
     <LinearLayout
diff --git a/mapcache/src/main/res/values-night/colors.xml b/mapcache/src/main/res/values-night/colors.xml
index e6a2b371..a98835b3 100644
--- a/mapcache/src/main/res/values-night/colors.xml
+++ b/mapcache/src/main/res/values-night/colors.xml
@@ -23,6 +23,7 @@
 
     <color name="textPrimaryColor">@color/white87</color>
     <color name="textSecondaryColor">@color/white75</color>
+    <color name="textSecondaryError">@color/yellowWarningTextNight</color>
     <color name="textLinkColor">@color/nga_accent_primary</color>
     <color name="textNavNotSelected">@color/nav_not_selected_dark</color>
     <color name="textSecondaryLinkColor">@color/white50</color>
diff --git a/mapcache/src/main/res/values/color.xml b/mapcache/src/main/res/values/color.xml
index 89868b5b..79d02235 100644
--- a/mapcache/src/main/res/values/color.xml
+++ b/mapcache/src/main/res/values/color.xml
@@ -70,6 +70,8 @@
     <color name="nga_primary_bright_partial">#C4FFFFFF</color>
 
     <!-- Light mode colors -->
+    <color name="yellowWarningText">#FFC107</color>
+
 
 
     <!-- Dark mode colors -->
@@ -83,6 +85,8 @@
     <color name="darkIconTint">#7EFFFFFF</color>
     <color name="lightIconTint">#05FFFFFF</color>
     <color name="redTextNight">#954A37</color>
+    <color name="yellowWarningTextNight">#CFAE4A</color>
+
 
 
     <color name="nga_accent_muted_dark">#1E5659</color>
diff --git a/mapcache/src/main/res/values/colors.xml b/mapcache/src/main/res/values/colors.xml
index ce0e8aee..d0198464 100644
--- a/mapcache/src/main/res/values/colors.xml
+++ b/mapcache/src/main/res/values/colors.xml
@@ -23,6 +23,7 @@
 
     <color name="textPrimaryColor">@color/black87</color>
     <color name="textSecondaryColor">@color/black50</color>
+    <color name="textSecondaryError">@color/yellowWarningText</color>
     <color name="textLinkColor">@color/nga_primary_light</color>
     <color name="textSecondaryLinkColor">@color/nav_not_selected</color>
     <color name="textNavNotSelected">@color/nav_not_selected</color>
diff --git a/mapcache/src/main/res/values/styles.xml b/mapcache/src/main/res/values/styles.xml
index 4ed532c8..5af09988 100644
--- a/mapcache/src/main/res/values/styles.xml
+++ b/mapcache/src/main/res/values/styles.xml
@@ -191,6 +191,12 @@
         <item name="android:textColor">@color/textSecondaryColor</item>
         <item name="android:letterSpacing">0.0071</item>
     </style>
+    <style name="textAppearanceSubtitle2_light_heavy_warning" parent="@android:style/TextAppearance.Material.Subhead">
+        <item name="android:fontFamily">@font/roboto_medium</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/textSecondaryError</item>
+        <item name="android:letterSpacing">0.0071</item>
+    </style>
     <style name="textAppearanceSubtitle3_light_heavy" parent="@android:style/TextAppearance.Material.Subhead">
         <item name="android:fontFamily">@font/roboto_medium</item>
         <item name="android:textSize">14sp</item>