Ritesh new

app/build.gradle

@@ -3,12 +3,9 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 29
     defaultConfig {
-        applicationId "com.crime_mapping.electrothon.sos"
-<<<<<<< HEAD
-        minSdkVersion 26
-=======
+        applicationId "com.crime_mapping.sih2020.sos"
+
         minSdkVersion 16
->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
@@ -30,14 +27,12 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 //    implementation 'androidx.appcompat:appcompat:1.0.0'
-<<<<<<< HEAD
+
 
     //retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.2.0'
 
-=======
->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81
     implementation(name: 'sinch-android-rtc', version: '+', ext: 'aar')
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.0.0'
@@ -79,14 +74,15 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0-alpha01'
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
     implementation 'com.google.android.gms:play-services-location:17.0.0'
-
+    implementation 'com.google.maps.android:android-maps-utils:2.0.3'
 //    implementation 'androidx.appcompat:appcompat:1.0.0'
 //    implementation(name: 'sinch-android-rtc', version: '+', ext: 'aar')
 //    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 //
 //    implementation 'org.greenrobot:eventbus:3.1.1'
 //    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
 
 
 }

app/src/androidTest/java/com/crime_mapping/electrothon/sos/ExampleInstrumentedTest.java → app/src/androidTest/java/com/crime_mapping/sih2020/sos/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.crime_mapping.electrothon.sos;
+package com.crime_mapping.sih2020.sos;
 
 import android.content.Context;
 import androidx.test.platform.app.InstrumentationRegistry;

app/src/main/AndroidManifest.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.crime_mapping.electrothon.sos">
+    package="com.crime_mapping.sih2020.sos">
 
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
@@ -24,28 +26,28 @@
     <uses-permission android:name="android.permission.READ_CONTACTS" />
 
     <application
-        android:name=".Sinch_Apps"
+        android:name="com.crime_mapping.sih2020.sos.Sinch_Apps"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".Sinch_MainActivity"
+            android:name="com.crime_mapping.sih2020.sos.Sinch_MainActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
 
         </activity>
 
         <service
-            android:name=".SinchService"
+            android:name="com.crime_mapping.sih2020.sos.SinchService"
             android:enabled="true"
             android:exported="true" />
-        <activity android:name=".IncommingCallActivity" android:theme="@style/AppTheme.NoActionBar" android:excludeFromRecents="true" />
+        <activity android:name="com.crime_mapping.sih2020.sos.IncommingCallActivity" android:theme="@style/AppTheme.NoActionBar" android:excludeFromRecents="true" />
 
 
-        <activity android:name="com.crime_mapping.electrothon.sos.MyCamera">
+        <activity android:name="com.crime_mapping.sih2020.sos.MyCamera">
 
         </activity>
 
@@ -55,36 +57,36 @@
             android:value="@string/google_maps_key" />
 
         <activity
-            android:name=".MapsActivity4"
+            android:name="com.crime_mapping.sih2020.sos.MapsActivity4"
             android:label="@string/title_activity_maps4"></activity>
-        <activity android:name=".prime_contacts" />
+        <activity android:name="com.crime_mapping.sih2020.sos.prime_contacts" />
         <activity
-            android:name=".MapsActivity3"
+            android:name="com.crime_mapping.sih2020.sos.MapsActivity3"
             android:label="@string/title_activity_maps3" />
         <activity
-            android:name=".MapsActivity2"
+            android:name="com.crime_mapping.sih2020.sos.MapsActivity2"
             android:label="@string/title_activity_maps2" />
-        <activity android:name=".update_spot" />
-        <activity android:name=".Login" />
-        <activity android:name=".MainActivity">
+        <activity android:name="com.crime_mapping.sih2020.sos.update_spot" />
+        <activity android:name="com.crime_mapping.sih2020.sos.Login" />
+        <activity android:name="com.crime_mapping.sih2020.sos.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name=".LoginActivity"
+            android:name="com.crime_mapping.sih2020.sos.LoginActivity"
             android:label="@string/title_activity_login" />
-        <activity android:name=".ProfileActivity" />
-        <activity android:name=".LocationListActivity" />
-        <activity android:name=".MapsActivity" />
+        <activity android:name="com.crime_mapping.sih2020.sos.ProfileActivity" />
+        <activity android:name="com.crime_mapping.sih2020.sos.LocationListActivity" />
+        <activity android:name="com.crime_mapping.sih2020.sos.MapsActivity" />
 
         <service
-            android:name=".MyService"
+            android:name="com.crime_mapping.sih2020.sos.MyService"
             android:enabled="true"
             android:exported="true" />
 
-        <activity android:name=".AboutActivity" />
+        <activity android:name="com.crime_mapping.sih2020.sos.AboutActivity" />
     </application>
 </manifest>

app/src/main/java/com/crime_mapping/electrothon/sos/AboutActivity.java → app/src/main/java/com/crime_mapping/sih2020/sos/AboutActivity.java

@@ -1,4 +1,4 @@
-package com.crime_mapping.electrothon.sos;
+package com.crime_mapping.sih2020.sos;
 
 import android.os.Bundle;
 

app/src/main/java/com/crime_mapping/electrothon/sos/CameraPreview.java → app/src/main/java/com/crime_mapping/sih2020/sos/CameraPreview.java

@@ -1,4 +1,4 @@
-package com.crime_mapping.electrothon.sos;
+package com.crime_mapping.sih2020.sos;
 
 import android.content.Context;
 import android.hardware.Camera;

app/src/main/java/com/crime_mapping/electrothon/sos/Constants.java → app/src/main/java/com/crime_mapping/sih2020/sos/Constants.java

@@ -1,4 +1,4 @@
-package com.crime_mapping.electrothon.sos;
+package com.crime_mapping.sih2020.sos;
 
 public class Constants {
     public static final String PHONE_NUMBER = "phoneNumber";

app/src/main/java/com/crime_mapping/electrothon/sos/CustomLocationListAdapter.java → app/src/main/java/com/crime_mapping/sih2020/sos/CustomLocationListAdapter.java

@@ -1,4 +1,4 @@
-package com.crime_mapping.electrothon.sos;
+package com.crime_mapping.sih2020.sos;
 
 import android.content.Context;
 import android.view.LayoutInflater;

app/src/main/java/com/crime_mapping/sih2020/sos/Data.java

@@ -0,0 +1,59 @@
+package com.crime_mapping.sih2020.sos;
+
+public class Data {
+
+    private String precautions;
+
+    private double x;
+
+    private String description;
+
+    private  double y;
+
+    public String getPrecautions ()
+    {
+        return precautions;
+    }
+
+    public void setPrecautions (String precautions)
+    {
+        this.precautions = precautions;
+    }
+
+    public double getX ()
+    {
+        return x;
+    }
+
+    public void setX (double x)
+    {
+        this.x = x;
+    }
+
+    public String getDescription ()
+    {
+        return description;
+    }
+
+    public void setDescription (String description)
+    {
+        this.description = description;
+    }
+
+    public double getY ()
+    {
+        return y;
+    }
+
+    public void setY (double y)
+    {
+        this.y = y;
+    }
+
+    public Data(String precautions, double x, String description, double y) {
+        this.precautions = precautions;
+        this.x = x;
+        this.description = description;
+        this.y = y;
+    }
+}

app/src/main/java/com/crime_mapping/electrothon/sos/FirebaseLocationData.java → app/src/main/java/com/crime_mapping/sih2020/sos/FirebaseLocationData.java

@@ -1,4 +1,4 @@
-package com.crime_mapping.electrothon.sos;
+package com.crime_mapping.sih2020.sos;
 
 public class FirebaseLocationData {
     String email;

app/src/main/java/com/crime_mapping/electrothon/sos/GpsTracker.java → app/src/main/java/com/crime_mapping/sih2020/sos/GpsTracker.java

@@ -1,4 +1,4 @@
-package com.crime_mapping.electrothon.sos;
+package com.crime_mapping.sih2020.sos;
 
 import android.Manifest;
 import android.app.AlertDialog;

app/src/main/java/com/crime_mapping/electrothon/sos/IncommingCallActivity.java → app/src/main/java/com/crime_mapping/sih2020/sos/IncommingCallActivity.java

@@ -1,4 +1,4 @@
-package com.crime_mapping.electrothon.sos;
+package com.crime_mapping.sih2020.sos;
 
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;

app/src/main/java/com/crime_mapping/sih2020/sos/LatLong.java

@@ -0,0 +1,27 @@
+package com.crime_mapping.sih2020.sos;
+
+public class LatLong {
+
+    double lat , lng;
+
+    public LatLong(double lat, double lng) {
+        this.lat = lat;
+        this.lng = lng;
+    }
+
+    public double getLat() {
+        return lat;
+    }
+
+    public void setLat(double lat) {
+        this.lat = lat;
+    }
+
+    public double getLng() {
+        return lng;
+    }
+
+    public void setLng(double lng) {
+        this.lng = lng;
+    }
+}

app/src/main/java/com/crime_mapping/electrothon/sos/LocationListActivity.java → app/src/main/java/com/crime_mapping/sih2020/sos/LocationListActivity.java

@@ -1,4 +1,4 @@
-package com.crime_mapping.electrothon.sos;
+package com.crime_mapping.sih2020.sos;
 
 import android.content.Intent;
 import android.os.Bundle;

app/src/main/java/com/crime_mapping/electrothon/sos/Login.java → app/src/main/java/com/crime_mapping/sih2020/sos/Login.java

@@ -1,4 +1,4 @@
-package com.crime_mapping.electrothon.sos;
+package com.crime_mapping.sih2020.sos;
 
 import android.os.Bundle;
 

app/src/main/java/com/crime_mapping/electrothon/sos/LoginActivity.java → app/src/main/java/com/crime_mapping/sih2020/sos/LoginActivity.java

@@ -1,4 +1,4 @@
-package com.crime_mapping.electrothon.sos;
+package com.crime_mapping.sih2020.sos;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;