Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix issue 189

Browse source 
redesign settings layout

git-svn-id: https://osmand.googlecode.com/svn/trunk@786 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-12-08 22:11:31 +00:00
parent 61df314095
commit 1e45f6959f
2 changed files with 91 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
OsmAnd/res/values/strings.xml
View file

@ -1,8 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?> <?xml version="1.0" encoding="utf-8" standalone="no"?>
<resources> <resources>
<string name="general_settings_descr">Config internet usage, map rotation, screen orientation and other</string>
<string name="general_settings">General</string>
<string name="rendering_settings_descr">Config map source and appearance</string>
<string name="rendering_settings">Map appearance</string>
<string name="index_settings_descr">Get/update data for offline usage</string>
<string name="index_settings">Data for offline usage</string>
<string name="osmand_service">Background service</string>
<string name="osmand_service_descr">Run background service to use OsmAnd while screen off</string>
<string name="fast_route_mode">Fastest route</string> <string name="fast_route_mode">Fastest route</string>
<string name="fast_route_mode_descr">Enable for calculate fastest route or disable for shortest route </string> <string name="fast_route_mode_descr">Enable for calculate fastest route or disable for shortest route </string>
<string name="tiles_to_download_estimated_size">At zoom {0} download {1} tiles ({2} Mb )</string> <string name="tiles_to_download_estimated_size">At zoom {0} download {1} tiles ({2} Mb )</string>
<string name="context_menu_item_download_map">Download map</string> <string name="context_menu_item_download_map">Download map</string>
<string name="select_max_zoom_preload_area">Select max zoom to preload visible area</string> <string name="select_max_zoom_preload_area">Select max zoom to preload visible area</string>
@ -127,7 +134,7 @@
<string name="route_tu">Make U-turn and go</string> <string name="route_tu">Make U-turn and go</string>
<string name="route_head">Head</string> <string name="route_head">Head</string>
<string name="first_time_continue">Continue</string> <string name="first_time_continue">Continue</string>
<string name="first_time_download">Download indexes</string> <string name="first_time_download">Download regions</string>
<string name="first_time_msg">Thank you for choosing OsmAnd. \nTo use all features of the application, you need index files, which you can download (Settings -&gt; Data) or prepare yourself. Afterwards, you will be able to: search by address, for search POIs, and search for public transport.</string> <string name="first_time_msg">Thank you for choosing OsmAnd. \nTo use all features of the application, you need index files, which you can download (Settings -&gt; Data) or prepare yourself. Afterwards, you will be able to: search by address, for search POIs, and search for public transport.</string>
<string name="search_poi_location">Searching signal...</string> <string name="search_poi_location">Searching signal...</string>
<string name="search_near_map">Search near last map location</string> <string name="search_near_map">Search near last map location</string>
@ -188,14 +195,14 @@
<string name="router_service">Routing</string> <string name="router_service">Routing</string>
<string name="sd_dir_not_accessible">Directory on SD card to save is not accessible</string> <string name="sd_dir_not_accessible">Directory on SD card to save is not accessible</string>
<string name="download_question">Download {0} - {1} ?</string> <string name="download_question">Download {0} - {1} ?</string>
<string name="download_question_exist">Index for {0} already exists ({1}). Do you want to update it ({2}) ?</string> <string name="download_question_exist">Offline data for {0} already exists ({1}). Do you want to update it ({2}) ?</string>
<string name="address">Address</string> <string name="address">Address</string>
<string name="download_index_success">Index downloaded successfully</string> <string name="download_index_success">Download successful</string>
<string name="error_io_error">Input/output error occured</string> <string name="error_io_error">Input/output error occured</string>
<string name="downloading_file">Downloading file...</string> <string name="downloading_file">Downloading file...</string>
<string name="downloading">Downloading...</string> <string name="downloading">Downloading...</string>
<string name="downloading_list_indexes">Downloading list of available indexes</string> <string name="downloading_list_indexes">Downloading list of available regions</string>
<string name="list_index_files_was_not_loaded">The list of index files was not retrieved from osmand.googlecode.com.</string> <string name="list_index_files_was_not_loaded">The list of regions was not retrieved from osmand.googlecode.com.</string>
<string name="select_index_file_to_download">If you can\'t find your region, you can make it yourself. See osmand.net</string> <string name="select_index_file_to_download">If you can\'t find your region, you can make it yourself. See osmand.net</string>
<string name="show_poi_on_map">Show on map</string> <string name="show_poi_on_map">Show on map</string>
<string name="fav_points_edited">Favorite point was edited</string> <string name="fav_points_edited">Favorite point was edited</string>
@ -237,10 +244,10 @@
<string name="previous_run_crashed">Previous application run was crashed. Log file is at {0}. Please raise the issue and attach log file.</string> <string name="previous_run_crashed">Previous application run was crashed. Log file is at {0}. Please raise the issue and attach log file.</string>
<string name="saving_gpx_tracks">Saving GPX tracks to SD...</string> <string name="saving_gpx_tracks">Saving GPX tracks to SD...</string>
<string name="finished_task">Finished</string> <string name="finished_task">Finished</string>
<string name="reload_indexes_descr">Reload data indexes from SD</string> <string name="reload_indexes_descr">Reload offline data from SD card</string>
<string name="reload_indexes">Reload indexes</string> <string name="reload_indexes">Reload offline data</string>
<string name="download_indexes_descr">Download indexes from the Internet</string> <string name="download_indexes_descr">Download data for offline usage from the Internet</string>
<string name="download_indexes">Download indexes</string> <string name="download_indexes">Download offline data</string>
<string name="use_online_routing_descr">Use Internet to calculate route</string> <string name="use_online_routing_descr">Use Internet to calculate route</string>
<string name="use_online_routing">Use online routing</string> <string name="use_online_routing">Use online routing</string>
<string name="user_password_descr">Your OSM password</string> <string name="user_password_descr">Your OSM password</string>
@ -248,8 +255,8 @@
<string name="osm_settings_descr">Specify OSM settings: OSM login</string> <string name="osm_settings_descr">Specify OSM settings: OSM login</string>
<string name="monitor_preferences_descr">Specify monitoring settings</string> <string name="monitor_preferences_descr">Specify monitoring settings</string>
<string name="data_settings_descr">Specify language, download/reload data</string> <string name="data_settings_descr">Specify language, download/reload data</string>
<string name="map_preferences_descr">Specify map settings: map source, rotation, center position, screen orientation</string>
<string name="data_settings">Data</string> <string name="data_settings">Data</string>
<string name="map_preferences_descr">Specify map settings: map source, rotation, center position, screen orientation</string>
<string name="osm_settings">OSM</string> <string name="osm_settings">OSM</string>
<string name="auto_zoom_map_descr">Auto zoom map according to your speed</string> <string name="auto_zoom_map_descr">Auto zoom map according to your speed</string>
<string name="auto_zoom_map">Auto zoom map</string> <string name="auto_zoom_map">Auto zoom map</string>

123
OsmAnd/res/xml/settings_pref.xml
View file

@ -1,55 +1,78 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android">
<ListPreference android:summary="@string/settings_preset_descr" android:title="@string/settings_preset" android:key="application_mode"></ListPreference> <ListPreference android:summary="@string/settings_preset_descr" android:title="@string/settings_preset" android:key="application_mode"></ListPreference>
<!-- <CheckBoxPreference android:key="use_internet_to_calculate_route" android:title="@string/use_online_routing" android:summary="@string/use_online_routing_descr"></CheckBoxPreference> -->
<PreferenceScreen android:title="@string/map_preferences" android:summary="@string/map_preferences_descr">
<CheckBoxPreference android:key="use_internet_to_download_tiles" android:title="@string/use_internet" android:summary="@string/use_internet_to_download_tile"></CheckBoxPreference>
<ListPreference android:title="@string/map_tile_source" android:summary="@string/map_tile_source_descr" android:key="map_tile_sources"></ListPreference>
<ListPreference android:title="@string/max_level_download_tile" android:summary="@string/max_level_download_tile_descr" android:key="max_level_download_tile"></ListPreference>
<!-- <CheckBoxPreference android:key="show_poi_over_map" android:title="@string/show_poi_over_map" android:summary="@string/show_poi_over_map_description"></CheckBoxPreference> -->
<!-- <CheckBoxPreference android:key="show_transport_over_map" android:title="@string/show_transport_over_map" android:summary="@string/show_transport_over_map_description"></CheckBoxPreference> -->
<CheckBoxPreference android:title="@string/auto_zoom_map" android:summary="@string/auto_zoom_map_descr" android:key="auto_zoom_map"></CheckBoxPreference>
<CheckBoxPreference android:key="show_view_angle" android:title="@string/show_view_angle" android:summary="@string/show_view_angle_descr"></CheckBoxPreference>
<ListPreference android:key="rotate_map" android:title="@string/rotate_map_to_bearing" android:summary="@string/rotate_map_to_bearing_descr"></ListPreference>
<ListPreference android:key="map_screen_orientation" android:title="@string/map_screen_orientation" android:summary="@string/map_screen_orientation_descr"></ListPreference>
<ListPreference android:key="position_on_map" android:title="@string/position_on_map" android:summary="@string/position_on_map_descr"></ListPreference>
<CheckBoxPreference android:key="use_trackball_for_movements" android:title="@string/use_trackball" android:summary="@string/use_trackball_descr"></CheckBoxPreference>
<CheckBoxPreference android:key="use_high_res_maps" android:title="@string/use_high_res_maps" android:summary="@string/use_high_res_maps_descr"></CheckBoxPreference>
</PreferenceScreen>
<PreferenceScreen android:title="@string/data_settings" android:summary="@string/data_settings_descr"> <PreferenceScreen android:title="@string/rendering_settings" android:summary="@string/rendering_settings_descr">
<CheckBoxPreference android:summary="@string/use_english_names_descr" android:title="@string/use_english_names" android:key="use_english_names"></CheckBoxPreference> <ListPreference android:title="@string/map_tile_source" android:summary="@string/map_tile_source_descr" android:key="map_tile_sources"></ListPreference>
<Preference android:title="@string/reload_indexes" android:key="reload_indexes" android:summary="@string/reload_indexes_descr"></Preference> <CheckBoxPreference android:summary="@string/use_english_names_descr" android:title="@string/use_english_names"
<Preference android:title="@string/download_indexes" android:key="download_indexes" android:summary="@string/download_indexes_descr"></Preference> android:key="use_english_names"></CheckBoxPreference>
<ListPreference android:title="@string/voice_provider" android:key="voice_provider" android:summary="@string/voice_provider_descr"></ListPreference> <ListPreference android:key="renderer" android:title="@string/renderers" android:summary="@string/renderers_descr"></ListPreference>
<ListPreference android:key="renderer" android:title="@string/renderers" android:summary="@string/renderers_descr"></ListPreference> <CheckBoxPreference android:summary="@string/continuous_rendering_descr" android:title="@string/continuous_rendering"
<CheckBoxPreference android:summary="@string/continuous_rendering_descr" android:title="@string/continuous_rendering" android:key="use_step_by_step_rendering"/> android:key="use_step_by_step_rendering" />
<CheckBoxPreference android:summary="Use this flag to check rendering performance" android:title="Trace rendering" android:key="debug_rendering"></CheckBoxPreference> <CheckBoxPreference android:key="use_high_res_maps" android:title="@string/use_high_res_maps" android:summary="@string/use_high_res_maps_descr"></CheckBoxPreference>
<CheckBoxPreference android:summary="Use this flag to check rendering performance" android:title="Trace rendering"
</PreferenceScreen> android:key="debug_rendering"></CheckBoxPreference>
<PreferenceScreen android:title="@string/routing_settings" android:summary="@string/routing_settings_descr"> </PreferenceScreen>
<ListPreference android:title="@string/router_service" android:key="router_service" android:summary="@string/router_service_descr"></ListPreference>
<CheckBoxPreference android:summary="@string/fast_route_mode_descr" android:title="@string/fast_route_mode" android:key="fast_route_mode"></CheckBoxPreference> <PreferenceScreen android:title="@string/routing_settings" android:summary="@string/routing_settings_descr">
<ListPreference android:title="@string/router_service" android:key="router_service" android:summary="@string/router_service_descr"></ListPreference>
<CheckBoxPreference android:summary="@string/background_router_service_descr" android:title="@string/background_router_service" android:key="service_off_enabled"></CheckBoxPreference> <CheckBoxPreference android:summary="@string/fast_route_mode_descr" android:title="@string/fast_route_mode"
<ListPreference android:key="service_off_provider" android:title="@string/background_service_provider" android:summary="@string/background_service_provider_descr"></ListPreference> android:key="fast_route_mode"></CheckBoxPreference>
<ListPreference android:key="service_off_interval" android:title="@string/background_service_int" android:summary="@string/background_service_int_descr"></ListPreference> <ListPreference android:title="@string/voice_provider" android:key="voice_provider" android:summary="@string/voice_provider_descr"></ListPreference>
<ListPreference android:key="service_off_wait_interval" android:title="@string/background_service_wait_int" android:summary="@string/background_service_wait_int_descr"></ListPreference> <!--
</PreferenceScreen> <CheckBoxPreference android:key="use_internet_to_calculate_route" android:title="@string/use_online_routing"
android:summary="@string/use_online_routing_descr"></CheckBoxPreference>
<PreferenceScreen android:title="@string/monitor_preferences" android:summary="@string/monitor_preferences_descr"> -->
<CheckBoxPreference android:summary="@string/save_track_to_gpx_descrp" android:title="@string/save_track_to_gpx" android:key="save_track_to_gpx"></CheckBoxPreference> </PreferenceScreen>
<ListPreference android:summary="@string/save_track_interval_descr" android:title="@string/save_track_interval" android:key="save_track_interval"></ListPreference>
<Preference android:summary="@string/save_current_track_descr" android:title="@string/save_current_track" android:key="save_current_track"></Preference> <PreferenceScreen android:title="@string/index_settings" android:summary="@string/index_settings_descr">
</PreferenceScreen> <Preference android:title="@string/reload_indexes" android:key="reload_indexes" android:summary="@string/reload_indexes_descr"></Preference>
<Preference android:title="@string/download_indexes" android:key="download_indexes" android:summary="@string/download_indexes_descr"></Preference>
<PreferenceScreen android:title="@string/osm_settings" android:summary="@string/osm_settings_descr"> </PreferenceScreen>
<!-- <CheckBoxPreference android:key="show_osm_bugs" android:title="@string/show_osm_bugs" android:summary="@string/show_osm_bugs_descr"></CheckBoxPreference> -->
<EditTextPreference android:title="@string/user_name" android:summary="@string/user_name_descr" android:key="user_name"></EditTextPreference> <PreferenceScreen android:title="@string/osmand_service" android:summary="@string/osmand_service_descr">
<EditTextPreference android:title="@string/user_password" android:password="true" android:summary="@string/user_password_descr" android:key="user_password"></EditTextPreference> <CheckBoxPreference android:summary="@string/background_router_service_descr" android:title="@string/background_router_service"
</PreferenceScreen> android:key="service_off_enabled"></CheckBoxPreference>
<ListPreference android:key="service_off_provider" android:title="@string/background_service_provider" android:summary="@string/background_service_provider_descr"></ListPreference>
<ListPreference android:key="service_off_interval" android:title="@string/background_service_int" android:summary="@string/background_service_int_descr"></ListPreference>
<ListPreference android:key="service_off_wait_interval" android:title="@string/background_service_wait_int"
android:summary="@string/background_service_wait_int_descr"></ListPreference>
</PreferenceScreen>
<PreferenceScreen android:title="@string/general_settings" android:summary="@string/general_settings_descr">
<CheckBoxPreference android:key="use_internet_to_download_tiles" android:title="@string/use_internet" android:summary="@string/use_internet_to_download_tile"></CheckBoxPreference>
<ListPreference android:title="@string/max_level_download_tile" android:summary="@string/max_level_download_tile_descr"
android:key="max_level_download_tile"></ListPreference>
<CheckBoxPreference android:title="@string/auto_zoom_map" android:summary="@string/auto_zoom_map_descr" android:key="auto_zoom_map"></CheckBoxPreference>
<CheckBoxPreference android:key="show_view_angle" android:title="@string/show_view_angle" android:summary="@string/show_view_angle_descr"></CheckBoxPreference>
<ListPreference android:key="rotate_map" android:title="@string/rotate_map_to_bearing" android:summary="@string/rotate_map_to_bearing_descr"></ListPreference>
<ListPreference android:key="map_screen_orientation" android:title="@string/map_screen_orientation" android:summary="@string/map_screen_orientation_descr"></ListPreference>
<ListPreference android:key="position_on_map" android:title="@string/position_on_map" android:summary="@string/position_on_map_descr"></ListPreference>
<CheckBoxPreference android:key="use_trackball_for_movements" android:title="@string/use_trackball" android:summary="@string/use_trackball_descr"></CheckBoxPreference>
</PreferenceScreen>
<PreferenceScreen android:title="@string/monitor_preferences" android:summary="@string/monitor_preferences_descr">
<CheckBoxPreference android:summary="@string/save_track_to_gpx_descrp" android:title="@string/save_track_to_gpx"
android:key="save_track_to_gpx"></CheckBoxPreference>
<ListPreference android:summary="@string/save_track_interval_descr" android:title="@string/save_track_interval"
android:key="save_track_interval"></ListPreference>
<Preference android:summary="@string/save_current_track_descr" android:title="@string/save_current_track" android:key="save_current_track"></Preference>
</PreferenceScreen>
<PreferenceScreen android:title="@string/osm_settings" android:summary="@string/osm_settings_descr">
<!--
<CheckBoxPreference android:key="show_osm_bugs" android:title="@string/show_osm_bugs"
android:summary="@string/show_osm_bugs_descr"></CheckBoxPreference>
-->
<EditTextPreference android:title="@string/user_name" android:summary="@string/user_name_descr" android:key="user_name"></EditTextPreference>
<EditTextPreference android:title="@string/user_password" android:password="true" android:summary="@string/user_password_descr"
android:key="user_password"></EditTextPreference>
</PreferenceScreen>
</PreferenceScreen> </PreferenceScreen>