mirror of
https://github.com/jfoucry/Pilldroid.git
synced 2024-11-22 04:29:22 +01:00
Merge branch 'feature/saveDrugs' of ssh://git.exodus-privacy.eu.org:19100/foucry.net/PillDroid into feature/saveDrugs
This commit is contained in:
commit
90f8e38a20
3 changed files with 16 additions and 8 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -15,6 +15,7 @@ local.properties
|
|||
.signing/
|
||||
|
||||
# User-specific configurations
|
||||
.idea/gradle.xml
|
||||
.idea/libraries/
|
||||
.idea/workspace.xml
|
||||
.idea/tasks.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>
|
||||
|
|
|
@ -59,6 +59,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;
|
||||
|
@ -318,10 +320,11 @@ public class MedicamentListActivity extends AppCompatActivity {
|
|||
// Handle cancel
|
||||
Toast.makeText(context, "Scan annulé", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
else if (requestCode == 1) {
|
||||
// TODO : Si requestCode=1 -> Sauvegarde du medoc dans la base et raffraichissement de la base.
|
||||
Toast.makeText(context, "back from detail == "+requestCode, Toast.LENGTH_SHORT).show();
|
||||
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)]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue