Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit d1ab87a

Browse files
BarnaBarthabarnabartha
BarnaBartha
and
barnabartha
authored
SORMAS-Foundation#1961 - show sample uuid on app (SORMAS-Foundation#4022)
* SORMAS-Foundation#1961 - show sample uuid on app * SORMAS-Foundation#1961 - show sample uuid on app for main samples list view as well Co-authored-by: barnabartha <[email protected]>
1 parent b65acf0 commit d1ab87a

5 files changed

Lines changed: 66 additions & 0 deletions

File tree

‎sormas-app/app/src/main/res/layout/fragment_sample_edit_layout.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,18 @@
6262

6363
<requestFocus/>
6464

65+
<LinearLayout
66+
android:layout_width="match_parent"
67+
android:layout_height="wrap_content"
68+
android:orientation="horizontal">
69+
70+
<de.symeda.sormas.app.component.controls.ControlTextReadField
71+
android:id="@+id/sample_uuid"
72+
app:shortUuidValue="@{data.uuid}"
73+
style="@style/ControlSingleColumnStyle" />
74+
75+
</LinearLayout>
76+
6577
<LinearLayout
6678
android:layout_width="match_parent"
6779
android:layout_height="wrap_content"

‎sormas-app/app/src/main/res/layout/fragment_sample_read_layout.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,18 @@
5656

5757
<requestFocus/>
5858

59+
<LinearLayout
60+
android:layout_width="match_parent"
61+
android:layout_height="wrap_content"
62+
android:orientation="horizontal">
63+
64+
<de.symeda.sormas.app.component.controls.ControlTextReadField
65+
android:id="@+id/sample_uuid"
66+
app:value="@{data.uuid}"
67+
style="@style/ControlSingleColumnStyle" />
68+
69+
</LinearLayout>
70+
5971
<LinearLayout
6072
android:layout_width="match_parent"
6173
android:layout_height="wrap_content"

‎sormas-app/app/src/main/res/layout/row_edit_sample_list_item_layout.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,17 @@
106106
app:diseaseValue="@{data}"
107107
app:defaultValue='@{@string/value_disease_unknown}' />
108108

109+
<TextView
110+
android:id="@+id/txtSampleUuid"
111+
android:layout_width="wrap_content"
112+
android:layout_height="wrap_content"
113+
android:textSize="@dimen/listActivityRowTertiaryTextSize"
114+
android:textColor="@color/listActivityRowLeastText"
115+
android:fontFamily="sans-serif-medium"
116+
app:value="@{data.uuid}"
117+
app:shortUuid="@{true}"
118+
app:defaultValue='@{@string/value_uuid_unknown}' />
119+
109120
</LinearLayout>
110121

111122

‎sormas-app/app/src/main/res/layout/row_read_case_sample_list_item_layout.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,17 @@
162162
app:defaultValue='@{@string/value_sample_result_unknown}'
163163
/>
164164

165+
<TextView
166+
android:id="@+id/txtSampleUuid"
167+
android:layout_width="wrap_content"
168+
android:layout_height="wrap_content"
169+
android:textSize="@dimen/listActivityRowTertiaryTextSize"
170+
android:textColor="@color/listActivityRowLeastText"
171+
android:fontFamily="sans-serif-medium"
172+
app:value="@{data.uuid}"
173+
app:shortUuid="@{true}"
174+
app:defaultValue='@{@string/value_uuid_unknown}' />
175+
165176
</LinearLayout>
166177

167178

‎sormas-app/app/src/main/res/layout/row_sample_list_item_layout.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,26 @@
104104
app:diseaseValue="@{data}"
105105
app:defaultValue='@{@string/value_disease_unknown}' />
106106

107+
<ImageView
108+
android:layout_width="@dimen/separatorThickness"
109+
android:layout_height="match_parent"
110+
android:background="@color/listActivityRowTopCaptionSeparator"
111+
android:layout_marginTop="2dp"
112+
android:layout_marginBottom="2dp"
113+
android:layout_marginLeft="8dp"
114+
android:layout_marginRight="8dp" />
115+
116+
<TextView
117+
android:id="@+id/txtSampleUuid"
118+
android:layout_width="wrap_content"
119+
android:layout_height="wrap_content"
120+
android:textSize="@dimen/listActivityRowTertiaryTextSize"
121+
android:textColor="@color/listActivityRowLeastText"
122+
android:fontFamily="sans-serif-medium"
123+
app:value="@{data.uuid}"
124+
app:shortUuid="@{true}"
125+
app:defaultValue='@{@string/value_uuid_unknown}' />
126+
107127
</LinearLayout>
108128

109129

0 commit comments

Comments
 (0)