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-11-30 22:52:01 +01:00
commit 218c2cc62a
7 changed files with 187 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2409,7 +2409,7 @@
<string name="poi_sculptor">Billedhugger</string>
<string name="poi_cross">Kors</string>
<string name="poi_summit_cross">Topkors: ja</string>
<string name="poi_summit_cross">Kors på toppen: ja</string>
<string name="poi_prison_camp">Tidligere fangelejr</string>
<string name="poi_concentration_camp">Type: koncentrationslejr</string>
@ -2429,7 +2429,7 @@
<string name="poi_boat_storage">Bådopbevaring</string>
<string name="poi_conveying_yes">Flytning: ja</string>
<string name="poi_conveying_yes">Transportør: ja</string>
<string name="poi_bridge_ref">Bro ref</string>
@ -2517,4 +2517,76 @@
<string name="poi_internet_access_type_yes">Med internetadgang</string>
<string name="poi_health_specialty_general_yes">Sundhedsspeciale: alment praktiserende læge</string>
<string name="poi_health_specialty_ophthalmology_yes">Sundhedsspeciale: oftalmologi</string>
<string name="poi_health_specialty_gynaecology_yes">Sundhedsspeciale: gynækologi</string>
<string name="poi_health_specialty_internal_medicine_yes">Sundhedsspeciale: intern medicin</string>
<string name="poi_health_specialty_orthopaedics_yes">Sundhedsspeciale: ortopædkirurgi</string>
<string name="poi_health_specialty_otolaryngology_yes">oto-rhino-laryngolog: oto-rhino-laryngolog</string>
<string name="poi_health_specialty_paediatrics_yes">Sundhedsspeciale: pædiatri</string>
<string name="poi_health_specialty_paediatrics_no">Sundhedsspeciale: pædiatri: nej</string>
<string name="poi_health_specialty_dermatology_yes">Sundhedsspeciale: dermatologi</string>
<string name="poi_health_specialty_urology_yes">Sundhedsspeciale: urologi</string>
<string name="poi_health_specialty_surgery_yes">Sundhedsspeciale: almen kirurgi</string>
<string name="poi_health_specialty_radiology_yes">Sundhedsspeciale: radiologi</string>
<string name="poi_health_specialty_psychiatry_yes">Sundhedsspeciale: psykiatri</string>
<string name="poi_health_specialty_neurology_yes">Sundhedsspeciale: neurologi</string>
<string name="poi_health_specialty_dermatovenereology_yes">Sundhedsspeciale: dermato-venerologi</string>
<string name="poi_health_specialty_cardiology_yes">Sundhedsspeciale: kardiologi</string>
<string name="poi_health_specialty_trauma_yes">Sundhedsspeciale: traumatologi</string>
<string name="poi_health_specialty_biology_yes">Sundhedsspeciale: klinisk biologi</string>
<string name="poi_health_specialty_osteopathy_yes">Sundhedsspeciale: osteopati</string>
<string name="poi_health_specialty_anaesthetics_yes">Sundhedsspeciale: anæstetika</string>
<string name="poi_health_specialty_pulmonology_yes">Sundhedsspeciale: pneumologi</string>
<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Sundhedsspeciale: tand-, mund- og kæbe ansigtskirurgi</string>
<string name="poi_health_specialty_maternity_yes">Sundhedsspeciale: barsel</string>
<string name="poi_health_specialty_emergency_medicine_yes">Sundhedsspeciale: ulykkes- og katastrofemedicin</string>
<string name="poi_health_specialty_emergency_medicine_no">Sundhedsspeciale: ulykkes- og katastrofemedicin: nej</string>
<string name="poi_health_specialty_plastic_surgery_yes">Sundhedsspeciale: plastikkirurgi</string>
<string name="poi_health_specialty_orthodontics_yes">Sundhedsspeciale: ortodonti</string>
<string name="poi_health_specialty_physiotherapy_yes">Sundhedsspeciale: fysioterapi</string>
<string name="poi_health_specialty_biochemistry_yes">Sundhedsspeciale: biokemi</string>
<string name="poi_health_specialty_occupational_yes">Sundhedsspeciale: ergoterapi</string>
<string name="poi_health_specialty_child_psychiatry_yes">Sundhedsspeciale: børnepsykiatri</string>
<string name="poi_health_specialty_physiatry_yes">Sundhedsspeciale: fysisk medicin og rehabilitering</string>
<string name="poi_health_specialty_maxillofacial_surgery_yes">Sundhedsspeciale:-ansigtskirurgi</string>
<string name="poi_health_specialty_diagnostic_radiology_yes">Sundhedsspeciale: diagnostisk radiologi</string>
<string name="poi_health_specialty_gastroenterology_yes">Sundhedsspeciale: gastroenterologi</string>
<string name="poi_health_specialty_dentistry_yes">Sundhedsspeciale: tandpleje</string>
<string name="poi_health_specialty_nephrology_yes">Sundhedsspeciale: nefrologi (nyre sygdomme)</string>
<string name="poi_health_specialty_neurosurgery_yes">Sundhedsspeciale: neurokirurgi</string>
<string name="poi_health_specialty_neuropsychiatry_yes">Sundhedsspeciale: neuropsykiatri</string>
<string name="poi_health_specialty_endocrinology_yes">Sundhedsspeciale: endokrinologi</string>
<string name="poi_health_specialty_nuclear_medicine_yes">Sundhedsspeciale: nuklear medicin</string>
<string name="poi_health_specialty_pathology_yes">Sundhedsspeciale: patologisk anatomi</string>
<string name="poi_health_specialty_oncology_yes">Sundhedsspeciale: onkologi</string>
<string name="poi_health_specialty_tropical_medicine_yes">Sundhedsspeciale: tropemedicin</string>
<string name="poi_health_specialty_tropical_medicine_no">Sundhedsspeciale: tropemedicin: nej</string>
<string name="poi_health_specialty_obstetrics_postnatal_yes">Sundhedsspeciale: obstetrik (postnatal)</string>
<string name="poi_health_specialty_obstetrics_postnatal_no">Sundhedsspeciale: obstetrik (postnatal): nej</string>
<string name="poi_health_specialty_obstetrics_antenatal_yes">Sundhedsspeciale: obstetrik (før fødslen)</string>
<string name="poi_health_specialty_obstetrics_antenatal_no">Sundhedsspeciale: obstetrik (før fødslen): nej</string>
<string name="poi_health_specialty_social_paediatrics_yes">Sundhedsspeciale: socialpædiatri</string>
<string name="poi_health_specialty_social_paediatrics_no">Sundhedspeciale: socialpædiatri: nej</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Sundhedsspeciale: obstetrik (kejsersnit)</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_no">Sundhedsspeciale: obstetrik (kejsersnit): nej</string>
<string name="poi_health_specialty_addiction_medicine_yes">Sundhedsspeciale: afhængighed af medicin</string>
<string name="poi_health_specialty_optometry_yes">Sundhedsspeciale: optometry</string>
<string name="poi_health_specialty_clinical_pathology_yes">Sundhedspeciale: klinisk patologi</string>
<string name="poi_health_specialty_speech_therapy_yes">Sundhedsspeciale: taleterapi</string>
<string name="poi_health_specialty_manual_therapy_yes">Sundhedsspeciale: manuel terapi</string>
<string name="poi_health_specialty_sports_medicine_yes">Sundhedsspeciale: sportsmedicin</string>
<string name="poi_health_specialty_podology_yes">Sundhedsspeciale: podology</string>
<string name="poi_health_specialty_adult_psychiatry_yes">Sundhedsspeciale: voksenpsykiatri</string>
<string name="poi_health_specialty_acupuncture_yes">Sundhedsspeciale: akupunktur</string>
<string name="poi_health_specialty_homeopathy_yes">Sundhedsspeciale: homøopati</string>
<string name="poi_health_specialty_traditional_chinese_medicine_yes">Sundhedsspeciale: traditionel kinesiskmedicin</string>
<string name="poi_health_specialty_reiki_yes">Sundhedsspeciale: reiki</string>
<string name="poi_health_specialty_herbalism_yes">Sundhedsspeciale: naturmedicin</string>
<string name="poi_health_specialty_chiropractic_yes">Sundhedspeciale: kiropraktik</string>
<string name="poi_health_specialty_naturopathy_yes">Sundhesspeciale: naturopati</string>
<string name="poi_health_specialty_depth_psychology_yes">Sundhedsspeciale: dybde psykologi</string>
<string name="poi_health_specialty_behavior_yes">Sundhedsspeciale: adfærd</string>
</resources>

72
OsmAnd/res/values-de/phrases.xml
View file

@ -2444,4 +2444,76 @@
<string name="poi_wetland_palsa_bog">Palsamoor</string>
<string name="poi_payment_icsf_yes">IC gespeicherte Fährfahrkarten akzeptiert</string>
<string name="poi_payment_icsf_no">IC gespeicherte Fährfahrkarten nicht akzeptiert</string>
<string name="poi_health_specialty_general_yes">Hausarzt</string>
<string name="poi_health_specialty_ophthalmology_yes">Augenheilkunde</string>
<string name="poi_health_specialty_gynaecology_yes">Gynäkologie</string>
<string name="poi_health_specialty_internal_medicine_yes">Innere Medizin</string>
<string name="poi_health_specialty_orthopaedics_yes">Orthopädie</string>
<string name="poi_health_specialty_otolaryngology_yes">Hals-Nasen-Ohrenheilkunde</string>
<string name="poi_health_specialty_paediatrics_yes">Kinderheilkunde</string>
<string name="poi_health_specialty_paediatrics_no">Kinderheilkunde: nein</string>
<string name="poi_health_specialty_dermatology_yes">Dermatologie</string>
<string name="poi_health_specialty_urology_yes">Urologie</string>
<string name="poi_health_specialty_surgery_yes">(Allgemeine) Chirurgie</string>
<string name="poi_health_specialty_radiology_yes">Radiologie</string>
<string name="poi_health_specialty_psychiatry_yes">Psychiatrie und Psychotherapie</string>
<string name="poi_health_specialty_neurology_yes">Neurologie</string>
<string name="poi_health_specialty_dermatovenereology_yes">Haut- und Geschlechtskrankheiten</string>
<string name="poi_health_specialty_cardiology_yes">Innere Medizin und Schwerpunkt Kardiologie</string>
<string name="poi_health_specialty_trauma_yes">Traumatologie</string>
<string name="poi_health_specialty_biology_yes">Klinische Biologie</string>
<string name="poi_health_specialty_osteopathy_yes">Osteopathie (Alternativmedizin)</string>
<string name="poi_health_specialty_anaesthetics_yes">Anästhesiologie</string>
<string name="poi_health_specialty_pulmonology_yes">Pneumologie</string>
<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Zahn-, Mund-, Kiefer- und Gesichtschirurgie</string>
<string name="poi_health_specialty_maternity_yes">Mutterschaft</string>
<string name="poi_health_specialty_emergency_medicine_yes">Unfall- und Notfallmedizin</string>
<string name="poi_health_specialty_emergency_medicine_no">Unfall- und Notfallmedizin: Nein</string>
<string name="poi_health_specialty_plastic_surgery_yes">Plastische Chirurgie</string>
<string name="poi_health_specialty_orthodontics_yes">Kieferorthopädie</string>
<string name="poi_health_specialty_physiotherapy_yes">Krankengymnastik</string>
<string name="poi_health_specialty_biochemistry_yes">Biologische Chemie</string>
<string name="poi_health_specialty_occupational_yes">Ergotherapie</string>
<string name="poi_health_specialty_child_psychiatry_yes">Kinderpsychiatrie</string>
<string name="poi_health_specialty_physiatry_yes">Physikalische Medizin und Rehabilitation</string>
<string name="poi_health_specialty_maxillofacial_surgery_yes">Kiefer- und Gesichtschirurgie</string>
<string name="poi_health_specialty_diagnostic_radiology_yes">diagnostische Radiologie</string>
<string name="poi_health_specialty_gastroenterology_yes">Innere Medizin und Schwerpunkt Gastroenterologie</string>
<string name="poi_health_specialty_dentistry_yes">Zahnheilkunde</string>
<string name="poi_health_specialty_nephrology_yes">Nephrologie (Nierenerkrankungen)</string>
<string name="poi_health_specialty_neurosurgery_yes">Neurochirurgie</string>
<string name="poi_health_specialty_neuropsychiatry_yes">Nervenheilkunde (Neurologie und Psychiatrie)</string>
<string name="poi_health_specialty_endocrinology_yes">Innere Medizin und Schwerpunkt Endokrinologie und Diabetologie</string>
<string name="poi_health_specialty_nuclear_medicine_yes">Nuklearmedizin</string>
<string name="poi_health_specialty_pathology_yes">Pathologie</string>
<string name="poi_health_specialty_oncology_yes">Onkologie</string>
<string name="poi_health_specialty_tropical_medicine_yes">Tropenmedizin</string>
<string name="poi_health_specialty_tropical_medicine_no">Tropenmedizin: Nein</string>
<string name="poi_health_specialty_obstetrics_postnatal_yes">Geburtshilfe (postnatal)</string>
<string name="poi_health_specialty_obstetrics_postnatal_no">Geburtshilfe (nachgeburtlich): Nein</string>
<string name="poi_health_specialty_obstetrics_antenatal_yes">Geburtshilfe (vorgeburtliche)</string>
<string name="poi_health_specialty_obstetrics_antenatal_no">Geburtshilfe (vorgeburtliche): Nein</string>
<string name="poi_health_specialty_social_paediatrics_yes">Sozialpädiatrie</string>
<string name="poi_health_specialty_social_paediatrics_no">Sozialpädiatrie: Nein</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Geburtshilfe (Kaiserschnitt)</string>
<string name="poi_health_specialty_obstetrics_caesarean_section_no">Geburtshilfe (Kaiserschnitt): Nein</string>
<string name="poi_health_specialty_addiction_medicine_yes">Suchtmedizin</string>
<string name="poi_health_specialty_optometry_yes">praktische Augenheilkunde</string>
<string name="poi_health_specialty_clinical_pathology_yes">Klinische Pathologie</string>
<string name="poi_health_specialty_speech_therapy_yes">Logopädie (Sprachtherapie)</string>
<string name="poi_health_specialty_manual_therapy_yes">Physiotherapie</string>
<string name="poi_health_specialty_sports_medicine_yes">Sportmedizin</string>
<string name="poi_health_specialty_podology_yes">Podologie</string>
<string name="poi_health_specialty_adult_psychiatry_yes">Erwachsenenpsychiatrie</string>
<string name="poi_health_specialty_acupuncture_yes">Akupunktur</string>
<string name="poi_health_specialty_homeopathy_yes">Homöopathie</string>
<string name="poi_health_specialty_traditional_chinese_medicine_yes">Traditionelle chinesische Medizin</string>
<string name="poi_health_specialty_reiki_yes">Reiki</string>
<string name="poi_health_specialty_herbalism_yes">Kräuterkunde</string>
<string name="poi_health_specialty_chiropractic_yes">Chiropraktik</string>
<string name="poi_health_specialty_naturopathy_yes">Naturheilkunde</string>
<string name="poi_health_specialty_depth_psychology_yes">Tiefenpsychologie</string>
<string name="poi_health_specialty_behavior_yes">Verhalten</string>
</resources>

8
OsmAnd/src/net/osmand/plus/dashboard/DashRateUsFragment.java
View file

@ -1,6 +1,5 @@
package net.osmand.plus.dashboard;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
@ -84,17 +83,12 @@ public class DashRateUsFragment extends DashBaseFragment {
positiveButton.setText(getResources().getString(R.string.shared_string_ok));
negativeButton.setText(getResources().getString(R.string.shared_string_no_thanks));
return;
<<<<<<< HEAD
case USER_LIKES_APP:
settings.RATE_US_STATE.set(RateUsBottomSheetDialog.RateUsState.LIKED);
Uri uri = Uri.parse(Version.marketPrefix(getMyApplication()) + getActivity().getPackageName());
Intent goToMarket = new Intent(Intent.ACTION_VIEW, uri);
try {
startActivity(goToMarket);
} catch (ActivityNotFoundException e) {
startActivity(new Intent(Intent.ACTION_VIEW,
Uri.parse(Version.marketPrefix(getMyApplication()) + getActivity().getPackageName())));
}
break;
case USER_DISLIKES_APP:
String email = getString(R.string.support_email);

17
OsmAnd/src/net/osmand/plus/dialogs/RateUsBottomSheetDialog.java
View file

@ -1,6 +1,5 @@
package net.osmand.plus.dialogs;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
@ -10,6 +9,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
@ -35,11 +35,11 @@ public class RateUsBottomSheetDialog extends BottomSheetDialogFragment {
return view;
}
public static boolean shouldShow(OsmandApplication app) {
if(!Version.isMarketEnabled(app)) {
public static boolean shouldShow(OsmandApplication application) {
if (Version.isMarketEnabled(application)) {
return false;
}
OsmandSettings settings = app.getSettings();
OsmandSettings settings = application.getSettings();
if(!settings.LAST_DISPLAY_TIME.isSet()) {
settings.LAST_DISPLAY_TIME.set(System.currentTimeMillis());
}
@ -115,16 +115,9 @@ public class RateUsBottomSheetDialog extends BottomSheetDialogFragment {
return;
case USER_LIKES_APP:
settings.RATE_US_STATE.set(RateUsBottomSheetDialog.RateUsState.LIKED);
// Assuming GooglePlay
Uri uri = Uri.parse("market://details?id=" + getActivity().getPackageName());
Uri uri = Uri.parse(Version.marketPrefix(getMyApplication()) + getActivity().getPackageName());
Intent goToMarket = new Intent(Intent.ACTION_VIEW, uri);
try {
startActivity(goToMarket);
} catch (ActivityNotFoundException e) {
startActivity(new Intent(Intent.ACTION_VIEW,
Uri.parse("http://play.google.com/store/apps/details?id="
+ getActivity().getPackageName())));
}
break;
case USER_DISLIKES_APP:
String email = getString(R.string.support_email);

6
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
View file

@ -133,15 +133,13 @@ public abstract class MenuController extends BaseMenuController {
}
public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) {
addMyLocationToPlainItems(pointDescription, latLon);
addMyLocationToPlainItems(latLon);
}
protected void addMyLocationToPlainItems(PointDescription pointDescription, LatLon latLon) {
if (pointDescription != null) {
protected void addMyLocationToPlainItems(LatLon latLon) {
addPlainMenuItem(R.drawable.ic_action_get_my_location, PointDescription.getLocationName(getMapActivity(),
latLon.getLatitude(), latLon.getLongitude(), true).replaceAll("\n", ""), false);
}
}
public PointDescription getPointDescription() {
return pointDescription;

5
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
View file

@ -12,6 +12,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import net.osmand.data.Amenity;
import net.osmand.data.PointDescription;
import net.osmand.osm.AbstractPoiType;
import net.osmand.osm.MapPoiTypes;
import net.osmand.osm.PoiType;
@ -281,6 +282,10 @@ public class AmenityMenuBuilder extends MenuBuilder {
for (AmenityInfoRow info : descriptions) {
buildAmenityRow(view, info);
}
buildRow(view, R.drawable.ic_action_get_my_location, PointDescription.getLocationName(app,
amenity.getLocation().getLatitude(), amenity.getLocation().getLongitude(), true)
.replaceAll("\n", ""), 0, false, 0);
}
public void buildAmenityRow(View view, AmenityInfoRow info) {

1
OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AmenityMenuController.java
View file

@ -99,6 +99,5 @@ public class AmenityMenuController extends MenuController {
}
addPlainMenuItem(resId, typeStr, false);
}
addMyLocationToPlainItems(pointDescription, amenity.getLocation());
}
}