From 099645b66b528fec44f26a5c23d4e4554c930dd7 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Tue, 6 May 2014 12:28:46 +0200
Subject: [PATCH] Added text to loading view.

---
 res/layout/main.xml                           | 25 ++++++++++++++-----
 res/values/strings.xml                        |  6 ++++-
 .../syncthingandroid/WebGuiActivity.java      |  8 +++---
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/res/layout/main.xml b/res/layout/main.xml
index 98a3b1c2..afaac6c1 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent" >
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent" >
 
 	<WebView
 			android:id="@+id/webview"
@@ -11,11 +11,24 @@
 			android:layout_height="match_parent"
 			android:visibility="gone" />
 
-	<ProgressBar
+	<RelativeLayout
+			android:layout_centerInParent="true"
 			android:id="@+id/loading"
-			style="?android:attr/progressBarStyleLarge"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content" >
+
+		<ProgressBar
+				android:id="@+id/progress"
+				style="?android:attr/progressBarStyleLarge"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content" />
+
+		<TextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_centerInParent="true" />
+			android:layout_below="@id/progress"
+			android:text="@string/web_gui_loading" />
+
+	</RelativeLayout>
 
 </RelativeLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 69439834..b2341ab1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Syncthing</string>
+
+	<string name="app_name">Syncthing</string>
+
+	<string name="web_gui_loading">Waiting for GUI</string>
+
 </resources>
diff --git a/src/com/nutomic/syncthingandroid/WebGuiActivity.java b/src/com/nutomic/syncthingandroid/WebGuiActivity.java
index 1e46ce06..7f1ea9b7 100644
--- a/src/com/nutomic/syncthingandroid/WebGuiActivity.java
+++ b/src/com/nutomic/syncthingandroid/WebGuiActivity.java
@@ -21,7 +21,7 @@ public class WebGuiActivity extends Activity {
 	private static final String SYNCTHING_URL = "http://127.0.0.1:8080";
 
 	private WebView mWebView;
-	private ProgressBar mLoadingView;
+	private View mLoadingView;
 
 	/**
 	 * Retries loading every second until the web UI becomes available.
@@ -60,8 +60,10 @@ public class WebGuiActivity extends Activity {
 
 		setContentView(R.layout.main);
 
-		mLoadingView = (ProgressBar) findViewById(R.id.loading);
-		mLoadingView.setIndeterminate(true);
+		mLoadingView = findViewById(R.id.loading);
+		ProgressBar pb = (ProgressBar) mLoadingView.findViewById(R.id.progress);
+		pb.setIndeterminate(true);
+		
 		mWebView = (WebView) findViewById(R.id.webview);
 		mWebView.getSettings().setJavaScriptEnabled(true);
 		mWebView.setWebViewClient(new WebViewClient());