Skip to content
This repository has been archived by the owner on Jun 21, 2018. It is now read-only.

Commit

Permalink
v0.9.2: about, preferences, UI language, units system, cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@mudar
mudar committed Nov 22, 2011
1 parent 20701cd commit f466b65
Show file tree
Hide file tree
Showing 18 changed files with 368 additions and 215 deletions.
19 changes: 15 additions & 4 deletions AndroidManifest.xml
View file
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto"
package="ca.mudar.mtlaucasou"
android:versionCode="11"
android:versionName="0.9.1" >
android:versionCode="12"
android:versionName="@string/app_version" >

<uses-sdk
android:minSdkVersion="7"
Expand Down Expand Up @@ -30,21 +31,31 @@
</intent-filter>
</activity>
<activity
android:exported="false"
android:label="@string/app_label_fire_halls"
android:name=".ui.FireHallsMapActivity" />
<activity
android:exported="false"
android:label="@string/app_label_spvm_stations"
android:name=".ui.SpvmStationsMapActivity" />
<activity
android:exported="false"
android:label="@string/app_label_water_supplies"
android:name=".ui.WaterSuppliesMapActivity" />
<activity
android:exported="false"
android:label="@string/app_label_emergency_hostels"
android:name=".ui.EmergencyHostelsMapActivity" />
<activity
android:exported="false"
android:label="@string/app_label_about"
android:name=".ui.AboutActivity"
android:theme="@style/Theme.About"/>
android:name=".ui.AboutActivity"
android:theme="@style/Theme.About" />
<activity
android:exported="false"
android:label="@string/app_label_preferences"
android:name=".ui.widgets.MyPreferenceActivity"
android:theme="@style/Theme.Preferences" />

<uses-library android:name="com.google.android.maps" />

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Expand Up @@ -4,7 +4,7 @@

Montréal Just in Case is an open source **Android** application that provides you with the geographic locations and addresses for four public safety services:

* Fire Halls;
* Fire Stations;
* SPVM Stations;
* Water Supplies;
* Emergency Hostels.
Expand Down Expand Up @@ -34,7 +34,7 @@ This project was done in collaboration with [Montréal Ouvert][link_mtl_ouvert].

Data sources are KML files provided by the City of Montréal:

1. [Fire Halls][link_portal_1]
1. [Fire Stations][link_portal_1]
2. [SPVM Stations][link_portal_2]
3. [Water Supplies][link_portal_3]
4. [Emergency Hostels][link_portal_4]
Expand Down
54 changes: 36 additions & 18 deletions res/values-fr/strings.xml
View file
Expand Up @@ -26,28 +26,33 @@

<string name="hello">Hello World, Montréal au cas où!</string>
<string name="app_name">MTL au cas où</string>
<string name="app_version">0.9.2</string>
<string name="google_map_api_key" _YOUR_GOOGLE_MAP_API_KEY_></string>
<string name="google_map_api_key_debug" _YOUR_GOOGLE_MAP_API_KEY_DEBUG_></string>
<string name="app_label_fire_halls">Casernes de pompiers</string>
<string name="app_label_spvm_stations">Postes de police de quartier</string>
<string name="app_label_water_supplies">Points d\'eau</string>
<string name="app_label_emergency_hostels">Hébergements d\'urgence</string>
<string name="app_label_about">À propos</string>
<string name="app_label_preferences">Réglages</string>
<string name="btn_fire_halls">Casernes\nde pompiers</string>
<string name="btn_spvm_stations">Postes\nde la SPVM</string>
<string name="btn_water_supplies">Points\nd\'eau</string>
<string name="btn_emergency_hostels">Hébergements\nd\'urgence</string>
<string name="menu_view_list">Liste</string>
<string name="menu_view_map">Carte</string>
<string name="menu_preferences">Préférences</string>
<string name="menu_preferences">Réglages</string>
<string name="menu_help">Aide</string>
<string name="menu_about">À propos</string>
<string name="menu_link_kml">Ouvrir dans GMaps</string>
<string name="placemarks_empty_list">La liste est vide…</string>
<string name="placemark_distance">%.1f km</string>
<string name="placemark_distance_min">&lt;100 m</string>
<string name="placemark_distance_iso">%.1f km</string>
<string name="placemark_distance_iso_min">&lt; 100 m</string>
<string name="placemark_distance_imp">%.1f mi</string>
<string name="placemark_distance_imp_feet">%s pi</string>
<string name="placemark_distance_imp_min">&lt; 200 pi</string>
<string name="logo_open_data">@drawable/logo_open_data_fr</string>
<string name="toast_sync_error">Erreur de syntaxe: <xliff:g id="error">%1$s</xliff:g></string>
<string name="toast_sync_error">Erreur de syntaxe : <xliff:g id="error">%1$s</xliff:g></string>
<string name="eula_assets_filename">gpl-3.0-standalone.html</string>
<string name="eula_title">GNU General Public License v3.0</string>
<string name="dialog_btn_ok">Ok</string>
Expand All @@ -60,19 +65,32 @@
<string name="toast_sync_finished">Chargement terminé</string>
<string name="dialog_remote_kml_title">Ouvrir dans GMaps</string>
<string name="dialog_remote_kml_summary">Voulez-vous télécharger le fichier KML ? Il sera affiché dans l\'application Google Maps…</string>
<string name="dialog_prefs_todo_summary">À venir… Ceci est encore une version bêta !\nCette section vous permettra de :\n– trier les listes par nom ou par distance,\n– utiliser le français ou l\'anglais pour la langue de l\'interface,\n– afficher les distances avec le système métrique ou impérial,\n– mettre les données à jour à partir du site de la ville.</string>
<string name="about_contents_1">En cas d\'urgence, veuillez contacter le Service de la sécurité publique. Ne vous fiez pas aux informations présentées dans cette application car elle ne contiendra pas les dernirères mesures d\'urgence.</string>
<string name="about_contents_2">Montréal au cas où vous donne accès aux localisations géographiques et aux adresses civiques associées à quatre services de sécurité publique :</string>
<string name="about_contents_2_1">1. casernes de pompiers,</string>
<string name="about_contents_2_2">2. postes de quartier de la police (SPVM),</string>
<string name="about_contents_2_3">3. points d\'eau - mesures d\'urgence : Localisation des points d\'eau mises à la disposition de la population en cas de canicule ou autre événement touchant la sécurité publique,</string>
<string name="about_contents_2_4">4. centres d\'hébergement d\'urgence et lieux publics climatisés.</string>
<string name="about_contents_3">Les données sont en provenance du Portail données ouvertes de la Ville de Montréal. Appuyez pour accéder aux adresses URL :</string>
<string name="about_contents_3_1"><a href="http://donnees.ville.montreal.qc.ca/archives/fiche-donnees/casernes-pompiers">Casernes de pompiers</a></string>
<string name="about_contents_3_2"><a href="http://donnees.ville.montreal.qc.ca/archives/fiche-donnees/carte-postes-quartier">Postes de la SPVM</a></string>
<string name="about_contents_3_3"><a href="http://donnees.ville.montreal.qc.ca/archives/fiche-donnees/points-eau">Points d\'eau</a></string>
<string name="about_contents_3_4"><a href="http://donnees.ville.montreal.qc.ca/archives/fiche-donnees/centres-hebergement-urgence">Hébergements d\'urgence</a></string>
<string name="about_contents_3_5"><a href="http://donnees.ville.montreal.qc.ca/licence-texte-complet">La licence des données ouvertes</a></string>
<string name="about_contents_credits">Application Android réalisée par <a href="http://www.montrealjustincase.com/">Mudar Noufal</a>. Le code source est publié sous la licence GPLv3 de la Free Software Foundation.</string>
<string name="about_contents_note">En cas d\'urgence, veuillez contacter le Service de la sécurité publique. Ne vous fiez pas aux informations présentées dans cette application car elle ne contiendra pas les dernirères mesures d\'urgence.</string>
<string name="about_contents_project_url"><a href="http://www.montrealaucasou.com/">montrealaucasou.com</a></string>
<string name="about_contents_project_version">Version %s</string>
<string name="about_contents_intro">Montréal au cas où vous donne accès aux localisations géographiques et aux adresses civiques associées à quatre services de sécurité publique :</string>
<string name="about_contents_2_1">casernes de pompiers,</string>
<string name="about_contents_2_2">postes de quartier de la police (SPVM),</string>
<string name="about_contents_2_3">points d\'eau mises à la disposition de la population en cas de canicule ou autre événement touchant la sécurité publique,</string>
<string name="about_contents_2_4">centres d\'hébergement d\'urgence et lieux publics climatisés.</string>
<string name="about_contents_credits">Application Android réalisée par <a href="http://www.mudar.ca/">Mudar Noufal</a>. Le code source est publié sous la licence GPLv3 de la Free Software Foundation.</string>
<string name="about_contents_open_data">Projet réalisé en collaboration avec <a href="http://montrealouvert.net/donnees-ouvertes-questions-frequemment-demandees/?lang=fr">Montréal ouvert</a>. Cette application est propulsée par le <a href="http://donnees.ville.montreal.qc.ca/">Portail</a> données ouvertes de la Ville de Montréal en conformité avec sa <a href="http://donnees.ville.montreal.qc.ca/licence-texte-complet">licence</a> d\'utilisation des données ouvertes.</string>
<string name="prefs_general_preferences">Réglages</string>
<string name="prefs_language_title">Langue</string>
<string name="prefs_language_summary">Changer la langue de l\'interface</string>
<string name="prefs_language_dialog_title">Choix de langue</string>
<string name="prefs_language_french">Français</string>
<string name="prefs_language_english">English</string>
<string name="prefs_units_title">Unités de mesure</string>
<string name="prefs_units_summary">Afficher les distances en km ou en milles</string>
<string name="prefs_units_dialog_title">Système des unités de mesure</string>
<string name="prefs_units_iso">Métrique (km)</string>
<string name="prefs_units_imperial">Impérial (mile)</string>
<string name="prefs_list_sort_title">Ordre d\'affichage</string>
<string name="prefs_list_sort_summary">Modifier l\'ordre d\'affichage des listes</string>
<string name="prefs_list_sort_summary_todo">Ordre alphabétique ou distance. À venir…</string>
<string name="prefs_list_sort_dialog_title">Trier par</string>
<string name="prefs_list_sort_name">Ordre alphabétique</string>
<string name="prefs_list_sort_distance">Distance</string>

</resources>
4 changes: 3 additions & 1 deletion res/values/colors.xml
View file
Expand Up @@ -46,12 +46,14 @@
<!-- <color name="body_text_1_inverse">#ff000000</color> -->
<!-- <color name="body_text_2_inverse">#99000000</color> -->
<!-- <color name="body_text_disabled_inverse">#66000000</color> -->
<color name="hyperlink">#cc9900</color>
<color name="hyperlink">#ffaa00</color>
<color name="background_1">#404040</color>
<color name="black">#000000</color>
<color name="listview_color_1">#ff9900</color>
<color name="listview_color_2">#cc9900</color>
<color name="listview_color_3">#aa6600</color>
<!-- <color name="background_dashboard">#606060</color> -->
<color name="separator_map_list">#e5e5e5</color>
<color name="separator_about">#606060</color>

</resources>
4 changes: 2 additions & 2 deletions res/values/dimens.xml
View file
Expand Up @@ -27,8 +27,8 @@
<dimen name="paddingSmall">2dp</dimen>
<dimen name="paddingMedium">4dp</dimen>
<dimen name="paddingLarge">6dp</dimen>
<dimen name="tabMargin">2dp</dimen>
<dimen name="tabPadding">10dp</dimen>
<!-- <dimen name="tabMargin">2dp</dimen> -->
<!-- <dimen name="tabPadding">10dp</dimen> -->
<dimen name="bodyPaddingMedium">10dp</dimen>
<dimen name="bodyPaddingLarge">10dp</dimen>
<dimen name="textSizeSmall">12sp</dimen>
Expand Down
54 changes: 36 additions & 18 deletions res/values/strings.xml
View file
Expand Up @@ -26,14 +26,16 @@

<string name="hello">Hello World, Montréal Just in Case!</string>
<string name="app_name">MTL Just in Case</string>
<string name="app_version">0.9.2</string>
<string name="google_map_api_key" _YOUR_GOOGLE_MAP_API_KEY_></string>
<string name="google_map_api_key_debug" _YOUR_GOOGLE_MAP_API_KEY_DEBUG_></string>
<string name="app_label_fire_halls">Fire Halls</string>
<string name="app_label_fire_halls">Fire Stations</string>
<string name="app_label_spvm_stations">SPVM Stations</string>
<string name="app_label_water_supplies">Water Supplies</string>
<string name="app_label_emergency_hostels">Emergency Hostels</string>
<string name="app_label_about">About</string>
<string name="btn_fire_halls">Fire Halls</string>
<string name="app_label_preferences">Settings</string>
<string name="btn_fire_halls">Fire Stations</string>
<string name="btn_spvm_stations">SPVM Stations</string>
<string name="btn_water_supplies">Water\nSupplies</string>
<string name="btn_emergency_hostels">Emergency\nHostels</string>
Expand All @@ -44,8 +46,11 @@
<string name="menu_about">About</string>
<string name="menu_link_kml">Open in GMaps</string>
<string name="placemarks_empty_list">List is empty…</string>
<string name="placemark_distance">%.1fkm</string>
<string name="placemark_distance_min">&lt;100m</string>
<string name="placemark_distance_iso">%.1f km</string>
<string name="placemark_distance_iso_min">&lt; 100 m</string>
<string name="placemark_distance_imp">%.1f mi</string>
<string name="placemark_distance_imp_feet">%s ft</string>
<string name="placemark_distance_imp_min">&lt; 200 ft</string>
<string name="logo_open_data">@drawable/logo_open_data_en</string>
<string name="toast_sync_error">Sync error: <xliff:g id="error">%1$s</xliff:g></string>
<string name="eula_assets_filename">gpl-3.0-standalone.html</string>
Expand All @@ -60,19 +65,32 @@
<string name="toast_sync_finished">Loading completed successfully!</string>
<string name="dialog_remote_kml_title">Open in GMaps</string>
<string name="dialog_remote_kml_summary">Do you want to download the remote KML file? It will be opened using your Google Maps app…</string>
<string name="dialog_prefs_todo_summary">Coming soon… This is still a beta version!\nSettings will allow you to:\n– Sort lists by Distance or Name;\n– Set interface language to English or French;\n– Display distances using Metric or Imperial units;\n– Update data using the city\'s remote server.</string>
<string name="about_contents_1">In case of emergency, please contact the City\'s security services directly. Do not rely on information provided here as it will not contain the updated security measures.</string>
<string name="about_contents_2">Montréal Just in Case provides you with the geographic locations and addresses for four public safety services:</string>
<string name="about_contents_2_1">1. Fire Halls;</string>
<string name="about_contents_2_2">2. Neighbourhood Police Stations (SPVM);</string>
<string name="about_contents_2_3">3. Water Supplies – Contingency measures: Locations of water supplies available to the population in case of heat wave or other events related to public safety;</string>
<string name="about_contents_2_4">4. Emergency accommodation centres and air conditioned public places.</string>
<string name="about_contents_3">The source of the data is the City of Montréal on its Open Data Portal. Tap to access the URL of each source:</string>
<string name="about_contents_3_1"><a href="http://donnees.ville.montreal.qc.ca/archives/fiche-donnees/casernes-pompiers">Fire Halls</a></string>
<string name="about_contents_3_2"><a href="http://donnees.ville.montreal.qc.ca/archives/fiche-donnees/carte-postes-quartier">SPVM Stations</a></string>
<string name="about_contents_3_3"><a href="http://donnees.ville.montreal.qc.ca/archives/fiche-donnees/points-eau">Water Supplies</a></string>
<string name="about_contents_3_4"><a href="http://donnees.ville.montreal.qc.ca/archives/fiche-donnees/centres-hebergement-urgence">Emergency Hostels</a></string>
<string name="about_contents_3_5"><a href="http://donnees.ville.montreal.qc.ca/licence-texte-complet">Licence related to the use and redistribution of the data</a></string>
<string name="about_contents_credits">Android app developed by <a href="http://www.montrealjustincase.com/">Mudar Noufal</a>. Source code is released under the GPLv3 license from the Free Software Foundation.</string>
<string name="about_contents_note">In case of emergency, please contact the City\'s security services directly. Do not rely on information provided here as it will not contain the updated security measures.</string>
<string name="about_contents_project_url"><a href="http://www.montrealjustincase.com/">montrealjustincase.com</a></string>
<string name="about_contents_project_version">Version %s</string>
<string name="about_contents_intro">Montréal Just in Case provides you with the geographic locations and addresses of four public safety services:</string>
<string name="about_contents_2_1">Fire stations.</string>
<string name="about_contents_2_2">Neighbourhood police stations (SPVM).</string>
<string name="about_contents_2_3">Water supplies available to the population in case of heat wave or other events related to public safety.</string>
<string name="about_contents_2_4">Emergency accommodation centres and air conditioned public places.</string>
<string name="about_contents_credits">Android app developed by <a href="http://www.mudar.ca/">Mudar Noufal</a>. Source code is released under the GPLv3 license from the Free Software Foundation.</string>
<string name="about_contents_open_data">Project done in collaboration with <a href="http://montrealouvert.net/donnees-ouvertes-questions-frequemment-demandees/?lang=en">Montréal ouvert</a>. This app is powered by The City of Montréal Open Data <a href="http://donnees.ville.montreal.qc.ca/">Portal</a>, in compliance with its Open Data <a href="http://donnees.ville.montreal.qc.ca/licence-texte-complet">license</a>.</string>
<string name="prefs_general_preferences">General Preferences</string>
<string name="prefs_language_title">Language</string>
<string name="prefs_language_summary">Change the interface language</string>
<string name="prefs_language_dialog_title">Set language</string>
<string name="prefs_language_french">Français</string>
<string name="prefs_language_english">English</string>
<string name="prefs_units_title">Distance Units System</string>
<string name="prefs_units_summary">Calculate distances using km or mi</string>
<string name="prefs_units_dialog_title">Set units system</string>
<string name="prefs_units_iso">Metric (km)</string>
<string name="prefs_units_imperial">Imperial (mile)</string>
<string name="prefs_list_sort_title">Sort By</string>
<string name="prefs_list_sort_summary">Sort lists by name or distance</string>
<string name="prefs_list_sort_summary_todo">By name or distance. Coming soon…</string>
<string name="prefs_list_sort_dialog_title">Sort lists by</string>
<string name="prefs_list_sort_name">Alphabetical order</string>
<string name="prefs_list_sort_distance">Distance</string>

</resources>

0 comments on commit f466b65

Please sign in to comment.