Merge pull request #446 from origami-team/v1.0.3-web

V1.0.3 web

android/app/build.gradle

@@ -6,7 +6,7 @@ android {
         applicationId "com.ifgi.geogami"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion 31
-        versionCode 13
+        versionCode 14
         versionName "1.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

android/app/src/main/AndroidManifest.xml

@@ -15,7 +15,8 @@
             android:name="com.ifgi.geogami.MainActivity"
             android:label="@string/title_activity_main"
             android:theme="@style/AppTheme.NoActionBarLaunch"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

android/app/src/main/assets/capacitor.config.json

@@ -4,9 +4,9 @@
   "bundledWebRuntime": false,
   "npmClient": "yarn",
   "webDir": "www",
+  "hideLogs": true,
   "server": {
     "iosScheme": "https",
     "androidScheme": "https"
-  },
-  "hideLogs": true
+  }
 }

android/app/src/main/res/drawable/launch_splash.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/splash"
+    android:scaleType="centerCrop"
+    />

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#FFFFFF</color>
+    <color name="ic_launcher_background">#ffffff</color>
 </resources>

android/app/src/main/res/values/strings.xml

@@ -3,5 +3,6 @@
     <string name="app_name">GeoGami</string>
     <string name="title_activity_main">GeoGami</string>
     <string name="package_name">com.ifgi.geogami</string>
+    <string name="fileprovider_authority">com.ifgi.geogami.fileprovider</string>
     <string name="custom_url_scheme">com.ifgi.geogami</string>
 </resources>

android/app/src/main/res/xml/file_paths.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
     <external-path name="my_images" path="." />
-    <cache-path name="my_cache_images" path="." />
 </paths>

capacitor.config.json

@@ -4,9 +4,9 @@
   "bundledWebRuntime": false,
   "npmClient": "yarn",
   "webDir": "www",
+  "hideLogs": true,
   "server": {
     "iosScheme": "https",
     "androidScheme": "https"
-  },
-  "hideLogs": true
+  }
 }

electron/capacitor.config.json

@@ -4,9 +4,9 @@
   "bundledWebRuntime": false,
   "npmClient": "yarn",
   "webDir": "www",
+  "hideLogs": true,
   "server": {
     "iosScheme": "https",
     "androidScheme": "https"
-  },
-  "hideLogs": true
+  }
 }

ios/App/App/capacitor.config.json

@@ -4,9 +4,9 @@
   "bundledWebRuntime": false,
   "npmClient": "yarn",
   "webDir": "www",
+  "hideLogs": true,
   "server": {
     "iosScheme": "https",
     "androidScheme": "https"
-  },
-  "hideLogs": true
+  }
 }

scripts/fixcordova7issue.js.js

@@ -5,7 +5,7 @@
 
 module.exports = function (ctx) {
 
-    console.log("Attempting To Modify serve-config.js....")
+    // console.log("Attempting To Modify serve-config.js....")
 
     // Reference Dependencies
     var fs = ctx.requireCordovaModule('fs'),
@@ -20,7 +20,7 @@ module.exports = function (ctx) {
         fs.stat(filePath, function (error, stat) {
 
             if (error) {
-                console.log(error);
+                // console.log(error);
                 return;
             }
 
@@ -42,15 +42,15 @@ module.exports = function (ctx) {
             // Loop Through The Lines and Modify the Line/Item if it contains The sourceFileString
             for (var i = dataArray.length - 1; i >= 0; i--) {
                 if (dataArray[i].indexOf(sourceFileString) !== -1) {
-                    console.log('Modifying line:' + dataArray[i]);
+                    // console.log('Modifying line:' + dataArray[i]);
                     dataArray[i] = targetFileString;
                     fileModifiedSuccessfully = true;
                 }
             }
 
             // If Nothing Was Found/Removed/Spliced, No Need To Overwrite.
             if (!fileModifiedSuccessfully) {
-                console.log("No Changes to File: " + filePath);
+                // console.log("No Changes to File: " + filePath);
                 return;
             }
 

src/app/app.component.ts

@@ -50,14 +50,14 @@ export class AppComponent {
   checkInternetConnection() {
     // watch network for a disconnection
     let disconnectSubscription = this.network.onDisconnect().subscribe(async () => {
-      //console.log('network was disconnected :-(');
+      //// console.log('network was disconnected :-(');
       this.utilService.setIsOnlineValue(false);   // set behaviour sub. false
       this.networkAlert = await this.utilService.showToastBtn("No connection", 'dark', null)   // show toast
       this.networkAlert.present();
     });
 
     let connectSubscription = this.network.onConnect().subscribe(() => {
-      //console.log('network connected!');
+      //// console.log('network connected!');
       this.utilService.setIsOnlineValue(true);   // set behaviour sub. true
       this.utilService.showToast("Back online", 'success', 3000)   // show toast
       // Remove notification when connection get back

src/app/components/feedback/feedback.component.ts

@@ -374,7 +374,7 @@ export class FeedbackComponent {
     }
 
     if (this.task.answer.type == AnswerType.DIRECTION) {
-      // console.log(this.Math.abs(directionBearing - compassHeading));
+      // // console.log(this.Math.abs(directionBearing - compassHeading));
       this.initFeedback(
         this.Math.abs(directionBearing - compassHeading) <=
           this.DIRECTION_TRESHOLD, 
@@ -525,7 +525,7 @@ export class FeedbackComponent {
         ) {
           const bounds = new mapboxgl.LngLatBounds();
           bounds.extend(options.clickPosition);
-          // console.log(this.lastKnownPosition.coords);
+          // // console.log(this.lastKnownPosition.coords);
           bounds.extend([
             this.lastKnownPosition.coords.longitude,
             this.lastKnownPosition.coords.latitude,
@@ -677,7 +677,7 @@ export class FeedbackComponent {
   }
 
   public showHint(options: any = undefined) {
-    // console.log(options);
+    // // console.log(options);
     if (this.task.answer.type == AnswerType.POSITION) {
       const waypoint = this.task.answer.position.geometry.coordinates;
       const distance = this.helperService.getDistanceFromLatLonInM(
@@ -718,7 +718,7 @@ export class FeedbackComponent {
       this.task.type != "theme-loc"
     ) {
       const center = centroid(this.task.question.geometry.features[0]);
-      // console.log(center);
+      // // console.log(center);
       const waypoint = options.clickPosition;
       const distance = this.helperService.getDistanceFromLatLonInM(
         waypoint[1],
@@ -742,7 +742,7 @@ export class FeedbackComponent {
       }
 
       const absClckDir = this.Math.abs(options.clickDirection - evalDirection)
-      // console.log(absClckDir);
+      // // console.log(absClckDir);
 
       this.feedback.hint = ""
 
@@ -754,7 +754,7 @@ export class FeedbackComponent {
         this.feedback.hint =
           this.task.answer?.hints?.[2] ?? this.translate.instant("Feedback.directionWrongHint");
       }
-      // console.log(this.feedback.hint);
+      // // console.log(this.feedback.hint);
       this.changeDetectorRef.detectChanges();
     }
 

src/app/components/popup/popup.component.ts

@@ -17,11 +17,11 @@ export class PopupComponent implements OnInit {
   constructor(public navCtrl: NavController) { }
 
   ngOnInit(): void {
-    //console.log("gameName: ", this.gameName)
+    //// console.log("gameName: ", this.gameName)
   }
 
   playGame(){
-    // console.log("play pressed: ", this.gameName)
+    // // console.log("play pressed: ", this.gameName)
     this.navCtrl.navigateForward(`play-game/game-detail/${this.gameID}`);
 
   }

src/app/mapControllers/layer-control.ts

@@ -114,7 +114,7 @@ export class LayerControl {
     try {
       this.map.removeControl(this.styleSwitcherControl);
     } catch (e) {
-      console.log(e);
+      // console.log(e);
     }
     if (this.compare != null) {
       this.compare.remove();

src/app/mapControllers/track-control.ts

@@ -108,7 +108,7 @@ export class TrackControl {
 
     // keep track permanent impl.
     addPermanentTrack(taskId, path = this.path){
-        // console.log("(track) P index:", taskId,"path: ",path)
+        // // console.log("(track) P index:", taskId,"path: ",path)
         this.map.addSource(`permanentTrack${taskId}`, { type: 'geojson', data: path });
         this.map.addLayer({
             id: `permanentTrack${taskId}`,
@@ -127,7 +127,7 @@ export class TrackControl {
 
     // keep track temporary impl.
     addTemporaryTrack(taskId, path = this.path){
-        // console.log("(track) T index:", taskId,"path: ",path)
+        // // console.log("(track) T index:", taskId,"path: ",path)
         this.map.addSource(`temporaryTrack${taskId}`, { type: 'geojson', data: path });
         this.map.addLayer({
             id: `temporaryTrack${taskId}`,
@@ -147,7 +147,7 @@ export class TrackControl {
     // remove track temporary impl.
     removeTemporaryTrack(taskId){
         if (this.map.getLayer(`temporaryTrack${taskId}`)) {
-            // console.log('removeTemporaryTrack/////(track): ', taskId)
+            // // console.log('removeTemporaryTrack/////(track): ', taskId)
             this.map.removeLayer(`temporaryTrack${taskId}`);
         }
     }

src/app/pages/analyze-game/analyze-game-list/analyze-game-list.page.ts

@@ -48,7 +48,7 @@ export class AnalyzeGameListPage implements OnInit {
       directory: FilesystemDirectory.Documents,
       encoding: FilesystemEncoding.UTF8
     });
-    console.log(contents);
+    // console.log(contents);
 
     this.http.post(`${environment.apiURL}/track`, JSON.parse(contents.data), { observe: 'response' })
       .subscribe(response => alert(response.status + ' ' + response.statusText));

src/app/pages/create-game/create-free-task-modal/create-free-task-modal.component.ts

@@ -71,7 +71,7 @@ export class CreateFreeTaskModalComponent implements OnInit {
         showMarker: true,
       };
 
-      console.log(this.task);
+      // console.log(this.task);
 
       // todo --- check it out
       // this.settingsChange();

src/app/pages/create-game/create-game-list/create-game-list.page.ts

@@ -62,7 +62,7 @@ export class CreateGameListPage implements OnInit {
       }
 
     });
-    // console.log("this.gameFactory.game: ", this.gameFactory.game);
+    // // console.log("this.gameFactory.game: ", this.gameFactory.game);
   }
 
   ionViewWillEnter() {
@@ -86,7 +86,7 @@ export class CreateGameListPage implements OnInit {
     // map.addControl(geolocate);
     // // let watch = this.geolocation.watchPosition();
     // // watch.subscribe((data) => {
-    // //   console.log(data)
+    // //   // console.log(data)
     // // });
     // // Add geolocate control to the map.
     // map.on("load", () => {
@@ -95,7 +95,7 @@ export class CreateGameListPage implements OnInit {
   }
 
   async presentTaskModal(type: string = "nav", task: any = null, isVirtualWorld: boolean = this.isVirtualWorld) {
-    // console.log(task);
+    // // console.log(task);
 
     const modal: HTMLIonModalElement = await this.modalController.create({
       component:
@@ -110,7 +110,7 @@ export class CreateGameListPage implements OnInit {
 
     await modal.present();
     const { data } = await modal.onWillDismiss();
-    console.log(data);
+    // console.log(data);
     if (data != undefined) {
       if (task != null) {
         if (!task._id) {
@@ -128,32 +128,32 @@ export class CreateGameListPage implements OnInit {
   addTaskToGame(task) {
     this.game = this.gameFactory.addTask(task);
     // this.gameFactory.getGame().then(game => {
-    //   console.log(game)
+    //   // console.log(game)
     //   this.game = game
     // });
 
-    console.log(this.game.tasks);
+    // console.log(this.game.tasks);
   }
 
   deleteTask(taskID) {
-    console.log("deleting", taskID);
+    // console.log("deleting", taskID);
     this.game = this.gameFactory.removeTask(taskID);
   }
 
   updateTask(taskID, task) {
-    console.log("updating", taskID);
+    // console.log("updating", taskID);
     this.game = this.gameFactory.updateTask(taskID, task);
-    console.log(this.game);
+    // console.log(this.game);
   }
 
   doReorder(ev: any) {
     // The `from` and `to` properties contain the index of the item
     // when the drag started and ended, respectively
-    console.log("Dragged from index", ev.detail.from, "to", ev.detail.to);
+    // console.log("Dragged from index", ev.detail.from, "to", ev.detail.to);
 
     // Before complete is called with the items they will remain in the
     // order before the drag
-    console.log("Before complete", this.game.tasks);
+    // console.log("Before complete", this.game.tasks);
 
     // Finish the reorder and position the item in the DOM based on
     // where the gesture ended. Update the items variable to the
@@ -162,20 +162,20 @@ export class CreateGameListPage implements OnInit {
 
     this.gameFactory.applyReorder(this.game.tasks);
 
-    console.log(this.game.tasks);
+    // console.log(this.game.tasks);
 
     ev.detail.complete(true);
 
     // After complete is called the items will be in the new order
-    console.log("After complete", this.game.tasks);
+    // console.log("After complete", this.game.tasks);
   }
 
   toggleReorder() {
     this.reorder = !this.reorder;
   }
 
   navigateToOverview() {
-    //console.log("navigate");
+    //// console.log("navigate");
 
     let bundle = {
       isVRWorld: false,