1. Updated the UI of the App.

2. Important Notes: (i) Resolved the problem encountered last time. (ii) Titles are adjusted for each page for both doctor and patient. (iii) Font size, font color and font styles are changed for better readability. 3. No problems encountered.
Ansel-Hong · Aug 7, 2021 · 97c941e · 97c941e
1 parent 06e8939
commit 97c941e
Show file tree

Hide file tree

Showing 23 changed files with 97 additions and 18 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/example/b07project/LoginPage.java b/app/src/main/java/com/example/b07project/LoginPage.java
@@ -46,7 +46,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_login_page);
 
         Context pageContext = this;
-
+        getSupportActionBar().setTitle("B07 Hospital App");
 
 
 

diff --git a/app/src/main/java/com/example/b07project/MainActivity.java b/app/src/main/java/com/example/b07project/MainActivity.java
@@ -25,7 +25,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         setActivityBackgroundColor(0xff4293f5, this);
-
+        getSupportActionBar().setTitle("B07 Hospital App");
 
     }
 

diff --git a/...ain/java/com/example/b07project/appointment_activities/DoctorViewAppointmentActivity.java b/...ain/java/com/example/b07project/appointment_activities/DoctorViewAppointmentActivity.java
@@ -4,7 +4,10 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -39,6 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle("See Upcoming Appointments");
 
         DatabaseReference ref = FirebaseDatabase.getInstance().getReference();
         ref.addValueEventListener(new ValueEventListener() {
@@ -104,7 +108,11 @@ public void onDataChange(@NonNull DataSnapshot snapshot) {
                             SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM d 'at' h:mm a");
                             String time = dateFormat.format(date);
                             appointmentInfo.setText(time + " with " + pat.getName() + "\n");
-
+                            Resources resource = (Resources) getBaseContext().getResources();
+                            ColorStateList csl = (ColorStateList) resource.getColorStateList(R.color.black);
+                            appointmentInfo.setTextColor(csl);
+                            appointmentInfo.setTextSize(15);
+                            appointmentInfo.setGravity(Gravity.CENTER);
                             layout.addView(appointmentInfo);
                         }
                     }

diff --git a/...in/java/com/example/b07project/appointment_activities/DoctorViewAvailabilityActivity.java b/...in/java/com/example/b07project/appointment_activities/DoctorViewAvailabilityActivity.java
@@ -6,7 +6,11 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -39,7 +43,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
-
+        actionBar.setTitle("See Available Time");
 
 
 
@@ -188,7 +192,11 @@ public void addTimeSlot(Date date){
         SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM d 'at' h:mm a");
         String time = dateFormat.format(date);
         timeSlot.setText(time + " (available) " + "\n");
-
+        Resources resource = (Resources) getBaseContext().getResources();
+        ColorStateList csl = (ColorStateList) resource.getColorStateList(R.color.black);
+        timeSlot.setTextColor(csl);
+        timeSlot.setTextSize(15);
+        timeSlot.setGravity(Gravity.CENTER);
         layout.addView(timeSlot);
 
     }

diff --git a/...in/java/com/example/b07project/appointment_activities/PatientBookAppointmentActivity.java b/...in/java/com/example/b07project/appointment_activities/PatientBookAppointmentActivity.java
@@ -42,6 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle("Select Time Slots");
 
 
         Intent intent = getIntent();

diff --git a/.../main/java/com/example/b07project/appointment_activities/PatientChooseDoctorActivity.java b/.../main/java/com/example/b07project/appointment_activities/PatientChooseDoctorActivity.java
@@ -38,6 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle("Book Appointments");
 
         //Declaring Specialties and initializing spinner
         String[] specialties = new String[] {"Any", "Cardiology", "Dermatology", "Family Medicine", "Neurology"

diff --git a/...in/java/com/example/b07project/appointment_activities/PatientViewAppointmentActivity.java b/...in/java/com/example/b07project/appointment_activities/PatientViewAppointmentActivity.java
@@ -4,7 +4,10 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -38,6 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle("See Upcoming Appointments");
 
         DatabaseReference ref = FirebaseDatabase.getInstance().getReference();
         ref.addValueEventListener(new ValueEventListener() {
@@ -104,7 +108,11 @@ public void onDataChange(@NonNull DataSnapshot snapshot) {
                             SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM d 'at' h:mm a");
                             String time = dateFormat.format(date);
                             appointmentInfo.setText(time+" with Dr."+doc.getName() + "\n");
-
+                            Resources resource = (Resources) getBaseContext().getResources();
+                            ColorStateList csl = (ColorStateList) resource.getColorStateList(R.color.black);
+                            appointmentInfo.setTextColor(csl);
+                            appointmentInfo.setTextSize(15);
+                            appointmentInfo.setGravity(Gravity.CENTER);
                             layout.addView(appointmentInfo);
                         }
                     }

diff --git a/...ava/com/example/b07project/appointment_activities/PatientViewPastAppointmentActivity.java b/...ava/com/example/b07project/appointment_activities/PatientViewPastAppointmentActivity.java
@@ -4,7 +4,10 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -38,6 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle("See Past Appointments");
 
         DatabaseReference ref = FirebaseDatabase.getInstance().getReference();
         ref.addValueEventListener(new ValueEventListener() {
@@ -96,6 +100,11 @@ public void onDataChange(@NonNull DataSnapshot snapshot) {
                             SimpleDateFormat formattedDate = new SimpleDateFormat("EEE MMM d 'at' h:mm a");
                             String time = formattedDate.format(date);
                             appointmentInfo.setText(time + " with Dr." + doc.getName() + "\n");
+                            Resources resource = (Resources) getBaseContext().getResources();
+                            ColorStateList csl = (ColorStateList) resource.getColorStateList(R.color.black);
+                            appointmentInfo.setTextColor(csl);
+                            appointmentInfo.setGravity(Gravity.CENTER);
+                            appointmentInfo.setTextSize(15);
                             layout.addView(appointmentInfo);
                         }
                     }

diff --git a/app/src/main/java/com/example/b07project/user_information/DoctorActivity.java b/app/src/main/java/com/example/b07project/user_information/DoctorActivity.java
@@ -34,6 +34,8 @@ protected void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_doctor);
 
+        getSupportActionBar().setTitle("My Account");
+
         MainActivity.setActivityBackgroundColor(0xff597ea8, this);
 
         doctor = FirebaseAuth.getInstance().getCurrentUser();

diff --git a/app/src/main/java/com/example/b07project/user_information/DoctorPatientCheckupActivity.java b/app/src/main/java/com/example/b07project/user_information/DoctorPatientCheckupActivity.java
@@ -37,6 +37,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle("See Patient Info");
 
         LinearLayout layout = (LinearLayout) findViewById(R.id.patient_list);
 

diff --git a/app/src/main/java/com/example/b07project/user_information/DoctorSignup.java b/app/src/main/java/com/example/b07project/user_information/DoctorSignup.java
@@ -55,6 +55,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         auth = FirebaseAuth.getInstance();
         Button update_info = findViewById(R.id.add_doctor_info);
+        update_info.setAllCaps(false);
         update_info.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

diff --git a/app/src/main/java/com/example/b07project/user_information/PatientActivity.java b/app/src/main/java/com/example/b07project/user_information/PatientActivity.java
@@ -36,6 +36,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_patient);
 
+        getSupportActionBar().setTitle("My Account");
+
         MainActivity.setActivityBackgroundColor(0xf0bccbe8, this);
 
         patient = FirebaseAuth.getInstance().getCurrentUser();

diff --git a/app/src/main/java/com/example/b07project/user_information/PatientSignup.java b/app/src/main/java/com/example/b07project/user_information/PatientSignup.java
@@ -43,6 +43,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
         Button update_info = findViewById(R.id.add_patient_info);
+        update_info.setAllCaps(false);
         update_info.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

diff --git a/.../main/java/com/example/b07project/user_information/PatientViewVisitedDoctorsActivity.java b/.../main/java/com/example/b07project/user_information/PatientViewVisitedDoctorsActivity.java
@@ -3,7 +3,11 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.view.Gravity;
 import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -35,6 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle("See Visited Doctors");
 
         DatabaseReference ref = FirebaseDatabase.getInstance().getReference();
         ref.addValueEventListener(new ValueEventListener() {
@@ -76,6 +81,11 @@ public void onDataChange(@NonNull DataSnapshot snapshot) {
                                 doctorName.add(doc.getName());
                                 doctorInfo = new TextView(PatientViewVisitedDoctorsActivity.this);
                                 doctorInfo.setText("Dr." + doc.getName() + ", specializes in " + doc.getSpecialty() + "\n");
+                                Resources resource = (Resources) getBaseContext().getResources();
+                                ColorStateList csl = (ColorStateList) resource.getColorStateList(R.color.black);
+                                doctorInfo.setTextColor(csl);
+                                doctorInfo.setGravity(Gravity.CENTER);
+                                doctorInfo.setTextSize(15);
                                 layout.addView(doctorInfo);
                             }
                         }

diff --git a/app/src/main/res/layout/activity_doctor_patient_checkup.xml b/app/src/main/res/layout/activity_doctor_patient_checkup.xml
@@ -8,10 +8,13 @@
 
     <TextView
         android:id="@+id/textView7"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        android:textSize="20sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
-        android:text="View the following patient information"
+        android:text="View the following patient information:"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

diff --git a/app/src/main/res/layout/activity_doctor_view_appointment.xml b/app/src/main/res/layout/activity_doctor_view_appointment.xml
@@ -8,6 +8,9 @@
 
     <TextView
         android:id="@+id/textView6"
+        android:textColor="@color/black"
+        android:textSize="20sp"
+        android:textStyle="bold"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"

diff --git a/app/src/main/res/layout/activity_doctor_view_availability.xml b/app/src/main/res/layout/activity_doctor_view_availability.xml
@@ -7,12 +7,14 @@
 
     <TextView
         android:id="@+id/textView5"
-        android:gravity="center"
-        android:layout_width="205dp"
-        android:layout_height="33dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
+        android:gravity="center"
         android:text="Here are your schedule:"
-        android:textSize="18sp"
+        android:textColor="@color/black"
+        android:textSize="20sp"
+        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/scrollView3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/activity_patient_book_appointment.xml b/app/src/main/res/layout/activity_patient_book_appointment.xml
@@ -32,6 +32,9 @@
 
             <TextView
                 android:id="@+id/textView3"
+                android:textColor="@color/black"
+                android:textSize="18sp"
+                android:textStyle="bold"
                 android:layout_width="wrap_content"
                 android:layout_height="50dp"
                 android:layout_marginStart="50dp"

diff --git a/app/src/main/res/layout/activity_patient_choose_doctor.xml b/app/src/main/res/layout/activity_patient_choose_doctor.xml
@@ -10,8 +10,11 @@
         android:id="@+id/textView4"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="44dp"
+        android:layout_marginTop="35dp"
         android:text="Please choose from the following doctors:"
+        android:textColor="@color/black"
+        android:textSize="18sp"
+        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.496"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/activity_patient_view_appointment.xml b/app/src/main/res/layout/activity_patient_view_appointment.xml
@@ -8,6 +8,9 @@
 
     <TextView
         android:id="@+id/textView4"
+        android:textSize="20sp"
+        android:textColor="@color/black"
+        android:textStyle="bold"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
@@ -19,7 +22,7 @@
     <ScrollView
         android:layout_width="312dp"
         android:layout_height="604dp"
-        android:layout_marginStart="50dp"
+        android:layout_marginStart="40dp"
         android:layout_marginTop="32dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -30,7 +33,7 @@
 
         <LinearLayout
             android:id="@+id/appointment_list"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical" />
     </ScrollView>

diff --git a/app/src/main/res/layout/activity_patient_view_past_appointment.xml b/app/src/main/res/layout/activity_patient_view_past_appointment.xml
@@ -8,6 +8,9 @@
 
     <TextView
         android:id="@+id/textView8"
+        android:textStyle="bold"
+        android:textColor="@color/black"
+        android:textSize="20sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
@@ -19,8 +22,9 @@
     <ScrollView
         android:layout_width="312dp"
         android:layout_height="604dp"
-        android:layout_marginStart="50dp"
+        android:layout_marginStart="40dp"
         android:layout_marginTop="32dp"
+        android:layout_marginEnd="50dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"

diff --git a/app/src/main/res/layout/activity_patient_view_visited_doctors.xml b/app/src/main/res/layout/activity_patient_view_visited_doctors.xml
@@ -9,18 +9,21 @@
 
   <TextView
       android:id="@+id/textView9"
+      android:textColor="@color/black"
+      android:textStyle="bold"
+      android:textSize="20sp"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="24dp"
-      android:text="View the following doctors information"
+      android:text="View the following doctors information:"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
 
   <ScrollView
       android:layout_width="306dp"
       android:layout_height="489dp"
-      android:layout_marginStart="54dp"
+      android:layout_marginStart="40dp"
       android:layout_marginTop="32dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,7 +46,7 @@ protected void onCreate(Bundle savedInstanceState) {
		setContentView(R.layout.activity_login_page);

		Context pageContext = this;

		getSupportActionBar().setTitle("B07 Hospital App");



Expand Down