From: zoff99 Date: Sun, 6 Mar 2011 11:08:35 +0000 (+0000) Subject: Fix:Android:small visual fixes X-Git-Tag: navit-0.5.0.5194svn~889 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c87be09c5fd57b920f8c5cbd21350dcb81f53c3;p=profile%2Fivi%2Fnavit.git Fix:Android:small visual fixes git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4306 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- diff --git a/navit/navit/android/src/org/navitproject/navit/Navit.java b/navit/navit/android/src/org/navitproject/navit/Navit.java index 8bff908..9aa97d3 100644 --- a/navit/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/navit/android/src/org/navitproject/navit/Navit.java @@ -63,7 +63,7 @@ public class Navit extends Activity implements Handler.Callback public static final class Navit_Address_Result_Struct { String result_type; // TWN,STR,SHN - String item_id; // HL -> item.id_hi item.id_lo + String item_id; // HL -> item.id_hi item.id_lo float lat; float lon; String addr; @@ -746,7 +746,8 @@ public class Navit extends Activity implements Handler.Callback if (Navit_last_address_search_string.equals("")) { // empty search string entered - Toast.makeText(getApplicationContext(), Navit.get_text("No address found"), Toast.LENGTH_LONG).show(); //TRANS + Toast.makeText(getApplicationContext(), Navit.get_text("No address found"), + Toast.LENGTH_LONG).show(); //TRANS } else { @@ -969,8 +970,8 @@ public class Navit extends Activity implements Handler.Callback if (addr.equals("")) { // empty search string entered - Toast.makeText(getApplicationContext(), Navit.get_text("No search string entered"), - Toast.LENGTH_LONG).show(); //TRANS + Toast.makeText(getApplicationContext(), + Navit.get_text("No search string entered"), Toast.LENGTH_LONG).show(); //TRANS } else { @@ -1016,7 +1017,8 @@ public class Navit extends Activity implements Handler.Callback Toast .makeText( getApplicationContext(), - Navit.get_text("setting destination to")+"\n" + Navit.get_text("setting destination to") + + "\n" + Navit.NavitAddressResultList_foundItems .get(destination_id).addr, Toast.LENGTH_LONG).show(); //TRANS @@ -1360,7 +1362,8 @@ public class Navit extends Activity implements Handler.Callback progressThread_pri.start(); // show license for OSM maps Toast.makeText(getApplicationContext(), - Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"), Toast.LENGTH_LONG).show(); //TRANS + Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"), + Toast.LENGTH_LONG).show(); //TRANS return mapdownloader_dialog_pri; case Navit.MAPDOWNLOAD_SEC_DIALOG : mapdownloader_dialog_sec = new ProgressDialog(this); @@ -1387,7 +1390,8 @@ public class Navit extends Activity implements Handler.Callback progressThread_sec.start(); // show license for OSM maps Toast.makeText(getApplicationContext(), - Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"), Toast.LENGTH_LONG).show(); //TRANS + Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"), + Toast.LENGTH_LONG).show(); //TRANS return mapdownloader_dialog_sec; } // should never get here!! diff --git a/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java index d2b4f54..d2678c6 100644 --- a/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java +++ b/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java @@ -1241,8 +1241,8 @@ public class NavitGraphics tmp_addr.lat = Float.parseFloat(tmp_s[2]); tmp_addr.lon = Float.parseFloat(tmp_s[3]); // the rest ist address - tmp_addr.addr = s.substring(4 + tmp_s[0].length() + tmp_s[1].length() + tmp_s[2].length() + tmp_s[3].length(), s - .length()); + tmp_addr.addr = s.substring(4 + tmp_s[0].length() + tmp_s[1].length() + tmp_s[2].length() + + tmp_s[3].length(), s.length()); Navit.NavitAddressResultList_foundItems.add(tmp_addr); if (tmp_addr.result_type.equals("TWN")) @@ -1265,8 +1265,9 @@ public class NavitGraphics b.putInt("cur", Navit.NavitAddressResultList_foundItems.size() % (Navit.ADDRESS_RESULTS_DIALOG_MAX + 1)); b.putString("title", Navit.get_text("loading search results")); //TRANS - b.putString("text", Navit.get_text("towns")+":" + Navit.search_results_towns + " " + Navit.get_text("Streets") - + ":" + (int) (Navit.search_results_streets + Navit.search_results_streets_hn)); + b.putString("text", Navit.get_text("towns") + ":" + Navit.search_results_towns + " " + + Navit.get_text("Streets") + ":" + Navit.search_results_streets + "/" + + Navit.search_results_streets_hn); Navit.msg_to_msg_handler(b, 10); //TRANS } public void SearchResultList(int i, int partial_match, String text)