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 (file)
--- 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\r
        {\r
                String  result_type;    // TWN,STR,SHN\r
-               String          item_id; // H<ddddd>L<ddddd> -> item.id_hi item.id_lo\r
+               String  item_id;                // H<ddddd>L<ddddd> -> item.id_hi item.id_lo\r
                float           lat;\r
                float           lon;\r
                String  addr;\r
@@ -746,7 +746,8 @@ public class Navit extends Activity implements Handler.Callback
                if (Navit_last_address_search_string.equals(""))\r
                {\r
                        // empty search string entered\r
-                       Toast.makeText(getApplicationContext(), Navit.get_text("No address found"), Toast.LENGTH_LONG).show(); //TRANS\r
+                       Toast.makeText(getApplicationContext(), Navit.get_text("No address found"),\r
+                                       Toast.LENGTH_LONG).show(); //TRANS\r
                }\r
                else\r
                {\r
@@ -969,8 +970,8 @@ public class Navit extends Activity implements Handler.Callback
                                                        if (addr.equals(""))\r
                                                        {\r
                                                                // empty search string entered\r
-                                                               Toast.makeText(getApplicationContext(), Navit.get_text("No search string entered"),\r
-                                                                               Toast.LENGTH_LONG).show(); //TRANS\r
+                                                               Toast.makeText(getApplicationContext(),\r
+                                                                               Navit.get_text("No search string entered"), Toast.LENGTH_LONG).show(); //TRANS\r
                                                        }\r
                                                        else\r
                                                        {\r
@@ -1016,7 +1017,8 @@ public class Navit extends Activity implements Handler.Callback
                                                        Toast\r
                                                                        .makeText(\r
                                                                                        getApplicationContext(),\r
-                                                                                       Navit.get_text("setting destination to")+"\n"\r
+                                                                                       Navit.get_text("setting destination to")\r
+                                                                                                       + "\n"\r
                                                                                                        + Navit.NavitAddressResultList_foundItems\r
                                                                                                                        .get(destination_id).addr, Toast.LENGTH_LONG).show(); //TRANS\r
 \r
@@ -1360,7 +1362,8 @@ public class Navit extends Activity implements Handler.Callback
                                progressThread_pri.start();\r
                                // show license for OSM maps\r
                                Toast.makeText(getApplicationContext(),\r
-                                               Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"), Toast.LENGTH_LONG).show(); //TRANS\r
+                                               Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"),\r
+                                               Toast.LENGTH_LONG).show(); //TRANS\r
                                return mapdownloader_dialog_pri;\r
                        case Navit.MAPDOWNLOAD_SEC_DIALOG :\r
                                mapdownloader_dialog_sec = new ProgressDialog(this);\r
@@ -1387,7 +1390,8 @@ public class Navit extends Activity implements Handler.Callback
                                progressThread_sec.start();\r
                                // show license for OSM maps\r
                                Toast.makeText(getApplicationContext(),\r
-                                               Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"), Toast.LENGTH_LONG).show(); //TRANS\r
+                                               Navit.get_text("Map data (c) OpenStreetMap contributors, CC-BY-SA"),\r
+                                               Toast.LENGTH_LONG).show(); //TRANS\r
                                return mapdownloader_dialog_sec;\r
                }\r
                // should never get here!!\r

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 (file)
--- 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)