Commit a4df48a2 authored by Schoumi's avatar Schoumi

Livraison version 7

parent e453036e
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="fr.mobdev.blooddonation" package="fr.mobdev.blooddonation"
android:versionCode="5" android:versionCode="7"
android:versionName="2.0" > android:versionName="2.0" >
<uses-sdk <uses-sdk
......
...@@ -58,14 +58,11 @@ public class Database extends SQLiteOpenHelper { ...@@ -58,14 +58,11 @@ public class Database extends SQLiteOpenHelper {
@Override @Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
//nothing to do right now //nothing to do right now
if(oldVersion == 1 && newVersion == 2) db.execSQL("Create table if not exists notification (" +
{ "id integer primary key autoincrement, siteId INTEGER, skip INTEGER " +
db.execSQL("Create table if not exists notification (" +
"id integer primary key autoincrement, siteId INTEGER " +
");"); ");");
} if(oldVersion == 2 && newVersion == 3)
else if(oldVersion == 2 && newVersion == 3)
{ {
db.execSQL("Alter Table notification Add Column skip INTEGER;"); db.execSQL("Alter Table notification Add Column skip INTEGER;");
} }
......
...@@ -103,7 +103,8 @@ public class InformationDialog extends DialogFragment { ...@@ -103,7 +103,8 @@ public class InformationDialog extends DialogFragment {
} }
intent.putExtra("allDay", false); intent.putExtra("allDay", false);
intent.putExtra("title", site.getSiteName()); intent.putExtra("title", "Don du Sang");
intent.putExtra("description",site.getSiteName());
intent.putExtra("eventLocation", ""+site.getLoc().latitude+","+site.getLoc().longitude); intent.putExtra("eventLocation", ""+site.getLoc().latitude+","+site.getLoc().longitude);
startActivity(intent); startActivity(intent);
} }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<string name="validate">Valider</string> <string name="validate">Valider</string>
<string name="blood_donation">Donner mon sang</string> <string name="blood_donation">Donner mon sang</string>
<string name="donations">Mes dons</string> <string name="donations">Mes dons</string>
<string name="donation_info">Information du donneur</string> <string name="donation_info">Informations du donneur</string>
<string name="tools">Outils</string> <string name="tools">Outils</string>
<string name="legend">Légende</string> <string name="legend">Légende</string>
<string name="preference">Préférences</string> <string name="preference">Préférences</string>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<string name="notif_title">Notification</string> <string name="notif_title">Notification</string>
<string name="service_title">Service</string> <string name="service_title">Service</string>
<string name="localisation_title">Localisation</string> <string name="localisation_title">Localisation</string>
<string name="deactivate_localisation_sum">Désactiver la localisation et utiliser la ville défini dans les informations donneurs</string> <string name="deactivate_localisation_sum">Désactiver la localisation et utiliser la ville définie dans les informations donneur</string>
<string name="deactivate_localisation">Désactiver la localisation</string> <string name="deactivate_localisation">Désactiver la localisation</string>
<string name="launcher">Le logo de l\'application est l\'oeuvre de François Becker</string> <string name="launcher">Le logo de l\'application est l\'oeuvre de François Becker</string>
<string name="action_notif">Centre de Notification</string> <string name="action_notif">Centre de Notification</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment