diff --git a/AndorsTrail/res/layout/displayworldmap.xml b/AndorsTrail/res/layout/displayworldmap.xml
index f7960091a..ea42a9203 100644
--- a/AndorsTrail/res/layout/displayworldmap.xml
+++ b/AndorsTrail/res/layout/displayworldmap.xml
@@ -1,9 +1,44 @@
-
+ android:orientation="vertical"
+ >
+
+
+
+
-
+
+
+
+
+
+
+
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index b64ec9494..407bfbac1 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -507,5 +507,6 @@
Map
Map cannot be displayed.
The map cannot be displayed from this location.
+ Map
diff --git a/AndorsTrail/res/values/ui_colors.xml b/AndorsTrail/res/values/ui_colors.xml
index 5df4b03a2..7caaee8cf 100644
--- a/AndorsTrail/res/values/ui_colors.xml
+++ b/AndorsTrail/res/values/ui_colors.xml
@@ -1,4 +1,5 @@
#80000000
+ #423921
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
index 2eae1157e..cfe9efae5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
@@ -5,7 +5,10 @@ import java.io.File;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
import android.webkit.WebView;
+import android.widget.Button;
import android.widget.Toast;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
@@ -35,10 +38,18 @@ public class DisplayWorldMapActivity extends Activity {
setContentView(R.layout.displayworldmap);
displayworldmap_webview = (WebView) findViewById(R.id.displayworldmap_webview);
- displayworldmap_webview.setBackgroundColor(getResources().getColor(android.R.color.black));
+ displayworldmap_webview.setBackgroundColor(getResources().getColor(R.color.displayworldmap_background));
displayworldmap_webview.getSettings().setBuiltInZoomControls(true);
enableJavascript();
+ Button b = (Button) findViewById(R.id.displayworldmap_close);
+ b.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ DisplayWorldMapActivity.this.finish();
+ }
+ });
+
worldMapSegmentName = getIntent().getStringExtra("worldMapSegmentName");
}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
index 3f466d8cd..8db9463bc 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
@@ -31,7 +31,7 @@ import com.gpl.rpg.AndorsTrail.util.L;
public final class WorldMapController {
- public static int WORLDMAP_SCREENSHOT_TILESIZE = 12;
+ public static int WORLDMAP_SCREENSHOT_TILESIZE = 8;
public static int WORLDMAP_DISPLAY_TILESIZE = WORLDMAP_SCREENSHOT_TILESIZE;
public static void updateWorldMap(final WorldContext world, final PredefinedMap map, final LayeredTileMap mapTiles, final TileCollection cachedTiles, final Resources res) {