Release 2.8.0 (#621)

openmrs · Aug 6, 2019 · 8a8676e · 8a8676e
1 parent 5fe4a36
commit 8a8676e
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -23,6 +23,7 @@ OpenMRS Android Client
   - [Demo Password: Admin123](#Demo-Password-Admin123)
 - [Releasing [Collaborators only]](#Releasing-Collaborators-only)
 - [Release Notes](#Release-Notes)
+ - [Version 2.8.0](#Version-280)
   - [Version 2.7.4](#Version-274)
   - [Summary:](#Summary)
   - [Version 2.7.3](#Version-273)
@@ -44,7 +45,6 @@ OpenMRS Android Client
   - [Version 2.4](#Version-24)
   - [Summary:](#Summary-9)
 - [Objectives](#Objectives)
-  - [Version 2.8 (next release)](#Version-28-next-release)
   - [Goals:](#Goals)
 - [User Manual](#User-Manual)
 - [License](#License)
@@ -127,6 +127,11 @@ To release the application, make sure to do these steps **in order**:
 
 # Release Notes
 
+### Version 2.8.0
+### Summary:
+1. Add Dark mode to the app
+2. Provider management: admins can now find, add, edit and delete providers
+
 ### Version 2.7.4
 ### Summary:
 1. Make UI more consistent and follow more of the material design specs

diff --git a/openmrs-client/build.gradle b/openmrs-client/build.gradle
@@ -18,7 +18,7 @@ plugins {
  id 'jacoco-android'
 }
 
-def version = "2.7.4"
+def version = "2.8.0"
 
 android {
  compileSdkVersion 28
@@ -41,6 +41,12 @@ android {
 
  testApplicationId "org.openmrs.mobile.test"
  testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+
+ javaCompileOptions {
+ annotationProcessorOptions {
+ arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+ }
+ }
  }
 
  configurations.all {

diff --git a/openmrs-client/src/main/play/release-notes/en-US/default.txt b/openmrs-client/src/main/play/release-notes/en-US/default.txt
@@ -1,3 +1,2 @@
-- Make UI more consistent and follow more of the material design specs
-- Implement initial provider management functionality
-- Add Floating Action Button in patient's details tab, so that the menu bar is not packed.
+- Add Dark mode to the app
+- Provider management: admins can now find, add, edit and delete providers
diff --git a/openmrs-client/src/main/res/layout/activity_form_display.xml b/openmrs-client/src/main/res/layout/activity_form_display.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
  ~ The contents of this file are subject to the OpenMRS Public License
  ~ Version 1.0 (the "License"); you may not use this file except in
  ~ compliance with the License. You may obtain a copy of the License at
@@ -13,56 +12,48 @@
  ~ Copyright (C) OpenMRS, LLC. All Rights Reserved.
  -->
 
-<ScrollView
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
- android:fillViewport="true">
+ android:fillViewport="true"
+ android:orientation="vertical">
 
  <RelativeLayout
  android:id="@+id/formMainContainer"
- android:orientation="vertical"
  android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <!--<androidx.appcompat.widget.Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?attr/colorPrimary"
- app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
- app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />-->
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
 
  <RelativeLayout
  android:id="@+id/viewPagerIndicator"
- android:layout_alignParentBottom="true"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
  android:gravity="bottom"
  android:orientation="horizontal">
 
  <RelativeLayout
+ android:id="@+id/buttonContainer"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:id="@+id/buttonContainer">
+ android:layout_marginTop="10dp">
+
  <Button
  android:id="@+id/btn_next"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:background="@drawable/btn_submit_selector"
- android:textColor="@color/white"
- android:text="@string/action_next"/>
+ android:text="@string/action_next"
+ android:textColor="@color/white" />
+
  <Button
  android:id="@+id/btn_finish"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:background="@drawable/btn_submit_selector"
- android:textColor="@color/white"
  android:text="@string/action_submit"
- android:visibility="gone"/>
+ android:textColor="@color/white"
+ android:visibility="gone" />
  </RelativeLayout>
 
  <LinearLayout
@@ -77,17 +68,22 @@
 
  <LinearLayout
  android:id="@+id/pagerContainer"
- android:layout_above="@id/viewPagerIndicator"
- android:layout_below="@+id/toolbar"
- android:layout_alignLeft="@+id/toolbar"
- android:layout_alignStart="@+id/toolbar"
- android:layout_alignRight="@+id/toolbar"
- android:layout_alignEnd="@+id/toolbar"
  android:layout_width="match_parent"
  android:layout_height="fill_parent"
+ android:layout_above="@id/viewPagerIndicator"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:layout_marginStart="0dp"
+ android:layout_marginLeft="0dp"
+ android:layout_marginTop="0dp"
+ android:layout_marginEnd="0dp"
+ android:layout_marginRight="0dp"
  android:orientation="horizontal">
- <androidx.viewpager.widget.ViewPager
-   xmlns:tools="http://schemas.android.com/tools"
+
+ <androidx.viewpager.widget.ViewPager xmlns:tools="http://schemas.android.com/tools"
  android:id="@+id/container"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"