Merge pull request #1071 from digidem/release/v5.6.0

Release v5.6.0

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [5.6.0](https://github.com/digidem/mapeo-mobile/compare/v5.5.0...v5.6.0) (2023-01-16)
+
+### Features
+
+- Re-introduce improved maps management experimental feature ([93a0753](https://github.com/digidem/mapeo-mobile/commit/93a0753403b729763fc0a8aeafeca6e66827d615), [1649e3f](https://github.com/digidem/mapeo-mobile/commit/1649e3f50355d8325a7ea9115273d99572e05d4f), [7ee2863](https://github.com/digidem/mapeo-mobile/commit/7ee2863508c3b6d09aa7f85f7f3940fb990269b1))
+
 ## [5.5.0](https://github.com/digidem/mapeo-mobile/compare/v5.4.7...v5.5.0) (2022-11-17)
 
 ### Features

android/app/src/main/java/com/mapeo/AppInfoPackage.java

@@ -21,6 +21,7 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
     List<NativeModule> modules = new ArrayList<>();
 
     modules.add(new AppInfoModule(reactContext));
+    modules.add(new FlagSecureModule(reactContext));
 
     return modules;
   }

android/app/src/main/java/com/mapeo/FlagSecureModule.java

@@ -0,0 +1,54 @@
+// Based off https://github.com/kristiansorens/react-native-flag-secure-android 
+package com.mapeo;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import android.app.Activity;
+import android.view.WindowManager;
+
+public class FlagSecureModule extends ReactContextBaseJavaModule {
+    FlagSecureModule(ReactApplicationContext context) {
+        super(context);
+    }
+
+    @Override
+    public String getName() {
+        return "FlagSecureModule";
+    }
+
+    @ReactMethod
+    public void activate() {
+        final Activity activity = getCurrentActivity();
+
+        if (activity != null) {
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() 
+                {
+                    activity.getWindow().setFlags(
+                        WindowManager.LayoutParams.FLAG_SECURE,
+                        WindowManager.LayoutParams.FLAG_SECURE
+                    );
+                }
+            });
+        }
+
+
+    }
+
+    @ReactMethod
+    public void deactivate() {
+        final Activity activity = getCurrentActivity();
+
+        if (activity != null) {
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+                }
+            });
+        }
+    }
+}

jest.config.js

@@ -15,11 +15,15 @@ const modulesToTransform = [
   "expo-document-picker",
   "@unimodules",
   "@react-native-picker/picker",
+  "p-defer",
 ];
 
 module.exports = {
   preset: "react-native",
-  setupFilesAfterEnv: ["@testing-library/jest-native/extend-expect"],
+  setupFilesAfterEnv: [
+    "@testing-library/jest-native/extend-expect",
+    "@react-native-mapbox-gl/maps/setup-jest",
+  ],
   testPathIgnorePatterns: ["/node_modules/", "/e2e/", "/src/backend/"],
   modulePathIgnorePatterns: [
     "/nodejs-assets/",

messages/de.json

@@ -573,6 +573,10 @@
     "description": "Title of message when the server has not responded for 10 seconds",
     "message": "Etwas stimmt nicht mit der Mapeo Datenbank"
   },
+  "screens.Settings.MapSettings.importErrorTitle": {
+    "description": "Title for import error in bottom sheet content",
+    "message": "Fehler beim Importieren"
+  },
   "screens.Settings.ProjectConfig.LeavePracticeMode.leavePracticeMode": {
     "message": "Bereit, den Übungsmodus zu verlassen?"
   },

messages/en.json

@@ -31,6 +31,14 @@
     "description": "Title of dialog shown to the user when Mapeo is updated",
     "message": "Mapeo Updated ✅"
   },
+  "hooks.useMapStyles.defaultMapName": {
+    "description": "The name of the default background map",
+    "message": "Default"
+  },
+  "hooks.useMapStyles.offlineMapName": {
+    "description": "The name of the legacy offline background map",
+    "message": "Offline Map"
+  },
   "screens.AboutMapeo.androidBuild": {
     "description": "Label for Android build number",
     "message": "Android build number"
@@ -183,6 +191,9 @@
   "screens.AppPasscode.NewPasscode.InputPasscodeScreen.subTitleSet": {
     "message": "This passcode will be required to open the Mapeo App"
   },
+  "screens.AppPasscode.NewPasscode.InputPasscodeScreen.title": {
+    "message": "Set Passcode"
+  },
   "screens.AppPasscode.NewPasscode.Splash.continue": {
     "message": "Continue"
   },
@@ -207,6 +218,9 @@
   "screens.AppPasscode.TurnOffPasscode.description": {
     "message": "App Passcode adds an additional layer of security by requiring that you enter a passcode in order to open the Mapeo app."
   },
+  "screens.AppPasscode.TurnOffPasscode.title": {
+    "message": "App Passcode"
+  },
   "screens.AppPasscode.TurnOffPasscode.turnOff": {
     "message": "Turn Off"
   },
@@ -811,6 +825,10 @@
   "screens.Settings.Experiments.BGMaps.goTo": {
     "message": "Try it now"
   },
+  "screens.Settings.Experiments.BGMaps.shortLink": {
+    "description": "Used as a link to the gitbooks documentation for adding background maps",
+    "message": "here."
+  },
   "screens.Settings.Experiments.BGMaps.useBGMap": {
     "message": "Use Background Maps (Feature)"
   },
@@ -931,6 +949,12 @@
   "screens.Settings.MapSettings.DeleteMapBottomSheet.deleteMapWarning": {
     "message": "This area will no longer be available offline. Cannot be undone."
   },
+  "screens.Settings.MapSettings.addBGMap": {
+    "message": "Add Background Map"
+  },
+  "screens.Settings.MapSettings.backgroundMapTitle": {
+    "message": "Background Maps"
+  },
   "screens.Settings.MapSettings.backgroundMaps": {
     "message": "Background Maps"
   },
@@ -941,20 +965,36 @@
     "description": "Confirm delete map modal button",
     "message": "Yes, Delete"
   },
+  "screens.Settings.MapSettings.defaultMap": {
+    "description": "Name of default map",
+    "message": "Default Map"
+  },
   "screens.Settings.MapSettings.deleteMapTitle": {
     "description": "Title for the delete map modal",
     "message": "Delete Map"
   },
-  "screens.Settings.MapSettings.importError": {
-    "description": "Error importing map warning",
-    "message": "Error Importing Map, please try a different file."
+  "screens.Settings.MapSettings.fileErrorDescription": {
+    "description": "Description for file error in bottom sheet content",
+    "message": "Error importing file, please try a different file."
+  },
+  "screens.Settings.MapSettings.importErrorDescription": {
+    "description": "Description for import error in bottom sheet content",
+    "message": "Unable to import {styleNames}. Re-import the map {fileCount, plural, one {file} other {files}} to try again."
+  },
+  "screens.Settings.MapSettings.importErrorTitle": {
+    "description": "Title for import error in bottom sheet content",
+    "message": "Import Error"
   },
   "screens.Settings.MapSettings.importFromFile": {
     "message": "Import from File"
   },
   "screens.Settings.MapSettings.mapSettings": {
     "message": "Map Settings"
   },
+  "screens.Settings.MapSettings.processingFile": {
+    "description": "Description for when a file is being processed for import",
+    "message": "Processing file..."
+  },
   "screens.Settings.MapSettings.subtitle": {
     "message": "Add, remove, and view map details"
   },
@@ -1316,10 +1356,22 @@
   "sharedComponents.BGMapCard.currentMap": {
     "message": "Current Map"
   },
+  "sharedComponents.BGMapCard.errorOccurred": {
+    "description": "Message describing that error occurred for map import",
+    "message": "Error occurred"
+  },
+  "sharedComponents.BGMapCard.importInProgress": {
+    "description": "Progress bar message about the import being in progress",
+    "message": "Import in progress…"
+  },
   "sharedComponents.BGMapCard.unamedStyle": {
     "description": "The name for the default map style",
     "message": "Unnamed Style"
   },
+  "sharedComponents.BGMapCard.waitingForImport": {
+    "description": "Progress bar message indicating that import is waiting to start",
+    "message": "Waiting for import…"
+  },
   "sharedComponents.BGMapSelector.close": {
     "message": "Close"
   },