From 7a9ccca4dc4c47e88aff7349d371ed458f357d1b Mon Sep 17 00:00:00 2001 From: Aris Panagiotides Date: Thu, 11 Mar 2021 18:43:52 +0200 Subject: [PATCH 1/8] Added script to read API key from local.properties --- app/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 117433c..36165de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,10 @@ plugins { id 'kotlin-android' } +Properties properties = new Properties() +properties.load(project.rootProject.file('local.properties').newDataInputStream()) +def MAPS_API_KEY = properties.getProperty('google.map.key') + android { compileSdkVersion 30 buildToolsVersion "30.0.3" From 6f4261a5b17d31cd2606f76954d442a7bd474e72 Mon Sep 17 00:00:00 2001 From: Aris Panagiotides Date: Thu, 11 Mar 2021 18:46:23 +0200 Subject: [PATCH 2/8] Added meta-data tag for Google geolocation API --- app/src/main/AndroidManifest.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a8494ef..a973bf8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,9 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.ProjectCompass"> + From 0600d779ddfa4dbf3626d6034c1afc03b32fd6d2 Mon Sep 17 00:00:00 2001 From: Aris Panagiotides Date: Thu, 11 Mar 2021 20:37:19 +0200 Subject: [PATCH 3/8] Updated to include setup instructions for Google API --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a1ad01a..2631675 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,8 @@ The user interface will provide an overview of the user current route with the h ## Setup In order to preview and develop the application, Android Studio will be used. -To load the project, start by cloning the repository in your local machine. -*Note that Android Studio projects, usually reside in C:/Users//AndroidStudioProjects/ directory*. -Open Android Studio then go to Files -> Open, navigate to the project direcotry and hit OK. +To load the project, start by cloning the repository in your local machine. Open Android Studio then go to Files -> Open, navigate to the project direcotry and hit OK.
+*Note that Android Studio projects, usually reside in* `C:/Users/username/AndroidStudioProjects/`.
+In order to get the google API to work you have to include the key in your *local.properties* file. +Since this is a local configuration file generated by Android Studio, you will have to manually add the line `google.map.key = ` in its contents. From a72855958ee81e455229fba8faf53f1dc7ab4786 Mon Sep 17 00:00:00 2001 From: Aris Panagiotides Date: Fri, 12 Mar 2021 11:28:14 +0200 Subject: [PATCH 4/8] Removed MAPS_API_KEY placeholder. Now the value is correctly passed. --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a973bf8..4d6b20b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,7 @@ android:theme="@style/Theme.ProjectCompass"> + android:value="MAPS_API_KEY" /> From 23d6aa115db7d6950b7ba2ba1022ca337d8b1998 Mon Sep 17 00:00:00 2001 From: Aris Panagiotides Date: Fri, 12 Mar 2021 12:17:33 +0200 Subject: [PATCH 5/8] Updated Description and Setup instructions --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2631675..d71c06a 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ Its development is part of the March-April 2021 Software Development internship ## Android Application Description The role of this application is to provide end users with an intuitive interface which allows them to log their routes. -The app is receiving GPS coordinates at a given time interval which in turn are filtered using the Kalman Algorithm in order to improve accuracy. +The app is receiving GPS coordinates at a given time interval. They are then passed to a FaaS implementation of the Kalman filter in order to improve accuracy. The user interface will provide an overview of the user current route with the help of Google Maps API. ## Setup -In order to preview and develop the application, Android Studio will be used. -To load the project, start by cloning the repository in your local machine. Open Android Studio then go to Files -> Open, navigate to the project direcotry and hit OK.
+In order to preview and develop the application, we 'll be using Android Studio. +To load the project, start by going to `File -> New -> Project from Version Control`. The *Get from Version Control* window pops up. Make sure to log in to your GitHub account from the *GitHub* tab. Then, in the *Repository URL* tab, select Git for Version control. Paste the repository URL and specify the directory in which the project will reside. Finally hit *Clone*.
*Note that Android Studio projects, usually reside in* `C:/Users/username/AndroidStudioProjects/`.
In order to get the google API to work you have to include the key in your *local.properties* file. From 5aec3212e193691f4be664832985b49db350c44d Mon Sep 17 00:00:00 2001 From: Aris Panagiotides Date: Mon, 29 Mar 2021 18:30:39 +0300 Subject: [PATCH 6/8] Updated Description and Setup instructions --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d71c06a..c3c50c3 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,11 @@ ## A few words on Project Compass Compass is a location monitoring platform with GPS reading optimisation capabilities. -Its development is part of the March-April 2021 Software Development internship in [Terracom SA](www.terracom.gr). +Its development is part of the March-April 2021 Software Development internship in [Terracom SA](https://www.terracom.gr/). ## Android Application Description -The role of this application is to provide end users with an intuitive interface which allows them to log their routes. -The app is receiving GPS coordinates at a given time interval. They are then passed to a FaaS implementation of the Kalman filter in order to improve accuracy. -The user interface will provide an overview of the user current route with the help of Google Maps API. +The role of this application is to provide end users with an intuitive interface for logging their routes. +The app is receiving GPS coordinates at a given time interval. They are in turn stored in a local DB and given an Internet connection, they are published to a remote server via RabbitMQ Queues implementing the AMQ Protocol. These coordinates are then passed to a FaaS implementation of the Kalman filter in order to improve accuracy. The user interface will provide an overview of user's current route with the help of Google Maps API. ## Setup In order to preview and develop the application, we 'll be using Android Studio. @@ -15,4 +14,6 @@ To load the project, start by going to `File -> New -> Project from Version Cont *Note that Android Studio projects, usually reside in* `C:/Users/username/AndroidStudioProjects/`.
In order to get the google API to work you have to include the key in your *local.properties* file. -Since this is a local configuration file generated by Android Studio, you will have to manually add the line `google.map.key = ` in its contents. +Since this is a local configuration file generated by Android Studio, you will have to manually add the line `google.map.key = ` in its contents.
+ +Make sure that before you build and run the project, your Gradle file is in sync. Simply go to `File -> Sync Project with Gradle Files`. From 661109b357e2b0b246d47986a21e5457b830b3b4 Mon Sep 17 00:00:00 2001 From: vanessatsinoudi <43861489+vanessatsinoudi@users.noreply.github.com> Date: Tue, 6 Apr 2021 13:54:09 +0300 Subject: [PATCH 7/8] Setup Map --- .idea/.name | 2 +- .idea/gradle.xml | 1 + .idea/vcs.xml | 6 + README.md | 19 -- app/build.gradle | 30 +- app/mipmap-hdpi/ic_user_location.png | Bin 0 -> 855 bytes app/mipmap-mdpi/ic_user_location.png | Bin 0 -> 654 bytes app/mipmap-xhdpi/ic_user_location.png | Bin 0 -> 1370 bytes app/mipmap-xxhdpi/ic_user_location.png | Bin 0 -> 2468 bytes app/mipmap-xxxhdpi/ic_user_location.png | Bin 0 -> 4009 bytes .../projectcompass/ExampleInstrumentedTest.kt | 24 -- app/src/main/AndroidManifest.xml | 26 +- app/src/main/ic_launcher-playstore.png | Bin 0 -> 53413 bytes .../example/projectcompass/MainActivity.kt | 11 - .../example/projectcompass/MapsActivity.kt | 256 ++++++++++++++++++ .../drawable-v24/ic_launcher_foreground.xml | 30 -- app/src/main/res/drawable/icons8.xml | 4 + app/src/main/res/layout/activity_main.xml | 18 -- app/src/main/res/layout/activity_maps.xml | 40 +++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 4 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3593 -> 3482 bytes .../mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 6273 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 5339 -> 5646 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2636 -> 2267 bytes .../mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 3898 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 3388 -> 3424 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4926 -> 4933 bytes .../mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 8838 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 7472 -> 8051 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7909 -> 7771 bytes .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 15142 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 11873 -> 12873 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 10652 -> 10961 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 22940 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 16570 -> 18738 bytes app/src/main/res/values-night/themes.xml | 16 -- app/src/main/res/values/google_maps_api.xml | 24 ++ .../res/values/ic_launcher_background.xml | 4 + app/src/main/res/values/strings.xml | 1 + .../release/res/values/google_maps_api.xml | 20 ++ .../example/projectcompass/ExampleUnitTest.kt | 17 -- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- 44 files changed, 403 insertions(+), 158 deletions(-) create mode 100644 .idea/vcs.xml create mode 100644 app/mipmap-hdpi/ic_user_location.png create mode 100644 app/mipmap-mdpi/ic_user_location.png create mode 100644 app/mipmap-xhdpi/ic_user_location.png create mode 100644 app/mipmap-xxhdpi/ic_user_location.png create mode 100644 app/mipmap-xxxhdpi/ic_user_location.png delete mode 100644 app/src/androidTest/java/com/example/projectcompass/ExampleInstrumentedTest.kt create mode 100644 app/src/main/ic_launcher-playstore.png delete mode 100644 app/src/main/java/com/example/projectcompass/MainActivity.kt create mode 100644 app/src/main/java/com/example/projectcompass/MapsActivity.kt delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/icons8.xml delete mode 100644 app/src/main/res/layout/activity_main.xml create mode 100644 app/src/main/res/layout/activity_maps.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png delete mode 100644 app/src/main/res/values-night/themes.xml create mode 100644 app/src/main/res/values/google_maps_api.xml create mode 100644 app/src/main/res/values/ic_launcher_background.xml create mode 100644 app/src/release/res/values/google_maps_api.xml delete mode 100644 app/src/test/java/com/example/projectcompass/ExampleUnitTest.kt diff --git a/.idea/.name b/.idea/.name index 2cdd8b9..4bf068f 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -Project Compass \ No newline at end of file +Parks Guide \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 23a89bb..b617266 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,6 +5,7 @@