From 460dca941002b3731878c89464585d8b1955f07f Mon Sep 17 00:00:00 2001
From: Jacques Foucry <jacques@foucry.net>
Date: Sun, 26 Jan 2020 22:56:12 +0100
Subject: [PATCH 1/2] Change some TODO comments

---
 .../java/net/foucry/pilldroid/MedicamentListActivity.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java b/app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
index 1391198..3203dc3 100644
--- a/app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
+++ b/app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
@@ -60,6 +60,8 @@ public class MedicamentListActivity extends AppCompatActivity {
      * Whether or not the activity is in two-pane mode, i.e. running on a tablet
      * device.
      */
+
+    // TODO: Change DEMO/DBDEMO form statci to non-static. In order to create fake data at only at launchtime
     private boolean mTwoPane;
     final static Boolean DEMO = true;
     final static Boolean DBDEMO = true;
@@ -319,10 +321,12 @@ public class MedicamentListActivity extends AppCompatActivity {
                 // Handle cancel
                 Toast.makeText(context, "Scan annulé", Toast.LENGTH_LONG).show();
             }
-            else {
+            else if (requestCode == 1 ){
                 Toast.makeText(context, "back from detail", Toast.LENGTH_SHORT).show();
+                // TODO : Si requestCode=1 -> Sauvegarde du medoc dans la base et
+                // TODO : raffraichissement de la base.[Call updateDrug(medicament)]
             }
-        } // TODO : Si requestCode=1 -> Sauvegarde du medoc dans la base et raffraichissement de la base.
+        }
     }
 
     private void setupRecyclerView(@NonNull RecyclerView recyclerView) {

From f232608b50982a5544308e91509e0f9f69087fdd Mon Sep 17 00:00:00 2001
From: Jacques Foucry <jacques@foucry.net>
Date: Sun, 26 Jan 2020 23:06:09 +0100
Subject: [PATCH 2/2] Modification de .gitignore

---
 .gitignore       |  1 +
 .idea/gradle.xml | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 289bf66..100b386 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ local.properties
 .signing/
 
 # User-specific configurations
+.idea/gradle.xml
 .idea/libraries/
 .idea/workspace.xml
 .idea/tasks.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d291b3d..5cd135a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>