diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 30aa626..ae78c11 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,29 +1,113 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
+    <codeStyleSettings language="XML">
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1b40c43..ec9a4d9 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..2118e57
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="C:\Users\Aravind\AppData\Local\Android\Sdk\extras\google\m2repository" />
+      <option name="name" value="C:\Users\Aravind\AppData\Local\Android\Sdk\extras\google\m2repository" />
+      <option name="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/extras/google/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="C:\Users\Aravind\AppData\Local\Android\Sdk\extras\android\m2repository" />
+      <option name="name" value="C:\Users\Aravind\AppData\Local\Android\Sdk\extras\android\m2repository" />
+      <option name="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/extras/android/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="C:\Users\Aravind\AppData\Local\Android\Sdk\extras\m2repository" />
+      <option name="name" value="C:\Users\Aravind\AppData\Local\Android\Sdk\extras\m2repository" />
+      <option name="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/extras/m2repository" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e0d5b93..047238c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="7">
+        <list size="12">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
@@ -13,18 +13,28 @@
           <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
           <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
           <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="6">
+        <list size="11">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
           <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
           <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="android.annotation.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
         </list>
       </value>
     </option>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/GeoLocator/build.gradle b/GeoLocator/build.gradle
index 989ef96..9a1ec26 100644
--- a/GeoLocator/build.gradle
+++ b/GeoLocator/build.gradle
@@ -1,17 +1,17 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
 
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 29
+        versionCode 2
+        versionName "2.0.0"
+
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -27,8 +27,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation 'com.google.android.gms:play-services-maps:17.0.0'
 }
diff --git a/GeoLocator/src/androidTest/java/com/location/aravind/getlocation/ExampleInstrumentedTest.java b/GeoLocator/src/androidTest/java/com/location/aravind/getlocation/ExampleInstrumentedTest.java
deleted file mode 100644
index 02ac30f..0000000
--- a/GeoLocator/src/androidTest/java/com/location/aravind/getlocation/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.location.aravind.getlocation;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.location.aravind.getlocation.test", appContext.getPackageName());
-    }
-}
diff --git a/GeoLocator/src/main/AndroidManifest.xml b/GeoLocator/src/main/AndroidManifest.xml
index 8d2a261..bf94d41 100644
--- a/GeoLocator/src/main/AndroidManifest.xml
+++ b/GeoLocator/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.location.aravind.getlocation" >
-
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 </manifest>
diff --git a/GeoLocator/src/main/java/com/location/aravind/getlocation/GeoLocator.java b/GeoLocator/src/main/java/com/location/aravind/getlocation/GeoLocator.java
index f754005..1e6415c 100644
--- a/GeoLocator/src/main/java/com/location/aravind/getlocation/GeoLocator.java
+++ b/GeoLocator/src/main/java/com/location/aravind/getlocation/GeoLocator.java
@@ -11,10 +11,13 @@
 import android.location.Location;
 import android.location.LocationManager;
 import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AlertDialog;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.app.ActivityCompat;
+
+import com.google.android.gms.maps.model.LatLng;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
@@ -22,141 +25,145 @@
 public class GeoLocator {
 
 
-    private static double lattitude ,longitude;
     private static final int REQUEST_LOCATION = 1;
+    private static double lattitude, longitude;
     private Context context;
     private Activity activity;
-    private String address,city,state,country,postalCode,knownName;
-
+    private String address, city, state, country, postalCode, knownName, conversionAddress;
 
 
     public GeoLocator(Context context, Activity activity) {
         this.context = context;
         this.activity = activity;
-
         GetLocation();
-
         geoAddress();
-
     }
 
-    public void GetLocation(){
-
-
-        LocationManager locationManager = (LocationManager) context.getSystemService(context.LOCATION_SERVICE);
-
-
-        if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
-
-
-            showSettingsAlert();
-           Toast.makeText(context,"Permission Denied",Toast.LENGTH_SHORT).show();
+    public GeoLocator(Context context, Activity activity, String address) {
+        this.context = context;
+        this.activity = activity;
+        this.conversionAddress = address;
+        getLocationFromAddress();
+    }
 
-        } else if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)){
 
+    /**
+     * Find coordinates from address
+     */
+    public void getLocationFromAddress() {
 
+        Geocoder coder = new Geocoder(context);
+        List<Address> address;
 
+        try {
+            address = coder.getFromLocationName(conversionAddress, 5);
+            if (address != null) {
+                Address location = address.get(0);
+                lattitude = location.getLatitude();
+                longitude = location.getLongitude();
+            }
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+    }
 
-            if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION)
-                    != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission
-                    (context, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+    /**
+     * Coordinates from  Location manager
+     */
 
-                ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, REQUEST_LOCATION);
+    public void GetLocation() {
 
-            } else {
-                Location location = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+        //Initialize Location manager
+        LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
 
-                Location location1 = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+        if (locationManager != null) {
+            if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+                showSettingsAlert();
+            } else if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
 
-                Location location2 = locationManager.getLastKnownLocation(LocationManager. PASSIVE_PROVIDER);
 
-                if (location != null) {
-                    double latti = location.getLatitude();
-                    double longi = location.getLongitude();
-                    lattitude = latti;
-                    longitude = longi;
+                if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION)
+                        != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission
+                        (context, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
 
+                    ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, REQUEST_LOCATION);
 
+                } else {
 
-                } else  if (location1 != null) {
-                    double latti = location1.getLatitude();
-                    double longi = location1.getLongitude();
-                    lattitude = latti;
-                    longitude = longi;
+                    //  Looking for location from Network Provides or GPS or Passive Provider
 
+                    Location location = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+                    Location location1 = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+                    Location location2 = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER);
 
+                    if (location != null) {
 
+                        //Location data available from Network provider
+                        lattitude= location.getLatitude();
+                        longitude = location.getLongitude();
 
-                } else  if (location2 != null) {
-                    double latti = location2.getLatitude();
-                    double longi = location2.getLongitude();
-                    lattitude = latti;
-                    longitude = longi;
+                    } else if (location1 != null) {
 
+                        //Location data available from GPS
+                        lattitude = location1.getLatitude();
+                        longitude = location1.getLongitude();
 
-                }else{
+                    } else if (location2 != null) {
 
-                    Toast.makeText(context,"Unble to Trace your location",Toast.LENGTH_SHORT).show();
+                        //Location data available from Passive provider
+                        lattitude = location2.getLatitude();
+                        longitude = location2.getLongitude();
 
+                    } else {
+                        Toast.makeText(context, "Unable to Trace your location", Toast.LENGTH_SHORT).show();
+                    }
                 }
             }
-
-
-
-
-
-        }
-
-
-
-
-
-
+        } else {
+            Toast.makeText(context, "Unable to Trace your location", Toast.LENGTH_SHORT).show();
         }
+    }
 
-    public   double getLattitude() {
+    public double getLattitude() {
         return lattitude;
     }
 
-    public  double getLongitude() {
+    public double getLongitude() {
         return longitude;
     }
 
+    public LatLng getLatLong() {
+        return new LatLng(lattitude, longitude);
+    }
 
-
-
-    public void geoAddress(){
-
-
+    /**
+     * Converting coordinates to address
+     */
+    public void geoAddress() {
         Geocoder geocoder;
         List<Address> addresses;
         geocoder = new Geocoder(context, Locale.getDefault());
 
         try {
             addresses = geocoder.getFromLocation(lattitude, longitude, 1);
-
-              address = addresses.get(0).getAddressLine(0);
-              city = addresses.get(0).getLocality();
-              state = addresses.get(0).getAdminArea();
-              country = addresses.get(0).getCountryName();
-              postalCode = addresses.get(0).getPostalCode();
-              knownName = addresses.get(0).getFeatureName();
-
-
-
-
+            if (addresses.size() > 0) {
+
+                //Translate Required parameters from address array
+                address = addresses.get(0).getAddressLine(0);
+                city = addresses.get(0).getLocality();
+                state = addresses.get(0).getAdminArea();
+                country = addresses.get(0).getCountryName();
+                postalCode = addresses.get(0).getPostalCode();
+                knownName = addresses.get(0).getFeatureName();
+            } else {
+                //address array is empty
+                Toast.makeText(context, "Unble to Trace your location", Toast.LENGTH_SHORT).show();
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }
-
-
-
-
-
     }
 
-
-
     public String getAddress() {
         return address;
     }
@@ -181,14 +188,12 @@ public String getKnownName() {
         return knownName;
     }
 
+    /**
+     * Checking if GPS is enabled
+     */
 
-
-
-
-
-    public void showSettingsAlert(){
-        AlertDialog.Builder alertDialog = new AlertDialog.Builder(context);
-
+    public void showSettingsAlert() {
+        AlertDialog.Builder alertDialog = new AlertDialog.Builder(activity);
         // Setting Dialog Title
         alertDialog.setTitle("GPS is settings");
 
@@ -197,9 +202,9 @@ public void showSettingsAlert(){
 
         // On pressing Settings button
         alertDialog.setPositiveButton("Settings", new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog,int which) {
+            public void onClick(DialogInterface dialog, int which) {
                 Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-                context.startActivity(intent);
+                activity.startActivity(intent);
             }
         });
 
@@ -214,9 +219,4 @@ public void onClick(DialogInterface dialog, int which) {
         alertDialog.show();
     }
 
-
-
-
-
-
 }
diff --git a/GeoLocator/src/test/java/com/location/aravind/getlocation/ExampleUnitTest.java b/GeoLocator/src/test/java/com/location/aravind/getlocation/ExampleUnitTest.java
deleted file mode 100644
index a848689..0000000
--- a/GeoLocator/src/test/java/com/location/aravind/getlocation/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.location.aravind.getlocation;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/README.md b/README.md
index 4ca91d7..4c55b58 100644
--- a/README.md
+++ b/README.md
@@ -22,19 +22,26 @@ At the moment we do not have a publishing mechanism to a maven repository so the
   
   	dependencies {
 	       implementation 'com.github.AravindVijay7:GeoLocator-Android:1.0.2'
-
 	}
 
 
 # Usage
 
 
- ## Initaialize GeoLocator:
+ ## Initialize GeoLocator:
  
    > GeoLocator geoLocator = new GeoLocator(getApplicationContext(),MainActivity.this);
-  
- ## get latitiude and lontitude by:
+
+     >or(Converting address to latitude and longitude)
+
+   > GeoLocator geoLocator = new GeoLocator(getApplicationContext(),MainActivity.this,"Address String");
+
+ ## get latitude and longitude by:
   
    > geoLocator.getLattitude()
    
    > geoLocator.getLongitude()
+
+ ## get address by:
+
+   > geoLocator.getAddress()
diff --git a/app/build.gradle b/app/build.gradle
index 5fcda10..f079a06 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.location.aravind.getlocationmain"
         minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 29
+        versionCode 2
+        versionName "2.0.0"
+
     }
     buildTypes {
         release {
@@ -20,10 +20,9 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'com.google.android.gms:play-services-maps:17.0.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation project(':GeoLocator')
 }
diff --git a/app/src/androidTest/java/com/location/aravind/getlocationmain/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/location/aravind/getlocationmain/ExampleInstrumentedTest.java
deleted file mode 100644
index a9e4068..0000000
--- a/app/src/androidTest/java/com/location/aravind/getlocationmain/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.location.aravind.getlocationmain;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.location.aravind.getlocationmain", appContext.getPackageName());
-    }
-}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b499388..1f7d1c2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,8 +18,6 @@
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
-
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
diff --git a/app/src/main/java/com/location/aravind/getlocationmain/MainActivity.java b/app/src/main/java/com/location/aravind/getlocationmain/MainActivity.java
index 59d3913..a5a8897 100644
--- a/app/src/main/java/com/location/aravind/getlocationmain/MainActivity.java
+++ b/app/src/main/java/com/location/aravind/getlocationmain/MainActivity.java
@@ -1,19 +1,15 @@
 package com.location.aravind.getlocationmain;
 
-import android.location.Address;
-import android.location.Geocoder;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import android.app.Activity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
 import com.location.aravind.getlocation.GeoLocator;
 
-import java.util.List;
-
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends Activity {
 
     TextView tvValue;
     Button btGetData;
@@ -29,40 +25,14 @@ protected void onCreate(Bundle savedInstanceState) {
         btGetData.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
-                GeoLocator geoLocator = new GeoLocator(getApplicationContext(),MainActivity.this);
-                tvValue.setText( geoLocator.getLattitude()+","+ geoLocator.getLongitude() + "\n" + geoLocator.getAddress());
-
+                GeoLocator geoLocator = new GeoLocator(getApplicationContext(), MainActivity.this);
+                tvValue.setText(String.format("%s,%s\n%s", geoLocator.getLattitude(), geoLocator.getLongitude(), geoLocator.getAddress()));
             }
         });
-
-
-
-
-
-
-
     }
 
-
-    public  void initWidgets(){
-
+    public void initWidgets() {
         tvValue = findViewById(R.id.tvValue);
         btGetData = findViewById(R.id.btGetData);
-
-
-
     }
-
-
-
-
-
-
-
-
-
-
-
-
 }
diff --git a/app/src/test/java/com/location/aravind/getlocationmain/ExampleUnitTest.java b/app/src/test/java/com/location/aravind/getlocationmain/ExampleUnitTest.java
deleted file mode 100644
index 3294eed..0000000
--- a/app/src/test/java/com/location/aravind/getlocationmain/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.location.aravind.getlocationmain;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8d3ef8e..2deb66d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 82618ce..d546dea 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9a4163a..b59edc4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sun Sep 27 13:51:53 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip