From 15bcbac26ad8c6682318574c39cab77e2d38c4a5 Mon Sep 17 00:00:00 2001
From: frolovmo <frolovmo@e29c36b1-1cfa-d876-8d93-3434fc2bb7b8>
Date: Wed, 5 May 2010 10:34:17 +0000
Subject: [PATCH] add back button

git-svn-id: https://osmand.googlecode.com/svn/trunk@34 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
---
 OsmAnd/res/drawable/back.png                  | Bin 0 -> 1505 bytes
 OsmAnd/res/layout/main.xml                    |   3 +-
 OsmAnd/res/layout/menu.xml                    |  31 +++++++++++++-----
 .../osmand/activities/MainMenuActivity.java   |   5 +--
 .../com/osmand/activities/MapActivity.java    |  14 ++++----
 5 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 OsmAnd/res/drawable/back.png

diff --git a/OsmAnd/res/drawable/back.png b/OsmAnd/res/drawable/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..da51117a58dd88af98a885140bff2bfa79c3b851
GIT binary patch
literal 1505
zcmV<71s?i|P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000H3Nkl<Zc-rk*
z4@}fm9DncK-S3X$_~RKc(I!Zi;dD|XThqiJ)v77OmNpq$>CkemrPV6`%(WS7v({YM
zmZ@tD7!)%gW<*W1a!oX+Qkj2dnhF*mAaLFt-g|xC@jE)sJGeU_j*ai`?R|c~-~03Z
zeE+=ne!rt+j0+uY1;z=CwgTe>Mq7c1Cb0h7zl=7=t$lhOHSc^Pb>WyIQ1I1-#}eX<
zUs_`ov)#cvH_uIq9Ww-0Rh=)Iof5y|a<ffbZMD%@v%Y=T;=3k9Jb{AhvzZfOqV`X+
zM%{7rYzrY=5K1YrL>X>;vN$a+q6w_3JoEm{sn!iwTDr)U=5AupGcJ|qLNJTT(Ee%8
z^vLwUn(8xYF(zYOa)No<u`~Y&7c|!C7{enjpK}fZQHJ(Cx%WgKf#>%9zH#Q%iSIPF
zc9B1?bxNzdL&jT#5X59)cEzCE${5uTWj^i_OsAvOyK-in8WMqm%F{_^lk)YQiI$A|
z(@nzVg4Nl7R)_RqK`<$!B4c_Yz2)NJOxGvyENSVmk?Wlf%ibmF-C+?}@%gFMv!*5N
zZffl&=dQL9qd~_ttNSG&F}%QUA)y1b3E0mU3yhI$wXhp@XLji`vk!zsU`^F;(TZMQ
zlbRf#b-3XQk=E4f*pMt5stC6YI6PrcEAr<Y44OcG`H3azDG6oG?cK`hORXI7OxPe+
z4*`eN4<s06M6G-_b8rF$l?_zSSb5rH>(avwmx;Z{MGXJ5)%^;kYW4FE3``)u?D+f{
zQxj{N+q+_az3?|;U5{7?dqVp%Q6{M8I$Ru9Kc-V_RzDb+z}l*YkJBbkeDSA~7s<^Y
zCs%aXm9U~S!rZl|o%eOPIGlb+1$BSHyxR#ZFFBH)o;vB9){d?zC(bp&>asa=^X_db
ze7bmFhl@k+Cx}k1T|2)&f!w0{r1UA)YbVb)lA8`E$EF0$=|Blb$S5SS#DX%l?u7;Y
z2`nu+rnFvfYr+jHf{X_-+2|2qO#N=%LjO6Seppw8WL*)-FKbvy)dMeO2TtOw9d(a@
za20k~vyYV`!UOoJ2VZ`4;AJ#xN3Fs+{{k>aJ1RsF0jeH)<?-Nl;)g%j|1^k{V;yD@
z6IIyAeq8@#@JESx@6}j1<u!!U1#pI3(?l4S4unJR2Lgv*T@*Y4k36)!ay7P--CDOW
z-9K~!lu`BP*K<NAAZ6~ml}VKHT6CQgYTw}!ylH12c_TNp<Fv127FN85&f5tc+#5o;
z55m;<Z7pn}G^PH{r!EbNfRy_SD^hVpsYQa{t&Qa8_$xd+`VYX8!%)r=a@_J?HZS|A
zkIQfvBx76IHYE5ae}myQip0l6JHOwMV;mOi`^c~@j2Um2&g7KT!NAEL-FpcLW>O4}
z`nQ&vBAS3lW^FCri5Oj{4a_A0vr%!>Z(KGu2)IdXDVhiK*C62IWd0iAf#X}2j~xOY
zxp&iNCCI-#xeEPJxN1b+MMwN_Fk|E1MX1t1V8@swFw!zkV6<hNfVY&EmiB(GV+<QW
z@2SEc&dbXa;m<Mvf#Tv~iU|}zJti{(8-Pu~W;rox9cuYci_u3pp*@QSjs_M12*~l}
zSLJqK7cljC?f~upbZPf(z;@ssV7qqTnV+98ZX-}qQlenFz7H@HWfDpPN(_nxMgBp@
zv?8%W{C^-aY2*T}`BGDdREqfj$mB%1p|#^0?n3EAX+dd3If`-|B%J*S!1{7x6-={G
zPX^OOVEIxXr+GtK$b{OY_4Br#qIn>w5Yjvb$emu^5*qFSwrN<B?Etm|O9B^x4*?%o
zxpJk$UkDjBrOjv<ttlG|tZ43zLv8W2*Fr*unH4x{5T$*w42u>mY=qZ%GHlvB1f>^b
z*l3~G1#E-$9e#5l7?FA6bBlSEP(&*2BK^N|xWzlh2a|sRT;B&?|9nOD00000NkvXX
Hu0mjf;eF6(

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index dc3932d3f9..d0f223ebb8 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -8,7 +8,8 @@
 <com.osmand.views.POIMapLayer android:id="@+id/PoiMapLayer" android:layout_width="fill_parent" android:layout_height="fill_parent"></com.osmand.views.POIMapLayer>
 <ZoomControls android:id="@+id/ZoomControls01"
 		android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|right"></ZoomControls>		
+<ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|left" android:id="@+id/BackToMenu" android:background="@drawable/back"></ImageButton>
 <ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|right" android:id="@+id/BackToLocation" android:background="@drawable/icon"></ImageButton>
-<Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/settings_activity" android:layout_gravity="top|left" android:id="@+id/GoToSettingsButton" ></Button>
+
 
 </FrameLayout>
diff --git a/OsmAnd/res/layout/menu.xml b/OsmAnd/res/layout/menu.xml
index ec147e2933..ad2286ea74 100644
--- a/OsmAnd/res/layout/menu.xml
+++ b/OsmAnd/res/layout/menu.xml
@@ -1,15 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:orientation="vertical" android:layout_height="fill_parent">
-<ProgressBar android:id="@+id/ProgressBar01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|right"></ProgressBar><Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" android:id="@+id/MapButton" android:text="@string/map_Button"></Button>
-<Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" android:id="@+id/SettingsButton" android:text="@string/settings_Button"></Button>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:orientation="vertical"
+	android:layout_height="fill_parent">
+	<ProgressBar android:id="@+id/ProgressBar01"
+		android:layout_width="wrap_content" android:layout_height="wrap_content"
+		android:layout_gravity="top|right"></ProgressBar>
+	<TextView android:id="@+id/EmptyLable01" android:layout_width="wrap_content"
+		android:layout_height="wrap_content"></TextView>
+	<Button android:layout_height="wrap_content"
+		android:layout_gravity="center" android:id="@+id/MapButton"
+		android:text="@string/map_Button" android:layout_width="fill_parent"></Button>
+	<TextView android:id="@+id/EmptyLable02" android:layout_width="wrap_content"
+		android:layout_height="wrap_content"></TextView>
+	<Button android:layout_height="wrap_content"
+		android:layout_gravity="center" android:id="@+id/SettingsButton"
+		android:text="@string/settings_Button" android:layout_width="fill_parent"></Button>
 
 
-<FrameLayout android:id="@+id/FrameLayout01" android:layout_height="fill_parent" android:layout_width="fill_parent"><Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|left" android:text="@string/exit_Button" android:id="@+id/ExitButton"></Button>
-</FrameLayout>
+	<FrameLayout android:id="@+id/FrameLayout01"
+		android:layout_height="fill_parent" android:layout_width="fill_parent">
+		<Button android:layout_width="wrap_content"
+			android:layout_height="wrap_content" android:layout_gravity="bottom|left"
+			android:text="@string/exit_Button" android:id="@+id/ExitButton"></Button>
+	</FrameLayout>
+
 
 
 </LinearLayout>
diff --git a/OsmAnd/src/com/osmand/activities/MainMenuActivity.java b/OsmAnd/src/com/osmand/activities/MainMenuActivity.java
index 6b4c9dcfc5..da3175b13d 100644
--- a/OsmAnd/src/com/osmand/activities/MainMenuActivity.java
+++ b/OsmAnd/src/com/osmand/activities/MainMenuActivity.java
@@ -27,8 +27,9 @@ public class MainMenuActivity extends Activity {
 		showMap.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				final Intent settings = new Intent(MainMenuActivity.this, MapActivity.class);
-				startActivity(settings);
+				final Intent mapIndent = new Intent(MainMenuActivity.this, MapActivity.class);
+				startActivityForResult(mapIndent, 0);
+
 			}
 		});
 		settingsButton = (Button) findViewById(R.id.SettingsButton);
diff --git a/OsmAnd/src/com/osmand/activities/MapActivity.java b/OsmAnd/src/com/osmand/activities/MapActivity.java
index 05a9b520e3..d5bf908deb 100644
--- a/OsmAnd/src/com/osmand/activities/MapActivity.java
+++ b/OsmAnd/src/com/osmand/activities/MapActivity.java
@@ -49,6 +49,8 @@ public class MapActivity extends Activity implements LocationListener, IMapLocat
 
 	private ImageButton backToLocation;
 
+	private ImageButton backToMenu;
+	
 	private PointOfView pointOfView;
 	
 	private static final String TILES_PATH = "osmand/tiles/";
@@ -107,17 +109,17 @@ public class MapActivity extends Activity implements LocationListener, IMapLocat
 			
 		});
 		
-		Button goToSettings = (Button)findViewById(R.id.GoToSettingsButton);
-		goToSettings.setOnClickListener(new OnClickListener(){
+		backToMenu = (ImageButton)findViewById(R.id.BackToMenu);
+		backToMenu.setOnClickListener(new OnClickListener(){
 			@Override
 			public void onClick(View v) {
-				final Intent settings = new Intent(MapActivity.this, SettingsActivity.class);
-				startActivity(settings);
+		           Intent intent = new Intent();
+	                setResult(RESULT_OK, intent);
+	                finish();
 			}
 			
 		});
-		
-		
+			
 		LocationManager service = (LocationManager) getSystemService(LOCATION_SERVICE);
 		service.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 0, this);
 		indexPOI = indexPOI();