diff --git a/.idea/misc.xml b/.idea/misc.xml index c5aa07a..523b793 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -17,6 +17,7 @@ + diff --git a/app/src/main/java/com/example/b07project/LoginPage.java b/app/src/main/java/com/example/b07project/LoginPage.java index 7e3a237..b8d0c1d 100644 --- a/app/src/main/java/com/example/b07project/LoginPage.java +++ b/app/src/main/java/com/example/b07project/LoginPage.java @@ -7,6 +7,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.util.Log; import android.util.Patterns; @@ -67,6 +70,7 @@ protected void onCreate(Bundle savedInstanceState) { Context pageContext = this; getSupportActionBar().setTitle("B07 Hospital App"); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); presenter = new Presenter(new Model(), this); diff --git a/app/src/main/java/com/example/b07project/MainActivity.java b/app/src/main/java/com/example/b07project/MainActivity.java index 1fd0201..fc687e0 100644 --- a/app/src/main/java/com/example/b07project/MainActivity.java +++ b/app/src/main/java/com/example/b07project/MainActivity.java @@ -3,6 +3,8 @@ import androidx.appcompat.app.AppCompatActivity; import android.content.Intent; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -26,6 +28,7 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); setActivityBackgroundColor(0xff4293f5, this); getSupportActionBar().setTitle("B07 Hospital App"); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); } diff --git a/app/src/main/java/com/example/b07project/appointment_activities/DoctorViewAppointmentActivity.java b/app/src/main/java/com/example/b07project/appointment_activities/DoctorViewAppointmentActivity.java index 2b7c57e..d7d63ad 100644 --- a/app/src/main/java/com/example/b07project/appointment_activities/DoctorViewAppointmentActivity.java +++ b/app/src/main/java/com/example/b07project/appointment_activities/DoctorViewAppointmentActivity.java @@ -6,6 +6,8 @@ import android.content.res.ColorStateList; import android.content.res.Resources; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.Gravity; import android.view.MenuItem; @@ -43,6 +45,7 @@ protected void onCreate(Bundle savedInstanceState) { ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setTitle("See Upcoming Appointments"); + actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); DatabaseReference ref = FirebaseDatabase.getInstance().getReference(); ref.addValueEventListener(new ValueEventListener() { diff --git a/app/src/main/java/com/example/b07project/appointment_activities/DoctorViewAvailabilityActivity.java b/app/src/main/java/com/example/b07project/appointment_activities/DoctorViewAvailabilityActivity.java index a879da2..ff81a81 100644 --- a/app/src/main/java/com/example/b07project/appointment_activities/DoctorViewAvailabilityActivity.java +++ b/app/src/main/java/com/example/b07project/appointment_activities/DoctorViewAvailabilityActivity.java @@ -8,6 +8,7 @@ import android.content.Intent; import android.content.res.ColorStateList; import android.content.res.Resources; +import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.Gravity; @@ -44,7 +45,7 @@ protected void onCreate(Bundle savedInstanceState) { ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setTitle("See Available Time"); - + actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); String doctorID = auth.getUid(); @@ -220,7 +221,11 @@ public void onDataChange(@NonNull DataSnapshot snapshot) { SimpleDateFormat dateFormat = new SimpleDateFormat("EEE MMM d 'at' h:mm a"); String time = dateFormat.format(date); timeSlot.setText("An appointment is booked at " + time + "\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); break; } diff --git a/app/src/main/java/com/example/b07project/appointment_activities/PatientBookAppointmentActivity.java b/app/src/main/java/com/example/b07project/appointment_activities/PatientBookAppointmentActivity.java index 7eb3d37..80e03aa 100644 --- a/app/src/main/java/com/example/b07project/appointment_activities/PatientBookAppointmentActivity.java +++ b/app/src/main/java/com/example/b07project/appointment_activities/PatientBookAppointmentActivity.java @@ -8,6 +8,8 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.MenuItem; import android.view.View; @@ -43,7 +45,7 @@ protected void onCreate(Bundle savedInstanceState) { ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setTitle("Select Time Slots"); - + actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); Intent intent = getIntent(); String doctorID = intent.getStringExtra("doctorID"); diff --git a/app/src/main/java/com/example/b07project/appointment_activities/PatientChooseDoctorActivity.java b/app/src/main/java/com/example/b07project/appointment_activities/PatientChooseDoctorActivity.java index 2fd12e6..4bf3ab7 100644 --- a/app/src/main/java/com/example/b07project/appointment_activities/PatientChooseDoctorActivity.java +++ b/app/src/main/java/com/example/b07project/appointment_activities/PatientChooseDoctorActivity.java @@ -5,6 +5,8 @@ import androidx.appcompat.app.AppCompatActivity; import android.content.Intent; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.util.Log; import android.view.MenuItem; @@ -39,6 +41,7 @@ protected void onCreate(Bundle savedInstanceState) { ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setTitle("Book Appointments"); + actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); //Declaring Specialties and initializing spinner String[] specialties = new String[] {"Any", "Cardiology", "Dermatology", "Family Medicine", "Neurology" diff --git a/app/src/main/java/com/example/b07project/appointment_activities/PatientViewAppointmentActivity.java b/app/src/main/java/com/example/b07project/appointment_activities/PatientViewAppointmentActivity.java index ee559a9..25dec18 100644 --- a/app/src/main/java/com/example/b07project/appointment_activities/PatientViewAppointmentActivity.java +++ b/app/src/main/java/com/example/b07project/appointment_activities/PatientViewAppointmentActivity.java @@ -6,6 +6,8 @@ import android.content.res.ColorStateList; import android.content.res.Resources; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.Gravity; import android.view.MenuItem; @@ -42,6 +44,7 @@ protected void onCreate(Bundle savedInstanceState) { ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setTitle("See Upcoming Appointments"); + actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); DatabaseReference ref = FirebaseDatabase.getInstance().getReference(); ref.addValueEventListener(new ValueEventListener() { diff --git a/app/src/main/java/com/example/b07project/appointment_activities/PatientViewPastAppointmentActivity.java b/app/src/main/java/com/example/b07project/appointment_activities/PatientViewPastAppointmentActivity.java index 3c49248..76f924e 100644 --- a/app/src/main/java/com/example/b07project/appointment_activities/PatientViewPastAppointmentActivity.java +++ b/app/src/main/java/com/example/b07project/appointment_activities/PatientViewPastAppointmentActivity.java @@ -6,6 +6,8 @@ import android.content.res.ColorStateList; import android.content.res.Resources; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.Gravity; import android.view.MenuItem; @@ -42,6 +44,7 @@ protected void onCreate(Bundle savedInstanceState) { ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setTitle("See Past Appointments"); + actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); DatabaseReference ref = FirebaseDatabase.getInstance().getReference(); ref.addValueEventListener(new ValueEventListener() { 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 index 9cb8d01..67cf39d 100644 --- a/app/src/main/java/com/example/b07project/user_information/DoctorActivity.java +++ b/app/src/main/java/com/example/b07project/user_information/DoctorActivity.java @@ -3,6 +3,8 @@ import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.View; import android.widget.Button; @@ -35,6 +37,7 @@ protected void onCreate(Bundle savedInstanceState){ setContentView(R.layout.activity_doctor); getSupportActionBar().setTitle("My Account"); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); MainActivity.setActivityBackgroundColor(0xff597ea8, this); 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 index ac425eb..b70d8c0 100644 --- a/app/src/main/java/com/example/b07project/user_information/DoctorPatientCheckupActivity.java +++ b/app/src/main/java/com/example/b07project/user_information/DoctorPatientCheckupActivity.java @@ -4,8 +4,13 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; +import android.content.res.ColorStateList; +import android.content.res.Resources; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.util.Log; +import android.view.Gravity; import android.view.MenuItem; import android.widget.LinearLayout; import android.widget.TextView; @@ -38,6 +43,7 @@ protected void onCreate(Bundle savedInstanceState) { ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setTitle("See Patient Info"); + actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); LinearLayout layout = (LinearLayout) findViewById(R.id.patient_list); @@ -131,6 +137,10 @@ public void onDataChange(@NonNull DataSnapshot snapshot) { } patientInfo.append("\n\n"); + Resources resource = (Resources) getBaseContext().getResources(); + ColorStateList csl = (ColorStateList) resource.getColorStateList(R.color.black); + patientInfo.setTextColor(csl); + patientInfo.setTextSize(13); layout.addView(patientInfo); } 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 index 915fe3c..fafcb56 100644 --- a/app/src/main/java/com/example/b07project/user_information/DoctorSignup.java +++ b/app/src/main/java/com/example/b07project/user_information/DoctorSignup.java @@ -7,6 +7,8 @@ import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.util.Patterns; import android.view.Gravity; @@ -46,6 +48,7 @@ protected void onCreate(Bundle savedInstanceState) { ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setTitle("Create An Account"); + actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); String[] specialties = new String[] {"Specialty", "Cardiology", "Dermatology", "Family Medicine", "Neurology" , "Gynecology", "Pediatrics", "Physiotherapy", "Psychiatry"}; 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 index d80ff0f..ccc111a 100644 --- a/app/src/main/java/com/example/b07project/user_information/PatientActivity.java +++ b/app/src/main/java/com/example/b07project/user_information/PatientActivity.java @@ -6,6 +6,8 @@ import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.View; import android.widget.Button; @@ -37,6 +39,7 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_patient); getSupportActionBar().setTitle("My Account"); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); MainActivity.setActivityBackgroundColor(0xf0bccbe8, this); 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 index 0e82562..722132d 100644 --- a/app/src/main/java/com/example/b07project/user_information/PatientSignup.java +++ b/app/src/main/java/com/example/b07project/user_information/PatientSignup.java @@ -7,6 +7,8 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.util.Log; import android.util.Patterns; @@ -37,6 +39,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_patient_signup); getSupportActionBar().setTitle("Create An Account"); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); diff --git a/app/src/main/java/com/example/b07project/user_information/PatientViewVisitedDoctorsActivity.java b/app/src/main/java/com/example/b07project/user_information/PatientViewVisitedDoctorsActivity.java index 1cb7f93..6228078 100644 --- a/app/src/main/java/com/example/b07project/user_information/PatientViewVisitedDoctorsActivity.java +++ b/app/src/main/java/com/example/b07project/user_information/PatientViewVisitedDoctorsActivity.java @@ -6,6 +6,8 @@ import android.content.res.ColorStateList; import android.content.res.Resources; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.Gravity; import android.view.MenuItem; @@ -40,6 +42,7 @@ protected void onCreate(Bundle savedInstanceState) { ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setTitle("See Visited Doctors"); + actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#2E5DA3"))); DatabaseReference ref = FirebaseDatabase.getInstance().getReference(); ref.addValueEventListener(new ValueEventListener() { diff --git a/app/src/main/res/layout/activity_doctor_signup.xml b/app/src/main/res/layout/activity_doctor_signup.xml index 8210e55..00cf823 100644 --- a/app/src/main/res/layout/activity_doctor_signup.xml +++ b/app/src/main/res/layout/activity_doctor_signup.xml @@ -64,7 +64,7 @@ android:id="@+id/toolbar" android:layout_width="409dp" android:layout_height="wrap_content" - android:background="?attr/colorPrimary" + android:background="@color/white" android:minHeight="?attr/actionBarSize" android:theme="?attr/actionBarTheme" app:layout_constraintEnd_toEndOf="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 index 0cb0543..fe241e9 100644 --- a/app/src/main/res/layout/activity_doctor_view_appointment.xml +++ b/app/src/main/res/layout/activity_doctor_view_appointment.xml @@ -22,7 +22,7 @@