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

Merge branch 'master' of github.com:osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2015-12-09 17:23:08 +01:00
commit 5a60189ee6
18 changed files with 292 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OsmAnd/res/drawable-hdpi/map_target_point.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
OsmAnd/res/drawable-mdpi/map_target_point.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_target_point.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_target_point.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

42
OsmAnd/res/layout/dialog_live_updates_item_settings.xml
View file

@ -37,25 +37,39 @@
android:layout_height="wrap_content">
<TextView
android:layout_width="0dp"
android:layout_gravity="fill_horizontal"
android:text="Live update"/>
<Switch/>
android:layout_width="wrap_content"
android:layout_column="0"
android:layout_row="1"
android:text="@string/live_update"/>
<Switch
android:id="@+id/liveUpdatesSwitch"
android:layout_gravity="right"/>
<TextView
android:layout_width="0dp"
android:layout_gravity="fill_horizontal"
android:text="Only download over WiFi"
android:layout_width="wrap_content"
android:layout_column="0"
android:layout_row="2"
android:layout_column="0"/>
<Switch/>
android:text="@string/only_download_over_wifi"/>
<Switch
android:id="@+id/downloadOnlyOverWiFi"
android:layout_gravity="right"/>
<TextView
android:layout_width="0dp"
android:layout_gravity="fill_horizontal"
android:text="Live update"
android:layout_width="wrap_content"
android:layout_column="0"
android:layout_row="3"
android:layout_column="0"/>
<Spinner/>
android:text="@string/update_every"/>
<Spinner
android:id="@+id/updateFrequencySpinner"
android:layout_width="wrap_content"
android:layout_column="1"
android:layout_gravity="right"
android:entries="@array/update_frequencies_array"/>
</GridLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"

7
OsmAnd/res/layout/live_updates_header.xml
View file

@ -13,14 +13,15 @@
android:orientation="horizontal">
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/onOffTextView"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/shared_string_on"
tools:text="@string/shared_string_on"
app:textAllCapsCompat="true"/>
<include
layout="@layout/check_item_rel"
<android.support.v7.widget.SwitchCompat
android:id="@+id/liveUpdatesSwitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>

3
OsmAnd/res/values-da/phrases.xml
View file

@ -2591,4 +2591,7 @@
<string name="poi_building_type_pyramid">Bygningstype: pyramide</string>
<string name="poi_fitness_centre">Fitnesscenter</string>
<string name="poi_fitness">Fitness</string>
</resources>

5
OsmAnd/res/values-da/strings.xml
View file

@ -2183,4 +2183,7 @@
<string name="no_address_found">Kan ikke bestemme adresse</string>
<string name="looking_up_address">Søger efter adressen</string>
<string name="rendering_attr_horseRoutes_name">Hesteruter</string>
</resources>
<string name="update_every">Opdater hver</string>
<string name="only_download_over_wifi">Hent kun over WiFi</string>
<string name="live_update">Realtids opdatering</string>
</resources>

186
OsmAnd/res/values-nl/phrases.xml
View file

@ -212,7 +212,7 @@
<string name="poi_townhall">Stadhuis</string>
<string name="poi_advertising_agency">Reclamebureau</string>
<string name="poi_educational_institution">Onderwijsinstelling</string>
<string name="poi_architect">Architectenkantoor</string>
<string name="poi_architect">Architectenbureau</string>
<string name="poi_research">Onderzoekskantoor</string>
<string name="poi_studio">Studio</string>
<string name="poi_bookmaker">Bookmaker</string>
@ -257,15 +257,15 @@
<string name="poi_monastery">Klooster</string>
<string name="poi_historic_monastery">Historisch klooster</string>
<string name="poi_religion_taoist">Gebedshuis: taoïstisch</string>
<string name="poi_religion_taoist">Taoïsme</string>
<string name="poi_place_of_worship">Gebedshuis</string>
<string name="poi_religion_christian">Gebedshuis: christelijk</string>
<string name="poi_religion_jewish">Gebedshuis: joods</string>
<string name="poi_religion_muslim">Gebedshuis: islamitisch</string>
<string name="poi_religion_sikh">Gebedshuis: sikh</string>
<string name="poi_religion_buddhist">Gebedshuis: boeddhistisch</string>
<string name="poi_religion_hindu">Gebedshuis: hindu</string>
<string name="poi_religion_shinto">Gebedshuis: shinto</string>
<string name="poi_religion_christian">Christelijk</string>
<string name="poi_religion_jewish">Joods</string>
<string name="poi_religion_muslim">Islam</string>
<string name="poi_religion_sikh">Sikh</string>
<string name="poi_religion_buddhist">Boeddhisme</string>
<string name="poi_religion_hindu">Hindoeïsme</string>
<string name="poi_religion_shinto">Shinto</string>
<string name="poi_clock">Klok</string>
<string name="poi_travel_agent">Reisbureau</string>
<string name="poi_spring">Bron</string>
@ -803,4 +803,172 @@
<string name="poi_ford_stepping_stones">Stapstenen</string>
<string name="poi_traffic_calming_island">Verkeerseiland</string>
<string name="poi_fuel_svo">Biobrandstof</string>
<string name="poi_pasta">Pasta-winkel</string>
<string name="poi_games">Spellen en games</string>
<string name="poi_aerialway_pylon">Kabelbaanmast</string>
<string name="poi_breakwater">Golfbreker</string>
<string name="poi_power_cable_distribution_cabinet">Stroomverdeelkast</string>
<string name="poi_power_tower">Hoogspanningsmast</string>
<string name="poi_power_pole">Bokpaal</string>
<string name="poi_cooling_tower">Koeltoren</string>
<string name="poi_lighting_tower">Lichtmast</string>
<string name="poi_recycling_centre">Type: milieustation</string>
<string name="poi_recycling_container">Afvalcontainer</string>
<string name="poi_recycling_glass">Glas</string>
<string name="poi_recycling_paper">Papier</string>
<string name="poi_recycling_clothes">Kleding</string>
<string name="poi_recycling_cans">Blik</string>
<string name="poi_recycling_glass_bottles">Glazen flessen</string>
<string name="poi_recycling_plastic">Plastic</string>
<string name="poi_recycling_scrap_metal">Metalen</string>
<string name="poi_recycling_batteries">Batterijen</string>
<string name="poi_recycling_plastic_bottles">Plastic flessen</string>
<string name="poi_recycling_green_waste">Groenafval</string>
<string name="poi_recycling_waste">Restafval</string>
<string name="poi_recycling_plastic_packaging">Plastic verpakkingen</string>
<string name="poi_recycling_newspaper">Kranten</string>
<string name="poi_recycling_cartons">Kartonnen dozen</string>
<string name="poi_recycling_cardboard">Karton</string>
<string name="poi_recycling_magazines">Tijdschriften</string>
<string name="poi_recycling_paper_packaging">Papieren verpakkingen</string>
<string name="poi_recycling_small_appliances">Kleine apparaten</string>
<string name="poi_recycling_wood">Hout</string>
<string name="poi_recycling_books"/>
<string name="poi_recycling_shoes">Schoenen</string>
<string name="poi_recycling_aluminium">Aluminium</string>
<string name="poi_recycling_organic">Organische materialen</string>
<string name="poi_recycling_beverage_cartons">Drankkartons</string>
<string name="poi_recycling_garden_waste">Tuinafval</string>
<string name="poi_recycling_low_energy_bulbs">Spaarlampen</string>
<string name="poi_recycling_fluorescent_tubes">TL-buizen</string>
<string name="poi_recycling_metal">Metaal</string>
<string name="poi_recycling_electrical_items">Elektrische apparaten</string>
<string name="poi_recycling_white_goods">Witgoed</string>
<string name="poi_recycling_cooking_oil">Frituurvet-en olie</string>
<string name="poi_recycling_engine_oil">Motorolie</string>
<string name="poi_recycling_plastic_bags">Plastic zakken</string>
<string name="poi_recycling_hazardous_waste">Chemisch afval</string>
<string name="poi_recycling_mobile_phones">Mobiele telefoons</string>
<string name="poi_recycling_hydrargyrum">Kwik</string>
<string name="poi_recycling_computers">Computers</string>
<string name="poi_recycling_tyres">Banden</string>
<string name="poi_recycling_tv_monitor">TV, monitoren</string>
<string name="poi_recycling_tetrapak">Tetrapak</string>
<string name="poi_recycling_rubble">Puin</string>
<string name="poi_recycling_cds">CD\'s</string>
<string name="poi_recycling_waste_oil">Afgewerkte olie</string>
<string name="poi_recycling_bottles">Flessen</string>
<string name="poi_recycling_cork">Kurk</string>
<string name="poi_recycling_printer_cartridges">Printer cartridges</string>
<string name="poi_recycling_sheet_metal">Plaatwerk</string>
<string name="poi_recycling_foil">Folie</string>
<string name="poi_recycling_paint">Verf</string>
<string name="poi_recycling_styrofoam">Piepschuim/Styrofoam</string>
<string name="poi_recycling_drugs">Medicijnen</string>
<string name="poi_recycling_compost">Compost</string>
<string name="poi_recycling_hardcore">Bouwafval</string>
<string name="poi_recycling_christmas_trees">Kerstbomen</string>
<string name="poi_recycling_light_bulbs">Gloeilampen</string>
<string name="poi_recycling_chipboard">Spaanplaat</string>
<string name="poi_recycling_polyester">Polyester</string>
<string name="poi_recycling_plasterboard">Gipsplaten</string>
<string name="poi_recycling_animal_waste">Dierlijk afval</string>
<string name="poi_recycling_fridge_and_freezer">Koel-en vrieskasten</string>
<string name="poi_recycling_furniture">Meubels</string>
<string name="poi_recycling_diapers">Luiers</string>
<string name="poi_recycling_car_batteries">Accu\'s</string>
<string name="poi_recycling_cars">Auto \'s</string>
<string name="poi_recycling_bicycles"/>
<string name="poi_landfill_waste_nuclear">Nucleair afval</string>
<string name="poi_basin">Waterbekken</string>
<string name="poi_conservation">Beschermd gebied</string>
<string name="poi_monitoring_station">Meetstation</string>
<string name="poi_crane">Kraan</string>
<string name="poi_brownfield">Braakliggend bouwterrein</string>
<string name="poi_greenfield">Braakliggend terrein</string>
<string name="poi_reservoir">Reservoir</string>
<string name="poi_bunker_silo">Silo</string>
<string name="poi_training">Oefenterrein</string>
<string name="poi_country">Land</string>
<string name="poi_capital">Hoofdstad</string>
<string name="poi_paediatrics">Kindergeneeskunde</string>
<string name="poi_office_religion">Kerkelijk bureau</string>
<string name="poi_association">Verenigingskantoor</string>
<string name="poi_financial">Financieel hoofdkantoor</string>
<string name="poi_political_party">Partijkantoor</string>
<string name="poi_notary">Notaris</string>
<string name="poi_foundation">Stichtingskantoor</string>
<string name="poi_tax_advisor">Belastingadviseur</string>
<string name="poi_field_hockey">Veldhockey</string>
<string name="poi_tourism_yes">Toeristische bezienswaardigheid</string>
<string name="poi_lean_to">Schuilafdak</string>
<string name="poi_religion_voodoo">Voodoo</string>
<string name="poi_religion_unitarian_universalist">Unitarisch universalisme</string>
<string name="poi_religion_multifaith">Multireligieus</string>
<string name="poi_religion_jain">Jainisme</string>
<string name="poi_religion_spiritualist">Spiritualisme</string>
<string name="poi_religion_bahai">Bahaisme</string>
<string name="poi_religion_scientologist">Scientology</string>
<string name="poi_religion_pagan">Heidendom</string>
<string name="poi_religion_tenrikyo">Tenrikyo</string>
<string name="poi_religion_zoroastrian">Zoroastrisme</string>
<string name="poi_denomination_catholic">Katholiek</string>
<string name="poi_denomination_baptist">Baptisten</string>
<string name="poi_denomination_roman_catholic">Rooms Katholiek</string>
<string name="poi_denomination_orthodox">Orthodox</string>
<string name="poi_denomination_lutheran">Luthers</string>
<string name="poi_denomination_sunni">Sunni</string>
<string name="poi_denomination_protestant">Protestant</string>
<string name="poi_denomination_methodist">Methodistisch</string>
<string name="poi_denomination_anglican">Anglicaans</string>
<string name="poi_denomination_presbyterian">Presbyteriaans</string>
<string name="poi_denomination_evangelical">Evangelisch</string>
<string name="poi_denomination_russian_orthodox">Russisch Orthodox</string>
<string name="poi_denomination_pentecostal">Pinksterkerk</string>
<string name="poi_denomination_mormon">Mormoons</string>
<string name="poi_denomination_jehovahs_witness">Jehovahs Getuigen</string>
<string name="poi_denomination_greek_orthodox">Grieks Orthodox</string>
<string name="poi_denomination_reformed">Reformatorisch</string>
<string name="poi_denomination_seventh_day_adventist">Zevende dag adventist</string>
<string name="poi_denomination_new_apostolic">Nieuw Apostolisch</string>
<string name="poi_denomination_church_of_england">Church of England</string>
<string name="poi_denomination_episcopal">Episcopaal</string>
<string name="poi_denomination_shia">Shia</string>
<string name="poi_denomination_united">United Church</string>
<string name="poi_denomination_greek_catholic">Grieks Katholiek</string>
<string name="poi_denomination_tibetan">Tibetaans</string>
<string name="poi_denomination_united_reformed">United Reformed</string>
<string name="poi_denomination_church_of_scotland">Church of Scotland</string>
<string name="poi_denomination_salvation_army">Leger des Heils</string>
<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni cristo</string>
<string name="poi_denomination_uniting">Uniting Church</string>
<string name="poi_denomination_mennonite">Mennonieten</string>
<string name="poi_denomination_quaker">Quakers</string>
<string name="poi_denomination_bulgarian_orthodox">Bulgaars Orthodox</string>
<string name="poi_denomination_assemblies_of_god">Assemblies of God</string>
<string name="poi_denomination_nondenominational">Vrije Gemeente</string>
<string name="poi_denomination_adventist">Adventisten</string>
<string name="poi_denomination_nazarene">Nazareners</string>
<string name="poi_denomination_united_methodist">United Methodist</string>
<string name="poi_denomination_congregational">Congregational</string>
<string name="poi_denomination_old_believers">Oud-Orthodoxen</string>
<string name="poi_denomination_serbian_orthodox">Servisch-Orthodox</string>
<string name="poi_denomination_spiritist">Spiritisten</string>
<string name="poi_denomination_armenian_apostolic">Armeens Apostolisch</string>
<string name="poi_denomination_dutch_reformed">Nederlands Hervormd</string>
<string name="poi_denomination_apostolic">Apostolisch</string>
<string name="poi_denomination_reform">Gereformeerd</string>
<string name="poi_denomination_latter_day_saints">Heiligen der laatste dagen</string>
<string name="poi_denomination_church_of_christ">Church of Christ</string>
<string name="poi_denomination_united_church_of_christ">United Church of Christ</string>
<string name="poi_denomination_georgian_orthodox">Georgisch Orthodox</string>
<string name="poi_denomination_scientist">Scientisme</string>
<string name="poi_denomination_romanian_orthodox">Roemeens Orthodox</string>
</resources>

5
OsmAnd/res/values-pt-rBR/phrases.xml
View file

@ -2559,4 +2559,7 @@
<string name="poi_site_type_hut_circle">Tipo: círculo de cabana</string>
<string name="poi_fortification_type_ring_ditch">Tipo de fortificação: vala circular</string>
</resources>
<string name="poi_fitness_centre">Academia de ginástica</string>
<string name="poi_fitness">Fitness</string>
</resources>

3
OsmAnd/res/values-ru/phrases.xml
View file

@ -2540,4 +2540,7 @@
<string name="poi_building_type_pyramid">Тип здания: пирамида</string>
<string name="poi_fitness_centre">Фитнес-центр</string>
<string name="poi_fitness">Фитнес</string>
</resources>

10
OsmAnd/res/values-sl/strings.xml
View file

@ -82,7 +82,7 @@
<string name="context_menu_item_last_intermediate_point">Dodaj kot zadnji vmesni cilj</string>
<string name="add_as_last_destination_point">Dodaj kot zadnji vmesni cilj</string>
<string name="add_as_first_destination_point">Dodaj kot prvo vmesni cilj</string>
<string name="replace_destination_point">Zamenjaj ciljno točko</string>
<string name="replace_destination_point">Zamenjaj cilj</string>
<string name="new_destination_point_dialog">Ciljna točka je že določena.</string>
<string name="context_menu_item_intermediate_point">Dodaj kot vmesni cilj</string>
<string name="arrived_at_intermediate_point">Prispeli ste do vmesnega cilja</string>
@ -1172,7 +1172,7 @@
<string name="base_world_map">Osnovni zemljevid sveta</string>
<string name="shared_string_and">in</string>
<string name="shared_string_or">ali</string>
<string name="route_is_too_long">Usmerjanje brez povezave za točke, ki so oddaljene več kot 200 km, lahko traja zelo dolgo (ali včasih celo ne deluje). Za natančnejše določanje je priporočljivo dodati cilje na poti.</string>
<string name="route_is_too_long">Usmerjanje brez povezave za točke, ki so oddaljene več kot 200 km, lahko traja zelo dolgo (ali včasih celo ne deluje). Za natančnejše določanje je priporočljivo dodati vmesne cilje na poti.</string>
<string name="auto_zoom_none">Ne omogoči samodejnega približevanja</string>
<string name="auto_zoom_farthest">Na dolge razdalje</string>
<string name="map_magnifier">Velikost zemljevida</string>
@ -1666,8 +1666,8 @@
<string name="track_segments">Odsek sledi</string>
<string name="track_points">Točke sledi</string>
<string name="action_create">Ustvarjanje dejanja</string>
<string name="action_modify">Spreminjanje dejanja</string>
<string name="action_delete">Brisanje dejanja</string>
<string name="action_modify">Spremenjeno</string>
<string name="action_delete">Izbrisano</string>
<string name="osm_edits">Urejanje OSM</string>
<string name="osmand_parking_hour">h</string>
<string name="osmand_parking_minute">min</string>
@ -1687,7 +1687,7 @@
<string name="shared_string_unexpected_error">Prišlo je do nepričakovane napake</string>
<string name="shared_string_action_template">Dejanje {0}</string>
<string name="shared_string_collapse">Zloži</string>
<string name="shared_string_currently_recording_track">Trenutno beležena sled</string>
<string name="shared_string_currently_recording_track">Beleženje sledi</string>
<string name="shared_string_audio">Zvok</string>
<string name="shared_string_video">Video</string>
<string name="shared_string_photo">Fotografija</string>

5
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -2029,4 +2029,7 @@
<string name="no_address_found">沒有確定地址</string>
<string name="looking_up_address">查尋地址</string>
<string name="rendering_attr_horseRoutes_name">馬道</string>
</resources>
<string name="update_every">更新全部</string>
<string name="only_download_over_wifi">只在 WiFi 連線下載</string>
<string name="live_update">即時更新</string>
</resources>

3
OsmAnd/res/values/phrases.xml
View file

@ -2534,4 +2534,7 @@
<string name="poi_building_type_pyramid">Building type: pyramid</string>
<string name="poi_fitness_centre">Fitness centre</string>
<string name="poi_fitness">Fitness</string>
</resources>

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

@ -9,6 +9,11 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string-array name="update_frequencies_array">
<item>Every Hour</item>
<item>Once a day</item>
<item>Weekly</item>
</string-array>
<string name="rendering_attr_horseRoutes_name">Horse routes</string>
<string name="no_address_found">No address determined</string>
<string name="shared_string_near">Near</string>
@ -2105,4 +2110,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="use_drawer_btn">Use menu</string>
<string name="dashboard_or_drawer_title">Dashboard or menu control</string>
<string name="dashboard_or_drawer_description">There is a new choice to primarily control the app via the flexible dashboard or a static menu. Your choice can always be changed in the dashboard settings.</string>
<string name="update_every">Update every</string>
<string name="only_download_over_wifi">Only download over WiFi</string>
<string name="live_update">Live update</string>
</resources>

9
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -671,7 +671,7 @@ public class OsmandSettings {
"default_driving_region", DrivingRegion.EUROPE_ASIA, DrivingRegion.values()) {
protected boolean setValue(Object prefs, DrivingRegion val) {
if(val != null) {
((CommonPreference<MetricsConstants>)METRIC_SYSTEM).set(val.defMetrics);
METRIC_SYSTEM.set(val.defMetrics);
}
return super.setValue(prefs, val);
};
@ -1855,8 +1855,11 @@ public class OsmandSettings {
public final OsmandPreference<Long> AGPS_DATA_LAST_TIME_DOWNLOADED =
new LongPreference("agps_data_downloaded", 0).makeGlobal();
// Live Updates
public final OsmandPreference<Boolean> IS_LIVE_UPDATES_ON =
new BooleanPreference("IS_LIVE_UPDATES_ON", false).makeGlobal();
// UI boxes
public final CommonPreference<Boolean> TRANSPARENT_MAP_THEME =
new BooleanPreference("transparent_map_theme", true).makeProfile();

2
OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
View file

@ -124,7 +124,7 @@ public class DownloadIndexesThread {
}
contentText.append(i.getVisibleName(app, app.getRegions()));
}
bld.setContentTitle(msg).setSmallIcon(R.drawable.ic_action_import).
bld.setContentTitle(msg).setSmallIcon(android.R.drawable.stat_sys_download).
setContentText(contentText.toString()).
setContentIntent(contentPendingIntent).setOngoing(true);
int progress = getCurrentDownloadingItemProgress();

42
OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
View file

@ -9,16 +9,20 @@ import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.SwitchCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.CompoundButton;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.ToggleButton;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.ActionBarProgressActivity;
import net.osmand.plus.activities.LocalIndexHelper;
@ -43,6 +47,27 @@ public class LiveUpdatesFragment extends Fragment {
View view = inflater.inflate(R.layout.fragment_live_updates, container, false);
ListView listView = (ListView) view.findViewById(android.R.id.list);
View header = inflater.inflate(R.layout.live_updates_header, listView, false);
final OsmandSettings settings = getMyActivity().getMyApplication().getSettings();
final TextView onOffTextView = (TextView) header.findViewById(R.id.onOffTextView);
int liveUpdatesStateId = settings.IS_LIVE_UPDATES_ON.get()
? R.string.shared_string_on : R.string.shared_string_off;
onOffTextView.setText(liveUpdatesStateId);
SwitchCompat liveUpdatesSwitch = (SwitchCompat) header.findViewById(R.id.liveUpdatesSwitch);
liveUpdatesSwitch.setChecked(settings.IS_LIVE_UPDATES_ON.get());
liveUpdatesSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
settings.IS_LIVE_UPDATES_ON.set(isChecked);
int liveUpdatesStateId = isChecked ? R.string.shared_string_on
: R.string.shared_string_off;
onOffTextView.setText(liveUpdatesStateId);
}
});
listView.addHeaderView(header);
LiveUpdatesAdapter adapter = new LiveUpdatesAdapter(this);
listView.setAdapter(adapter);
@ -159,11 +184,28 @@ public class LiveUpdatesFragment extends Fragment {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
View view = LayoutInflater.from(getActivity())
.inflate(R.layout.dialog_live_updates_item_settings, null);
builder.setView(view)
.setPositiveButton("SAVE", null)
.setNegativeButton("CANCEL", null)
.setNeutralButton("UPDATE NOW", null);
return builder.create();
}
private void initSwitch(ToggleButton toggleButton, String idPostfix, LocalIndexInfo item) {
final OsmandApplication myApplication = ((OsmandActionBarActivity) this.getActivity()).getMyApplication();
final OsmandSettings settings = myApplication.getSettings();
final String settingId = item.getFileName() + idPostfix;
final OsmandSettings.CommonPreference<Boolean> preference =
settings.registerBooleanPreference(settingId, false);
boolean initialValue = preference.get();
toggleButton.setChecked(initialValue);
toggleButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
preference.set(isChecked);
}
});
}
}
}