First Commit

app/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "29.0.3"
     defaultConfig {
         applicationId "com.ShanMukhaInnovations.ArrestTB"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"

app/src/main/AndroidManifest.xml

@@ -9,11 +9,23 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+
+        android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_path" />
+        </provider>
         <activity android:name=".Report">
 
+
         </activity>
         <activity android:name=".AddImage"></activity>
         <activity android:name=".Camera_Guide"></activity>
@@ -26,6 +38,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
+
+
         </activity>
         <activity android:name=".Patient_detail" >
 

app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Camera_Guide.java

@@ -1,9 +1,13 @@
 package com.ShanMukhaInnovations.ArrestTB;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
+import android.Manifest;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -26,25 +30,15 @@ public class Camera_Guide extends AppCompatActivity {
         setContentView(R.layout.activity_camera__guide);
         Intro=findViewById(R.id.intro);
 
-        patientdob=  getIntent().getStringExtra("dob_report");
-        patientid=getIntent().getStringExtra("id_report");
-        patientage=getIntent().getStringExtra("age_report");
-        patientnikshayid=getIntent().getStringExtra("nikshay_report");
-        Log.d(patientid,"vvvvvvvvvvvvvvvv");
 
 
         Intro.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 
+
                 Intent intent = new Intent(getApplicationContext(),AddImage.class );
-                intent.putExtra("dob_report",patientdob);
-                intent.putExtra("id_report",patientid);
-
-                intent.putExtra("age_report",patientage);
-                intent.putExtra("nikshay_report",patientnikshayid);
-
-                startActivity(intent);
+                  startActivity(intent);
 
                 savePrefsData();
                 finish();

app/src/main/java/com/ShanMukhaInnovations/ArrestTB/FontAwesome.java

@@ -27,7 +27,6 @@ public class FontAwesome extends AppCompatTextView {
 
     private void init() {
 
-        //Font name should not contain "/".
         Typeface tf = Typeface.createFromAsset(getContext().getAssets(),
                 "fa-solid-900.ttf");
         setTypeface(tf);

app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Navigation_Top.java

@@ -44,7 +44,7 @@ public class Navigation_Top extends AppCompatActivity implements NavigationView.
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-      //  getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
         setContentView(R.layout.activity_navigation__top);
 

app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Patient_detail.java

@@ -9,6 +9,8 @@ import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -18,6 +20,7 @@ import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.Spinner;
+import android.widget.Toast;
 
 import java.util.Calendar;
 
@@ -42,13 +45,19 @@ public class Patient_detail extends Navigation_Top implements AdapterView.OnItem
         patient_ID=findViewById(R.id.patientid);
         Age=findViewById(R.id.age);
         NikshayId=findViewById(R.id.NikshayID);
+      /*  patient_ID.addTextChangedListener(loginTextWatcher);
+        Age.addTextChangedListener(loginTextWatcher);
+        NikshayId.addTextChangedListener(loginTextWatcher);
 
+*/
 
         ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
                 R.array.Gender, android.R.layout.simple_spinner_item);
         mDisplayDate.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                mDisplayDate.setEnabled(true);
+
                 Calendar cal = Calendar.getInstance();
                 int year = cal.get(Calendar.YEAR);
                 int month = cal.get(Calendar.MONTH);
@@ -87,32 +96,33 @@ public class Patient_detail extends Navigation_Top implements AdapterView.OnItem
         next_act.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                patientid=patient_ID.getText().toString();
-patientage=Age.getText().toString();
-                patientnikshayid=NikshayId.getText().toString();
-                SharedPreferences preferences=getSharedPreferences("PhoneBook",MODE_PRIVATE);
-                SharedPreferences.Editor editor=preferences.edit();
+                patientid = patient_ID.getText().toString();
+                patientage = Age.getText().toString();
+                patientnikshayid = NikshayId.getText().toString();
+                if (patientid.equals("") || patientage.equals("") || patientnikshayid.equals("")) {
+                    Toast.makeText(Patient_detail.this, "Please fill all fields", Toast.LENGTH_SHORT).show();
 
-                //   editor.putString(Name, phonenum);
-                editor.putString("gender", gender);
-                editor.putString("patientid", patientid);
-                editor.putString("patientage", patientage);
-                editor.putString("patientnikshayid", patientnikshayid);
-                editor.putString("dob", patientdob);
+                } else {
+
+                    SharedPreferences preferences = getSharedPreferences("PhoneBook", MODE_PRIVATE);
+                    SharedPreferences.Editor editor = preferences.edit();
+
+                    //   editor.putString(Name, phonenum);
+                    editor.putString("gender", gender);
+                    editor.putString("patientid", patientid);
+                    editor.putString("patientage", patientage);
+                    editor.putString("patientnikshayid", patientnikshayid);
+                    editor.putString("dob", patientdob);
 
 
+                    editor.commit();
 
 
+                    Intent intent = new Intent(Patient_detail.this, Test_details.class);
 
 
-
-                editor.commit();
-
-
-                Intent intent=new Intent (Patient_detail.this,Test_details.class);
-
-
-                startActivity(intent);
+                    startActivity(intent);
+                }
             }
         });
     }
@@ -132,4 +142,18 @@ patientage=Age.getText().toString();
     public void onNothingSelected(AdapterView<?> parent) {
 
     }
+
+    /*private TextWatcher loginTextWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        }
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+    next_act.setEnabled(!patientid.isEmpty() && !patientage.isEmpty() && !patientnikshayid.isEmpty());
+        }
+        @Override
+        public void afterTextChanged(Editable s) {
+        }
+    };*/
 }

app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Report.java

@@ -1,40 +1,66 @@
 package com.ShanMukhaInnovations.ArrestTB;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
 
+import android.Manifest;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.pdf.PdfDocument;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ImageButton;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
-public class Report extends Navigation_Top {
+public class Report extends AppCompatActivity {
     TextView patient_id,patient_dob,patientnikshayid,agepatient,patientgender,patientsample,validatyd,spintubeid,nirtlab,dated,timed,resultd;
+    ImageButton shared ,dowbloadd;
+    String string1,string2,string3,string4,string5,string6,string7,string8,string9,date,time;
+    File filePath=null;
+
 
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_report);
+     /*   super.onCreate(savedInstanceState);
         LayoutInflater inflater = (LayoutInflater) this
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         View contentView = inflater.inflate(R.layout.activity_report, null, false);
         draw.addView(contentView, 0);
+*/
 
-
-        //  setContentView(R.layout.activity_report);
+         setContentView(R.layout.activity_report);
+        shared=findViewById(R.id.share);
+        dowbloadd=findViewById(R.id.downlaod);
         patient_id=findViewById(R.id.patient_idr);
         patient_dob=findViewById(R.id.patien_dobr);
         patientnikshayid=findViewById(R.id.patient_nikshayidr);
                 agepatient=findViewById(R.id.patient_ager);
-        String date = String.valueOf(android.text.format.DateFormat.format("dd-MM-yyyy", new java.util.Date()));
+         date = String.valueOf(android.text.format.DateFormat.format("dd-MM-yyyy", new java.util.Date()));
         DateFormat df = new SimpleDateFormat("h:mm a");
-        String time = df.format(Calendar.getInstance().getTime());
+         time = df.format(Calendar.getInstance().getTime());
 
         patientgender=findViewById(R.id.patient_genderr);
                 patientsample=findViewById(R.id.patient_typesampler);
@@ -52,18 +78,81 @@ public class Report extends Navigation_Top {
 
         SharedPreferences preferences=getSharedPreferences("PhoneBook",MODE_PRIVATE);
 
-        String string1 = preferences.getString("gender", null);
-        String string2 = preferences.getString("patientid", null);
-        String string3 = preferences.getString("patientage", null);
-        String string4 = preferences.getString("patientnikshayid", null);
-        String string5 = preferences.getString("dob", null);
+         string1 = preferences.getString("gender", null);
+         string2 = preferences.getString("patientid", null);
+         string3 = preferences.getString("patientage", null);
+         string4 = preferences.getString("patientnikshayid", null);
+         string5 = preferences.getString("dob", null);
+
 
         SharedPreferences preferences1=getSharedPreferences("PhoneBook1",MODE_PRIVATE);
 
-        String string6 = preferences1.getString("NIRTLabde", null);
-        String string7 = preferences1.getString("SPINTubeIDde", null);
-        String string8 = preferences1.getString("sample", null);
-        String string9 = preferences1.getString("validity", null);
+         string6 = preferences1.getString("NIRTLabde", null);
+         string7 = preferences1.getString("SPINTubeIDde", null);
+         string8 = preferences1.getString("sample", null);
+         string9 = preferences1.getString("validity", null);
+
+        shared.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(ContextCompat.checkSelfPermission(Report.this, Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED)
+                {
+
+                    ActivityCompat.requestPermissions(Report.this,new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},23);
+                }
+                else
+                {
+                    createPdf();
+
+                    Intent intent=new Intent(Intent.ACTION_SEND);
+                    intent.putExtra(Intent.EXTRA_TEXT,"Report");
+                    if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N) {
+                        Uri path= FileProvider.getUriForFile(Report.this,"com.ShanMukhaInnovations.ArrestTB.fileprovider",filePath);
+                        intent.putExtra(Intent.EXTRA_STREAM,path);
+                    }
+                    else{
+
+                        intent.putExtra(Intent.EXTRA_STREAM,Uri.fromFile(filePath));
+                    }
+                    intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                    intent.setType("application/pdf");
+                    startActivity(intent);
+
+                    //startCropImageActivity();
+                    // createPdf(editText.getText().toString());
+
+
+                }
+                //now for sharing file i need to create file provider for android version greater than noughat let's do it
+
+
+                //Everything WOrking
+
+
+            }
+        });
+
+        dowbloadd.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(ContextCompat.checkSelfPermission(Report.this, Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED)
+                {
+
+                    ActivityCompat.requestPermissions(Report.this,new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},23);
+                }
+                else
+                {
+                    //startCropImageActivity();
+                    createPdf();
+                    Toast.makeText(Report.this, "File Downloaded", Toast.LENGTH_LONG).show();
+
+
+
+                }
+            }
+
+        });
+
 
 patient_id.setText(string2);
 patient_dob.setText(string5);
@@ -84,4 +173,130 @@ validatyd.setText(string9);
 
 
     }
+    private void createPdf(){
+        // create a new document
+        PdfDocument document = new PdfDocument();
+
+        // crate a page description
+        PdfDocument.PageInfo pageInfo = new PdfDocument.PageInfo.Builder(1000, 2000, 1).create();
+
+        // start a page
+        PdfDocument.Page page = document.startPage(pageInfo);
+        Canvas canvas = page.getCanvas();
+        Paint paint = new Paint();
+        paint.setTextSize(80);
+        canvas.drawText("Arrest Tb",40,80,paint);
+        paint.setTextSize(30);
+        canvas.drawText("ShanMukha Innovations Pvt Ltd",30,120,paint);
+        paint.setTextAlign(Paint.Align.RIGHT);
+        canvas.drawText(date,canvas.getWidth()-40,40,paint);
+        canvas.drawText(time,canvas.getWidth()-40,80,paint);
+        paint.setTextAlign(Paint.Align.LEFT);
+        paint.setColor(Color.rgb(150,150,150));
+        canvas.drawRect(30,250,canvas.getWidth()-30,300,paint);
+        paint.setColor(Color.WHITE);
+        canvas.drawText("Result",50,285,paint);
+        // canvas.drawText("name 2",450,435,paint);
+        paint.setTextAlign(Paint.Align.RIGHT);
+        canvas.drawText("POSITIVE",canvas.getWidth()-40,285,paint);
+        paint.setTextAlign(Paint.Align.LEFT);
+
+
+        paint.setColor(Color.rgb(150,150,150));
+        // canvas.drawRect(30,150,canvas.getWidth()-30,160,paint);
+
+
+        canvas.drawRect(30,400,canvas.getWidth()-30,450,paint);
+        paint.setColor(Color.WHITE);
+        canvas.drawText("Patient ID",50,435,paint);
+        canvas.drawText("Patient Gender",450,435,paint);
+        paint.setTextAlign(Paint.Align.RIGHT);
+        canvas.drawText("Date of Birth",canvas.getWidth()-40,435,paint);
+        paint.setTextAlign(Paint.Align.LEFT);
+        paint.setColor(Color.BLACK);
+
+        canvas.drawText(string2,50,480,paint);
+        canvas.drawText(string1,450,480,paint);
+        paint.setTextAlign(Paint.Align.RIGHT);
+        canvas.drawText(string5+".",canvas.getWidth()-40,480,paint);
+
+        paint.setTextAlign(Paint.Align.RIGHT);
+
+        paint.setColor(Color.rgb(150,150,150));
+        // canvas.drawRect(30,150,canvas.getWidth()-30,160,paint);
+
+        // canvas.drawRect(30,550,canvas.getWidth()-30,560,paint);
+        canvas.drawRect(30,570,canvas.getWidth()-30,620,paint);
+
+
+        paint.setColor(Color.WHITE);
+        canvas.drawText("Age",100,605,paint);
+        canvas.drawText("Nikshay ID ",540,605,paint);
+        paint.setTextAlign(Paint.Align.RIGHT);
+        canvas.drawText("NIRT Lab Number",canvas.getWidth()-40,605,paint);
+        paint.setTextAlign(Paint.Align.LEFT);
+        paint.setColor(Color.BLACK);
+
+        canvas.drawText(string3,50,650,paint);
+        canvas.drawText(string4,440,650,paint);
+        paint.setTextAlign(Paint.Align.RIGHT);
+        canvas.drawText(string6,canvas.getWidth()-40,650,paint);
+
+        paint.setTextAlign(Paint.Align.RIGHT);
+        paint.setColor(Color.rgb(150,150,150));
+
+        canvas.drawRect(30,740,canvas.getWidth()-30,790,paint);
+
+        paint.setColor(Color.WHITE);
+        canvas.drawText("SPIN Tube ID",220,775,paint);
+        canvas.drawText("Type of Sample",540,775,paint);
+        paint.setTextAlign(Paint.Align.RIGHT);
+        canvas.drawText("Tube Validity",canvas.getWidth()-40,775,paint);
+        paint.setTextAlign(Paint.Align.LEFT);
+        paint.setColor(Color.BLACK);
+
+        canvas.drawText(string7,50,820,paint);
+        canvas.drawText(string8,440,820,paint);
+        paint.setTextAlign(Paint.Align.RIGHT);
+        canvas.drawText(string9,canvas.getWidth()-40,820,paint);
+
+        paint.setTextAlign(Paint.Align.RIGHT);
+        paint.setColor(Color.rgb(150,150,150));
+
+             // finish the page
+        document.finishPage(page);
+      /*  File file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),"Raman.pdf");
+
+
+        // write the document content
+        *//*String directory_path = Environment.getExternalStorageDirectory().getPath() + "/ArrestTb/";
+        File file = new File(directory_path);
+        if (!file.exists()) {
+            file.mkdirs();
+        }*//*
+       // String targetPdf = directory_path+"Report_"+string2+".pdf";
+        filePath = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),"Report_"+string2+".pdf");
+*/
+        String directory_path = Environment.getExternalStorageDirectory().getPath() + "/ArrestTb/";
+        File file = new File(directory_path);
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        String targetPdf = directory_path+"Report_"+string2+".pdf";
+        filePath = new File(targetPdf);
+
+        try {
+            document.writeTo(new FileOutputStream(filePath));
+        } catch (IOException e) {
+            Log.e("main", "error "+e.toString());
+        }
+       // filePath= new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),"Report_"+string2+".pdf");
+
+
+        // close the document
+        document.close();
+
+    }
+
+
 }

app/src/main/java/com/ShanMukhaInnovations/ArrestTB/Test_details.java

@@ -1,10 +1,14 @@
 package com.ShanMukhaInnovations.ArrestTB;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
+import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -14,11 +18,14 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Spinner;
+import android.widget.Toast;
 
 public class Test_details extends Navigation_Top implements AdapterView.OnItemSelectedListener {
     Button btnTest;
    EditText NIRTLabd,SPINTubeIDd;
    String NIRTLabde,SPINTubeIDde,validatyd,sampled;
+    int PERMISSION_ALL = 1;
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -41,48 +48,60 @@ public class Test_details extends Navigation_Top implements AdapterView.OnItemSe
         btnTest.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                NIRTLabde=NIRTLabd.getText().toString();
-                SPINTubeIDde= SPINTubeIDd.getText().toString();
+                NIRTLabde = NIRTLabd.getText().toString();
+                SPINTubeIDde = SPINTubeIDd.getText().toString();
+                if (NIRTLabde.equals("") || SPINTubeIDde.equals("") || sampled.equals("")) {
+                    Toast.makeText(Test_details.this, "Please fill all fields", Toast.LENGTH_SHORT).show();
+
+                } else {
+                    if(ContextCompat.checkSelfPermission(Test_details.this, Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED)
+                    {
+
+                        ActivityCompat.requestPermissions(Test_details.this,new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},23);
+
+                        // MY_PERMISSIONS_REQUEST_READ_CONTACTS is an
+                        // app-defined int constant
+
+                        return;
+                    }
+
+
+                    SharedPreferences preferences = getSharedPreferences("PhoneBook1", MODE_PRIVATE);
+                    SharedPreferences.Editor editor = preferences.edit();
+
+                    editor.putString("NIRTLabde", NIRTLabde);
+                    editor.putString("SPINTubeIDde", SPINTubeIDde);
+                    editor.putString("sample", sampled);
+                    editor.putString("validity", validatyd);
 
 
 
-                SharedPreferences preferences=getSharedPreferences("PhoneBook1",MODE_PRIVATE);
-                SharedPreferences.Editor editor=preferences.edit();
+                    editor.commit();
 
-                editor.putString("NIRTLabde", NIRTLabde);
-                editor.putString("SPINTubeIDde", SPINTubeIDde);
-                editor.putString("sample", sampled);
-                editor.putString("validity", validatyd);
+                    if (restorePrefData()) {
 
 
 
+                        Intent intent = new Intent(getApplicationContext(), AddImage.class);
 
 
+                        startActivity(intent);
+                        finish();
 
 
-                editor.commit();
-                if (restorePrefData()) {
+                    } else {
 
 
-                    Intent  intent = new Intent(getApplicationContext(),AddImage.class );
+                        Intent intent = new Intent(getApplicationContext(), Camera_Guide.class);
+
+                        startActivity(intent);
+                        finish();
 
 
-                    startActivity( intent);
-                    finish();
+                    }
 
 
                 }
-                else
-                {
-                    Intent intent = new Intent(getApplicationContext(),Camera_Guide.class );
-
-                    startActivity(intent);
-                    finish();
-
-
-                }
-
-
             }
         });
         ArrayAdapter<CharSequence> sample_adapter = ArrayAdapter.createFromResource(this,
@@ -139,4 +158,5 @@ public class Test_details extends Navigation_Top implements AdapterView.OnItemSe
     public void onNothingSelected(AdapterView<?> parent) {
 
     }
+
 }

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

@@ -1,70 +1,246 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:orientation="vertical"
     android:layout_height="match_parent"
-    tools:context=".About">
-
-    <LinearLayout
-        android:layout_marginTop="70dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-
-        android:orientation="vertical">
+    >
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true">
 
 
-        <TextView
-            android:layout_width="wrap_content"
+
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="120dp"
+                android:layout_marginTop="80dp"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/shanmukha_logo_small"
+                android:textColor="#131313"
+                android:textSize="24sp"
+                android:textStyle="bold">
+
+            </ImageView>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/shanmukha_logo_small"
+                android:text="About"
+                android:textColor="#131313"
+                android:textSize="@dimen/heading_size"
+                android:textStyle="bold">
+
+            </TextView>
+            <TextView
+                android:padding="20dp"
+                android:textStyle="bold"
+
+                android:layout_width="wrap_content"
+                android:textSize="@dimen/small_text_size"
+                android:lineSpacingExtra="2sp"
+
+                android:layout_height="wrap_content"
+
+                android:fontFamily="@font/fontstyle"
+                android:text="The ARREST-TB project aims to develop a suite of technologies to rapidly, accurately and economically detect, report and monitor TB and MDR TB, and monitor response to anti-TB treatments."
+                android:gravity="left" />
+
+
+            <View
+                android:layout_margin="20dp"
+                android:layout_width="fill_parent"
+                android:layout_height="2dp"
+                android:background="#EEE" />
+
+
+            <TextView
+                android:padding="20dp"
+                android:layout_width="wrap_content"
+                android:textSize="@dimen/small_text_size"
+                android:textStyle="bold"
+
+                android:fontFamily="@font/fontstyle"
+                android:layout_height="wrap_content"
+                android:text="Tel: +91 9742255674"
+                />
+            <View
+                android:layout_margin="20dp"
+                android:layout_width="fill_parent"
+                android:layout_height="2dp"
+                android:background="#EEE" />
+
+            <TextView
+                android:padding="20dp"
+                android:layout_width="wrap_content"
+                android:textSize="@dimen/small_text_size"
+                android:textStyle="bold"
+                android:fontFamily="@font/fontstyle"
+                android:layout_height="wrap_content"
+                android:text="Email : info@sminnovations.in"
+                />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+
+</LinearLayout>
+
+
+
+
+
+
+
+
+
+    <!--
+
+
+    <?xml version="1.0" encoding="utf-8"?>
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_weight="10"
+            android:layout_height="match_parent"
+            tools:context=".About">
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_weight="2"
+                android:layout_marginTop="20dp"
+
+                android:layout_height="0dp"
+                android:gravity="center"
+
+                android:orientation="vertical">
+                <ImageView
+                    android:layout_width="120dp"
+                    android:layout_height="90dp"
+                    android:gravity="center"
+                    android:src="@drawable/shanmukha_logo_small"
+                    android:textColor="#131313"
+                    android:textStyle="bold">
+                </ImageView>
+
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="About"
+
+                    android:textColor="#131313"
+                    android:textSize="24sp"
+                    android:textStyle="bold">
+
+                </TextView>
+
+            </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_weight="3"
+            android:layout_marginTop="20dp"
+
+            android:layout_height="0dp"
             android:gravity="center"
-            android:text="About Us "
-            android:textColor="#131313"
-            android:textSize="24sp"
-            android:textStyle="bold">
 
-        </TextView>
+            android:orientation="vertical">
+            <TextView
+                android:padding="20dp"
 
-    </LinearLayout>
+                android:layout_width="wrap_content"
+                android:textSize="18sp"
+                android:layout_weight="4"
 
-    <TextView
-        android:padding="26dp"
-        android:layout_width="wrap_content"
-        android:textSize="18sp"
-        android:fontFamily="@font/fontstyle"
-        android:layout_height="wrap_content"
-        android:text="At Shanmukha Innovations we are striving to develop affordable point-of-care diagnostic solutions. We undertake custom instrumentation development to support bespoke needs of our Research and Industrial customers."
-        />
-    <View
-        android:layout_margin="18dp"
-        android:layout_width="fill_parent"
-        android:layout_height="2dp"
-        android:background="#EEE" />
-    <TextView
-        android:padding="20dp"
-        android:layout_width="wrap_content"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        android:fontFamily="@font/fontstyle"
-        android:layout_height="wrap_content"
-        android:text="Tel: +91 9742255674"
-        />
-    <View
-        android:layout_margin="20dp"
-        android:layout_width="fill_parent"
-        android:layout_height="2dp"
-        android:background="#EEE" />
+                android:layout_height="0dp"
 
-    <TextView
-        android:padding="20dp"
-        android:layout_width="wrap_content"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        android:fontFamily="@font/fontstyle"
-        android:layout_height="wrap_content"
-        android:text="Email : info@sminnovations.in"
-        />
-</LinearLayout>
+                android:fontFamily="@font/fontstyle"
+                android:text="The ARREST-TB project aims to develop a suite of technologies to rapidly, accurately and economically detect, report and monitor TB and MDR TB, and monitor response to anti-TB treatments."
+                />
+            <View
+                android:layout_margin="18dp"
+                android:layout_width="fill_parent"
+
+                android:layout_height="2dp"
+                android:background="#EEE" />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_weight="2"
+            android:layout_marginTop="20dp"
+
+            android:layout_height="0dp"
+            android:gravity="left"
+
+            android:orientation="vertical">
+            <TextView
+                android:padding="20dp"
+                android:layout_weight="1"
+
+                android:layout_height="0dp"
+                android:paddingLeft="20dp"
+
+                android:layout_width="wrap_content"
+                android:textSize="18sp"
+                android:textStyle="bold"
+                android:fontFamily="@font/fontstyle"
+                android:text="Tel: +91 9742255674"
+                />
+            <View
+                android:layout_margin="20dp"
+                android:layout_width="fill_parent"
+                android:layout_height="2dp"
+                android:background="#EEE" />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_weight="2"
+            android:layout_marginTop="30dp"
+
+            android:layout_height="0dp"
+            android:gravity="left"
+            android:paddingLeft="20dp"
+
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:textSize="18sp"
+
+
+                android:textStyle="bold"
+                android:fontFamily="@font/fontstyle"
+                android:layout_height="wrap_content"
+                android:text="Email : info@sminnovations.in"
+                />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_weight="1"
+
+            android:layout_height="0dp"
+
+            android:orientation="vertical">
+
+
+        </LinearLayout>
+        </LinearLayout>
+    -->

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

@@ -1,53 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:orientation="vertical"
-    android:gravity="center"
-    android:layout_weight="10"
     android:layout_height="match_parent"
-   >
+    >
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_alignParentStart="true">
 
 
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/circle_image"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="5"
-        android:padding="23dp"
-
-        android:src="@android:drawable/ic_menu_gallery"
-        app:civ_border_width="1dp" />
-    <TextView
-        android:layout_width="wrap_content"
-        android:textSize="34dp"
-        android:layout_height="wrap_content"
-
-        android:textColor="@android:color/holo_red_light"
-        android:text=" Test Result: Positive"
-        android:id="@+id/selection_image"/>
-    <Button
-        android:id="@+id/report"
-        android:layout_width="match_parent"
-        android:layout_marginTop="10dp"
 
 
-        android:background="@drawable/buttonshape"
 
-        android:layout_height="wrap_content"
-        android:layout_marginStart="100dp"
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:orientation="vertical">
+
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/circle_image"
+                android:layout_width="match_parent"
+                android:layout_height="546dp"
+                android:padding="23dp"
+
+                android:src="@android:drawable/ic_menu_gallery"
+                app:civ_border_width="1dp" />
+
+            <TextView
+                android:id="@+id/selection_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+
+                android:text=" Test Result: Positive"
+                android:textSize="@dimen/heading_size" />
+
+            <Button
+                android:id="@+id/report"
+                android:layout_width="match_parent"
+                android:layout_marginTop="20dp"
 
 
-        android:layout_marginEnd="100dp"
-        android:textColor="@android:color/white"
-        android:text="Get Report"
-        android:layout_marginBottom="60dp"
+                android:background="@drawable/buttonshape"
+
+                android:layout_height="wrap_content"
+                android:layout_marginStart="100dp"
 
 
-        android:textAllCaps="false"
-
-        android:textSize="20sp" />
+                android:layout_marginEnd="100dp"
+                android:textColor="@android:color/white"
+                android:text="Get Report"
+                android:layout_marginBottom="60dp"
 
 
+                android:textAllCaps="false"
+
+                android:textSize="20sp" />
+
+
+        </LinearLayout>
+    </ScrollView>
 </LinearLayout>

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

@@ -14,100 +14,101 @@
 
 
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_gravity="center_horizontal"
-
-            android:text="Guideline "
-            android:textColor="#131313"
-            android:textSize="24sp"
-            android:textStyle="bold">
-
-        </TextView>
-        <View
-            android:layout_margin="20dp"
-            android:layout_width="fill_parent"
-            android:layout_height="2dp"
-            android:background="#EEE" />
-        <TextView
-            android:paddingLeft="26dp"
-            android:layout_width="wrap_content"
-            android:textSize="18sp"
-            android:fontFamily="@font/fontstyle"
-            android:textStyle="bold"
-            android:layout_height="wrap_content"
-            android:text="Don't Use Flash to Click the Picture"
-            />
-        <View
-            android:layout_margin="10dp"
-            android:layout_width="fill_parent"
-            android:layout_height="0.8dp"
-            android:background="#EEE" />
-
-        <TextView
-            android:paddingLeft="26dp"
-            android:fontFamily="@font/fontstyle"
-            android:textStyle="bold"
-
-            android:layout_width="wrap_content"
-            android:textSize="18sp"
-            android:layout_height="wrap_content"
-            android:text="Take the picture when the lid is open and focused on the Pattern"
-            />
-
-        <View
-            android:layout_margin="18dp"
-            android:layout_width="fill_parent"
-            android:layout_height="0.8dp"
-            android:background="#EEE" />
-
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/circle_image"
-            android:layout_width="234dp"
-            android:layout_gravity="center"
-
-            android:src="@drawable/sample1"
-            android:layout_height="234dp"
-            app:civ_border_width="2dp"/>
-        <View
-            android:layout_margin="20dp"
-            android:layout_width="fill_parent"
-            android:layout_height="2dp"
-            android:background="#EEE" />
-
-
-       <Button
-            android:id="@+id/intro"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_marginTop="10dp"
-
-
-            android:background="@drawable/buttonshape"
-
             android:layout_height="wrap_content"
-            android:layout_marginStart="100dp"
-            android:layout_marginBottom="20dp"
+
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_gravity="center_horizontal"
+
+                android:text="Guideline "
+                android:textColor="#131313"
+                android:textSize="@dimen/heading_size"
+                android:textStyle="bold">
+
+            </TextView>
+            <View
+                android:layout_margin="20dp"
+                android:layout_width="fill_parent"
+                android:layout_height="2dp"
+                android:background="#EEE" />
+            <TextView
+                android:paddingLeft="26dp"
+                android:layout_width="wrap_content"
+                android:textSize="@dimen/small_text_size"
+                android:fontFamily="@font/fontstyle"
+                android:textStyle="bold"
+                android:layout_height="wrap_content"
+                android:text="Don't Use Flash to Click the Picture"
+                />
+            <View
+                android:layout_margin="10dp"
+                android:layout_width="fill_parent"
+                android:layout_height="0.8dp"
+                android:background="#EEE" />
+
+            <TextView
+                android:paddingLeft="26dp"
+                android:fontFamily="@font/fontstyle"
+                android:textStyle="bold"
+
+                android:layout_width="wrap_content"
+                android:textSize="@dimen/small_text_size"
+                android:layout_height="wrap_content"
+                android:text="Take the picture when the lid is open and focused on the Pattern"
+                />
+
+            <View
+                android:layout_margin="18dp"
+                android:layout_width="fill_parent"
+                android:layout_height="0.8dp"
+                android:background="#EEE" />
+
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/circle_image"
+                android:layout_width="234dp"
+                android:layout_height="234dp"
+
+                android:layout_gravity="center"
+                android:src="@drawable/sample1"
+                app:civ_border_width="2dp" />
+
+            <View
+                android:layout_margin="20dp"
+                android:layout_width="fill_parent"
+                android:layout_height="2dp"
+                android:background="#EEE" />
 
 
-            android:layout_marginEnd="100dp"
-            android:textColor="@android:color/white"
-            android:text="Get Started"
+            <Button
+                android:id="@+id/intro"
+                android:layout_width="match_parent"
+                android:layout_marginTop="10dp"
 
 
-            android:textAllCaps="false"
+                android:background="@drawable/buttonshape"
 
-            android:textSize="20sp" />
+                android:layout_height="wrap_content"
+                android:layout_marginStart="100dp"
+                android:layout_marginBottom="20dp"
 
 
-    </LinearLayout>
+                android:layout_marginEnd="100dp"
+                android:textColor="@android:color/white"
+                android:text="Get Started"
+
+
+                android:textAllCaps="false"
+
+                android:textSize="20sp" />
+
+
+        </LinearLayout>
 
     </ScrollView>
 

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

@@ -38,7 +38,7 @@
                         android:layout_height="wrap_content"
 
                         android:text="Spin Tube App"
-                        android:textSize="24sp"
+                        android:textSize="@dimen/heading_size"
                         android:gravity="center"
                         android:textStyle="bold"
                         android:layout_marginTop="10dp"

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

@@ -1,187 +1,195 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:orientation="vertical"
     android:layout_height="match_parent"
-
     >
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <ImageView
-            android:id="@+id/imageView"
 
+
+
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="70dp"
-            android:contentDescription="TODO"
-            android:layout_marginTop="15dp"
-android:src="@drawable/logo_app"
+            android:layout_height="wrap_content"
+
+            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/imageView"
+
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:contentDescription="TODO"
+                android:layout_marginTop="15dp"
+                android:src="@drawable/logo_app"
                 app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/titleapp"
-            android:layout_width="match_parent"
-            android:layout_height="@android:dimen/app_icon_size"
-            android:contentDescription="TODO"
-            android:layout_marginTop="15dp"
-            android:textSize="24sp"
-            android:fontFamily="@font/fontstyle"
-            android:textStyle="bold"
 
-            android:textAlignment="center"
-            android:textColor="#131313"
-            android:text="Spin Tube App"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/imageView"
-            android:gravity="center_horizontal" />
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Sign in"
-            android:textColor="#131313"
+            <TextView
+                android:id="@+id/titleapp"
+                android:layout_width="match_parent"
+                android:layout_height="@android:dimen/app_icon_size"
+                android:contentDescription="TODO"
+                android:layout_marginTop="15dp"
+                android:textSize="@dimen/heading_size"
+                android:fontFamily="@font/fontstyle"
+                android:textStyle="bold"
 
-            android:fontFamily="@font/fontstyle"
-            android:paddingLeft="10dp"
-            android:layout_marginTop="15dp"
-            android:id="@+id/sign_in_text"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/titleapp" />
+                android:textAlignment="center"
+                android:textColor="#131313"
+                android:text="Spin Tube App"
+                android:gravity="center_horizontal" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Sign in"
+                android:textColor="#131313"
 
-        <EditText
-            android:id="@+id/username"
-            android:layout_width="0dp"
-            android:layout_marginTop="40dp"
-            android:background="@drawable/text_back"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20sp"
-            android:layout_marginEnd="20sp"
-            android:ems="10"
-            android:hint="User Name :"
-            android:inputType="textEmailAddress"
-            android:padding="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/sign_in_text" />
+                android:fontFamily="@font/fontstyle"
+                android:paddingLeft="10dp"
+                android:layout_marginTop="15dp"
+                android:id="@+id/sign_in_text"
+                android:textSize="@dimen/heading_size"
+                android:textStyle="bold"
+                />
+            <EditText
+                android:id="@+id/username"
+                android:layout_width="match_parent"
+                android:layout_marginTop="40dp"
+                android:background="@drawable/text_back"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20sp"
+                android:layout_marginEnd="20sp"
+                android:ems="10"
+                android:hint="User Name :"
+                android:inputType="textEmailAddress"
+                android:padding="12dp"
+                />
+            <EditText
+                android:id="@+id/password"
+                android:layout_width="match_parent"
+                android:textColorHint="@android:color/darker_gray"
 
-        <EditText
-            android:id="@+id/password"
-            android:layout_width="0dp"
-            android:textColorHint="@android:color/darker_gray"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20sp"
+                android:layout_marginTop="18dp"
 
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20sp"
-            android:layout_marginTop="18dp"
+                android:background="@drawable/text_back"
+                android:layout_marginEnd="20sp"
+                android:ems="10"
+                android:hint="Password :"
+                android:inputType="textPassword"
+                android:padding="12dp"/>
+            <androidx.appcompat.widget.AppCompatCheckBox
+                android:id="@+id/showpassword"
+                android:layout_width="match_parent"
 
-            android:background="@drawable/text_back"
-            android:layout_marginEnd="20sp"
-            android:ems="10"
-            android:hint="Password :"
-            android:inputType="textPassword"
-            android:padding="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/username" />
-        <androidx.appcompat.widget.AppCompatCheckBox
-            android:id="@+id/showpassword"
-            android:layout_width="0dp"
+                android:buttonTint="@android:color/darker_gray"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20sp"
+                android:layout_marginTop="18dp"
+                android:layout_marginEnd="20sp"
+                android:textColorHighlight="@android:color/black"
+                android:backgroundTint="#ffffff"
+                android:padding="20dp"
+                android:textColor="#131313"
+                android:textColorHint="#ffffff"
+                android:text="Show password"
+                />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
 
-            android:buttonTint="@android:color/darker_gray"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20sp"
-            android:layout_marginTop="18dp"
-            android:layout_marginEnd="20sp"
-            android:textColorHighlight="@android:color/black"
-            android:backgroundTint="#ffffff"
-            android:padding="20dp"
-            android:textColor="#131313"
-            android:textColorHint="#ffffff"
-            android:text="Show password"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/password" />
 
-        />
-        <TextView
-            android:id="@+id/forgetpassword"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:padding="10dp"
-            android:text="Forgot Password?"
-            android:textColor="#4285f4"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/showpassword"
-            android:layout_marginLeft="30dp" />
+                android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/createaccount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginTop="1dp"
+                <TextView
+                    android:id="@+id/forgetpassword"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:padding="10dp"
+                    android:text="Forgot Password?"
+                    android:textColor="#4285f4"
+                    android:textStyle="bold"
+                    android:layout_marginLeft="10dp" />
+
+
+                <View
+                    android:id="@+id/divider"
+                    android:layout_width="2dp"
+                    android:layout_height="41dp"
+
+                    android:layout_marginHorizontal="25dp"
+
+                    android:background="#4285f4" />
+
+                <TextView
+                    android:id="@+id/createaccount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginLeft="10dp"
+
+                    android:layout_marginTop="1dp"
+                    android:padding="10dp"
+                    android:text="Register here"
+                    android:textColor="#4285f4"
+
+                    android:textStyle="bold" />
+
+
+                />
+
+
+
+            </LinearLayout>
+            <Button
+                android:layout_marginTop="50dp"
+                android:id="@+id/login"
+
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAllCaps="false"
+                android:fontFamily="@font/fontstyle"
+                android:text="Sign in"
+                android:layout_marginBottom="30dp"
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="40dp"
+
+                android:background="@android:color/holo_blue_dark"
+
+                android:textColor="@android:color/white"
+                android:textSize="20sp"
+                />
+
+
+
+
+
+
+        </LinearLayout>
+
+    </ScrollView>
+
+
+</LinearLayout>
 
-            android:padding="10dp"
-            android:textColor="#4285f4"
-            app:layout_constraintTop_toBottomOf="@id/showpassword"
-            android:text="Register here"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.821"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginLeft="30dp" />
 
-        <Button
-            android:id="@+id/login"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="40dp"
-            android:layout_marginEnd="40dp"
-            android:textAllCaps="false"
-            android:fontFamily="@font/fontstyle"
-            android:text="Sign in"
-            android:background="@android:color/holo_blue_dark"
 
-            android:textColor="@android:color/white"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/password"
-            app:layout_constraintVertical_bias="0.698" />
 
-        <View
-            android:id="@+id/divider"
-            android:layout_width="2dp"
-            android:layout_height="41dp"
-            android:background="#4285f4"
-            app:layout_constraintTop_toBottomOf="@id/showpassword"
-            app:layout_constraintBottom_toTopOf="@id/login"
-            app:layout_constraintEnd_toStartOf="@id/createaccount"
-            app:layout_constraintHorizontal_bias="0.52"
-            app:layout_constraintStart_toEndOf="@id/forgetpassword"
-            app:layout_constraintVertical_bias="0.0" />
 
 
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-</LinearLayout>

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

@@ -46,7 +46,7 @@
                         android:gravity="center"
                         android:text="Patient Details "
                         android:textColor="#131313"
-                        android:textSize="24sp"
+                        android:textSize="@dimen/heading_size"
                         android:textStyle="bold">
 
                     </TextView>
@@ -70,151 +70,149 @@
                         android:orientation="vertical">
 
 
-                            <LinearLayout
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:background="#fff"
+                            android:layout_height="match_parent"
+                            android:orientation="vertical">
+
+                            <EditText
+                                android:id="@+id/patientid"
                                 android:layout_width="match_parent"
-                                android:background="#fff"
-                                android:layout_height="match_parent"
-                                android:orientation="vertical">
+                                android:maxLength="5"
 
-                                <EditText
-                                    android:id="@+id/patientid"
-                                    android:layout_width="match_parent"
 
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="10dp"
-                                    android:layout_marginTop="20dp"
-                                    android:fontFamily="@font/fontstyle"
-                                    android:hint="Patient ID *"
-                                    android:inputType="textNoSuggestions"
-                                    android:paddingStart="5dp"
-                                    android:paddingLeft="5dp"
-                                    android:singleLine="true" />
-                                <TableLayout
-                                    android:id="@+id/table45"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content">
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="10dp"
+                                android:layout_marginTop="20dp"
+                                android:fontFamily="@font/fontstyle"
+                                android:hint="Patient ID *"
+                                android:paddingStart="5dp"
+                                android:paddingLeft="5dp"
+                                android:singleLine="true" />
+                            <TableLayout
+                                android:id="@+id/table45"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content">
 
-                                    <TableRow android:layout_marginTop="20dp">
+                                <TableRow android:layout_marginTop="20dp">
 
-                                        <TextView
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:layout_column="1"
-                                            android:layout_marginLeft="10dp"
-                                            android:fontFamily="@font/fontstyle"
-                                            android:paddingStart="5dp"
-                                            android:paddingLeft="5dp"
-                                            android:id="@+id/gender"
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_column="1"
+                                        android:layout_marginLeft="10dp"
+                                        android:fontFamily="@font/fontstyle"
+                                        android:paddingStart="5dp"
+                                        android:paddingLeft="5dp"
+                                        android:id="@+id/gender"
+                                        android:textSize="@dimen/small_text_size"
 
-                                            android:text="Patient Gender *"
-                                            android:textColor="@android:color/darker_gray"
-                                            android:textSize="18sp" />
 
-                                        <Spinner
-                                            android:id="@+id/spinner_gender"
-                                            android:layout_width="150dp"
+                                        android:text="Patient Gender *"
+                                        android:textColor="@android:color/darker_gray"
+                                         />
 
-                                            android:layout_height="wrap_content"
-                                            android:layout_marginLeft="20dp" />
-                                    </TableRow>
-                                </TableLayout>
-                                <EditText
-                                    android:id="@+id/dob"
+                                    <Spinner
+                                        android:id="@+id/spinner_gender"
+                                        android:layout_width="150dp"
 
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="10dp"
-                                    android:layout_marginTop="20dp"
-                                    android:fontFamily="@font/fontstyle"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="20dp" />
+                                </TableRow>
+                            </TableLayout>
+                            <EditText
+                                android:id="@+id/dob"
+                                android:editable="false"
+                                android:inputType="none"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="10dp"
+                                android:layout_marginTop="20dp"
+                                android:fontFamily="@font/fontstyle"
 
-                                    android:hint="Date of Birth"
-                                    android:drawableEnd="@android:drawable/ic_menu_today"
-                                    android:drawableRight="@android:drawable/ic_menu_edit"
+                                android:hint="Date of Birth"
+                                android:drawableEnd="@android:drawable/ic_menu_today"
+                                android:drawableRight="@android:drawable/ic_menu_edit"
 
-                                    android:maxLines="1"
-                                    android:paddingStart="5dp"
-                                    android:paddingLeft="5dp"
-                                    android:singleLine="true" />
+                                android:maxLines="1"
+                                android:paddingStart="5dp"
+                                android:paddingLeft="5dp"
+                                android:singleLine="true" />
 
 
 
 
 
 
-                                <EditText
-                                    android:id="@+id/age"
+                            <EditText
+                                android:id="@+id/age"
 
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="10dp"
-                                    android:layout_marginTop="20dp"
-                                    android:fontFamily="@font/fontstyle"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="10dp"
+                                android:layout_marginTop="20dp"
+                                android:fontFamily="@font/fontstyle"
+                                android:inputType="number"
+                                android:maxLength="3"
 
-                                    android:hint="Age *"
-                                    android:maxLines="1"
-                                    android:paddingStart="5dp"
-                                    android:paddingLeft="5dp"
-                                    android:singleLine="true" />
+
+                                android:hint="Age *"
+                                android:maxLines="1"
+                                android:paddingStart="5dp"
+                                android:paddingLeft="5dp"
+                                android:singleLine="true" />
 
 
 
-                                <EditText
-                                    android:id="@+id/NikshayID"
+                            <EditText
+                                android:id="@+id/NikshayID"
+                                android:maxLength="9"
 
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="10dp"
-                                    android:layout_marginTop="20dp"
-                                    android:fontFamily="@font/fontstyle"
-                                    android:hint="Nikshay ID *"
-                                    android:inputType="number"
 
-                                    android:maxLines="1"
-                                    android:paddingStart="5dp"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="10dp"
+                                android:layout_marginTop="20dp"
+                                android:fontFamily="@font/fontstyle"
+                                android:hint="Nikshay ID *"
+                                android:inputType="number"
 
-                                    android:paddingLeft="5dp"
-                                    android:singleLine="true" />
+                                android:maxLines="1"
+                                android:paddingStart="5dp"
 
-                                <EditText
-                                    android:id="@+id/Email"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="10dp"
-                                    android:hint="Email"
-
-                                    android:maxLines="1"
-                                    android:paddingStart="5dp"
-
-                                    android:paddingLeft="5dp"
-                                    android:singleLine="true"
-                                    android:visibility="gone" />
+                                android:paddingLeft="5dp"
+                                android:singleLine="true" />
 
 
 
 
-                                <Button
-                                    android:id="@+id/next"
-                                    android:layout_width="match_parent"
-                                    android:layout_marginTop="50dp"
 
 
-                                    android:background="@drawable/buttonshape"
-
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginStart="100dp"
-                                    android:layout_marginBottom="200dp"
+                            <Button
+                                android:id="@+id/next"
+                                android:layout_width="match_parent"
+                                android:layout_marginTop="50dp"
 
 
-                                    android:layout_marginEnd="100dp"
-                                    android:textColor="@android:color/white"
-                                    android:text="Next"
+
+                                android:background="@drawable/buttonshape"
+
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="100dp"
+                                android:layout_marginBottom="200dp"
 
 
-                                    android:textAllCaps="false"
+                                android:layout_marginEnd="100dp"
+                                android:textColor="@android:color/white"
+                                android:text="Next"
 
-                                    android:textSize="20sp" />
 
-                            </LinearLayout>
+                                android:textAllCaps="false"
+
+                                android:textSize="20sp" />
+
+                        </LinearLayout>
 
                     </LinearLayout>
 

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

@@ -7,8 +7,40 @@
     android:orientation="vertical"
     >
 
+    <RelativeLayout
+
+        android:layout_width="fill_parent"
+
+        android:background="@android:color/holo_blue_light"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:orientation="vertical">
+        <ImageButton
+            android:layout_width="wrap_content"
+            android:layout_height="@android:dimen/app_icon_size"
+            android:id="@+id/share"
+            android:tint="@android:color/white"
+
+            android:layout_alignParentEnd="true"
+            android:backgroundTint="@android:color/transparent"
+            android:src="@android:drawable/ic_menu_share"
+            android:layout_alignParentRight="true" />
+
+        <ImageButton
+            android:id="@+id/downlaod"
+            android:layout_width="wrap_content"
+
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginHorizontal="50dp"
+            android:backgroundTint="@android:color/transparent"
+            android:src="@android:drawable/stat_sys_download"
+            android:tint="@android:color/white" />
+
+    </RelativeLayout>
+
+
     <LinearLayout
-        android:layout_marginTop="@android:dimen/app_icon_size"
 
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
@@ -33,7 +65,7 @@
                     android:gravity="center"
                     android:text="Test Report"
                     android:textColor="#131313"
-                    android:textSize="24sp"
+                    android:textSize="@dimen/heading_size"
                     android:textStyle="bold">
 
                 </TextView>
@@ -48,501 +80,506 @@
                 android:layout_alignParentTop="true">
 
 
-            <TableLayout
-
-                android:layout_width="fill_parent"
-
-                android:layout_height="fill_parent">
-
-
-
-
-
-
                 <TableLayout
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                    android:layout_width="fill_parent"
 
-                    <TableRow
-                        android:padding="15dp"
+                    android:layout_height="fill_parent">
 
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="10"
-                        >
 
-                        <TextView
-                            android:text="Date : "
-                            android:textSize="18sp"
-                            android:lines="2"
 
-                            android:layout_weight="5"
+
+
+
+                    <TableLayout
+
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+
+                        <TableRow
+                            android:padding="15dp"
+
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_column="1" />
+                            android:layout_weight="10"
+                            >
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:textSize="18sp"
-android:id="@+id/dater"
-                            android:layout_weight="5"
-                            android:layout_height="wrap_content" />
-                    </TableRow>
-                    <View
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:layout_width="fill_parent"
+                            <TextView
+                                android:text="Date : "
+                                android:textSize="@dimen/small_text_size"
+                                android:lines="2"
 
-                        android:layout_height="2dp"
-                        android:background="#eee" />
+                                android:layout_weight="5"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_column="1" />
 
-                </TableLayout>
-                <TableLayout
+                            <TextView
+                                android:layout_width="0dp"
+                                android:textSize="@dimen/small_text_size"
+                                android:id="@+id/dater"
+                                android:layout_weight="5"
+                                android:layout_height="wrap_content" />
+                        </TableRow>
+                        <View
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_width="fill_parent"
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                            android:layout_height="2dp"
+                            android:background="#eee" />
 
-                    <TableRow
-                        android:padding="15dp"
+                    </TableLayout>
+                    <TableLayout
 
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="10"
-                        >
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                        <TextView
-                            android:text="Time : "
-                            android:textSize="18sp"
-                            android:lines="2"
+                        <TableRow
+                            android:padding="15dp"
 
-                            android:layout_weight="5"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_column="1" />
+                            android:layout_weight="10"
+                            >
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:textSize="18sp"
-                            android:id="@+id/timer"
-                            android:layout_weight="5"
-                            android:layout_height="wrap_content" />
-                    </TableRow>
-                    <View
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:layout_width="fill_parent"
+                            <TextView
+                                android:text="Time : "
+                                android:textSize="@dimen/small_text_size"
+                                android:lines="2"
 
-                        android:layout_height="2dp"
-                        android:background="#eee" />
+                                android:layout_weight="5"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_column="1" />
 
-                </TableLayout>
-                <TableLayout
+                            <TextView
+                                android:layout_width="0dp"
+                                android:textSize="@dimen/small_text_size"
+                                android:id="@+id/timer"
+                                android:layout_weight="5"
+                                android:layout_height="wrap_content" />
+                        </TableRow>
+                        <View
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_width="fill_parent"
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                            android:layout_height="2dp"
+                            android:background="#eee" />
 
-                    <TableRow
-                        android:padding="15dp"
+                    </TableLayout>
+                    <TableLayout
 
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="10"
-                        >
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                        <TextView
-                            android:text="Patient ID : "
-                            android:textSize="18sp"
-                            android:lines="2"
+                        <TableRow
+                            android:padding="15dp"
 
-                            android:layout_weight="5"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_column="1" />
+                            android:layout_weight="10"
+                            >
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:textSize="18sp"
-                            android:id="@+id/patient_idr"
-                            android:layout_weight="5"
-                            android:layout_height="wrap_content" />
-                    </TableRow>
-                    <View
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:layout_width="fill_parent"
+                            <TextView
+                                android:text="Patient ID : "
+                                android:textSize="@dimen/small_text_size"
+                                android:lines="2"
 
-                        android:layout_height="2dp"
-                        android:background="#eee" />
+                                android:layout_weight="5"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_column="1" />
 
-                </TableLayout>
+                            <TextView
+                                android:layout_width="0dp"
+                                android:textSize="@dimen/small_text_size"
+                                android:id="@+id/patient_idr"
+                                android:layout_weight="5"
+                                android:layout_height="wrap_content" />
+                        </TableRow>
+                        <View
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_width="fill_parent"
+
+                            android:layout_height="2dp"
+                            android:background="#eee" />
+
+                    </TableLayout>
 
 
-                <TableLayout
+                    <TableLayout
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                    <TableRow
-                        android:padding="15dp"
+                        <TableRow
+                            android:padding="15dp"
 
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="10"
-                        >
-
-                        <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_column="1"
-                            android:layout_weight="5"
-                            android:lines="2"
-                            android:text="Patient Gender  :"
-                            android:textSize="18sp" />
+                            android:layout_weight="10"
+                            >
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:textSize="18sp"
-                            android:id="@+id/patient_genderr"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_column="1"
+                                android:layout_weight="5"
+                                android:lines="2"
+                                android:text="Patient Gender  :"
+                                android:textSize="@dimen/small_text_size"
+                                />
 
-                            android:layout_weight="5"
-                            android:layout_height="wrap_content" />
-                    </TableRow>
-                    <View
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:layout_width="fill_parent"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:textSize="@dimen/small_text_size"
+                                android:id="@+id/patient_genderr"
 
-                        android:layout_height="2dp"
-                        android:background="#eee" />
+                                android:layout_weight="5"
+                                android:layout_height="wrap_content" />
+                        </TableRow>
+                        <View
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_width="fill_parent"
 
-                </TableLayout>
-                <TableLayout
+                            android:layout_height="2dp"
+                            android:background="#eee" />
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                    </TableLayout>
+                    <TableLayout
 
-                    <TableRow
-                        android:padding="15dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="10"
-                        >
+                        <TableRow
+                            android:padding="15dp"
 
-                        <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_column="1"
-                            android:layout_weight="5"
-                            android:lines="2"
-                            android:text="Date of Birth :"
-                            android:textSize="18sp" />
+                            android:layout_weight="10"
+                            >
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:textSize="18sp"
-                            android:id="@+id/patien_dobr"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_column="1"
+                                android:layout_weight="5"
+                                android:lines="2"
+                                android:text="Date of Birth :"
+                                android:textSize="@dimen/small_text_size" />
 
-                            android:layout_weight="5"
-                            android:layout_height="wrap_content" />
-                    </TableRow>
-                    <View
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:layout_width="fill_parent"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:textSize="@dimen/small_text_size"
+                                android:id="@+id/patien_dobr"
 
-                        android:layout_height="2dp"
-                        android:background="#eee" />
+                                android:layout_weight="5"
+                                android:layout_height="wrap_content" />
+                        </TableRow>
+                        <View
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_width="fill_parent"
 
-                </TableLayout>
-                <TableLayout
+                            android:layout_height="2dp"
+                            android:background="#eee" />
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                    </TableLayout>
+                    <TableLayout
 
-                    <TableRow
-                        android:padding="15dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="10"
-                        >
+                        <TableRow
+                            android:padding="15dp"
 
-                        <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_column="1"
-                            android:layout_weight="5"
-                            android:lines="2"
-                            android:text="Age :"
-                            android:textSize="18sp" />
+                            android:layout_weight="10"
+                            >
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:textSize="18sp"
-                            android:id="@+id/patient_ager"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_column="1"
+                                android:layout_weight="5"
+                                android:lines="2"
+                                android:text="Age :"
+                                android:textSize="@dimen/small_text_size"
+                                />
 
-                            android:layout_weight="5"
-                            android:layout_height="wrap_content" />
-                    </TableRow>
-                    <View
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:layout_width="fill_parent"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:textSize="@dimen/small_text_size"
+                                android:id="@+id/patient_ager"
 
-                        android:layout_height="2dp"
-                        android:background="#eee" />
+                                android:layout_weight="5"
+                                android:layout_height="wrap_content" />
+                        </TableRow>
+                        <View
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_width="fill_parent"
 
-                </TableLayout>
-                <TableLayout
+                            android:layout_height="2dp"
+                            android:background="#eee" />
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                    </TableLayout>
+                    <TableLayout
 
-                    <TableRow
-                        android:padding="15dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="10"
-                        >
+                        <TableRow
+                            android:padding="15dp"
 
-                        <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_column="1"
-                            android:layout_weight="5"
-                            android:lines="2"
-                            android:text="Result :"
-                            android:textSize="18sp" />
+                            android:layout_weight="10"
+                            >
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:textSize="18sp"
-                            android:id="@+id/patient_resultr"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_column="1"
+                                android:layout_weight="5"
+                                android:lines="2"
+                                android:text="Result :"
+                                android:textSize="@dimen/small_text_size"
+                                />
 
-                            android:layout_weight="5"
-                            android:layout_height="wrap_content" />
-                    </TableRow>
-                    <View
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:layout_width="fill_parent"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:textSize="@dimen/small_text_size"
+                                android:id="@+id/patient_resultr"
 
-                        android:layout_height="2dp"
-                        android:background="#eee" />
+                                android:layout_weight="5"
+                                android:layout_height="wrap_content" />
+                        </TableRow>
+                        <View
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_width="fill_parent"
 
-                </TableLayout>
-                <TableLayout
+                            android:layout_height="2dp"
+                            android:background="#eee" />
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                    </TableLayout>
+                    <TableLayout
 
-                    <TableRow
-                        android:padding="15dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="10"
-                        >
+                        <TableRow
+                            android:padding="15dp"
 
-                        <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_column="1"
-                            android:layout_weight="5"
-                            android:lines="2"
-                            android:text="Nikshay ID :"
-                            android:textSize="18sp" />
+                            android:layout_weight="10"
+                            >
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:textSize="18sp"
-                            android:id="@+id/patient_nikshayidr"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_column="1"
+                                android:layout_weight="5"
+                                android:lines="2"
+                                android:text="Nikshay ID :"
+                                android:textSize="@dimen/small_text_size"
+                                />
 
-                            android:layout_weight="5"
-                            android:layout_height="wrap_content" />
-                    </TableRow>
-                    <View
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:layout_width="fill_parent"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:textSize="@dimen/small_text_size"
+                                android:id="@+id/patient_nikshayidr"
 
-                        android:layout_height="2dp"
-                        android:background="#eee" />
+                                android:layout_weight="5"
+                                android:layout_height="wrap_content" />
+                        </TableRow>
+                        <View
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_width="fill_parent"
 
-                </TableLayout>
-                <TableLayout
+                            android:layout_height="2dp"
+                            android:background="#eee" />
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                    </TableLayout>
+                    <TableLayout
 
-                    <TableRow
-                        android:padding="15dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="10"
-                        >
+                        <TableRow
+                            android:padding="15dp"
 
-                        <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_column="1"
-                            android:layout_weight="5"
-                            android:lines="2"
-                            android:text="NIRT Lab Number :"
-                            android:textSize="18sp" />
+                            android:layout_weight="10"
+                            >
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:textSize="18sp"
-                            android:id="@+id/patient_nirtr"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_column="1"
+                                android:layout_weight="5"
+                                android:lines="2"
+                                android:text="NIRT Lab Number :"
+                                android:textSize="@dimen/small_text_size"
+                                />
 
-                            android:layout_weight="5"
-                            android:layout_height="wrap_content" />
-                    </TableRow>
-                    <View
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:layout_width="fill_parent"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:textSize="@dimen/small_text_size"
+                                android:id="@+id/patient_nirtr"
 
-                        android:layout_height="2dp"
-                        android:background="#eee" />
+                                android:layout_weight="5"
+                                android:layout_height="wrap_content" />
+                        </TableRow>
+                        <View
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_width="fill_parent"
 
-                </TableLayout>
-                <TableLayout
+                            android:layout_height="2dp"
+                            android:background="#eee" />
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                    </TableLayout>
+                    <TableLayout
 
-                    <TableRow
-                        android:padding="15dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="10"
-                        >
+                        <TableRow
+                            android:padding="15dp"
 
-                        <TextView
-                            android:text="SPIN Tube ID :"
-                            android:textSize="18sp"
-                            android:lines="2"
-                            android:layout_weight="5"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_column="1" />
+                            android:layout_weight="10"
+                            >
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:textSize="18sp"
-                            android:id="@+id/patient_spintuber"
+                            <TextView
+                                android:text="SPIN Tube ID :"
+                                android:textSize="@dimen/small_text_size"
+                                android:lines="2"
+                                android:layout_weight="5"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_column="1" />
 
-                   android:layout_weight="5"
-                            android:layout_height="wrap_content" />
-                    </TableRow>
-                    <View
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:layout_width="fill_parent"
+                            <TextView
+                                android:layout_width="0dp"
+                                android:textSize="@dimen/small_text_size"
+                                android:id="@+id/patient_spintuber"
 
-                        android:layout_height="2dp"
-                        android:background="#eee" />
+                                android:layout_weight="5"
+                                android:layout_height="wrap_content" />
+                        </TableRow>
+                        <View
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_width="fill_parent"
 
-                </TableLayout>
+                            android:layout_height="2dp"
+                            android:background="#eee" />
+
+                    </TableLayout>
 
 
 
-                <TableLayout
+                    <TableLayout
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                    <TableRow
-                        android:padding="15dp"
+                        <TableRow
+                            android:padding="15dp"
 
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="10"
-                        >
-
-                        <TextView
-                            android:text="Type of Sample :"
-                            android:textSize="18sp"
-                            android:lines="2"
-
-                            android:layout_weight="5"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_column="1" />
+                            android:layout_weight="10"
+                            >
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:textSize="18sp"
-                            android:id="@+id/patient_typesampler"
+                            <TextView
+                                android:text="Type of Sample :"
+                                android:textSize="@dimen/small_text_size"
+                                android:lines="2"
+
+                                android:layout_weight="5"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_column="1" />
+
+                            <TextView
+                                android:layout_width="0dp"
+                                android:textSize="@dimen/small_text_size"
+                                android:id="@+id/patient_typesampler"
 
 
 
-                            android:layout_weight="5"
-                            android:layout_height="wrap_content" />
-                    </TableRow>
-                    <View
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:layout_width="fill_parent"
+                                android:layout_weight="5"
+                                android:layout_height="wrap_content" />
+                        </TableRow>
+                        <View
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_width="fill_parent"
 
-                        android:layout_height="2dp"
-                        android:background="#eee" />
+                            android:layout_height="2dp"
+                            android:background="#eee" />
 
-                </TableLayout>
-                <TableLayout
+                    </TableLayout>
+                    <TableLayout
 
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                    <TableRow
-                        android:padding="15dp"
+                        <TableRow
+                            android:padding="15dp"
 
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="10"
-                        >
-
-                        <TextView
-                            android:text="Tube Validity :"
-                            android:textSize="18sp"
-                            android:lines="2"
-                            android:layout_weight="5"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_column="1" />
+                            android:layout_weight="10"
+                            >
+
+                            <TextView
+                                android:text="Tube Validity :"
+                                android:textSize="@dimen/small_text_size"
+                                android:lines="2"
+                                android:layout_weight="5"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_column="1" />
+
+                            <TextView
+                                android:layout_width="0dp"
+                                android:textSize="@dimen/small_text_size"
+                                android:id="@+id/patient_tubevisibler"
+
+
+                                android:layout_weight="5"
+                                android:layout_height="wrap_content" />
+                        </TableRow>
+                        <View
+                            android:layout_marginLeft="15dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_width="fill_parent"
+
+                            android:layout_height="2dp"
+                            android:background="#eee" />
+
+                    </TableLayout>
+
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:textSize="18sp"
-                            android:id="@+id/patient_tubevisibler"
 
 
-android:layout_weight="5"
-                            android:layout_height="wrap_content" />
-                    </TableRow>
-                    <View
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:layout_width="fill_parent"
 
-                        android:layout_height="2dp"
-                        android:background="#eee" />
 
                 </TableLayout>
-
-
-
-
-
-
-            </TableLayout>
             </ScrollView>
 
         </LinearLayout>

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

@@ -44,7 +44,7 @@
                         android:gravity="center"
                         android:text="Test Details "
                         android:textColor="#131313"
-                        android:textSize="24sp"
+                        android:textSize="@dimen/heading_size"
                         android:textStyle="bold">
 
                     </TextView>
@@ -65,125 +65,127 @@
                         android:layout_marginBottom="10dp"
                         android:orientation="vertical">
 
-                          <LinearLayout
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:orientation="vertical">
+
+                            <EditText
+                                android:id="@+id/NIRTLab"
                                 android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:orientation="vertical">
+                                android:maxLength="7"
 
-                                <EditText
-                                    android:id="@+id/NIRTLab"
-                                    android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="10dp"
+                                android:layout_marginTop="20dp"
 
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="10dp"
-                                    android:layout_marginTop="20dp"
-                                    android:textSize="18sp"
+                                android:hint="NIRT Lab Number *"
+                                android:maxLines="1"
+                                android:paddingStart="5dp"
+                                android:paddingLeft="5dp"
+                                android:singleLine="true" />
 
-                                    android:hint="NIRT Lab Number *"
-                                    android:inputType="number"
-                                    android:maxLines="1"
-                                    android:paddingStart="5dp"
-                                    android:paddingLeft="5dp"
-                                    android:singleLine="true" />
+                            <EditText
+                                android:maxLength="6"
 
-                                <EditText
-                                    android:id="@+id/SPINTubeID"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="10dp"
-                                    android:layout_marginTop="20dp"
-                                    android:hint="SPIN Tube ID *"
-                                    android:inputType="number"
-                                    android:maxLines="1"
-                                    android:paddingStart="5dp"
-                                    android:paddingLeft="5dp"
-                                    android:textSize="18sp"
+                                android:id="@+id/SPINTubeID"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="10dp"
+                                android:layout_marginTop="20dp"
+                                android:hint="SPIN Tube ID *"
+                                android:maxLines="1"
+                                android:paddingStart="5dp"
+                                android:paddingLeft="5dp"
 
-                                    android:singleLine="true" />
+                                android:singleLine="true" />
 
 
 
 
-                                <TableLayout
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content">
+                            <TableLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content">
 
-                                    <TableRow android:layout_marginTop="25dp">
+                                <TableRow android:layout_marginTop="25dp">
 
 
-                                        <TextView
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:layout_column="1"
-                                            android:layout_marginLeft="10dp"
-                                            android:paddingStart="5dp"
-                                            android:paddingLeft="5dp"
-                                            android:text="Type of Sample *"
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_column="1"
+                                        android:layout_marginLeft="10dp"
+                                        android:paddingStart="5dp"
+                                        android:paddingLeft="5dp"
+                                        android:text="Type of Sample *"
+android:textSize="@dimen/small_text_size"
+                                        android:textColor="@android:color/darker_gray"
+                                         />
 
-                                            android:textColor="@android:color/darker_gray"
-                                            android:textSize="18sp" />
+                                    <Spinner
+                                        android:id="@+id/spinner_sample"
+                                        android:layout_width="150dp"
+                                        android:layout_height="wrap_content"
 
-                                        <Spinner
-                                            android:id="@+id/spinner_sample"
-                                            android:layout_width="150dp"
-                                            android:layout_height="wrap_content"
 
-                                            android:layout_marginLeft="20dp" />
-                                    </TableRow>
-                                </TableLayout>
+                                        android:layout_marginLeft="20dp" />
+                                </TableRow>
+                            </TableLayout>
 
 
 
 
-                                <TableLayout
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content">
+                            <TableLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content">
 
-                                    <TableRow
-                                        android:layout_marginTop="30dp"
-                                        android:layout_marginBottom="40dp">
+                                <TableRow
+                                    android:layout_marginTop="30dp"
+                                    android:layout_marginBottom="40dp">
 
-                                        <TextView
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:layout_column="1"
-                                            android:layout_marginLeft="10dp"
-                                            android:paddingStart="5dp"
-                                            android:paddingLeft="5dp"
-
-                                            android:text="Tube Validity *     "
-                                            android:textColor="@android:color/darker_gray"
-                                            android:textSize="18sp" />
-
-                                        <Spinner
-
-                                            android:id="@+id/spinner_validity"
-                                            android:layout_width="150dp"
-                                            android:layout_height="wrap_content"
-
-                                            android:layout_marginLeft="20dp" />
-                                    </TableRow>
-                                </TableLayout>
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_column="1"
+                                        android:layout_marginLeft="10dp"
+                                        android:paddingStart="5dp"
+                                        android:paddingLeft="5dp"
+                                        android:textSize="@dimen/small_text_size"
 
 
-                                <Button
-                                    android:id="@+id/startTest"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginStart="80dp"
-                                    android:layout_marginEnd="80dp"
-                                    android:layout_marginTop="50dp"
-                                    android:textColor="@android:color/white"
+                                        android:text="Tube Validity *     "
+                                        android:textColor="@android:color/darker_gray"
+                                        />
 
-                                    android:layout_marginBottom="120dp"
-                                    android:background="@drawable/buttonshape"
-                                    android:text="Start Test"
-                                    android:textAllCaps="false"
+                                    <Spinner
 
-                                    android:textSize="20sp" />
+                                        android:id="@+id/spinner_validity"
+                                        android:layout_width="150dp"
+                                        android:layout_height="wrap_content"
+
+                                        android:layout_marginLeft="20dp" />
+                                </TableRow>
+                            </TableLayout>
 
 
-                            </LinearLayout>
+                            <Button
+                                android:id="@+id/startTest"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="80dp"
+                                android:layout_marginEnd="80dp"
+                                android:layout_marginTop="50dp"
+                                android:textColor="@android:color/white"
+
+                                android:layout_marginBottom="120dp"
+                                android:background="@drawable/buttonshape"
+                                android:text="Start Test"
+                                android:textAllCaps="false"
+
+                                android:textSize="20sp" />
+
+
+                        </LinearLayout>
 
                     </LinearLayout>
 

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

@@ -0,0 +1,5 @@
+<resources>
+	<dimen name="small_text_size">9.7sp</dimen>
+	<dimen name="heading_size">12.7sp</dimen>
+	<dimen name="default_text_size">11.7sp</dimen>
+</resources>

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

@@ -0,0 +1,5 @@
+<resources>
+	<dimen name="small_text_size">9.7sp</dimen>
+	<dimen name="heading_size">12.7sp</dimen>
+	<dimen name="default_text_size">11.7sp</dimen>
+</resources>

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

@@ -0,0 +1,6 @@
+<resources>
+	<dimen name="heading_size">19sp</dimen>
+	<dimen name="default_text_size">17.5sp</dimen>
+	<dimen name="small_text_size">14.5sp</dimen>
+
+</resources>

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

@@ -0,0 +1,5 @@
+<resources>
+	<dimen name="small_text_size">19.3sp</dimen>
+	<dimen name="heading_size">25.3sp</dimen>
+	<dimen name="default_text_size">23.3sp</dimen>
+</resources>

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

@@ -0,0 +1,5 @@
+<resources>
+	<dimen name="small_text_size">24.2sp</dimen>
+	<dimen name="heading_size">31.7sp</dimen>
+	<dimen name="default_text_size">29.2sp</dimen>
+</resources>

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

@@ -0,0 +1,5 @@
+<resources>
+	<dimen name="heading_size">10.6sp</dimen>
+	<dimen name="default_text_size">9.7sp</dimen>
+	<dimen name="small_text_size">8.1sp</dimen>
+</resources>

app/src/main/res/xml/file_path.xml

@@ -0,0 +1,3 @@
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="external_files" path="."/>
+</paths>