From 390e66433acb597a521f768a2466dd10ee34c81a Mon Sep 17 00:00:00 2001
From: brodeurlv <brodeur.levrai@gmail.com>
Date: Wed, 7 Nov 2018 22:42:03 +0100
Subject: [PATCH] Fixed database merge conflict.

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../java/com/easyfitness/MainActivity.java    | 23 ++++++++++++-------
 app/src/main/res/layout/dialog_rest.xml       |  3 +--
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2d96dcbe..5437f9b2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.easyfitness"
-    android:versionCode="22"
+    android:versionCode="23"
     android:versionName="0.16">
 
     <uses-sdk
diff --git a/app/src/main/java/com/easyfitness/MainActivity.java b/app/src/main/java/com/easyfitness/MainActivity.java
index 958cf6eb..e1f3000f 100644
--- a/app/src/main/java/com/easyfitness/MainActivity.java
+++ b/app/src/main/java/com/easyfitness/MainActivity.java
@@ -140,13 +140,6 @@ public void onCreate(Bundle savedInstanceState) {
             mpMachineFrag = (MachineFragment) getSupportFragmentManager().getFragment(savedInstanceState, MACHINES);
             mpBodyPartListFrag = (BodyPartListFragment) getSupportFragmentManager().getFragment(savedInstanceState, BODYTRACKING);
         }
-        /*else {
-			mpFontesPagerFrag = (FontesPagerFragment) getSupportFragmentManager().findFragmentByTag(FONTESPAGER);
-			mpCardioFrag = (CardioFragment) getSupportFragmentManager().findFragmentByTag(CARDIO);
-			mpProfilFrag = (ProfilFragment) getSupportFragmentManager().findFragmentByTag(WEIGHT);
-			mpAboutFrag = (AboutFragment) getSupportFragmentManager().findFragmentByTag(ABOUT);
-			mpMachineFrag = (MachineFragment) getSupportFragmentManager().findFragmentByTag(MACHINES);
-		}*/
 
         loadPreferences();
 
@@ -154,11 +147,21 @@ public void onCreate(Bundle savedInstanceState) {
 
         if (DatabaseHelper.DATABASE_VERSION >= 15) {
             DAOOldCardio mDbOldCardio = new DAOOldCardio(this);
+            DAOMachine lDAOMachine = new DAOMachine(this);
             if (mDbOldCardio.tableExists()) {
                 DAOCardio mDbCardio = new DAOCardio(this);
                 List<OldCardio> mList = mDbOldCardio.getAllRecords();
                 for (OldCardio record : mList) {
-                    mDbCardio.addCardioRecord(record.getDate(), "00:00", record.getExercice(), record.getDistance(), record.getDuration(), record.getProfil());
+                    String exerciseName="";
+                    Machine m = lDAOMachine.getMachine(record.getExercice());
+                    exerciseName = record.getExercice();
+                    if (m != null) { // if a machine exists
+                        if (m.getType()==DAOMachine.TYPE_FONTE) { // if it is not a Cardio type
+                            exerciseName = exerciseName + "-Cardio"; // add a suffix to
+                        }
+                    }
+
+                    mDbCardio.addCardioRecord(record.getDate(), "00:00", exerciseName, record.getDistance(), record.getDuration(), record.getProfil());
                 }
                 mDbOldCardio.dropTable();
 
@@ -168,6 +171,10 @@ public void onCreate(Bundle savedInstanceState) {
                     mDbFonte.updateRecord(record); // Automatically update record Type
                 }
             }
+            ArrayList<Machine> machineList = lDAOMachine.getAllMachinesArray();
+            for (Machine record : machineList) {
+                lDAOMachine.updateMachine(record); // Reset all the fields on machines.
+            }
         }
 		
 		/* creation de l'arborescence de l'application */
diff --git a/app/src/main/res/layout/dialog_rest.xml b/app/src/main/res/layout/dialog_rest.xml
index 9b5d3f47..1d0d0622 100644
--- a/app/src/main/res/layout/dialog_rest.xml
+++ b/app/src/main/res/layout/dialog_rest.xml
@@ -166,7 +166,6 @@
         android:layout_gravity="center"
         android:background="#3E80B4"
         android:gravity="center"
-
         android:orientation="horizontal"
         android:weightSum="1">
 
@@ -176,9 +175,9 @@
             android:layout_width="120dp"
             android:layout_height="40dp"
             android:layout_margin="10dp"
-
             android:background="@android:color/white"
             android:clickable="true"
+            android:gravity="center"
             android:text="@string/exit"
             android:textColor="#5DBCD2"
             android:textSize="18sp"