Merge pull request #64 from ngageoint/darkMode

Dark mode
ngageoint · Jul 21, 2023 · f94cbf9 · f94cbf9
2 parents 6d36f5b + e42e963
commit f94cbf9
Show file tree

Hide file tree

Showing 165 changed files with 24,818 additions and 895 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
         java-version: 16
         distribution: 'adopt'
     - name: mobsfscan
-      uses: MobSF/mobsfscan@0.1.2
+      uses: MobSF/mobsfscan@0.2.0
       with:
         args: '. --sarif --output results.sarif || true'
     - name: Upload mobsfscan report

diff --git a/MapCacheAndroid.sketch b/MapCacheAndroid.sketch
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript { 
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.7.10'
 
     repositories {
         google()
         mavenCentral()
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

diff --git a/get-pip2.py b/get-pip2.py
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Nov 15 09:06:01 MST 2019
+#Thu Jul 20 11:21:15 MDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/mapcache/build.gradle b/mapcache/build.gradle
@@ -15,8 +15,8 @@ android {
         resValue "string", "applicationId", applicationId
         minSdkVersion 28
         targetSdkVersion 31
-        versionCode 46
-        versionName '2.1.6'
+        versionCode 52
+        versionName '2.1.7'
         multiDexEnabled true
     }
     buildTypes {
@@ -50,19 +50,19 @@ task androidAppVersion {
 dependencies {
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     api 'androidx.appcompat:appcompat:1.3.0'
-    api 'com.google.android.material:material:1.0.0'
-    api 'androidx.preference:preference:1.1.1'
+    api 'com.google.android.material:material:1.6.0'
+    api 'androidx.preference:preference:1.2.0'
     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 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'
     api 'androidx.multidex:multidex:2.0.1'
     implementation 'com.google.code.gson:gson:2.8.7'
-    implementation 'androidx.exifinterface:exifinterface:1.3.3'
-    implementation 'com.google.android.gms:play-services-location:19.0.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
+    implementation 'com.google.android.gms:play-services-location:21.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
     implementation 'org.locationtech.jts:jts-core:1.18.2'
     testImplementation 'androidx.multidex:multidex:2.0.1'
     testImplementation 'junit:junit:4.13.1'

diff --git a/mapcache/release/output-metadata.json b/mapcache/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "mil.nga.mapcache",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 49,
+      "versionName": "2.1.7",
+      "outputFile": "mapcache-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
diff --git a/mapcache/src/main/AndroidManifest.xml b/mapcache/src/main/AndroidManifest.xml
@@ -94,29 +94,35 @@
 
         <activity
             android:name=".preferences.PreferencesActivity"
-            android:label="@string/title_activity_preferences">
+            android:label="@string/title_activity_preferences"
+            android:theme="@style/PreferenceStyle">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="mil.nga.mapcache.MainActivity" />
         </activity>
         <activity
             android:name=".preferences.AboutMapcacheActivity"
-            android:label="@string/title_activity_about_mapcache" />
+            android:label="@string/title_activity_about_mapcache"
+            android:theme="@style/PreferenceStyle"/>
         <activity
             android:name=".preferences.TileUrlActivity"
-            android:label="@string/title_activity_saved_tile_urls" />
+            android:label="@string/title_activity_saved_tile_urls"
+            android:theme="@style/PreferenceStyle"/>
         <activity
             android:name=".preferences.BasemapSettingsActivity"
-            android:label="BasemapSettingsActivity" />
+            android:label="BasemapSettingsActivity"
+            android:theme="@style/PreferenceStyle"/>
         <activity
             android:name=".preferences.PrivacyPolicyActivity"
-            android:label="@string/title_activity_privacy_policy" />
+            android:label="@string/title_activity_privacy_policy"
+            android:theme="@style/PreferenceStyle"/>
         <activity
             android:name=".preferences.DisclaimerActivity"
-            android:label="@string/title_activity_disclaimer" />
+            android:label="@string/title_activity_disclaimer"
+            android:theme="@style/PreferenceStyle"/>
         <activity
             android:name=".tutorial.TutorialActivity"
-            android:label="@string/title_activity_tutorial"></activity>
+            android:label="@string/title_activity_tutorial" />
         <activity
             android:name=".view.map.feature.FeatureViewActivity"
             android:label="@string/title_activity_feature_view" />