diff --git a/app/src/main/java/com/example/nimal/help/Add_Hosp.java b/app/src/main/java/com/example/nimal/help/Add_Hosp.java
index bd35957415df4a9c5e6145315a92bec2b4ebcaed..8c94cd4923496485092b4379def2d3a510f68725 100644
--- a/app/src/main/java/com/example/nimal/help/Add_Hosp.java
+++ b/app/src/main/java/com/example/nimal/help/Add_Hosp.java
@@ -1,6 +1,7 @@
package com.example.nimal.help;
import android.app.ProgressDialog;
+import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
@@ -114,4 +115,9 @@ public class Add_Hosp extends AppCompatActivity implements View.OnClickListener
}
}
+ public void onBackPressed()
+ {
+ Intent i = new Intent(Add_Hosp.this,Login1.class);
+ startActivity(i);
+ }
}
diff --git a/app/src/main/java/com/example/nimal/help/Help.java b/app/src/main/java/com/example/nimal/help/Help.java
index 3816b20dd443b0dd41b7d168b8bb16c026518d65..29e0105549e215c94e4db5d5ce63b89ee3986331 100644
--- a/app/src/main/java/com/example/nimal/help/Help.java
+++ b/app/src/main/java/com/example/nimal/help/Help.java
@@ -31,7 +31,7 @@ public class Help extends AppCompatActivity {
ProgressDialog progressDialog;
TextView show;
static StringBuffer sb,sb1;
- static String str,srt,phone;
+ static String str,srt,phone,ar;
static int count,fun,nuf;
static double dist=1000000000,rand;
static double hi[] = new double[2] ;
@@ -139,11 +139,12 @@ public class Help extends AppCompatActivity {
double r1 = lol(ss1[1]);
double r2 = lol(ss1[2]);
rand = Math.hypot(Math.abs(r1-latitude),Math.abs(r2-longitude));
- if(rand < dist && (lol(ss1[5]))>4)
+ if((rand < dist && (lol(ss1[5]))>4))
{
dist = rand;
hi[0] = dist;
fun = i;
+ ar = ss[1];
//show.setText(ss[i]);
}
else if(rand < dist && (lol(ss1[5]))<4)
@@ -151,8 +152,17 @@ public class Help extends AppCompatActivity {
dist = rand;
hi[1] = dist;
nuf = i;
+ ar = ss[1];
//show.setText(ss[i]);
}
+ else if(!ss[i].contains(ar))
+ {
+ dist = rand;
+ hi[0] = dist;
+ hi[1] = dist;
+ fun = i;
+ }
+
}
else
{
diff --git a/app/src/main/java/com/example/nimal/help/Login1.java b/app/src/main/java/com/example/nimal/help/Login1.java
index ba88708d9e25dfbc5857e38b888ba15eb09a827e..ef7bf09d3454130fcd0cec9512e764522ff52d24 100644
--- a/app/src/main/java/com/example/nimal/help/Login1.java
+++ b/app/src/main/java/com/example/nimal/help/Login1.java
@@ -43,6 +43,7 @@ public class Login1 extends AppCompatActivity {
TextView txt = (TextView) findViewById(R.id.TextView1);
txt.setText("Welcome "+sharedPreferences.getString("Email",null).toString()+" !!!");
+ /*
GridView gridView = (GridView) findViewById(R.id.GridView2);
gridView.setAdapter(new Login1.ImageAdapter(this));
gridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -123,6 +124,6 @@ public class Login1 extends AppCompatActivity {
R.drawable.images7,
R.drawable.images9,
R.drawable.images8
- };
+ };*/
}
}
diff --git a/app/src/main/res/layout/activity_login1.xml b/app/src/main/res/layout/activity_login1.xml
index 797526bc47e1e19d4d88bdebde0c57ae6dca8a76..ff022c18ab1e487c06bbd6ca3e9cc01fcf04b1dc 100644
--- a/app/src/main/res/layout/activity_login1.xml
+++ b/app/src/main/res/layout/activity_login1.xml
@@ -1,27 +1,138 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+ 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:layout_height="match_parent"
- android:orientation="vertical"
+
tools:context="com.example.nimal.help.Login1">
<TextView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="25dp"
+ android:textSize="20dp"
android:id="@+id/TextView1"
- android:gravity="right"/>
+ android:gravity="right"
+ android:textStyle="bold"/>
+
- <GridView
- android:id="@+id/GridView2"
+ <ImageView
+ android:layout_width="50dp"
+ android:layout_height="30dp"
+ android:layout_marginTop="50dp"
+ android:src="@drawable/images4"
+ android:layout_marginLeft="70dp"
+ android:id="@+id/imageView" />
+
+ <TextView
+ android:id="@+id/textView"
+ android:layout_width="match_parent"
+ android:layout_height="25dp"
+ android:text="Add User"
+ android:textSize="25dp"
+ android:textStyle="bold"
+ android:layout_marginTop="3dp"
+ android:layout_alignTop="@+id/imageView"
+ android:layout_toEndOf="@+id/imageView" />
+
+ <ImageView
+ android:layout_width="50dp"
+ android:layout_height="40dp"
+ android:layout_marginLeft="55dp"
+ android:src="@drawable/images5"
+ android:id="@+id/imageView2"
+ android:layout_alignTop="@+id/textView1"
+ android:layout_toStartOf="@+id/textView1" />
+
+ <TextView
+ android:id="@+id/textView1"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:columnWidth="90dp"
- android:gravity="center"
- android:horizontalSpacing="0.5dp"
- android:numColumns="2"
- android:stretchMode="columnWidth"
- android:verticalSpacing="0.5dp" />
-
-</LinearLayout>
+ android:layout_height="wrap_content"
+ android:textSize="25dp"
+ android:text="Add Hospital"
+ android:layout_marginTop="60dp"
+ android:textStyle="bold"
+ android:layout_alignTop="@+id/imageView"
+ android:layout_toEndOf="@+id/imageView" />
+
+ <ImageView
+ android:layout_width="50dp"
+ android:layout_height="40dp"
+ android:layout_marginLeft="40dp"
+ android:src="@drawable/image6"
+ android:id="@+id/imageView5"
+ android:layout_alignTop="@+id/textView2"
+ android:layout_toStartOf="@+id/textView2" />
+ <TextView
+ android:id="@+id/textView2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="25dp"
+ android:text="Remove Hospital"
+ android:layout_marginTop="110dp"
+ android:textStyle="bold"
+ android:layout_alignTop="@+id/imageView"
+ android:layout_toEndOf="@+id/imageView" />
+
+ <ImageView
+ android:layout_width="50dp"
+ android:layout_height="40dp"
+ android:src="@drawable/images7"
+ android:id="@+id/imageView4"
+ android:layout_alignTop="@+id/textView3"
+ android:layout_alignStart="@+id/imageView2" />
+
+ <TextView
+ android:id="@+id/textView3"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="25dp"
+ android:text="View Hospital"
+ android:layout_marginTop="158dp"
+ android:textStyle="bold"
+ android:layout_alignTop="@+id/imageView"
+ android:layout_toEndOf="@+id/imageView" />
+
+ <ImageView
+ android:layout_width="50dp"
+ android:layout_height="40dp"
+ android:src="@drawable/images9"
+ android:id="@+id/imageView3"
+ android:layout_alignTop="@+id/textView4"
+ android:layout_alignStart="@+id/imageView6" />
+
+ <TextView
+ android:id="@+id/textView4"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="25dp"
+ android:text="Update Hospital"
+ android:layout_marginTop="205dp"
+ android:textStyle="bold"
+ android:layout_alignTop="@+id/imageView"
+ android:layout_toEndOf="@+id/imageView" />
+
+ <ImageView
+ android:layout_width="50dp"
+ android:layout_height="40dp"
+ android:src="@drawable/images8"
+ android:id="@+id/imageView6"
+ android:layout_alignTop="@+id/textView5"
+ android:layout_alignStart="@+id/imageView2" />
+ <TextView
+ android:id="@+id/textView5"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="25dp"
+ android:layout_marginTop="250dp"
+ android:text="Location"
+ android:textStyle="bold"
+ android:layout_alignTop="@+id/imageView"
+ android:layout_toEndOf="@+id/imageView" />
+
+
+
+
+
+</RelativeLayout>