Skip to content

Commit 06e8102

Browse files
HAPP-1904
- updated login error text - updated target SDK version to 34 - updated play core SDK version to support android 34 - fixed issue of quick link tile after deleting all data from app. - fixed enter vaccination information screen navigation. - fixed dependent comment navigation issue.
1 parent 46033a9 commit 06e8102

File tree

3 files changed

+33
-22
lines changed

3 files changed

+33
-22
lines changed

app/src/main/res/navigation/dependents.xml

+12
Original file line numberDiff line numberDiff line change
@@ -212,4 +212,16 @@
212212
app:nullable="true" />
213213
</fragment>
214214

215+
<fragment
216+
android:id="@+id/commentsFragment"
217+
android:name="ca.bc.gov.bchealth.ui.comment.CommentsFragment"
218+
android:label="fragment_comments"
219+
tools:layout="@layout/fragment_comments">
220+
<argument
221+
android:name="recordType"
222+
app:argType="string" />
223+
<argument
224+
android:name="parentEntryId"
225+
app:argType="string" />
226+
</fragment>
215227
</navigation>

app/src/main/res/navigation/health_pass.xml

+20-1
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,29 @@
5757
<action
5858
android:id="@+id/action_addCardOptionFragment_to_onBoardingFragment"
5959
app:destination="@id/onBoardingFragment" />
60-
60+
<action
61+
android:id="@+id/action_addCardOptionFragment_to_fetchVaccineRecord"
62+
app:destination="@id/fetchVaccineRecordFragment" />
6163
</fragment>
6264

65+
<fragment
66+
android:id="@+id/fetchVaccineRecordFragment"
67+
android:name="ca.bc.gov.bchealth.ui.healthpass.add.FetchVaccineRecordFragment"
68+
tools:layout="@layout/fragment_fetch_vaccine_record">
69+
<action
70+
android:id="@+id/action_fetchVaccineRecordFragment_to_vaccineRecordDetailFragment"
71+
app:destination="@id/vaccineRecordDetailFragment" />
72+
</fragment>
6373

74+
<fragment
75+
android:id="@+id/vaccineRecordDetailFragment"
76+
android:name="ca.bc.gov.bchealth.ui.healthrecord.vaccine.VaccineRecordDetailFragment"
77+
android:label="fragment_vaccine_record_detail"
78+
tools:layout="@layout/fragment_vaccine_record_detail">
79+
<argument
80+
android:name="patientId"
81+
app:argType="long" />
82+
</fragment>
6483
<dialog
6584
android:id="@+id/expandQRFragment"
6685
android:name="ca.bc.gov.bchealth.ui.healthpass.ExpandQRFragment"

app/src/main/res/navigation/health_records.xml

+1-21
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
android:id="@+id/healthRecordFragment"
99
android:name="ca.bc.gov.bchealth.ui.healthrecord.HealthRecordFragment"
1010
android:label="HealthRecordFragment" >
11-
<action
12-
android:id="@+id/action_healthRecordFragment_to_vaccineRecordDetailFragment"
13-
app:destination="@id/vaccineRecordDetailFragment" />
11+
1412
<action
1513
android:id="@+id/action_healthRecordFragment_to_medicationDetailFragment"
1614
app:destination="@id/medicationDetailsFragment" />
@@ -53,24 +51,6 @@
5351
android:label="AddHealthRecordsFragment"
5452
tools:layout="@layout/scene_health_records_add" />
5553

56-
<fragment
57-
android:id="@+id/fetchVaccineRecordFragment"
58-
android:name="ca.bc.gov.bchealth.ui.healthpass.add.FetchVaccineRecordFragment"
59-
tools:layout="@layout/fragment_fetch_vaccine_record">
60-
<action
61-
android:id="@+id/action_fetchVaccineRecordFragment_to_vaccineRecordDetailFragment"
62-
app:destination="@id/vaccineRecordDetailFragment" />
63-
</fragment>
64-
65-
<fragment
66-
android:id="@+id/vaccineRecordDetailFragment"
67-
android:name="ca.bc.gov.bchealth.ui.healthrecord.vaccine.VaccineRecordDetailFragment"
68-
android:label="fragment_vaccine_record_detail"
69-
tools:layout="@layout/fragment_vaccine_record_detail">
70-
<argument
71-
android:name="patientId"
72-
app:argType="long" />
73-
</fragment>
7454
<fragment
7555
android:id="@+id/medicationDetailsFragment"
7656
android:name="ca.bc.gov.bchealth.ui.healthrecord.medication.MedicationDetailsFragment"

0 commit comments

Comments
 (0)