From 57396a386832fcc5ca41a5078420898fb9549a62 Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Fri, 15 Jul 2011 13:32:44 +0200
Subject: [PATCH] map: replace 'Loading..' with progress bar

---
 mapview.xml.tpl  | 15 ++++++---------
 src/MapAct.scala |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/mapview.xml.tpl b/mapview.xml.tpl
index 320f2e9..3695372 100644
--- a/mapview.xml.tpl
+++ b/mapview.xml.tpl
@@ -11,16 +11,13 @@
 	android:clickable="true"
 	android:apiKey="@apiKey@"
 	/>
-<TextView 
+<ProgressBar
+	style="@android:style/Widget.ProgressBar.Large.Inverse"
 	android:id="@+id/loading"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:layout_gravity="center_horizontal"
 	android:padding="10sp"
-	android:textColor="#000"
-	android:shadowColor="#fff"
-	android:shadowRadius="3.0"
-	android:textSize="25sp"
-	android:text="@string/map_loading"
+	android:layout_width="76dip"
+	android:layout_height="76dip"
+	android:gravity="right|top"
+	android:indeterminate="true"
 	/>
 </FrameLayout>
diff --git a/src/MapAct.scala b/src/MapAct.scala
index 5a02cc1..6d8e592 100644
--- a/src/MapAct.scala
+++ b/src/MapAct.scala
@@ -23,7 +23,7 @@ class MapAct extends MapActivity with UIHelper {
 	lazy val allicons = this.getResources().getDrawable(R.drawable.allicons)
 	lazy val db = StorageDatabase.open(this)
 	lazy val staoverlay = new StationOverlay(allicons, this, db)
-	lazy val loading = findViewById(R.id.loading).asInstanceOf[TextView]
+	lazy val loading = findViewById(R.id.loading)
 	lazy val targetcall = getTargetCall()
 
 	var showObjects = false