Merge branch 'dev' into 'dev-check-apk-update'

# Conflicts:
#   app/build.gradle
#   app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
#   app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
#   app/src/main/java/com/example/hpostesting/presentation/hemocube/HemocubeActivity.kt
#   build.gradle
#   gradle/wrapper/gradle-wrapper.properties
This commit is contained in:
Mariya Varghese
2024-03-04 11:11:13 +00:00
23 changed files with 372 additions and 114 deletions

View File

@@ -17,4 +17,4 @@
android:icon="@drawable/baseline_settings_24"
android:title="@string/menu_settings" />
</group>
</menu>
</menu>