Merge branch 'develop' of https://github.com/ngageoint/geopackage-map…

…cache-android into develop
ngageoint · Oct 17, 2023 · 1fcf1c3 · 1fcf1c3
2 parents 908bc5a + aaee439
commit 1fcf1c3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 1 deletion.
diff --git 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'

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>