From d2bb51076c1733f4bb5fed6c17d30e1c25e9d295 Mon Sep 17 00:00:00 2001
From: "[vinald]" <okiror1vinald@gmail.com>
Date: Tue, 24 Feb 2026 14:37:18 +0300
Subject: [PATCH 1/3] move the pop-up to the buttom of the screen

---
 .../visit/dialog/DosingOutOfWindowDialog.kt   |  21 ++-
 .../layout/dialog_dosing_out_of_window.xml    | 151 +++++++++---------
 app/src/test/resources/configuration.json     |   2 +-
 3 files changed, 99 insertions(+), 75 deletions(-)

diff --git a/app/src/main/java/com/jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt b/app/src/main/java/com/jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt
index e066e898e..6df15eda2 100644
--- a/app/src/main/java/com/jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt
+++ b/app/src/main/java/com/jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt
@@ -4,17 +4,20 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.FrameLayout
 import androidx.databinding.DataBindingUtil
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.jnj.vaccinetracker.R
 import com.jnj.vaccinetracker.common.helpers.findParent
-import com.jnj.vaccinetracker.common.ui.BaseDialogFragment
 import com.jnj.vaccinetracker.databinding.DialogDosingOutOfWindowBinding
 
 /**
  * @author maartenvangiel
  * @version 1
  */
-class DosingOutOfWindowDialog : BaseDialogFragment() {
+class DosingOutOfWindowDialog : BottomSheetDialogFragment() {
 
     private lateinit var binding: DialogDosingOutOfWindowBinding
 
@@ -47,6 +50,20 @@ class DosingOutOfWindowDialog : BaseDialogFragment() {
         return binding.root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        // Expand the bottom sheet fully so content is not cut off in landscape
+        dialog?.setOnShowListener { dialogInterface ->
+            val bottomSheetDialog = dialogInterface as? BottomSheetDialog
+            val bottomSheet = bottomSheetDialog?.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
+            bottomSheet?.let {
+                val behavior = BottomSheetBehavior.from(it)
+                behavior.state = BottomSheetBehavior.STATE_EXPANDED
+                behavior.skipCollapsed = true
+            }
+        }
+    }
+
     interface DosingOutOfWindowDialogListener {
         fun onOutOfWindowDosingCanceled()
     }
diff --git a/app/src/main/res/layout/dialog_dosing_out_of_window.xml b/app/src/main/res/layout/dialog_dosing_out_of_window.xml
index 4ad64a48b..586e24fc9 100644
--- a/app/src/main/res/layout/dialog_dosing_out_of_window.xml
+++ b/app/src/main/res/layout/dialog_dosing_out_of_window.xml
@@ -2,85 +2,92 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/constraintLayout"
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp">
+        android:fillViewport="true">
 
-        <ImageView
-            android:id="@+id/img_header"
-            android:layout_width="0dp"
-            android:layout_height="120dp"
-            android:scaleType="fitCenter"
-            android:adjustViewBounds="true"
-            android:background="@color/alertLight"
-            android:src="@drawable/ic_checkmark_alert"
-            app:tint="@color/colorTextOnPrimary"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <TextView
-            android:id="@+id/textView_title"
-            android:layout_width="wrap_content"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="center_horizontal"
-            android:text="@string/visit_dosing_warning_out_of_time_window_title"
-            android:textAppearance="@style/PopupTitle"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/img_header" />
+            android:padding="16dp">
 
-        <TextView
-            android:id="@+id/textView_description"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="@string/visit_dosing_warning_out_of_time_window_description"
-            android:textAppearance="@style/GeneralText"
-            android:textAlignment="center"
-            android:textColor="@color/colorTextOnLight"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView_title" />
+            <ImageView
+                android:id="@+id/img_header"
+                android:layout_width="0dp"
+                android:layout_height="80dp"
+                android:scaleType="fitCenter"
+                android:adjustViewBounds="true"
+                android:background="@color/alertLight"
+                android:src="@drawable/ic_checkmark_alert"
+                app:tint="@color/colorTextOnPrimary"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
 
-        <Button
-            android:id="@+id/btn_confirm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="32dp"
-            android:layout_marginBottom="16dp"
-            android:backgroundTint="@color/alertLight"
-            android:textAppearance="@style/ButtonTextStyling"
-            android:text="@string/general_label_confirm"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/btn_cancel"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/btn_cancel"
-            app:layout_constraintVertical_bias="0.0" />
+            <TextView
+                android:id="@+id/textView_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:gravity="center_horizontal"
+                android:text="@string/visit_dosing_warning_out_of_time_window_title"
+                android:textAppearance="@style/PopupTitle"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/img_header" />
 
-        <Button
-            android:id="@+id/btn_cancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
-            android:backgroundTint="@color/colorPrimary"
-            android:textAppearance="@style/ButtonTextStyling"
-            android:text="@string/general_label_cancel"
-            android:textColor="@color/colorTextOnSecondary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/btn_confirm"
-            app:layout_constraintTop_toBottomOf="@+id/textView_description" />
+            <TextView
+                android:id="@+id/textView_description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/margin_16"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="@dimen/margin_16"
+                android:text="@string/visit_dosing_warning_out_of_time_window_description"
+                android:textAppearance="@style/GeneralText"
+                android:textAlignment="center"
+                android:textColor="@color/colorTextOnLight"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView_title" />
+
+            <Button
+                android:id="@+id/btn_confirm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="32dp"
+                android:layout_marginBottom="16dp"
+                android:backgroundTint="@color/alertLight"
+                android:textAppearance="@style/ButtonTextStyling"
+                android:text="@string/general_label_confirm"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/btn_cancel"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/btn_cancel"
+                app:layout_constraintVertical_bias="0.0" />
+
+            <Button
+                android:id="@+id/btn_cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="16dp"
+                android:backgroundTint="@color/colorPrimary"
+                android:textAppearance="@style/ButtonTextStyling"
+                android:text="@string/general_label_cancel"
+                android:textColor="@color/colorTextOnSecondary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/btn_confirm"
+                app:layout_constraintTop_toBottomOf="@+id/textView_description" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
 
 </layout>
diff --git a/app/src/test/resources/configuration.json b/app/src/test/resources/configuration.json
index 110857c2c..82fa2651a 100644
--- a/app/src/test/resources/configuration.json
+++ b/app/src/test/resources/configuration.json
@@ -130,7 +130,7 @@
     {
       "mandatory": false,
       "type": "iris_scan"
-    }
+
   ],
   "irisScore": 40,
   "addressFields": {

From d8a1308eeaff3441842aa0cf7f1636719e752298 Mon Sep 17 00:00:00 2001
From: "[vinald]" <okiror1vinald@gmail.com>
Date: Tue, 24 Feb 2026 14:50:57 +0300
Subject: [PATCH 2/3] display the scheduled visit date on the pop-up

---
 .../visit/dialog/DosingOutOfWindowDialog.kt    |  9 ++++++++-
 .../visit/screens/ContraindicationsFragment.kt | 14 ++++++++++++--
 .../res/layout/dialog_dosing_out_of_window.xml | 18 +++++++++++++++++-
 app/src/main/res/values/strings.xml            |  1 +
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt b/app/src/main/java/com/jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt
index 6df15eda2..2271c1669 100644
--- a/app/src/main/java/com/jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt
+++ b/app/src/main/java/com/jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt
@@ -22,10 +22,11 @@ class DosingOutOfWindowDialog : BottomSheetDialogFragment() {
     private lateinit var binding: DialogDosingOutOfWindowBinding
 
     companion object {
-        fun newInstance(showConfirmButton: Boolean, descriptionResId: Int): DosingOutOfWindowDialog {
+        fun newInstance(showConfirmButton: Boolean, descriptionResId: Int, scheduledDate: String? = null): DosingOutOfWindowDialog {
             val args = Bundle()
             args.putBoolean("showConfirmButton", showConfirmButton)
             args.putInt("descriptionResId", descriptionResId)
+            scheduledDate?.let { args.putString("scheduledDate", it) }
             val dialog = DosingOutOfWindowDialog()
             dialog.arguments = args
             return dialog
@@ -38,10 +39,16 @@ class DosingOutOfWindowDialog : BottomSheetDialogFragment() {
 
         val showConfirm = arguments?.getBoolean("showConfirmButton") ?: true
         val descriptionResId = arguments?.getInt("descriptionResId") ?: R.string.visit_dosing_warning_out_of_time_window_description
+        val scheduledDate = arguments?.getString("scheduledDate")
 
         binding.btnConfirm.visibility = if (showConfirm) View.VISIBLE else View.GONE
         binding.textViewDescription.setText(descriptionResId)
 
+        if (!scheduledDate.isNullOrEmpty()) {
+            binding.textViewScheduledDate.visibility = View.VISIBLE
+            binding.textViewScheduledDate.text = getString(R.string.visit_dosing_scheduled_date_label, scheduledDate)
+        }
+
         binding.btnConfirm.setOnClickListener { dismissAllowingStateLoss() }
         binding.btnCancel.setOnClickListener {
             dismissAllowingStateLoss()
diff --git a/app/src/main/java/com/jnj/vaccinetracker/visit/screens/ContraindicationsFragment.kt b/app/src/main/java/com/jnj/vaccinetracker/visit/screens/ContraindicationsFragment.kt
index 711f36b2c..27f021ea7 100644
--- a/app/src/main/java/com/jnj/vaccinetracker/visit/screens/ContraindicationsFragment.kt
+++ b/app/src/main/java/com/jnj/vaccinetracker/visit/screens/ContraindicationsFragment.kt
@@ -19,7 +19,9 @@ import com.jnj.vaccinetracker.visit.VisitActivity
 import com.jnj.vaccinetracker.visit.VisitViewModel
 import com.jnj.vaccinetracker.visit.dialog.DosingOutOfWindowDialog
 import com.jnj.vaccinetracker.visit.dialog.RescheduleVisitDialog
+import java.text.SimpleDateFormat
 import java.util.Calendar
+import java.util.Locale
 import kotlin.math.ceil
 
 @RequiresApi(Build.VERSION_CODES.O)
@@ -118,10 +120,17 @@ class ContraindicationsFragment : BaseFragment() {
          .commit()
    }
 
+    private fun formatScheduledDate(): String? {
+        val visitDate = viewModel.dosingVisit.value?.visitDate ?: return null
+        val dateFormat = SimpleDateFormat("EEE, d MMM yyyy", Locale.ENGLISH)
+        return dateFormat.format(visitDate)
+    }
+
     private fun showOutsideTimeWindowConfirmationDialog() {
         val dialog = DosingOutOfWindowDialog.newInstance(
             true,
-            R.string.visit_dosing_warning_out_of_time_window_description
+            R.string.visit_dosing_warning_out_of_time_window_description,
+            formatScheduledDate()
         )
         dialog.isCancelable = false
         dialog.show(requireActivity().supportFragmentManager, VisitActivity.TAG_DIALOG_DOSING_OUT_OF_WINDOW)
@@ -130,7 +139,8 @@ class ContraindicationsFragment : BaseFragment() {
    private fun showFarFromWindowDialog() {
        val dialog = DosingOutOfWindowDialog.newInstance(
            false,
-           R.string.visit_dosing_warning_far_from_time_window_description
+           R.string.visit_dosing_warning_far_from_time_window_description,
+           formatScheduledDate()
        )
        dialog.isCancelable = false
        dialog.show(requireActivity().supportFragmentManager, "TAG_DOSING_OUT_OF_WINDOW")
diff --git a/app/src/main/res/layout/dialog_dosing_out_of_window.xml b/app/src/main/res/layout/dialog_dosing_out_of_window.xml
index 586e24fc9..533219c80 100644
--- a/app/src/main/res/layout/dialog_dosing_out_of_window.xml
+++ b/app/src/main/res/layout/dialog_dosing_out_of_window.xml
@@ -53,6 +53,22 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textView_title" />
 
+            <TextView
+                android:id="@+id/textView_scheduled_date"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/margin_16"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="@dimen/margin_16"
+                android:textAppearance="@style/GeneralText"
+                android:textAlignment="center"
+                android:textStyle="bold"
+                android:textColor="@color/colorTextOnLight"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView_description" />
+
             <Button
                 android:id="@+id/btn_confirm"
                 android:layout_width="wrap_content"
@@ -84,7 +100,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/btn_confirm"
-                app:layout_constraintTop_toBottomOf="@+id/textView_description" />
+                app:layout_constraintTop_toBottomOf="@+id/textView_scheduled_date" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8fbbfbbc6..355df404a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -252,6 +252,7 @@
     <string name="visit_dosing_warning_out_of_time_window_description">Please confirm that this child is receiving a dosage before the scheduled date.</string>
     <string name="visit_dosing_warning_far_from_time_window_description">Please note that this child is not due for the next visit.</string>
     <string name="visit_dosing_warning_out_of_time_window_title">Dosing outside of window</string>
+    <string name="visit_dosing_scheduled_date_label">Scheduled date: %s</string>
     <string name="visit_dosing_error_different_manufacturer_description">The manufacturer selected is different from the one indicated in the regimen and should not be administered.</string>
     <string name="visit_dosing_warning_different_manufacturer_description">The manufacturer selected is different from the one indicated in the regimen. Please confirm you will administer a different vaccine.</string>
     <string name="visit_dosing_warning_different_manufacturer_title">Different Manufacturer Expected</string>

From bf8a1afa08ed08980db396a39cb885845e2ace42 Mon Sep 17 00:00:00 2001
From: "[vinald]" <okiror1vinald@gmail.com>
Date: Tue, 24 Feb 2026 15:00:22 +0300
Subject: [PATCH 3/3] removed comments

---
 .../jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt  | 1 -
 app/src/test/resources/configuration.json                       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt b/app/src/main/java/com/jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt
index 2271c1669..064784c1c 100644
--- a/app/src/main/java/com/jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt
+++ b/app/src/main/java/com/jnj/vaccinetracker/visit/dialog/DosingOutOfWindowDialog.kt
@@ -59,7 +59,6 @@ class DosingOutOfWindowDialog : BottomSheetDialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        // Expand the bottom sheet fully so content is not cut off in landscape
         dialog?.setOnShowListener { dialogInterface ->
             val bottomSheetDialog = dialogInterface as? BottomSheetDialog
             val bottomSheet = bottomSheetDialog?.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
diff --git a/app/src/test/resources/configuration.json b/app/src/test/resources/configuration.json
index 82fa2651a..110857c2c 100644
--- a/app/src/test/resources/configuration.json
+++ b/app/src/test/resources/configuration.json
@@ -130,7 +130,7 @@
     {
       "mandatory": false,
       "type": "iris_scan"
-
+    }
   ],
   "irisScore": 40,
   "addressFields": {