Skip to content

Commit 0640714

Browse files
authored
Add icons for map view locations (#3771)
1 parent a727812 commit 0640714

File tree

6 files changed

+53
-0
lines changed

6 files changed

+53
-0
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="14dp"
3+
android:height="10dp"
4+
android:viewportWidth="14"
5+
android:viewportHeight="10">
6+
<path
7+
android:pathData="M12.834,0.774L4.813,8.795L1.167,5.149"
8+
android:strokeLineJoin="round"
9+
android:strokeWidth="1.1221"
10+
android:fillColor="#00000000"
11+
android:strokeColor="#F3F3F3"
12+
android:strokeLineCap="round"/>
13+
</vector>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="26dp"
3+
android:height="26dp"
4+
android:viewportWidth="26"
5+
android:viewportHeight="26">
6+
<path
7+
android:pathData="M9.982,23.517V12.891H16.357V23.517M3.606,9.703L13.17,2.265L22.733,9.703V21.392C22.733,21.956 22.509,22.496 22.111,22.895C21.712,23.294 21.171,23.517 20.608,23.517H5.731C5.168,23.517 4.627,23.294 4.228,22.895C3.83,22.496 3.606,21.956 3.606,21.392V9.703Z"
8+
android:strokeLineJoin="round"
9+
android:strokeWidth="1.1221"
10+
android:fillColor="#00000000"
11+
android:strokeColor="#F3F3F3"
12+
android:strokeLineCap="round"/>
13+
</vector>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="10dp"
3+
android:height="11dp"
4+
android:viewportWidth="10"
5+
android:viewportHeight="11">
6+
<path
7+
android:pathData="M9.375,0.774L0.625,9.524M0.625,0.774L9.375,9.524"
8+
android:strokeLineJoin="round"
9+
android:strokeWidth="1.1221"
10+
android:fillColor="#00000000"
11+
android:strokeColor="#F3F3F3"
12+
android:strokeLineCap="round"/>
13+
</vector>

android/geowidget/src/main/java/org/smartregister/fhircore/geowidget/model/ServicePointType.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,7 @@ enum class ServicePointType(
6666
ECOLE_PRIVÉ(R.drawable.ic_epp_service_point, "Ecole Privé"),
6767
ECOLE_PRIVE(R.drawable.ic_epp_service_point, "École Privée"),
6868
LYCÉE(R.drawable.ic_epp_service_point, "Lycée"),
69+
HOME(R.drawable.ic_home, "home"),
70+
VISITED(R.drawable.ic_done, "visited"),
71+
REJECTED(R.drawable.ic_reject, "rejected"),
6972
}

android/geowidget/src/main/java/org/smartregister/fhircore/geowidget/screens/GeoWidgetViewModel.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ class GeoWidgetViewModel : ViewModel() {
6565
ServicePointType.LYCÉE,
6666
ServicePointType.DIRECTION_COMMUNALE_DE_L_ENSEIGNEMENT,
6767
ServicePointType.ECOLE_PRIVE,
68+
ServicePointType.HOME,
69+
ServicePointType.VISITED,
70+
ServicePointType.REJECTED,
6871
)
6972

7073
fun updateMapFeatures(geoJsonFeatures: List<GeoJsonFeature>) {

android/quest/src/main/assets/fhircore_style.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12418,6 +12418,14 @@
1241812418
"rejected"
1241912419
],
1242012420
"hsl(349, 92%, 42%)",
12421+
[
12422+
"visited"
12423+
],
12424+
"hsl(119, 74%, 40%)",
12425+
[
12426+
"not_visited"
12427+
],
12428+
"hsl(0, 0%, 56%)",
1242112429
"hsl(100, 100%, 100%)"
1242212430
],
1242312431
"circle-opacity": 1

0 commit comments

Comments
 (0)