App Build Check 1

.idea/gradle.xml

@@ -4,10 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="false" />
         <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/jarRepositories.xml

@@ -21,5 +21,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
   </component>
 </project>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules/app/google-services.json

@@ -0,0 +1,48 @@
+{
+  "project_info": {
+    "project_number": "903475317641",
+    "firebase_url": "https://arresttb-aead0.firebaseio.com",
+    "project_id": "arresttb-aead0",
+    "storage_bucket": "arresttb-aead0.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:903475317641:android:444c2967176c6135eeaf58",
+        "android_client_info": {
+          "package_name": "in.sminnovations.arrest_tb"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "903475317641-hsfvg2fhlgt43g6tnv54fb4191hguqaa.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "in.sminnovations.arrest_tb",
+            "certificate_hash": "8aeffda288dd8e59580e114a5fe8178766f53ad1"
+          }
+        },
+        {
+          "client_id": "903475317641-k1mctjrq1d9f8i23lbr4nova31g2o387.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDD31gjK4qOIKlEgB5Nz5KO_aOH782B8WQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "903475317641-k1mctjrq1d9f8i23lbr4nova31g2o387.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/build.gradle

@@ -1,16 +1,24 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
 
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.3"
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         applicationId "in.sminnovations.arrest_tb"
         minSdkVersion 19
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -24,18 +32,14 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.firebase:firebase-auth:16.0.5'
-    implementation 'com.google.firebase:firebase-database:16.0.4'
-    implementation 'com.google.firebase:firebase-storage:16.0.4'
-    testImplementation 'junit:junit:4.12'
     implementation 'com.chaos.view:pinview:1.4.3'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
-    implementation 'com.firebaseui:firebase-ui-database:3.2.2'
+    implementation 'com.firebaseui:firebase-ui-database:7.1.1'
+
     implementation 'org.tensorflow:tensorflow-lite:+'
 
+    implementation 'androidx.browser:browser:1.2.0'
 
     implementation 'de.hdodenhof:circleimageview:3.1.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.+'
@@ -44,6 +48,18 @@ dependencies {
     implementation 'com.hbb20:ccp:2.4.0'
 
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
+    implementation fileTree(dir: "libs", include: ["*.jar"])
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.google.firebase:firebase-config:20.0.0'
+    implementation 'com.google.firebase:firebase-auth:20.0.1'
+
+    implementation 'com.google.firebase:firebase-database:19.5.1'
+    implementation 'com.google.firebase:firebase-storage:19.2.0'
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.google.android.gms:play-services-location:17.0.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
+
 }

app/src/androidTest/java/in/sminnovations/arrest_tb/ExampleInstrumentedTest.java

@@ -21,7 +21,6 @@ public class ExampleInstrumentedTest {
     public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-
+        assertEquals("in.sminnovations.arrest_tb", appContext.getPackageName());
-        assertEquals("com.ShanMukhaInnovations.ArrestTB", appContext.getPackageName());
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="in.sminnovations.arrest_tb">
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 
     <application
@@ -27,34 +28,50 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_path" />
         </provider>
-        <activity android:name=".NegativeResults"></activity>
+        <activity android:name=".NegativeResults" android:screenOrientation="portrait"
-        <activity android:name=".PositiveResult" />
+            ></activity>
-        <activity android:name=".TestDetails" />
+        <activity android:name=".PositiveResult" android:screenOrientation="portrait"
-        <activity android:name=".Register" />
+            />
-        <activity android:name=".ForgetPassword" />
+        <activity android:name=".TestDetails"  android:screenOrientation="portrait"
-        <activity android:name=".CreatePassword" />
+             />
-        <activity android:name=".Home" />
+        <activity android:name=".Register" android:screenOrientation="portrait"
-        <activity android:name=".VerifyOTP.VerifyOtp" />
+            />
-        <activity android:name=".ForgetPasswordReset" />
+        <activity android:name=".ForgetPassword"  android:screenOrientation="portrait"
-        <activity android:name=".VerifyOTP.VerifyOtpForgetPassword" />
+            />
-        <activity android:name=".SplashScreen">   <intent-filter>
+        <activity android:name=".CreatePassword" android:screenOrientation="portrait"
+            />
+        <activity android:name=".Home"  android:screenOrientation="portrait"
+            />
+        <activity android:name=".VerifyOTP.VerifyOtp"  android:screenOrientation="portrait"
+            />
+        <activity android:name=".ForgetPasswordReset" android:screenOrientation="portrait"
+            />
+        <activity android:name=".VerifyOTP.VerifyOtpForgetPassword"  android:screenOrientation="portrait"
+            />
+        <activity android:name=".SplashScreen" android:screenOrientation="portrait"
+            >   <intent-filter>
             <action android:name="android.intent.action.MAIN" />
 
             <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter></activity>
-        <activity android:name=".MainActivity" />
+        <activity android:name=".MainActivity" android:screenOrientation="portrait"
-        <activity android:name=".Report">
+            />
+        <activity android:name=".Report" android:screenOrientation="portrait"
+            >
 
         </activity>
-        <activity android:name=".NavigationTop" />
+        <activity android:name=".NavigationTop"  android:screenOrientation="portrait"
-        <activity android:name=".LoginScreen" />
+            />
+        <activity android:name=".LoginScreen" android:screenOrientation="portrait"
+            />
 
 
-        <activity android:name=".AddImage"></activity>
+        <activity android:name=".AddImage" android:screenOrientation="portrait"
-        <activity android:name=".CameraGuide"></activity>
+            ></activity>
-        <activity android:name=".About" />
+        <activity android:name=".CameraGuide"  android:screenOrientation="portrait"></activity>
-        <activity android:name=".PatientDetail"></activity>
+        <activity android:name=".About"  android:screenOrientation="portrait" />
-        <activity android:name=".TestResult" />
+        <activity android:name=".PatientDetail"  android:screenOrientation="portrait"></activity>
+        <activity android:name=".TestResult"  android:screenOrientation="portrait" />
 
 
 
@@ -70,6 +87,7 @@
 
         <activity
             android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
+
             android:theme="@style/Base.Theme.AppCompat" />
     </application>
 

app/src/main/java/in/sminnovations/arrest_tb/AddImage.java

@@ -38,6 +38,7 @@ import com.google.firebase.storage.UploadTask;
 import com.theartofdev.edmodo.cropper.CropImage;
 import com.theartofdev.edmodo.cropper.CropImageView;
 
+import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;

app/src/main/java/in/sminnovations/arrest_tb/ForgetPassword.java

@@ -1,5 +1,6 @@
 package in.sminnovations.arrest_tb;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -182,7 +183,7 @@ public class ForgetPassword extends AppCompatActivity {
                 number,
                 60,
                 TimeUnit.SECONDS,
-                TaskExecutors.MAIN_THREAD,
+                (Activity) TaskExecutors.MAIN_THREAD,
                 mCallBack
         );
     }

app/src/main/java/in/sminnovations/arrest_tb/ForgetPasswordReset.java

@@ -12,6 +12,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
+import com.hbb20.CountryCodePicker;
 
 public class ForgetPasswordReset extends AppCompatActivity {
     private Button next;

app/src/main/java/in/sminnovations/arrest_tb/MainActivity.java

@@ -134,7 +134,7 @@ info=findViewById(R.id.info);
                     @Override
                     public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
                     {
-                        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false);
+                        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false);
                         TestViewHolder holder = new TestViewHolder(view);
                         return holder;
                     }
@@ -197,7 +197,7 @@ info=findViewById(R.id.info);
                         @Override
                         public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
                         {
-                            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false);
+                            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false);
                             TestViewHolder holder = new TestViewHolder(view);
                             return holder;
                         }
@@ -254,7 +254,7 @@ info=findViewById(R.id.info);
                         @Override
                         public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
                         {
-                            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false);
+                            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false);
                             TestViewHolder holder = new TestViewHolder(view);
                             return holder;
                         }

app/src/main/java/in/sminnovations/arrest_tb/NavigationTop.java

@@ -30,7 +30,7 @@ public class NavigationTop extends AppCompatActivity implements NavigationView.O
         {
 
             case R.id.nav_contact_us:
-                Intent intent1=new Intent(this, About.class);
+                Intent intent1=new Intent(this,About.class);
                 startActivity(intent1);
                 break;
             case R.id.nav_home:

app/src/main/java/in/sminnovations/arrest_tb/NegativeResults.java

@@ -133,7 +133,7 @@ public class NegativeResults extends NavigationTop {
                     @Override
                     public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
                     {
-                        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false);
+                        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false);
                         TestViewHolder holder = new TestViewHolder(view);
                         return holder;
                     }
@@ -186,7 +186,7 @@ public class NegativeResults extends NavigationTop {
                         @Override
                         public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
                         {
-                            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false);
+                            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false);
                             TestViewHolder holder = new TestViewHolder(view);
                             return holder;
                         }

app/src/main/java/in/sminnovations/arrest_tb/PatientDetail.java

@@ -6,9 +6,11 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
@@ -19,6 +21,9 @@ import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.Toast;
 
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 import java.util.Calendar;
 
 public class PatientDetail extends NavigationTop implements AdapterView.OnItemSelectedListener {
@@ -26,6 +31,9 @@ public class PatientDetail extends NavigationTop implements AdapterView.OnItemSe
     private DatePickerDialog.OnDateSetListener mDateSetListener;
     String patientid,patientdob,patientage,patientnikshayid;
     String gender;
+    private GpsTracker gpsTracker;
+    String lat,logi;
+
 
 
     private EditText mDisplayDate,patient_ID,Age,NikshayId;
@@ -44,6 +52,7 @@ public class PatientDetail extends NavigationTop implements AdapterView.OnItemSe
         NikshayId=findViewById(R.id.NikshayID);
 
 
+
         ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
                 R.array.Gender, android.R.layout.simple_spinner_item);
         mDisplayDate.setOnClickListener(new View.OnClickListener() {
@@ -89,6 +98,7 @@ public class PatientDetail extends NavigationTop implements AdapterView.OnItemSe
         next_act.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                getLocation();
                 patientid = patient_ID.getText().toString();
                 patientage = Age.getText().toString();
                 patientnikshayid = NikshayId.getText().toString();
@@ -102,6 +112,10 @@ public class PatientDetail extends NavigationTop implements AdapterView.OnItemSe
 
                     //   editor.putString(Name, phonenum);
                     editor.putString("gender", gender);
+                    editor.putString("longitude", logi);
+                    editor.putString("latitude", lat);
+
+
                     editor.putString("patientid", patientid);
                     editor.putString("patientage", patientage);
                     editor.putString("patientnikshayid", patientnikshayid);
@@ -164,6 +178,24 @@ public class PatientDetail extends NavigationTop implements AdapterView.OnItemSe
         AlertDialog alert = builder.create();
         alert.show();
     }
+    public void getLocation(){
+        gpsTracker = new GpsTracker(PatientDetail.this);
+        if(gpsTracker.canGetLocation()){
+            double latitude = gpsTracker.getLatitude();
+            lat=String.valueOf(latitude);
+
+            double longitude = gpsTracker.getLongitude();
+            logi=String.valueOf(longitude);
+
+            Log.e("main", "error "+latitude);
+            Log.e("main", "error "+longitude);
+
+
+
+        }else{
+            gpsTracker.showSettingsAlert();
+        }
+    }
 
 
 

app/src/main/java/in/sminnovations/arrest_tb/PositiveResult.java

@@ -135,7 +135,7 @@ public class PositiveResult extends NavigationTop {
                     @Override
                     public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
                     {
-                        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false);
+                        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false);
                         TestViewHolder holder = new TestViewHolder(view);
                         return holder;
                     }
@@ -190,7 +190,7 @@ public class PositiveResult extends NavigationTop {
                         @Override
                         public TestViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
                         {
-                            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.demo, parent, false);
+                            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item, parent, false);
                             TestViewHolder holder = new TestViewHolder(view);
                             return holder;
                         }

app/src/main/java/in/sminnovations/arrest_tb/TestDetails.java

@@ -6,6 +6,8 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -16,6 +18,7 @@ import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.ValueEventListener;
 
+import java.io.File;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;

app/src/main/java/in/sminnovations/arrest_tb/VerifyOTP/VerifyOtp.java

@@ -6,6 +6,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -19,6 +20,7 @@ import com.google.firebase.FirebaseException;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.PhoneAuthCredential;
+import com.google.firebase.auth.PhoneAuthOptions;
 import com.google.firebase.auth.PhoneAuthProvider;
 
 import java.util.concurrent.TimeUnit;
@@ -49,8 +51,7 @@ public class VerifyOtp extends AppCompatActivity {
         nextactivity = findViewById(R.id.buttonSignIn);
 
         mAuth = FirebaseAuth.getInstance();
-
+       // mAuth =  FirebaseAuth.getInstance().getFirebaseAuthSettings().forceRecaptchaFlowForTesting();
-
         String phonenumberk = getIntent().getStringExtra("numberwithcode");
         phonenumberke = getIntent().getStringExtra("mobile");
 
@@ -111,13 +112,14 @@ public class VerifyOtp extends AppCompatActivity {
 
     private void sendVerificationCode(String number){
 
-        PhoneAuthProvider.getInstance().verifyPhoneNumber(
+        PhoneAuthOptions options =
-                number,
+                PhoneAuthOptions.newBuilder(mAuth)
-                60,
+                        .setPhoneNumber(number)       // Phone number to verify
-                TimeUnit.SECONDS,
+                        .setTimeout(60L, TimeUnit.SECONDS) // Timeout and unit
-                TaskExecutors.MAIN_THREAD,
+                        .setActivity(this)                 // Activity (for callback binding)
-                mCallBack
+                        .setCallbacks(mCallBack)          // OnVerificationStateChangedCallbacks
-        );
+                        .build();
+        PhoneAuthProvider.verifyPhoneNumber(options);
     }
 
     private PhoneAuthProvider.OnVerificationStateChangedCallbacks

app/src/main/java/in/sminnovations/arrest_tb/VerifyOTP/VerifyOtpForgetPassword.java

@@ -2,6 +2,7 @@ package in.sminnovations.arrest_tb.VerifyOTP;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -19,12 +20,13 @@ import com.google.firebase.FirebaseException;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.PhoneAuthCredential;
+import com.google.firebase.auth.PhoneAuthOptions;
 import com.google.firebase.auth.PhoneAuthProvider;
 
 import java.util.concurrent.TimeUnit;
 
-import in.sminnovations.arrest_tb.ForgetPassword;
 import in.sminnovations.arrest_tb.ForgetPasswordReset;
+import in.sminnovations.arrest_tb.ForgetPassword;
 import in.sminnovations.arrest_tb.R;
 
 
@@ -106,13 +108,14 @@ public class VerifyOtpForgetPassword extends AppCompatActivity {
 
     private void sendVerificationCode(String number){
 
-        PhoneAuthProvider.getInstance().verifyPhoneNumber(
+        PhoneAuthOptions options =
-                number,
+                PhoneAuthOptions.newBuilder(mAuth)
-                60,
+                        .setPhoneNumber(number)       // Phone number to verify
-                TimeUnit.SECONDS,
+                        .setTimeout(60L, TimeUnit.SECONDS) // Timeout and unit
-                TaskExecutors.MAIN_THREAD,
+                        .setActivity(this)                 // Activity (for callback binding)
-                mCallBack
+                        .setCallbacks(mCallBack)          // OnVerificationStateChangedCallbacks
-        );
+                        .build();
+        PhoneAuthProvider.verifyPhoneNumber(options);
     }
 
     private PhoneAuthProvider.OnVerificationStateChangedCallbacks
@@ -137,6 +140,7 @@ public class VerifyOtpForgetPassword extends AppCompatActivity {
         @Override
         public void onVerificationFailed(FirebaseException e) {
            // Toast.makeText(VerifyOtpForgetPassword.this, e.getMessage(),Toast.LENGTH_LONG).show();
+            Log.e("main", "error " + e.getMessage());
 
         }
     };

app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -4,17 +4,13 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-    <path
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000">
         <aapt:attr name="android:fillColor">
             <gradient
-                android:endX="78.5885"
+                android:endX="85.84757"
-                android:endY="90.9159"
+                android:endY="92.4963"
-                android:startX="48.7653"
+                android:startX="42.9492"
-                android:startY="61.0927"
+                android:startY="49.59793"
                 android:type="linear">
                 <item
                     android:color="#44000000"
@@ -28,7 +24,7 @@
     <path
         android:fillColor="#FFFFFF"
         android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
         android:strokeWidth="1"
         android:strokeColor="#00000000" />
 </vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>

app/src/main/res/layout/item.xml

@@ -32,7 +32,7 @@
             android:textColor="@color/from"
             android:textSize="@dimen/msg_text_primary"
             android:textStyle="bold"
-            tools:text="Patinet ID"/>
+            tools:text="Sender name"/>
 
         <TextView
             android:id="@+id/sample_type"
@@ -43,7 +43,7 @@
             android:textColor="@color/subject"
             android:textSize="@dimen/msg_text_secondary"
             android:textStyle="bold"
-            tools:text="Sample type"/>
+            tools:text="This is the subject of the email"/>
 
         <TextView
             android:id="@+id/nikshayid"
@@ -55,7 +55,7 @@
             android:paddingBottom="5dp"
             android:textColor="@color/message"
             android:textSize="@dimen/msg_text_secondary"
-            tools:text="Nikshay ID"/>
+            tools:text="This is the body of the email"/>
 
 
 
@@ -112,7 +112,7 @@
         android:textColor="@color/timestamp"
         android:textSize="@dimen/timestamp"
         android:textStyle="bold"
-        tools:text="Date"/>
+        tools:text="9:00 AM"/>
 
    <!-- <ImageView
         android:id="@+id/icon_star"

app/src/main/res/values-hdpi/dimens.xml

@@ -1,16 +1,16 @@
 <resources>
-	<dimen name="small_text_size">9.7sp</dimen>
-	<dimen name="heading_size">10.7sp</dimen>
-	<dimen name="default_text_size">11.7sp</dimen>
 	<dimen name="activity_vertical_margin">10.7dp</dimen>
-	<dimen name="padding_list_row">10.7dp</dimen>
+	<dimen name="padding_list_row">6.7dp</dimen>
 	<dimen name="activity_horizontal_margin">10.7dp</dimen>
 	<dimen name="fab_margin">10.7dp</dimen>
 	<dimen name="icon_star">16.7dp</dimen>
 	<dimen name="messages_padding_left">48dp</dimen>
 	<dimen name="icon_width_height">26.7dp</dimen>
-	<dimen name="icon_text">14.7dp</dimen>
+	<dimen name="icon_text">9.3sp</dimen>
-	<dimen name="timestamp">8dp</dimen>
+	<dimen name="timestamp">6.7sp</dimen>
-	<dimen name="msg_text_primary">9.3sp</dimen>
+	<dimen name="small_text_size">8sp</dimen>
-	<dimen name="msg_text_secondary">9.3sp</dimen>
+	<dimen name="msg_text_primary">8sp</dimen>
+	<dimen name="msg_text_secondary">7.3sp</dimen>
+	<dimen name="heading_size">10.7sp</dimen>
+	<dimen name="default_text_size">9.3sp</dimen>
 </resources>

app/src/main/res/values-ldpi/dimens.xml

@@ -1,16 +1,16 @@
 <resources>
-	<dimen name="small_text_size">9.7sp</dimen>
-	<dimen name="heading_size">10.7sp</dimen>
-	<dimen name="default_text_size">11.7sp</dimen>
 	<dimen name="activity_vertical_margin">10.7dp</dimen>
-	<dimen name="padding_list_row">10.7dp</dimen>
+	<dimen name="padding_list_row">6.7dp</dimen>
 	<dimen name="activity_horizontal_margin">10.7dp</dimen>
 	<dimen name="fab_margin">10.7dp</dimen>
 	<dimen name="icon_star">16.7dp</dimen>
 	<dimen name="messages_padding_left">48dp</dimen>
 	<dimen name="icon_width_height">26.7dp</dimen>
-	<dimen name="icon_text">14.7dp</dimen>
+	<dimen name="icon_text">9.3sp</dimen>
-	<dimen name="timestamp">8dp</dimen>
+	<dimen name="timestamp">6.7sp</dimen>
-	<dimen name="msg_text_primary">9.3sp</dimen>
+	<dimen name="small_text_size">8sp</dimen>
-	<dimen name="msg_text_secondary">9.3sp</dimen>
+	<dimen name="msg_text_primary">8sp</dimen>
+	<dimen name="msg_text_secondary">7.3sp</dimen>
+	<dimen name="heading_size">10.7sp</dimen>
+	<dimen name="default_text_size">9.3sp</dimen>
 </resources>

app/src/main/res/values-xhdpi/dimens.xml

@@ -1,16 +1,16 @@
 <resources>
 	<dimen name="heading_size">16sp</dimen>
-	<dimen name="default_text_size">17.5sp</dimen>
+	<dimen name="default_text_size">14sp</dimen>
-	<dimen name="small_text_size">14.5sp</dimen>
+	<dimen name="small_text_size">12sp</dimen>
 	<dimen name="activity_horizontal_margin">16dp</dimen>
 	<dimen name="activity_vertical_margin">16dp</dimen>
 	<dimen name="fab_margin">16dp</dimen>
-	<dimen name="padding_list_row">16dp</dimen>
+	<dimen name="padding_list_row">10dp</dimen>
 	<dimen name="messages_padding_left">72dp</dimen>
 	<dimen name="icon_width_height">40dp</dimen>
-	<dimen name="msg_text_primary">14sp</dimen>
+	<dimen name="msg_text_primary">12sp</dimen>
-	<dimen name="msg_text_secondary">13.9sp</dimen>
+	<dimen name="msg_text_secondary">11sp</dimen>
 	<dimen name="icon_star">25dp</dimen>
-	<dimen name="icon_text">22dp</dimen>
+	<dimen name="icon_text">14sp</dimen>
-	<dimen name="timestamp">12dp</dimen>
+	<dimen name="timestamp">10sp</dimen>
 </resources>

app/src/main/res/values-xxhdpi/dimens.xml

@@ -1,16 +1,16 @@
 <resources>
-	<dimen name="small_text_size">19.3sp</dimen>
-	<dimen name="heading_size">21.3sp</dimen>
-	<dimen name="default_text_size">23.3sp</dimen>
 	<dimen name="activity_vertical_margin">21.3dp</dimen>
-	<dimen name="padding_list_row">21.3dp</dimen>
+	<dimen name="padding_list_row">13.3dp</dimen>
 	<dimen name="activity_horizontal_margin">21.3dp</dimen>
 	<dimen name="fab_margin">21.3dp</dimen>
 	<dimen name="icon_star">33.3dp</dimen>
 	<dimen name="messages_padding_left">96dp</dimen>
 	<dimen name="icon_width_height">53.3dp</dimen>
-	<dimen name="icon_text">29.3dp</dimen>
+	<dimen name="icon_text">18.7sp</dimen>
-	<dimen name="timestamp">16dp</dimen>
+	<dimen name="timestamp">13.3sp</dimen>
-	<dimen name="msg_text_primary">18.7sp</dimen>
+	<dimen name="small_text_size">16sp</dimen>
-	<dimen name="msg_text_secondary">18.5sp</dimen>
+	<dimen name="msg_text_primary">16sp</dimen>
+	<dimen name="msg_text_secondary">14.7sp</dimen>
+	<dimen name="heading_size">21.3sp</dimen>
+	<dimen name="default_text_size">18.7sp</dimen>
 </resources>

app/src/main/res/values-xxxhdpi/dimens.xml

@@ -1,16 +1,16 @@
 <resources>
-	<dimen name="small_text_size">24.2sp</dimen>
-	<dimen name="heading_size">26.7sp</dimen>
-	<dimen name="default_text_size">29.2sp</dimen>
 	<dimen name="activity_vertical_margin">26.7dp</dimen>
-	<dimen name="padding_list_row">26.7dp</dimen>
+	<dimen name="padding_list_row">16.7dp</dimen>
 	<dimen name="activity_horizontal_margin">26.7dp</dimen>
 	<dimen name="fab_margin">26.7dp</dimen>
 	<dimen name="icon_star">41.7dp</dimen>
 	<dimen name="messages_padding_left">120dp</dimen>
 	<dimen name="icon_width_height">66.7dp</dimen>
-	<dimen name="icon_text">36.7dp</dimen>
+	<dimen name="icon_text">23.3sp</dimen>
-	<dimen name="timestamp">20dp</dimen>
+	<dimen name="timestamp">16.7sp</dimen>
-	<dimen name="msg_text_primary">23.3sp</dimen>
+	<dimen name="small_text_size">20sp</dimen>
-	<dimen name="msg_text_secondary">23.2sp</dimen>
+	<dimen name="msg_text_primary">20sp</dimen>
+	<dimen name="msg_text_secondary">18.3sp</dimen>
+	<dimen name="heading_size">26.7sp</dimen>
+	<dimen name="default_text_size">23.3sp</dimen>
 </resources>

app/src/main/res/values/dimens.xml

@@ -1,16 +1,16 @@
 <resources>
 	<dimen name="heading_size">8.9sp</dimen>
-	<dimen name="default_text_size">9.7sp</dimen>
+	<dimen name="default_text_size">7.8sp</dimen>
-	<dimen name="small_text_size">8.1sp</dimen>
+	<dimen name="small_text_size">6.7sp</dimen>
-	<dimen name="activity_vertical_margin">8.9dp</dimen>
-	<dimen name="padding_list_row">8.9dp</dimen>
 	<dimen name="activity_horizontal_margin">8.9dp</dimen>
+	<dimen name="activity_vertical_margin">8.9dp</dimen>
 	<dimen name="fab_margin">8.9dp</dimen>
-	<dimen name="icon_star">13.9dp</dimen>
+	<dimen name="padding_list_row">5.6dp</dimen>
 	<dimen name="messages_padding_left">40dp</dimen>
 	<dimen name="icon_width_height">22.2dp</dimen>
-	<dimen name="icon_text">12.2dp</dimen>
+	<dimen name="msg_text_primary">6.7sp</dimen>
-	<dimen name="timestamp">6.7dp</dimen>
+	<dimen name="msg_text_secondary">6.1sp</dimen>
-	<dimen name="msg_text_primary">7.8sp</dimen>
+	<dimen name="icon_star">13.9dp</dimen>
-	<dimen name="msg_text_secondary">7.7sp</dimen>
+	<dimen name="icon_text">7.8sp</dimen>
+	<dimen name="timestamp">5.6sp</dimen>
 </resources>

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Arrest TB</string>
+    <string name="app_name">Arrest TB </string>
     <string name="open_navigation_drawer">Open navigation drawer</string>
     <string name="close_navigation_drawer">Close navigation drawer</string>
     <string name="asteriskred"><font color='#cc0029'>*</font></string>
@@ -20,5 +20,4 @@
 
     </string-array>
 
-
 </resources>

app/src/main/res/values/styles.xml

@@ -1,7 +1,5 @@
 <resources>
-
     <!-- Base application theme. -->
-
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         google()
         jcenter()
-        
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath "com.android.tools.build:gradle:4.0.1"
+        classpath 'com.google.gms:google-services:4.2.0'
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -15,9 +15,10 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url 'https://jitpack.io' }
+
         google()
         jcenter()
-        
     }
 }
 

gradle.properties

@@ -6,15 +6,14 @@
 # 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.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
+# Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Sep 27 20:54:38 PDT 2020
+#Fri Nov 13 19:37:01 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

settings.gradle

@@ -1,2 +1,2 @@
 include ':app'
-rootProject.name='Spin Tube App'
+rootProject.name = "arrest_tb"