Merge branch 'develop' into OP-2534

Author: zikani03

.gitignore

@@ -81,4 +81,4 @@ fastlane/readme.md
 # Custom product flavours
 *custom-flavours.gradle
 
-.DS_Store
+*.DS_Store

claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java

@@ -18,6 +18,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -460,6 +461,7 @@ public boolean checkDataBase() {
     }
 
     public boolean getControls() {
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         if (global.isNetworkAvailable()) {
             String progress_message = getResources().getString(R.string.getControls);
             progressDialog = ProgressDialog.show(this, getResources().getString(R.string.initializing), progress_message);

claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeActivity.java

@@ -13,6 +13,7 @@
 import android.os.Environment;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -210,6 +211,7 @@ public void onBackPressed() {
     }
 
     public void uploadClaims() {
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         pd = ProgressDialog.show(this, "", getResources().getString(R.string.Processing));
         SynchronizeService.uploadClaims(this);
     }
@@ -248,6 +250,7 @@ public void CheckUpdate(){
                     JSONArray jsonarray = new JSONArray(response.toString());
                     String lastVersion = "";
                     String tag_name = "";
+                    String notes = "";
                     for (int i = 0; i < jsonarray.length(); i++){
                         JSONObject releaseObj = jsonarray.getJSONObject(i);
                         if(releaseObj.getString("tag_name").equals(getResources().getString(R.string.release_tag))){
@@ -256,6 +259,7 @@ public void CheckUpdate(){
                             if(!releaseName.equals(currentVersion)){
                                 lastVersion = releaseName;
                                 updateAvailable = true;
+                                notes = releaseObj.getString("body");
                             }
                         }
                     }
@@ -264,12 +268,17 @@ public void CheckUpdate(){
                     boolean finalUpdateAvailable = updateAvailable;
                     String finalLastVersion = lastVersion;
                     String finalTagName = tag_name;
+                    String finalNotes = notes;
                     runOnUiThread(() -> {
                         pd.dismiss();
                         if (finalUpdateAvailable) {
                             new AlertDialog.Builder(this)
                                     .setTitle(getResources().getString(R.string.updateAvailable))
-                                    .setMessage(getResources().getString(R.string.newVersion) + " " + finalLastVersion )
+                                    .setMessage(
+                                            getResources().getString(R.string.newVersion) + " " + finalLastVersion + "\n \n"
+                                                    +  getResources().getString(R.string.News) + "\n"
+                                                    + "\n" + finalNotes
+                                    )
                                     .setPositiveButton(getResources().getString(R.string.download), (dialog, which) -> downloadUpdate(finalLastVersion, finalTagName))
                                     .setNegativeButton(getResources().getString(R.string.cancel), null)
                                     .show();

claimManagement/src/main/res/layout/activity_main.xml

@@ -6,7 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:openDrawer="start">
+    tools:openDrawer="start"
+    android:keepScreenOn="false">
 
     <include
         layout="@layout/app_bar_main"

claimManagement/src/main/res/layout/activity_synchronize.xml

@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="org.openimis.imisclaims.SynchronizeActivity"
-    android:layout_margin="30dp">
+    android:layout_margin="30dp"
+    android:keepScreenOn="false">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"

claimManagement/src/main/res/values-fr/strings.xml

@@ -218,4 +218,5 @@
   <string name="NoServicesPricelist">La formation sanitaire n\'a pas de liste de prix pour les services </string>
   <string name="NoItemsPricelist">La formation sanitaire n\'a pas de liste de prix pour les produits </string>
   <string name="entered">Entrée</string>
+  <string name="News">Nouveautés:</string>
 </resources>

claimManagement/src/main/res/values/strings.xml

@@ -253,4 +253,5 @@
     <string name="getVersion">Downloading version </string>
     <string name="NoServicesPricelist">This healthfacility don\'t have services pricelist</string>
     <string name="NoItemsPricelist">This healthfacility don\'t have items pricelist</string>
+    <string name="News">New changes:</string>
 </resources>