diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981032aa01b060f5a568641d7a8840cc90dc..fbb68289f4352bf149aa31a2c9940faa99174224 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
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 c24e97c04fa12768af0af4c871e4dff8178053a4..ad190647f00821195ac1bfe8578a540b950605cc 100644
--- a/app/src/main/java/com/example/nimal/help/Help.java
+++ b/app/src/main/java/com/example/nimal/help/Help.java
@@ -34,7 +34,7 @@ public class Help extends AppCompatActivity {
TextView show;
static StringBuffer sb,sb1;
static String str,srt,phone,ar;
- static int count,fun,nuf;
+ static int count,fun,nuf,fabi = 1;
static double dist=1000000000,rand;
static double hi[] = new double[2] ;
static int round = 0;
@@ -213,8 +213,17 @@ public class Help extends AppCompatActivity {
FloatingActionButton fab1 = (FloatingActionButton)findViewById(R.id.floatingActionButton2);
FloatingActionButton fab2 = (FloatingActionButton)findViewById(R.id.floatingActionButton3);
- fab1.setVisibility(view.VISIBLE);
- fab2.setVisibility(view.VISIBLE);
+ if(fabi == 1) {
+ fab1.setVisibility(view.VISIBLE);
+ fab2.setVisibility(view.VISIBLE);
+ fabi = 0;
+ }
+ else if(fabi == 0)
+ {
+ fab1.setVisibility(view.INVISIBLE);
+ fab2.setVisibility(view.INVISIBLE);
+ fabi = 1;
+ }
}
public void call(View view)
{
diff --git a/app/src/main/java/com/example/nimal/help/Location.java b/app/src/main/java/com/example/nimal/help/Location.java
index d6fd67c2dc84d48f2bc1a3e364dd84527711d845..24a9ecd032b3c1a29ce989223687150fe0424eea 100644
--- a/app/src/main/java/com/example/nimal/help/Location.java
+++ b/app/src/main/java/com/example/nimal/help/Location.java
@@ -58,11 +58,10 @@ public class Location extends AppCompatActivity {
public void onBackPressed()
{
if(u.contentEquals("user")) {
- u = "hi";
Intent i = new Intent(this, User1.class);
startActivity(i);
}
- else{
+ else if(u.contentEquals("Login")){
Intent i = new Intent(this, Login1.class);
startActivity(i);
}
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 2404569c6efbdc73c021039c9e15171806aeb26e..cf576fde974d0ea06a9e137d8c6eab0d687fcf33 100644
--- a/app/src/main/java/com/example/nimal/help/Login1.java
+++ b/app/src/main/java/com/example/nimal/help/Login1.java
@@ -54,16 +54,24 @@ public class Login1 extends AppCompatActivity {
add = (TextView)findViewById(R.id.textView1);
remove = (TextView)findViewById(R.id.textView2);
view = (TextView)findViewById(R.id.textView3);
- update = (TextView)findViewById(R.id.textView4);
+ //update = (TextView)findViewById(R.id.textView4);
location = (TextView)findViewById(R.id.textView5);
contact1 = (ImageView)findViewById(R.id.imageView);
- add1 = (ImageView)findViewById(R.id.imageView2);
- remove1 = (ImageView)findViewById(R.id.imageView3);
- view1 = (ImageView)findViewById(R.id.imageView4);
- update1 = (ImageView)findViewById(R.id.imageView5);
+ add1 = (ImageView)findViewById(R.id.imageView5);
+ remove1 = (ImageView)findViewById(R.id.imageView4);
+ view1 = (ImageView)findViewById(R.id.imageView2);
+ //update1 = (ImageView)findViewById(R.id.imageView5);
location1 = (ImageView)findViewById(R.id.imageView6);
+
+ sharedPreferences = getSharedPreferences("FromUser", Context.MODE_PRIVATE);
+
+ SharedPreferences.Editor editor = sharedPreferences.edit();
+
+ editor.putString("User","Login");
+ editor.commit();
+
/*
GridView gridView = (GridView) findViewById(R.id.GridView2);
gridView.setAdapter(new Login1.ImageAdapter(this));
@@ -209,11 +217,12 @@ public class Login1 extends AppCompatActivity {
Intent j = new Intent(Login1.this, View_Hosp.class);
startActivity(j);
}
- public void edith(View view)
+ /* public void edith(View view)
{
Intent j = new Intent(Login1.this, Edit_Hosp.class);
startActivity(j);
}
+ */
public void locationh(View view)
{
Intent j = new Intent(Login1.this, Location.class);
diff --git a/app/src/main/java/com/example/nimal/help/MainActivity.java b/app/src/main/java/com/example/nimal/help/MainActivity.java
index a18651588a1dcf54ef7fa09b5009b61a3b6de00a..0f685ca663ae013ff578a89bb2235b82ae14fd40 100644
--- a/app/src/main/java/com/example/nimal/help/MainActivity.java
+++ b/app/src/main/java/com/example/nimal/help/MainActivity.java
@@ -123,4 +123,13 @@ public class MainActivity extends AppCompatActivity {
startActivity(j);
}
}
+
+ @Override
+ public void onBackPressed() {
+ Intent startMain = new Intent(Intent.ACTION_MAIN);
+ startMain.addCategory(Intent.CATEGORY_HOME);
+ startMain.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ startActivity(startMain);
+ }
+
}
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
index 6182ea067a309cd12df30cc35f9c5e91f1010f10..62e029263dbaa7036f60271c1b796d60b41b6dab 100644
--- a/app/src/main/res/layout/activity_help.xml
+++ b/app/src/main/res/layout/activity_help.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<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"
@@ -23,59 +23,46 @@
android:layout_marginBottom="45dp" />
-
-
- <Button
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:text="Retreive"
- android:onClick="retreival"
- android:background="#DB7093"
- android:layout_marginLeft="10dp"
- android:layout_marginRight="10dp"
- android:id="@+id/button9"
- android:textStyle="bold"
- android:layout_above="@+id/scrollView2"
- android:layout_toStartOf="@+id/floatingActionButton3" />
- <Button
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:text="Suggest"
- android:onClick="suggestion"
- android:background="#DB7093"
- android:textStyle="bold"
- android:layout_marginLeft="10dp"
- android:layout_marginRight="10dp"
- android:id="@+id/button10"
- android:layout_above="@+id/scrollView2"
- android:layout_alignStart="@+id/Area"
- android:layout_marginStart="46dp" />
-
-
-
-
+ android:gravity="center">
+
+ <Button
+ android:id="@+id/button9"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/scrollView2"
+ android:layout_alignEnd="@+id/scrollView2"
+ android:layout_gravity="center"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:background="#DB7093"
+ android:onClick="retreival"
+ android:text="Retreive"
+ android:textStyle="bold" />
+
+ <Button
+ android:id="@+id/button10"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/scrollView2"
+ android:layout_alignStart="@+id/Area"
+ android:layout_gravity="center"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginStart="46dp"
+ android:background="#DB7093"
+ android:onClick="suggestion"
+ android:text="Suggest"
+ android:textStyle="bold" />
- <ScrollView
- android:id="@+id/scrollView2"
- android:layout_width="300dp"
- android:layout_height="325dp"
- android:layout_alignParentBottom="true"
- android:layout_alignParentStart="true">
+ </LinearLayout>
- <TextView
- android:id="@+id/ShowSugg"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:layout_marginLeft="40dp"
- android:gravity="center"
- android:textStyle="italic"
- android:textColorHint="#000000"
- android:hint="First Click Retreive and Suggest for suggestion" />
- </ScrollView>
+<RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<android.support.design.widget.FloatingActionButton
@@ -85,6 +72,7 @@
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_gravity="end"
+ android:layout_margin="10dp"
android:clickable="true"
android:onClick="newing"
android:src="@android:drawable/ic_input_add" />
@@ -97,6 +85,7 @@
android:layout_alignParentEnd="true"
android:layout_marginBottom="15dp"
android:clickable="true"
+ android:layout_margin="10dp"
android:onClick="call"
android:visibility="invisible"
app:fabSize="mini"
@@ -106,25 +95,41 @@
android:id="@+id/floatingActionButton3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_above="@+id/floatingActionButton2"
- android:layout_alignStart="@+id/floatingActionButton2"
- android:layout_marginBottom="12dp"
android:clickable="true"
android:onClick="messaging"
android:visibility="invisible"
app:fabSize="mini"
- app:srcCompat="@android:drawable/stat_notify_chat" />
+ app:srcCompat="@android:drawable/stat_notify_chat"
+ android:layout_above="@+id/floatingActionButton2"
+ android:layout_alignStart="@+id/floatingActionButton2" />
<android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/coordinatorLayout"
- android:layout_alignTop="@+id/scrollView2"
- android:layout_alignParentStart="true"
- android:layout_marginTop="63dp">
-
- </android.support.design.widget.CoordinatorLayout>
+ android:layout_alignParentStart="true">
+ <ScrollView
+ android:id="@+id/scrollView2"
+ android:layout_width="300dp"
+ android:layout_height="325dp"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentStart="true">
+
+ <TextView
+ android:id="@+id/ShowSugg"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:layout_marginLeft="40dp"
+ android:gravity="center"
+ android:hint="First Click Retreive and Suggest for suggestion"
+ android:textColorHint="#000000"
+ android:textStyle="italic" />
+ </ScrollView>
+ </android.support.design.widget.CoordinatorLayout>
</RelativeLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_login1.xml b/app/src/main/res/layout/activity_login1.xml
index fabd84b9f9dc180c93e9ea280eb591a0952b8427..b08222a2b9ac4ef4fb3250198203b68a88436103 100644
--- a/app/src/main/res/layout/activity_login1.xml
+++ b/app/src/main/res/layout/activity_login1.xml
@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="30dp"
android:gravity="fill_vertical"
- android:textSize="20dp"
+ android:textSize="17dp"
android:textStyle="bold" />
@@ -52,7 +52,7 @@
android:id="@+id/imageView2"
android:onClick="viewh"
android:clickable="true"
- android:layout_alignBottom="@+id/textView3"
+ android:layout_alignTop="@+id/textView3"
android:layout_toStartOf="@+id/textView3" />
<TextView
@@ -61,11 +61,11 @@
android:layout_height="wrap_content"
android:textSize="25dp"
android:text="Add Hospital"
- android:layout_marginTop="45dp"
+ android:layout_marginTop="40dp"
android:textStyle="bold"
android:onClick="addh"
android:clickable="true"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/imageView"
android:layout_alignParentEnd="true"
android:layout_toEndOf="@+id/imageView" />
@@ -77,7 +77,7 @@
android:id="@+id/imageView5"
android:clickable="true"
android:onClick="addh"
- android:layout_above="@+id/textView2"
+ android:layout_alignBottom="@+id/textView1"
android:layout_toStartOf="@+id/textView1" />
<TextView
android:id="@+id/textView2"
@@ -86,7 +86,7 @@
android:textSize="25dp"
android:onClick="removeh"
android:text="Remove Hospital"
- android:layout_marginTop="35dp"
+ android:layout_marginTop="49dp"
android:textStyle="bold"
android:clickable="true"
android:layout_below="@+id/textView1"
@@ -109,7 +109,7 @@
android:layout_height="wrap_content"
android:textSize="25dp"
android:text="View Hospital"
- android:layout_marginTop="32dp"
+ android:layout_marginTop="44dp"
android:textStyle="bold"
android:onClick="viewh"
android:clickable="true"
@@ -117,29 +117,7 @@
android:layout_alignParentEnd="true"
android:layout_toEndOf="@+id/imageView5" />
- <ImageView
- android:layout_width="50dp"
- android:layout_height="40dp"
- android:src="@drawable/images9"
- android:id="@+id/imageView3"
- android:clickable="true"
- android:onClick="edith"
- android:layout_below="@+id/imageView2"
- android:layout_alignStart="@+id/imageView2"
- android:layout_marginTop="28dp" />
- <TextView
- android:id="@+id/textView4"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="25dp"
- android:text="Update Hospital"
- android:clickable="true"
- android:textStyle="bold"
- android:onClick="edith"
- android:layout_alignBottom="@+id/imageView3"
- android:layout_alignParentEnd="true"
- android:layout_toEndOf="@+id/imageView3" />
<ImageView
android:layout_width="50dp"
@@ -159,15 +137,14 @@
android:clickable="true"
android:onClick="locationh"
android:textStyle="bold"
- android:layout_below="@+id/textView4"
- android:layout_alignParentEnd="true"
- android:layout_marginTop="34dp"
- android:layout_toEndOf="@+id/imageView3" />
+ android:layout_marginTop="52dp"
+ android:layout_below="@+id/textView3"
+ android:layout_toEndOf="@+id/imageView2" />
<TextView
android:id="@+id/textView6"
android:layout_width="150dp"
- android:layout_height="30dp"
+ android:layout_height="50dp"
android:text="Sign Out"
android:textStyle="bold"
android:gravity="center"
diff --git a/app/src/main/res/layout/activity_remove__hosp.xml b/app/src/main/res/layout/activity_remove__hosp.xml
index 2a4c0b6ed6a2dfb1bff8746f2a628b5920e4d5f4..f1e73d70f365f453e80b2f0aa0390d32ab833d71 100644
--- a/app/src/main/res/layout/activity_remove__hosp.xml
+++ b/app/src/main/res/layout/activity_remove__hosp.xml
@@ -23,7 +23,7 @@
android:textStyle="italic"
android:textSize="15dp"
android:gravity="center"
- android:hint="First click on Read Data
+ android:hint="First click on Read Data\n
and the Refresh to display the found data"
android:layout_alignParentStart="true"
android:layout_above="@+id/Key" />