Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master

Conflicts: ios/Runner.xcodeproj/project.pbxproj lib/core/service/AuthenticatedUserObject.dart lib/pages/landing/landing_page.dart lib/pages/login/login.dart lib/widgets/drawer/app_drawer_widget.dart
4 years ago · 6d7cb1b970
parent a45216b902 f13d21c5b1
commit 6d7cb1b970
25 changed files with 873 additions and 185 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -86,7 +86,8 @@ dependencies {
    // Native Dependency
    implementation "org.jetbrains.anko:anko-commons:0.10.4"
    implementation 'com.github.kittinunf.fuel:fuel:2.3.0' //for JVM
-    implementation 'com.github.kittinunf.fuel:fuel-android:2.3.0' //for Android
+    implementation 'com.github.kittinunf.fuel:fuel-android:2.3.0'
+    implementation 'com.google.android.gms:play-services-location:17.1.0'//for Android


 }
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -63,8 +63,6 @@
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
-        <!-- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

        <receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">
            <intent-filter>
@ -74,20 +72,20 @@
        </receiver>
        <receiver android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />

-        <receiver android:name="io.flutter.plugins.geofencing.GeofencingBroadcastReceiver"
-            android:enabled="true" android:exported="true"/>
-        <service android:name="io.flutter.plugins.geofencing.GeofencingService"
-            android:permission="android.permission.BIND_JOB_SERVICE" android:exported="true"/>
+        <!--  Geofencing  -->
+        <receiver android:name=".geofence.GeofenceBroadcastReceiver" android:enabled="true" android:exported="true" />
+        <service android:name=".geofence.GeofenceTransitionsJobIntentService" android:exported="true" android:permission="android.permission.BIND_JOB_SERVICE" />

+        <meta-data android:name="com.google.android.geo.API_KEY"
+            android:value="AIzaSyCmevVlr2Bh-c8W1VUzo8gt8JRY7n5PANw"/>


+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
        <meta-data
            android:name="flutterEmbedding"
            android:value="2" />

-        <meta-data android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyCmevVlr2Bh-c8W1VUzo8gt8JRY7n5PANw"/>
-
    </application>

    <uses-permission android:name="android.permission.INTERNET" />
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeoZoneModel.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeoZoneModel.kt
@ -0,0 +1,56 @@
+package com.cloud.diplomaticquarterapp.geofence
+
+import com.google.android.gms.location.Geofence
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+
+class GeoZoneModel {
+    var GEOF_ID:Int = 0
+    var Radius:Int = 0
+    var Type:Int = 0
+    var ProjectID:Int = 0
+
+    var Description:String? = null
+    var DescriptionN:String? = null
+    var Latitude:String? = null
+    var Longitude:String? = null
+    var ImageURL:String? = null
+    var IsCity:String? = null
+
+    fun identifier():String{
+        return "$GEOF_ID" + "_hmg"
+    }
+
+    fun message():String{
+        return Description ?: "nil"
+    }
+
+    fun listFrom(jsonString: String) : List<GeoZoneModel>{
+        val type =  object : TypeToken<List<GeoZoneModel?>?>() {}.getType()
+        return Gson().fromJson(jsonString, type)
+    }
+
+    fun toGeofence() : Geofence?{
+        if (!Latitude.isNullOrEmpty() && !Longitude.isNullOrEmpty() && Radius > 50) {
+            val lat = Latitude!!.trim().toDoubleOrNull()
+            val long = Longitude!!.trim().toDoubleOrNull()
+            val rad = Radius.toFloat()
+            if(lat != null && long != null){
+
+                return Geofence.Builder()
+                        .setRequestId(identifier())
+                        .setCircularRegion(
+                                lat,
+                                long,
+                                rad
+                        )
+                        .setTransitionTypes(GeofenceTransition.ENTER_EXIT.value)
+//                        .setNotificationResponsiveness(0)
+                        .setExpirationDuration(Geofence.NEVER_EXPIRE)
+                        .build()
+            }
+        }
+        return null
+    }
+
+}
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceBroadcastReceiver.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceBroadcastReceiver.kt
@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2018 Razeware LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+ * distribute, sublicense, create a derivative work, and/or sell copies of the
+ * Software in any work that is designed, intended, or marketed for pedagogical or
+ * instructional purposes related to programming, coding, application development,
+ * or information technology.  Permission for such use, copying, modification,
+ * merger, publication, distribution, sublicensing, creation of derivative works,
+ * or sale is expressly withheld.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.cloud.diplomaticquarterapp.geofence
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+
+class GeofenceBroadcastReceiver : BroadcastReceiver() {
+  override fun onReceive(context: Context, intent: Intent) {
+    GeofenceTransitionsJobIntentService.enqueueWork(context, intent)
+  }
+}
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceErrorMessages.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceErrorMessages.kt
@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2018 Razeware LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+ * distribute, sublicense, create a derivative work, and/or sell copies of the
+ * Software in any work that is designed, intended, or marketed for pedagogical or
+ * instructional purposes related to programming, coding, application development,
+ * or information technology.  Permission for such use, copying, modification,
+ * merger, publication, distribution, sublicensing, creation of derivative works,
+ * or sale is expressly withheld.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.cloud.diplomaticquarterapp.geofence
+
+import android.content.Context
+import com.cloud.diplomaticquarterapp.R
+import com.google.android.gms.common.api.ApiException
+import com.google.android.gms.location.GeofenceStatusCodes
+
+object GeofenceErrorMessages {
+  fun getErrorString(context: Context, e: Exception): String {
+    return if (e is ApiException) {
+      getErrorString(context, e.statusCode)
+    } else {
+      context.resources.getString(R.string.geofence_unknown_error)
+    }
+  }
+
+  fun getErrorString(context: Context, errorCode: Int): String {
+    val resources = context.resources
+    return when (errorCode) {
+      GeofenceStatusCodes.GEOFENCE_NOT_AVAILABLE ->
+        resources.getString(R.string.geofence_not_available)
+
+      GeofenceStatusCodes.GEOFENCE_TOO_MANY_GEOFENCES ->
+        resources.getString(R.string.geofence_too_many_geofences)
+
+      GeofenceStatusCodes.GEOFENCE_TOO_MANY_PENDING_INTENTS ->
+        resources.getString(R.string.geofence_too_many_pending_intents)
+
+      else -> resources.getString(R.string.geofence_unknown_error)
+    }
+  }
+}
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceTransitionsJobIntentService.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceTransitionsJobIntentService.kt
@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2018 Razeware LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Notwithstanding the foregoing, you may not use, copy, modify, merge, publish,
+ * distribute, sublicense, create a derivative work, and/or sell copies of the
+ * Software in any work that is designed, intended, or marketed for pedagogical or
+ * instructional purposes related to programming, coding, application development,
+ * or information technology.  Permission for such use, copying, modification,
+ * merger, publication, distribution, sublicensing, creation of derivative works,
+ * or sale is expressly withheld.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+package com.cloud.diplomaticquarterapp.geofence
+
+import android.content.Context
+import android.content.Intent
+import android.location.Location
+import android.util.Log
+import androidx.core.app.JobIntentService
+import com.cloud.diplomaticquarterapp.utils.API
+import com.cloud.diplomaticquarterapp.utils.httpPost
+import com.cloud.diplomaticquarterapp.utils.sendNotification
+import com.github.kittinunf.fuel.core.extensions.jsonBody
+import com.github.kittinunf.fuel.core.isSuccessful
+import com.github.kittinunf.fuel.httpPost
+import com.google.android.gms.location.Geofence
+import com.google.android.gms.location.GeofencingEvent
+import com.google.gson.Gson
+
+class GeofenceTransitionsJobIntentService : JobIntentService() {
+
+  companion object {
+    private const val LOG_TAG = "GeoTrIntentService"
+
+    private const val JOB_ID = 573
+
+    fun enqueueWork(context: Context, intent: Intent) {
+      enqueueWork(
+          context,
+          GeofenceTransitionsJobIntentService::class.java, JOB_ID,
+          intent)
+    }
+  }
+
+  override fun onHandleWork(intent: Intent) {
+    val geofencingEvent = GeofencingEvent.fromIntent(intent)
+    if (geofencingEvent.hasError()) {
+      val errorMessage = GeofenceErrorMessages.getErrorString(this, geofencingEvent.errorCode)
+      Log.e(LOG_TAG, errorMessage)
+      return
+    }
+
+    if (geofencingEvent.geofenceTransition == Geofence.GEOFENCE_TRANSITION_ENTER || geofencingEvent.geofenceTransition == Geofence.GEOFENCE_TRANSITION_EXIT) {
+      handleEvent(geofencingEvent.triggeringGeofences,geofencingEvent.triggeringLocation, GeofenceTransition.fromInt(geofencingEvent.geofenceTransition));
+    }
+  }
+
+  private fun handleEvent(triggerGeofences: List<Geofence>, location:Location,  transition:GeofenceTransition) {
+    val hmg =  HMG_Geofence.shared(this)
+    hmg.getPatientID()?.let { patientId ->
+
+      hmg.getActiveGeofences({ activeGeofences ->
+
+        triggerGeofences.forEach { geofence ->
+          // Extract PointID from 'geofence.requestId' and find from active geofences
+          val pointID = activeGeofences.firstOrNull {it == geofence.requestId}?.split('_')?.first()
+          if(!pointID.isNullOrEmpty() && pointID.toIntOrNull() != null){
+
+            val body = mapOf(
+                    "PointsID" to pointID.toIntOrNull(),
+                    "GeoType" to transition.value,
+                    "PatientID" to patientId
+            )
+
+            httpPost<Map<String,Any>>(API.LOG_GEOFENCE, body, { response ->
+              sendNotification(this, transition.named(), geofence.requestId, "Notified to server.😎")
+            },{ exception ->
+              sendNotification(this, transition.named(), geofence.requestId, "Failed to notify server.😔")
+            })
+
+          }
+        }
+
+      },null)
+    }
+  }
+}
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofencingRebootBroadcastReceiver.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofencingRebootBroadcastReceiver.kt
@ -0,0 +1,21 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.geofencing
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
+
+class GeofencingRebootBroadcastReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action.equals("android.intent.action.BOOT_COMPLETED")) {
+            HMG_Geofence.shared(context).unRegisterAll { status, exception ->
+                HMG_Geofence.shared(context).re
+            }
+        }
+    }
+}
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/HMG_Geofence.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/HMG_Geofence.kt
@ -0,0 +1,155 @@
+package com.cloud.diplomaticquarterapp.geofence
+
+import android.Manifest
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.content.pm.PackageManager
+import androidx.core.content.ContextCompat
+import com.google.android.gms.location.Geofence
+import com.google.android.gms.location.GeofencingClient
+import com.google.android.gms.location.GeofencingRequest
+import com.google.android.gms.location.LocationServices
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+
+enum class GeofenceTransition(val value: Int) {
+    ENTER(1),
+    EXIT(2),
+    ENTER_EXIT((ENTER.value or EXIT.value)),
+    DWELL(4);
+
+    companion object {
+        fun fromInt(value: Int) = GeofenceTransition.values().first { it.value == value }
+    }
+
+    fun named():String{
+        if (value == 1)return "Enter"
+        if (value == 2)return "Exit"
+        if (value == (ENTER.value or EXIT.value))return "Enter or Exit"
+        if (value == 4)return "dWell"
+        return "unknown"
+    }
+}
+
+const val PREFS_STORAGE = "FlutterSharedPreferences"
+const val PREF_KEY_SUCCESS = "HMG_GEOFENCE_SUCCESS"
+const val PREF_KEY_FAILED = "HMG_GEOFENCE_FAILED"
+
+class HMG_Geofence {
+    // https://developer.android.com/training/location/geofencing#java
+
+    private lateinit var context: Context
+    private lateinit var preferences:SharedPreferences
+    private val gson = Gson()
+
+    private lateinit var geofencingClient:GeofencingClient
+    private val geofencePendingIntent: PendingIntent by lazy {
+        val intent = Intent(context, GeofenceBroadcastReceiver::class.java)
+        PendingIntent.getBroadcast(
+                context,
+                0,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT)
+    }
+
+    companion object{
+
+        var instance: HMG_Geofence? = null
+        fun shared(context: Context) : HMG_Geofence {
+            if (instance ==  null) {
+                instance = HMG_Geofence()
+                instance?.context = context
+                instance?.geofencingClient = LocationServices.getGeofencingClient(context)
+                instance?.preferences = context.getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE)
+            }
+            return  instance!!
+        }
+    }
+
+    fun register(geoZones: List<GeoZoneModel>){
+
+        fun buildGeofencingRequest(geofences: List<Geofence>): GeofencingRequest {
+            return GeofencingRequest.Builder()
+                    .setInitialTrigger(0)
+                    .addGeofences(geofences)
+                    .build()
+        }
+
+        getActiveGeofences({ active ->
+
+            val geofences = mutableListOf<Geofence>()
+            geoZones.forEach {
+                it.toGeofence()?.let {  geof ->
+                    if(!active.contains(geof.requestId)){ // if not already registered then register
+                        geofences.add(geof)
+                    }
+                }
+            }
+
+            if (checkPermission() && geofences.isNotEmpty()) {
+                geofencingClient
+                        .addGeofences(buildGeofencingRequest(geofences), geofencePendingIntent)
+                        .addOnSuccessListener {
+                            saveGeofenceResults(geofences.map { it.requestId }, listOf())
+                        }
+                        .addOnFailureListener {
+                            print(it.localizedMessage)
+                        }
+            }
+        },null)
+    }
+
+    fun unRegisterAll(completion: (status: Boolean, exception:Exception?) -> Unit){
+        getActiveGeofences({ success ->
+            geofencingClient
+                    .removeGeofences(success)
+                    .addOnSuccessListener {
+                        completion(true, null)
+                    }
+                    .addOnFailureListener {
+                        completion(false, it)
+                    }
+        }, { failed ->
+            // Nothing to do with failed geofences.
+        })
+    }
+
+    fun saveGeofenceResults(success: List<String>, failed: List<String>){
+        val jsonSuccess = gson.toJson(success)
+        val jsonFailure = gson.toJson(failed)
+        preferences.edit().putString(PREF_KEY_SUCCESS, jsonSuccess).apply()
+        preferences.edit().putString(PREF_KEY_FAILED, jsonFailure).apply()
+
+    }
+
+    fun getActiveGeofences(success: (success: List<String>) -> Unit, failure: ((failed: List<String>) -> Unit)?){
+        val type =  object : TypeToken<List<String?>?>() {}.type
+
+        val jsonSuccess = preferences.getString(PREF_KEY_SUCCESS, "[]")
+        val success = gson.fromJson<List<String>>(jsonSuccess, type)
+        success(success)
+
+        if(failure != null){
+            val jsonFailure = preferences.getString(PREF_KEY_FAILED, "[]")
+            val failed = gson.fromJson<List<String>>(jsonFailure, type)
+            failure(failed)
+        }
+
+    }
+
+    private fun checkPermission() : Boolean{
+        return ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
+    }
+
+    fun getPatientID():Int?{
+        val profileJson = preferences.getString("flutter.user-profile", "{}")
+        val type = object : TypeToken<Map<String?, Any?>?>() {}.type
+        return gson.fromJson<Map<String?, Any?>?>(profileJson,type)
+                ?.get("PatientID")
+                .toString()
+                .toDoubleOrNull()
+                ?.toInt()
+    }
+}
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/API.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/API.kt
@ -6,5 +6,6 @@ class API {
        private val SERVICE = "Services/Patients.svc/REST"

        val WIFI_CREDENTIALS = "$BASE/$SERVICE/Hmg_SMS_Get_By_ProjectID_And_PatientID"
+        val LOG_GEOFENCE = "$BASE/$SERVICE/GeoF_InsertPatientFileInfo"
    }
 }
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
@ -1,12 +1,30 @@
 package com.cloud.diplomaticquarterapp.utils

-import android.view.View
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
 import android.widget.Toast
+import androidx.annotation.Nullable
+import androidx.core.app.NotificationCompat
+import androidx.core.app.TaskStackBuilder
+import com.cloud.diplomaticquarterapp.BuildConfig
 import com.cloud.diplomaticquarterapp.MainActivity
+import com.cloud.diplomaticquarterapp.R
+import com.github.kittinunf.fuel.core.extensions.jsonBody
+import com.github.kittinunf.fuel.httpPost
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import io.flutter.plugin.common.MethodChannel
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
 import java.util.*
 import kotlin.concurrent.timerTask

+
 class HMGUtils {

    companion object{
@ -14,34 +32,34 @@ class HMGUtils {
        fun getPlatformChannel():MethodChannel{
            return platformChannel
        }
-        fun setPlatformChannel(channel:MethodChannel){
+        fun setPlatformChannel(channel: MethodChannel){
            platformChannel = channel
        }

-        fun timer(delay:Long, repeat:Boolean, tick:(Timer)->Unit) : Timer{
+        fun timer(delay: Long, repeat: Boolean, tick: (Timer) -> Unit) : Timer{
            val timer = Timer()
            if(repeat)
                timer.schedule(timerTask {
                    tick(timer)
-                },delay,delay)
+                }, delay, delay)
            else
                timer.schedule(timerTask {
                    tick(timer)
-                },delay)
+                }, delay)

            return timer
        }

-        fun popMessage(context:MainActivity, message:String){
+        fun popMessage(context: MainActivity, message: String){
            context.runOnUiThread {
-                Toast.makeText(context,message,Toast.LENGTH_LONG).show()
+                Toast.makeText(context, message, Toast.LENGTH_LONG).show()
            }
        }

-        fun popFlutterText(context:MainActivity, key:String){
+        fun popFlutterText(context: MainActivity, key: String){
            context.runOnUiThread {
                FlutterText.with(key){
-                    Toast.makeText(context,it,Toast.LENGTH_LONG).show()
+                    Toast.makeText(context, it, Toast.LENGTH_LONG).show()
                }
            }
        }
@ -53,3 +71,78 @@ class HMGUtils {
 private fun Timer.schedule(timerTask: TimerTask) {

 }
+private const val NOTIFICATION_CHANNEL_ID = BuildConfig.APPLICATION_ID + ".channel"
+
+fun sendNotification(context: Context, title:String, @Nullable subtitle:String?,  message:String?) {
+    val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+            && notificationManager.getNotificationChannel(NOTIFICATION_CHANNEL_ID) == null) {
+        val name = context.getString(R.string.app_name)
+        val channel = NotificationChannel(NOTIFICATION_CHANNEL_ID,
+                name,
+                NotificationManager.IMPORTANCE_DEFAULT)
+
+        notificationManager.createNotificationChannel(channel)
+    }
+
+    val intent = Intent(context, MainActivity::class.java)
+
+    val stackBuilder = TaskStackBuilder.create(context)
+            .addParentStack(MainActivity::class.java)
+            .addNextIntent(intent)
+    val notificationPendingIntent = stackBuilder.getPendingIntent(getUniqueId(), PendingIntent.FLAG_UPDATE_CURRENT)
+
+    val notification = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID)
+            .setSmallIcon(R.mipmap.ic_launcher)
+            .setContentIntent(notificationPendingIntent)
+            .setAutoCancel(true)
+            .setContentTitle(title)
+
+    subtitle.let { notification.setContentText(it) }
+    message.let { notification.setSubText(it) }
+
+    notificationManager.notify(getUniqueId(), notification.build())
+}
+
+
+private fun getUniqueId() = ((System.currentTimeMillis() % 10000).toInt())
+
+fun isJSONValid(jsonString: String?): Boolean {
+    try { JSONObject(jsonString) } catch (ex: JSONException) {
+        try {  JSONArray(jsonString) } catch (ex1: JSONException) {
+            return false
+        }
+    }
+    return true
+}
+
+class HTTPResponse<T>(data: T){
+    final var data:T = data
+}
+fun <T>httpPost(url: String, body: Map<String, Any?>, onSuccess: (response: HTTPResponse<T>) -> Unit, onError: (error: Exception) -> Unit){
+
+    val gson = Gson()
+    val type =  object : TypeToken<T>() {}.type
+    val jsonBody = gson.toJson(body)
+    url.httpPost()
+            .jsonBody(jsonBody, Charsets.UTF_8)
+            .timeout(10000)
+            .header("Content-Type","application/json")
+            .header("Allow","*/*")
+            .response { request, response, result ->
+                result.fold({ data ->
+                    val dataString = String(data)
+                    if(isJSONValid(dataString)){
+                        val responseData = gson.fromJson<T>(dataString,type)
+                        onSuccess(HTTPResponse(responseData))
+                    }else{
+                        onError(Exception("Invalid response from server (Not a valid JSON)"))
+                    }
+                }, {
+                    onError(it)
+                    it.localizedMessage
+                })
+
+            }
+}
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HTTPRequest.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HTTPRequest.kt
@ -1,46 +0,0 @@
-package com.cloud.diplomaticquarterapp.utils
-
-import android.util.Log
-import java.io.BufferedReader
-import java.io.InputStreamReader
-import java.io.OutputStreamWriter
-import java.net.HttpURLConnection
-import java.net.URL
-import java.net.URLEncoder
-
-class HTTPRequest {
-    val TAG = "HTTPRequest"
-
-    fun post(serverURL:String, params:Map<String,String>){
-
-        var encodedParamsList = params.map {
-            URLEncoder.encode(it.key, "UTF-8") + "=" + URLEncoder.encode(it.value,"UTF-8")
-        }
-
-        val postParam = encodedParamsList.joinToString (separator = "&")
-
-
-        val url = URL(serverURL)
-
-        with(url.openConnection() as HttpURLConnection) {
-            requestMethod = "POST"
-
-            val wr = OutputStreamWriter(outputStream)
-            wr.write(postParam)
-            wr.flush()
-
-            BufferedReader(InputStreamReader(inputStream)).use {
-                val response = StringBuffer()
-
-                var inputLIne = it.readLine()
-                while(inputLIne != null) {
-                    response.append(inputLIne)
-                    inputLIne = it.readLine()
-                }
-
-                it.close()
-                Log.v(TAG,response.toString())
-            }
-        }
-    }
-}
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/PlatformBridge.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/PlatformBridge.kt
@ -3,11 +3,11 @@ package com.cloud.diplomaticquarterapp.utils
 import android.content.Context
 import android.net.wifi.WifiManager
 import android.util.Log
-import android.widget.Toast
-import androidx.annotation.UiThread
 import com.cloud.diplomaticquarterapp.MainActivity
 import com.cloud.diplomaticquarterapp.hmgwifi.HMG_Guest
 import com.cloud.diplomaticquarterapp.hmgwifi.HMG_Internet
+import com.cloud.diplomaticquarterapp.geofence.GeoZoneModel
+import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
 import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
@ -23,7 +23,8 @@ class PlatformBridge(binaryMessenger: BinaryMessenger, flutterMainActivity: Main
        private const val HMG_INTERNET_WIFI_CONNECT_METHOD = "connectHMGInternetWifi"
        private const val HMG_GUEST_WIFI_CONNECT_METHOD = "connectHMGGuestWifi"
        private const val ENABLE_WIFI_IF_NOT = "enableWifiIfNot"
-
+        private const val REGISTER_HMG_GEOFENCES = "registerHmgGeofences"
+        private const val UN_REGISTER_HMG_GEOFENCES = "unRegisterHmgGeofences"
    }

    fun create(){
@ -39,6 +40,10 @@ class PlatformBridge(binaryMessenger: BinaryMessenger, flutterMainActivity: Main

            }else if (methodCall.method == ENABLE_WIFI_IF_NOT) {
                enableWifiIfNot(methodCall,result)
+            }else if (methodCall.method == REGISTER_HMG_GEOFENCES) {
+                registerHmgGeofences(methodCall,result)
+            }else if (methodCall.method == UN_REGISTER_HMG_GEOFENCES) {
+                unRegisterHmgGeofences(methodCall,result)
            }else{

                result.notImplemented()
@ -89,8 +94,34 @@ class PlatformBridge(binaryMessenger: BinaryMessenger, flutterMainActivity: Main
            if (!wm.isWifiEnabled)
                wm.isWifiEnabled = true
            result.success(true)
-        }else{
+        }else
            result.error("101","Error while opening wifi, Please try to open wifi yourself and try again","'WifiManager' service failed");
+    }
+
+
+    private fun registerHmgGeofences(methodCall: MethodCall, result: MethodChannel.Result) {
+
+        channel.invokeMethod("getGeoZones",null, object : MethodChannel.Result{
+            override fun success(result: Any?) {
+                if(result is String) {
+                    val geoZones = GeoZoneModel().listFrom(result)
+                    HMG_Geofence.shared(mainActivity).register(geoZones)
+                }
+            }
+
+            override fun error(errorCode: String?, errorMessage: String?, errorDetails: Any?) { print(result) }
+            override fun notImplemented() { print(result) }
+        })
+
+    }
+    
+    private fun unRegisterHmgGeofences(methodCall: MethodCall, result: MethodChannel.Result) {
+        HMG_Geofence.shared(mainActivity).unRegisterAll { status, exception ->
+            if(status)
+                result.success(true)
+            else
+                result.error("101", exception?.localizedMessage, exception);
        }
    }
-}
+    
+}
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@ -0,0 +1,16 @@
+<resources>
+  <string name="app_name">HMG Patient App</string>
+
+  <string name="geofence_unknown_error">
+    Unknown error: the Geofence service is not available now.
+  </string>
+  <string name="geofence_not_available">
+    Geofence service is not available now. Go to Settings>Location>Mode and choose High accuracy.
+  </string>
+  <string name="geofence_too_many_geofences">
+    Your app has registered too many geofences.
+  </string>
+  <string name="geofence_too_many_pending_intents">
+    You have provided too many PendingIntents to the addGeofences() call.
+  </string>
+</resources>
--- a/ios/.gitignore
+++ b/ios/.gitignore
@ -30,6 +30,4 @@ Runner/GeneratedPluginRegistrant.*
 !default.mode2v3
 !default.pbxuser
 !default.perspectivev3
-/Runner.xcworkspace/contents.xcworkspacedata
-/Runner.xcodeproj/project.pbxproj
 /Flutter/.last_build_id
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -20,7 +20,7 @@ PODS:
  - Firebase/Messaging (6.33.0):
    - Firebase/CoreOnly
    - FirebaseMessaging (~> 4.7.0)
-  - firebase_core (0.5.2):
+  - firebase_core (0.5.3):
    - Firebase/CoreOnly (~> 6.33.0)
    - Flutter
  - firebase_core_web (0.1.0):
@ -70,7 +70,7 @@ PODS:
    - Flutter
  - flutter_tts (0.0.1):
    - Flutter
-  - "geolocator (6.0.0+4)":
+  - geolocator (6.1.9):
    - Flutter
  - google_maps_flutter (0.0.1):
    - Flutter
@ -375,7 +375,7 @@ SPEC CHECKSUMS:
  device_calendar: 23b28a5f1ab3bf77e34542fb1167e1b8b29a98f5
  device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
  Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
-  firebase_core: 350ba329d1641211bc6183a3236893cafdacfea7
+  firebase_core: 5d6a02f3d85acd5f8321c2d6d62877626a670659
  firebase_core_web: d501d8b946b60c8af265428ce483b0fff5ad52d1
  firebase_messaging: 0aea2cd5885b65e19ede58ee3507f485c992cc75
  FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
@ -390,7 +390,7 @@ SPEC CHECKSUMS:
  flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186
  flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
  flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d
-  geolocator: 1ae40084cc6c1586ce5ad12cfc3fd38c64d05f2f
+  geolocator: 057a0c63a43e9c5296d8ad845a3ac8e6df23d899
  google_maps_flutter: c7f9c73576de1fbe152a227bfd6e6c4ae8088619
  GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
  GoogleMaps: 4b5346bddfe6911bb89155d43c903020170523ac
@ -438,6 +438,6 @@ SPEC CHECKSUMS:
  webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
  wifi: d7d77c94109e36c4175d845f0a5964eadba71060

-PODFILE CHECKSUM: ac5efa1ac3c9555d0008dc18004313c84746da62
+PODFILE CHECKSUM: 5a17be3f8af73a757fa4439c77cf6ab2db29a6e7

-COCOAPODS: 1.10.0
+COCOAPODS: 1.8.4
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -9,11 +9,27 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		5A016D0DD1095D385566337C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC606583E610E227F8186476 /* Pods_Runner.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
+		813F9CBA7DD5ED63B28B8BB6 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 767C165F7ABF3BF1F829B9BF /* Pods_Runner.framework */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		E91B5396256AAA6500E96549 /* GlobalHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91B538D256AAA6500E96549 /* GlobalHelper.swift */; };
+		E91B5397256AAA6500E96549 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91B538E256AAA6500E96549 /* Extensions.swift */; };
+		E91B5398256AAA6500E96549 /* API.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91B538F256AAA6500E96549 /* API.swift */; };
+		E91B539A256AAA6500E96549 /* MainFlutterVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91B5392256AAA6500E96549 /* MainFlutterVC.swift */; };
+		E91B539B256AAA6500E96549 /* HMG_Internet.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91B5394256AAA6500E96549 /* HMG_Internet.swift */; };
+		E91B539C256AAA6500E96549 /* HMG_GUEST_bkp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E91B5395256AAA6500E96549 /* HMG_GUEST_bkp.swift */; };
+		E91B539F256AAC1400E96549 /* GuestPOC_Certificate.p12 in Resources */ = {isa = PBXBuildFile; fileRef = E91B539D256AAC1400E96549 /* GuestPOC_Certificate.p12 */; };
+		E91B53A0256AAC1400E96549 /* GuestPOC_Certificate.cer in Resources */ = {isa = PBXBuildFile; fileRef = E91B539E256AAC1400E96549 /* GuestPOC_Certificate.cer */; };
+		E91B53A3256AAD8200E96549 /* Main_Custom.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E91B53A1256AAD8200E96549 /* Main_Custom.storyboard */; };
+		E923EFD225863FDF00E3E751 /* GeoZoneModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E923EFD125863FDF00E3E751 /* GeoZoneModel.swift */; };
+		E923EFD4258645C100E3E751 /* HMG_Geofence.swift in Sources */ = {isa = PBXBuildFile; fileRef = E923EFD3258645C100E3E751 /* HMG_Geofence.swift */; };
+		E923EFD62587443800E3E751 /* HMGPlatformBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = E923EFD52587443800E3E751 /* HMGPlatformBridge.swift */; };
+		E923EFD82588D17700E3E751 /* gpx.gpx in Resources */ = {isa = PBXBuildFile; fileRef = E923EFD72588D17700E3E751 /* gpx.gpx */; };
+		E9620805255C2ED100D3A35D /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9620804255C2ED100D3A35D /* NetworkExtension.framework */; };
+		E9C8C136256BACDA00EFFB62 /* HMG_Guest.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9C8C135256BACDA00EFFB62 /* HMG_Guest.swift */; };
+		E9E27168256E3A4000F49B69 /* LocalizedFromFlutter.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E27167256E3A4000F49B69 /* LocalizedFromFlutter.swift */; };
 /* End PBXBuildFile section */

 /* Begin PBXCopyFilesBuildPhase section */
@ -30,13 +46,15 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
-		09DDD2020D673759BD0E86B8 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		308FEC658188F7D588BE7580 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		767C165F7ABF3BF1F829B9BF /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		969F0CEC868FD7C196987A3E /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@ -44,9 +62,24 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		A8949DBAE70E5B302D91F1DB /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		AC606583E610E227F8186476 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		E2D9C922B5D0172FE487333D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		DCFFD369041FFFFA94CF7B26 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		E91B538D256AAA6500E96549 /* GlobalHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalHelper.swift; sourceTree = "<group>"; };
+		E91B538E256AAA6500E96549 /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
+		E91B538F256AAA6500E96549 /* API.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = "<group>"; };
+		E91B5392256AAA6500E96549 /* MainFlutterVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainFlutterVC.swift; sourceTree = "<group>"; };
+		E91B5394256AAA6500E96549 /* HMG_Internet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMG_Internet.swift; sourceTree = "<group>"; };
+		E91B5395256AAA6500E96549 /* HMG_GUEST_bkp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMG_GUEST_bkp.swift; sourceTree = "<group>"; };
+		E91B539D256AAC1400E96549 /* GuestPOC_Certificate.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; path = GuestPOC_Certificate.p12; sourceTree = "<group>"; };
+		E91B539E256AAC1400E96549 /* GuestPOC_Certificate.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = GuestPOC_Certificate.cer; sourceTree = "<group>"; };
+		E91B53A2256AAD8200E96549 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_Custom.storyboard; sourceTree = "<group>"; };
+		E923EFD125863FDF00E3E751 /* GeoZoneModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeoZoneModel.swift; sourceTree = "<group>"; };
+		E923EFD3258645C100E3E751 /* HMG_Geofence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HMG_Geofence.swift; sourceTree = "<group>"; };
+		E923EFD52587443800E3E751 /* HMGPlatformBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HMGPlatformBridge.swift; sourceTree = "<group>"; };
+		E923EFD72588D17700E3E751 /* gpx.gpx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = gpx.gpx; sourceTree = "<group>"; };
+		E9620803255C2ED100D3A35D /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
+		E9620804255C2ED100D3A35D /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; };
+		E9C8C135256BACDA00EFFB62 /* HMG_Guest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMG_Guest.swift; sourceTree = "<group>"; };
+		E9E27167256E3A4000F49B69 /* LocalizedFromFlutter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizedFromFlutter.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@ -54,29 +87,31 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5A016D0DD1095D385566337C /* Pods_Runner.framework in Frameworks */,
+				813F9CBA7DD5ED63B28B8BB6 /* Pods_Runner.framework in Frameworks */,
+				E9620805255C2ED100D3A35D /* NetworkExtension.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
-		0A1F078D9C068A8B18DE1EDB /* Pods */ = {
+		555EAAA626EFB641859EF0BE /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				A8949DBAE70E5B302D91F1DB /* Pods-Runner.debug.xcconfig */,
-				E2D9C922B5D0172FE487333D /* Pods-Runner.release.xcconfig */,
-				09DDD2020D673759BD0E86B8 /* Pods-Runner.profile.xcconfig */,
+				E9620804255C2ED100D3A35D /* NetworkExtension.framework */,
+				767C165F7ABF3BF1F829B9BF /* Pods_Runner.framework */,
 			);
-			path = Pods;
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		44EDA189DE1BB86E3A41BD4A /* Frameworks */ = {
+		605039E5DDF72C245F9765FE /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				AC606583E610E227F8186476 /* Pods_Runner.framework */,
+				DCFFD369041FFFFA94CF7B26 /* Pods-Runner.debug.xcconfig */,
+				969F0CEC868FD7C196987A3E /* Pods-Runner.release.xcconfig */,
+				308FEC658188F7D588BE7580 /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Frameworks;
+			path = Pods;
 			sourceTree = "<group>";
 		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
@ -93,11 +128,12 @@
 		97C146E51CF9000F007C117D = {
 			isa = PBXGroup;
 			children = (
+				E923EFD72588D17700E3E751 /* gpx.gpx */,
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				0A1F078D9C068A8B18DE1EDB /* Pods */,
-				44EDA189DE1BB86E3A41BD4A /* Frameworks */,
+				605039E5DDF72C245F9765FE /* Pods */,
+				555EAAA626EFB641859EF0BE /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@ -112,11 +148,17 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				E91B539E256AAC1400E96549 /* GuestPOC_Certificate.cer */,
+				E91B539D256AAC1400E96549 /* GuestPOC_Certificate.p12 */,
+				E91B5390256AAA6500E96549 /* Controllers */,
+				E91B538C256AAA6500E96549 /* Helper */,
+				E91B5393256AAA6500E96549 /* WifiConnect */,
+				E9620803255C2ED100D3A35D /* Runner.entitlements */,
+				E91B53A1256AAD8200E96549 /* Main_Custom.storyboard */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
 				97C147021CF9000F007C117D /* Info.plist */,
-				97C146F11CF9000F007C117D /* Supporting Files */,
 				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
@ -125,11 +167,36 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		97C146F11CF9000F007C117D /* Supporting Files */ = {
+		E91B538C256AAA6500E96549 /* Helper */ = {
+			isa = PBXGroup;
+			children = (
+				E91B538D256AAA6500E96549 /* GlobalHelper.swift */,
+				E91B538E256AAA6500E96549 /* Extensions.swift */,
+				E91B538F256AAA6500E96549 /* API.swift */,
+				E9E27167256E3A4000F49B69 /* LocalizedFromFlutter.swift */,
+				E923EFD125863FDF00E3E751 /* GeoZoneModel.swift */,
+				E923EFD3258645C100E3E751 /* HMG_Geofence.swift */,
+				E923EFD52587443800E3E751 /* HMGPlatformBridge.swift */,
+			);
+			path = Helper;
+			sourceTree = "<group>";
+		};
+		E91B5390256AAA6500E96549 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
+				E91B5392256AAA6500E96549 /* MainFlutterVC.swift */,
 			);
-			name = "Supporting Files";
+			path = Controllers;
+			sourceTree = "<group>";
+		};
+		E91B5393256AAA6500E96549 /* WifiConnect */ = {
+			isa = PBXGroup;
+			children = (
+				E9C8C135256BACDA00EFFB62 /* HMG_Guest.swift */,
+				E91B5394256AAA6500E96549 /* HMG_Internet.swift */,
+				E91B5395256AAA6500E96549 /* HMG_GUEST_bkp.swift */,
+			);
+			path = WifiConnect;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@ -139,15 +206,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				B4860726BBF5BF6213BBC91C /* [CP] Check Pods Manifest.lock */,
+				299B8FE131E5BAE7FA7E2FC9 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				B70CFE8FE22DFB581E0995B3 /* [CP] Embed Pods Frameworks */,
-				BF3D9FE28A237A0EC66B8700 /* [CP] Copy Pods Resources */,
+				125A739F71A29FBAE7B4D5AC /* [CP] Embed Pods Frameworks */,
+				940F4A376A48B060117A1E5D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@ -196,9 +263,13 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E91B53A0256AAC1400E96549 /* GuestPOC_Certificate.cer in Resources */,
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
+				E923EFD82588D17700E3E751 /* gpx.gpx in Resources */,
+				E91B539F256AAC1400E96549 /* GuestPOC_Certificate.p12 in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
+				E91B53A3256AAD8200E96549 /* Main_Custom.storyboard in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@ -206,35 +277,24 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXShellScriptBuildPhase section */
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Thin Binary";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
-		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
+		125A739F71A29FBAE7B4D5AC /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "Run Script";
-			outputPaths = (
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
 		};
-		B4860726BBF5BF6213BBC91C /* [CP] Check Pods Manifest.lock */ = {
+		299B8FE131E5BAE7FA7E2FC9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@ -256,24 +316,21 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		B70CFE8FE22DFB581E0995B3 /* [CP] Embed Pods Frameworks */ = {
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			inputPaths = (
 			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			name = "Thin Binary";
+			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		BF3D9FE28A237A0EC66B8700 /* [CP] Copy Pods Resources */ = {
+		940F4A376A48B060117A1E5D /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@ -290,6 +347,20 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		9740EEB61CF901F6004384FC /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@ -297,8 +368,19 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E923EFD225863FDF00E3E751 /* GeoZoneModel.swift in Sources */,
+				E91B539A256AAA6500E96549 /* MainFlutterVC.swift in Sources */,
+				E91B539C256AAA6500E96549 /* HMG_GUEST_bkp.swift in Sources */,
+				E91B5396256AAA6500E96549 /* GlobalHelper.swift in Sources */,
+				E923EFD4258645C100E3E751 /* HMG_Geofence.swift in Sources */,
+				E923EFD62587443800E3E751 /* HMGPlatformBridge.swift in Sources */,
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
+				E9E27168256E3A4000F49B69 /* LocalizedFromFlutter.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
+				E9C8C136256BACDA00EFFB62 /* HMG_Guest.swift in Sources */,
+				E91B539B256AAA6500E96549 /* HMG_Internet.swift in Sources */,
+				E91B5397256AAA6500E96549 /* Extensions.swift in Sources */,
+				E91B5398256AAA6500E96549 /* API.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -321,6 +403,14 @@
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
 		};
+		E91B53A1256AAD8200E96549 /* Main_Custom.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				E91B53A2256AAD8200E96549 /* Base */,
+			);
+			name = Main_Custom.storyboard;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */

 /* Begin XCBuildConfiguration section */
@ -365,7 +455,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@ -380,13 +470,16 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -395,7 +488,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.cloud.diplomaticquarterapp;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@ -450,7 +543,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@ -499,7 +592,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@ -516,13 +609,16 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -531,7 +627,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.cloud.diplomaticquarterapp;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@ -546,13 +642,16 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -561,7 +660,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.cloud.diplomaticquarterapp;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
--- a/ios/Runner/Helper/GeoZoneModel.swift
+++ b/ios/Runner/Helper/GeoZoneModel.swift
@ -21,7 +21,7 @@ class GeoZoneModel{
    var isCity:String?
    
    func identifier() -> String{
-        return "\(geofenceId)_hmg_geozone"
+        return "\(geofenceId)_hmg"
    }
    
    func message() -> String{
--- a/ios/Runner/Helper/HMGPlatformBridge.swift
+++ b/ios/Runner/Helper/HMGPlatformBridge.swift
@ -42,6 +42,9 @@ class HMGPlatformBridge{
                
            }else if methodCall.method == "registerHmgGeofences"{
                self.registerHmgGeofences(result: result)
+                
+            }else if methodCall.method == "unRegisterHmgGeofences"{
+                self.unRegisterHmgGeofences(result: result)
            }
            
            print("")
@ -119,10 +122,16 @@ class HMGPlatformBridge{
            if let jsonString = geoFencesJsonString as? String{
                let allZones = GeoZoneModel.list(from: jsonString)
                HMG_Geofence.shared().register(geoZones: allZones)
-                
+                result(true)
            }else{
            }
        }
    }
+    
+    // Register Geofence
+    func unRegisterHmgGeofences(result: @escaping FlutterResult){
+        HMG_Geofence.shared().unRegisterAll()
+        result(true)
+    }

 }
--- a/ios/Runner/Helper/HMG_Geofence.swift
+++ b/ios/Runner/Helper/HMG_Geofence.swift
@ -71,6 +71,12 @@ class HMG_Geofence:NSObject{
        return locationManager.monitoredRegions
    }
    
+    func unRegisterAll(){
+        for region in locationManager.monitoredRegions {
+            locationManager.stopMonitoring(for: region)
+        }
+    }
+    
 }

 // CLLocationManager Delegates
@ -149,9 +155,9 @@ extension HMG_Geofence{
    }
    
    func notifyServer(forRegion:CLRegion, transition:Transition, location:CLLocation?){
-        showNotification(title: "Notifying server..." , subtitle: forRegion.identifier, message:  "")
-        if let  userProfileJson = UserDefaults.standard.string(forKey: "user-profile"),
-            let userProfile = dictionary(from: userProfileJson), let patientId = userProfile["PatientID"] as? String{
+        df.dateFormat = "MMM/dd/yyyy hh:mm:ss"
+        if let  userProfileJson = UserDefaults.standard.string(forKey: "flutter.user-profile"),
+            let userProfile = dictionary(from: userProfileJson), let patientId = userProfile["PatientID"] as? Int{
            
            if let idString = forRegion.identifier.split(separator: "_").first,  let idInt = Int(idString){
                let body:[String:Any] = [
@ -162,27 +168,22 @@ extension HMG_Geofence{
                
                let url = "https://hmgwebservices.com/Services/Patients.svc/REST/GeoF_InsertPatientFileInfo"
                httpPostRequest(urlString: url, jsonBody: body){ (status,json) in
-                    showNotification(title: transition.name(), subtitle: forRegion.identifier, message: status ? "Success: notified to server ✔️" : "Failed to notified server ✖️")
+                    let status_ = status ?  "Notified" : "Not notified"
+                    showNotification(title: transition.name(), subtitle: forRegion.identifier, message: status_)
+                    
+                    
+                    var logs = UserDefaults.init(suiteName: "GeoFenceLog")?.dictionary(forKey: "LOGS") ?? [:]
+                    if var geo = logs[forRegion.identifier] as? [String]{
+                        geo.append("\(status_) at \(df.string(from: Date()))")
+                    }else{
+                        logs.updateValue(["\(status_) at \(df.string(from: Date()))"], forKey: forRegion.identifier)
+                    }
+                    
+                    UserDefaults.init(suiteName: "GeoFenceLog")?.set(logs, forKey: "LOGS")
+                    
                }
            }
        }
    }
-    
-    //    func notifyServer(forRegion:GeoZoneModel, transition:Transition, location:CLLocation?){
-    //                flutterMethodChannel?.invokeMethod("getLogGeofenceFullUrl", arguments: nil){ fullUrlString in
-    //                    if let url = fullUrlString as? String{
-    //                        flutterMethodChannel?.invokeMethod("getDefaultHttpParameters", arguments: nil){ params in
-    //                            if var body = params as? [String : Any]{
-    //                                body.updateValue(forZone.geofenceId, forKey: "PointsID")
-    //                                body.updateValue(transition.rawValue, forKey: "GeoType")
-    //                                httpPostRequest(urlString: url, jsonBody: body){ (status,json) in
-    //                                    showNotification(title: transition.name(), subtitle: forZone.identifier(), message: status ? "Success: sent to server ✔️" : "Failed: sent to server ✖️")
-    //                                }
-    //                            }
-    //                        }
-    //                    }
-    //                }
-    //    }
-    
 }

--- a/ios/gpx.gpx
+++ b/ios/gpx.gpx
--- a/lib/core/service/geofencing/GeofencingServices.dart
+++ b/lib/core/service/geofencing/GeofencingServices.dart
@ -56,10 +56,10 @@ class GeofencingServices extends BaseService {
  }

  addTestingGeoZones(List zones) {
-    zones.add({"GEOF_ID": -1, "Description": "ZiK Home", "Latitude": "24.691136", "Longitude": "46.650116", "Radius": 100, "Type": 1});
-    zones.add({"GEOF_ID": -2, "Description": "CS Office", "Latitude": "24.7087913", "Longitude": "46.6656461", "Radius": 100, "Type": 1});
-    zones.add({"GEOF_ID": -3, "Description": "Mahmoud Shrouf Home", "Latitude": "24.777577", "Longitude": "46.652675", "Radius": 100, "Type": 1});
-    zones.add({"GEOF_ID": -4, "Description": "Panorama Mall", "Latitude": "24.692453", "Longitude": "46.669168", "Radius": 450, "Type": 1});
-    zones.add({"GEOF_ID": -5, "Description": "Saudi Architects Crossing", "Latitude": "24.698375", "Longitude": "46.668567", "Radius": 140, "Type": 1});
+    // zones.add({"GEOF_ID": 12, "Description": "ZiK Home", "Latitude": "24.691136", "Longitude": "46.650116", "Radius": 100, "Type": 1});
+    // zones.add({"GEOF_ID": 13, "Description": "CS Office", "Latitude": "24.7087913", "Longitude": "46.6656461", "Radius": 100, "Type": 1});
+    // zones.add({"GEOF_ID": 14, "Description": "Mahmoud Shrouf Home", "Latitude": "24.777577", "Longitude": "46.652675", "Radius": 100, "Type": 1});
+    // zones.add({"GEOF_ID": 14, "Description": "Panorama Mall", "Latitude": "24.692453", "Longitude": "46.669168", "Radius": 450, "Type": 1});
+    // zones.add({"GEOF_ID": 16, "Description": "Saudi Architects Crossing", "Latitude": "24.698375", "Longitude": "46.668567", "Radius": 140, "Type": 1});
  }
 }
--- a/lib/pages/landing/landing_page.dart
+++ b/lib/pages/landing/landing_page.dart
@ -4,6 +4,7 @@ import 'dart:typed_data';
 import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
+import 'package:diplomaticquarterapp/core/service/geofencing/GeofencingServices.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
 import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart';
@ -16,7 +17,11 @@ import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart';
 import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
 import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
 import 'package:diplomaticquarterapp/uitl/CalendarUtils.dart';
+import 'package:diplomaticquarterapp/uitl/HMGNetworkConnectivity.dart';
+import 'package:diplomaticquarterapp/uitl/HMG_Geofence.dart';
 import 'package:diplomaticquarterapp/uitl/LocalNotification.dart';
+import 'package:diplomaticquarterapp/uitl/PlatformBridge.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart';
 import 'package:diplomaticquarterapp/widgets/buttons/floatingActionButton.dart';
@ -44,6 +49,8 @@ class LandingPage extends StatefulWidget {
 }

 class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
+  var authProvider = new AuthProvider();
+
  int currentTab = 0;
  PageController pageController;
  ProjectViewModel projectProvider;
@ -127,6 +134,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
  @override
  void initState() {
    super.initState();
+
    WidgetsBinding.instance.addObserver(this);
    //setState(() {
    AppGlobal.context = context;
@ -135,10 +143,46 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
    pageController = PageController(keepPage: true);
    _firebaseMessaging.setAutoInitEnabled(true);

+    // HMG (Guest/Internet) Wifi Access [Zohaib Kambrani]
+    HMGNetworkConnectivity(context, () {
+      GifLoaderDialogUtils.showMyDialog(context);
+      PlatformBridge().connectHMGGuestWifi().then((value) => {GifLoaderDialogUtils.hideDialog(context)});
+    }).checkAndConnectIfNoInternet();
+
    if (Platform.isIOS) {
      _firebaseMessaging.requestNotificationPermissions();
    }

+    // Flip Permission Checks [Zohaib Kambrani]
+    requestPermissions().then((results) {
+      if (results[Permission.location].isGranted) {
+        debugPrint("Fetching GEO ZONES from HMG service...");
+        locator<GeofencingServices>().getAllGeoZones(GeoZonesRequestModel()).then((geoZones) {
+          debugPrint("Finished Fetching GEO ZONES from HMG service...");
+          debugPrint("GEO ZONES saved to AppPreferences with key '$HMG_GEOFENCES'");
+          authProvider.authenticatedUserObject.getUser().then((value) {
+            debugPrint(value.toString());
+          });
+          if (authProvider.authenticatedUserObject.user != null) {
+            projectViewModel.platformBridge().registerHmgGeofences();
+          }
+        });
+      }
+
+      if (results[Permission.notification].isGranted)
+        _firebaseMessaging.getToken().then((String token) {
+          sharedPref.setString(PUSH_TOKEN, token);
+          if (token != null && DEVICE_TOKEN == "") {
+            DEVICE_TOKEN = token;
+            checkUserStatus(token);
+          }
+        });
+
+      if (results[Permission.storage].isGranted) ;
+      if (results[Permission.camera].isGranted) ;
+      if (results[Permission.photos].isGranted) ;
+      if (results[Permission.accessMediaLocation].isGranted) ;
+      if (results[Permission.calendar].isGranted) ;
    _firebaseMessaging.getToken().then((String token) {
      sharedPref.setString(PUSH_TOKEN, token);
      if (token != null && DEVICE_TOKEN == "") {
@ -149,6 +193,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
    }).catchError((err) {
      print(err);
    });
+
    //
    // //_firebase Background message handler
    // _firebaseMessaging.configure(
@ -508,3 +553,4 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
    }
  }
 }
+
--- a/lib/pages/login/login.dart
+++ b/lib/pages/login/login.dart
@ -92,10 +92,7 @@ class _Login extends State<Login> {
                child: Column(
                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                  children: <Widget>[
-                    MobileNo(
-                        onNumberChange: (value) =>
-                            {mobileNo = value, validateForm()},
-                        onCountryChange: (value) => countryCode = value),
+                    MobileNo(onNumberChange: (value) => {mobileNo = value, validateForm()}, onCountryChange: (value) => countryCode = value),
                    Directionality(
                        textDirection: TextDirection.ltr,
                        child: Container(
@ -126,9 +123,7 @@ class _Login extends State<Login> {
                        color: Colors.grey,
                        height: 2,
                      ),
-                      SizedBox(
-                        height: 10,
-                      ),
+                      SizedBox(height: 10,),
                      Row(
                        children: <Widget>[
                          Expanded(
@ -243,6 +238,9 @@ class _Login extends State<Login> {
    // request.isRegister = false;
    this.authService.checkActivationCode(request, code).then((result)  async{
          sharedPref.remove(FAMILY_FILE);
+          // Register GeoZones after login
+          registerGeoZones();
+
          result = CheckActivationCode.fromJson(result);
          result.list.isFamily = false;
          // this.sharedPref.setString(BLOOD_TYPE, result['PatientBloodType']),
@ -300,6 +298,10 @@ class _Login extends State<Login> {
    });
  }

+  void registerGeoZones() {
+    projectViewModel.platformBridge().registerHmgGeofences();
+  }
+
 // showLoader(bool isTrue) {
 //   setState(() {
 //     isLoading = isTrue;
--- a/lib/uitl/PlatformBridge.dart
+++ b/lib/uitl/PlatformBridge.dart
@ -90,6 +90,7 @@ class PlatformBridge {
  static const enable_wifi_if_not = "enableWifiIfNot";
  static const show_loading_method = "loading";
  static const register_Hmg_Geofences = "registerHmgGeofences";
+  static const un_register_Hmg_Geofences = "unRegisterHmgGeofences";

  Future<Object> connectHMGInternetWifi(String patientId) {
    print("Invoking platform method:  $hmg_internet_wifi_connect_method");
@ -134,7 +135,7 @@ class PlatformBridge {
  void showLoading(String message, bool show) async {
    print("Invoking platform method:  $show_loading_method");
    try {
-      final int result = await platform.invokeMethod(show_loading_method, [message, show]);
+      var result = await platform.invokeMethod(show_loading_method, [message, show]);
    } on PlatformException catch (e) {
      print(e);
    }
@ -142,6 +143,10 @@ class PlatformBridge {

  // GEO Fences
  void registerHmgGeofences() async {
-    final int result = await platform.invokeMethod(register_Hmg_Geofences);
+    var result = await platform.invokeMethod(register_Hmg_Geofences);
+  }
+
+  void unRegisterHmgGeofences() async {
+    var result = await platform.invokeMethod(un_register_Hmg_Geofences);
  }
 }
--- a/lib/widgets/drawer/app_drawer_widget.dart
+++ b/lib/widgets/drawer/app_drawer_widget.dart
@ -79,10 +79,8 @@ class _AppDrawerState extends State<AppDrawer> {
                          child: Column(
                            children: <Widget>[
                              Container(
-                                child:
-                                    Image.asset('assets/images/DQ/DQ_logo.png'),
-                                margin: EdgeInsets.all(
-                                    SizeConfig.imageSizeMultiplier * 4),
+                                child: Image.asset('assets/images/DQ/DQ_logo.png'),
+                                margin: EdgeInsets.all(SizeConfig.imageSizeMultiplier * 4),
                              ),
                              (user != null && projectProvider.isLogin)
                                  ? Padding(
@ -413,11 +411,9 @@ class _AppDrawerState extends State<AppDrawer> {
      var data = AuthenticatedUser.fromJson(
          await this.sharedPref.getObject(USER_PROFILE));

-      var data2 = AuthenticatedUser.fromJson(
-          await this.sharedPref.getObject(MAIN_USER));
+      var data2 = AuthenticatedUser.fromJson(await this.sharedPref.getObject(MAIN_USER));
      booldType = await sharedPref.getString(BLOOD_TYPE);
      notificationCount = await sharedPref.getString(NOTIFICATION_COUNT);
-
      setState(() {
        notificationCount = notificationCount;
        this.user = data;
@ -436,6 +432,7 @@ class _AppDrawerState extends State<AppDrawer> {
    this.user = null;
    toDoProvider.setState(0, false);
    Navigator.of(context).pushNamed(HOME);
+    projectProvider.platformBridge().unRegisterHmgGeofences();
  }

  login() async {
@ -464,11 +461,7 @@ class _AppDrawerState extends State<AppDrawer> {

  switchUser(user, context) {
    GifLoaderDialogUtils.showMyDialog(context);
-    this
-        .familyFileProvider
-        .silentLoggin(user is AuthenticatedUser ? null : user,
-            mainUser: user is AuthenticatedUser)
-        .then((value) async {
+    this.familyFileProvider.silentLoggin(user is AuthenticatedUser ? null : user, mainUser: user is AuthenticatedUser).then((value) async {
      await authenticatedUserObject.getUser();
      _vitalSignService.heightCm = "";
      _vitalSignService.weightKg = "";