Added new error screen layout

Author: longzheng

PTVGlass/NearMeActivity.cs

@@ -70,8 +70,8 @@ public async void NearbyDepartures(Location location)
 				// show error card
 				var errorCard = new Card(this);
 				errorCard.SetText (e.ToString());
-				errorCard.SetFootnote (Resource.String.error);
 				SetContentView (errorCard.ToView ());
+
 				return;
 			}
 
@@ -102,9 +102,11 @@ public async void NearbyDepartures(Location location)
 			// if there are no stops nearby, show no stops message
 			if (stopsNearby.Count == 0)
 			{
-				var noStopsCard = new Card(this);
-				noStopsCard.SetText(noStopsNearby);
-				SetContentView(noStopsCard.ToView());
+				// Show error screen
+				SetContentView (Resource.Layout.ErrorScreen);
+				var errorText = FindViewById<TextView> (Resource.Id.error_text);
+				errorText.SetText(noStopsNearby); // set error text
+
 				return;
 			}
 

PTVGlass/PTVGlass.csproj

@@ -79,6 +79,8 @@
     <None Include="Assets\AboutAssets.txt" />
     <None Include="Properties\AndroidManifest.xml" />
     <AndroidResource Include="Resources\layout\BusTramDepartureWithStationRow.axml" />
+    <AndroidResource Include="Resources\drawable\ic_warning_50.png" />
+    <AndroidResource Include="Resources\layout\ErrorScreen.axml" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
@@ -107,8 +109,8 @@
       <Visible>False</Visible>
     </XamarinComponentReference>
     <XamarinComponentReference Include="modernhttpclient">
-      <Visible>False</Visible>
       <Version>1.2.1</Version>
+      <Visible>False</Visible>
     </XamarinComponentReference>
   </ItemGroup>
   <ItemGroup>

PTVGlass/Resources/Resource.designer.cs

@@ -1,8 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-</LinearLayout>
-
+    android:layout_height="fill_parent">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center">
+        <ImageView
+            android:src="@drawable/ic_warning_50"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/error_icon"
+            android:layout_marginBottom="10dip" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/error_text"
+            android:layout_below="@+id/error_icon"
+            android:gravity="center"
+            android:textSize="36dip" />
+    </LinearLayout>
+</RelativeLayout>

PTVGlass/Resources/drawable/Thumbs.db

@@ -9,7 +9,7 @@
 	<string name="busses_near_me">buses near me</string>
 	<string name="trams_near_me">trams near me</string>
 	<string name="no_upcoming_departures">No upcoming departures scheduled</string>
-	<string name="error">Error</string>
+	<string name="no_internet_connection">Not connected to the internet</string>
 	<string name="no_bus_stops_nearby">No bus stops nearby</string>
 	<string name="no_tram_stops_nearby">No tram stops nearby</string>
 	<string name="no_train_stops_nearby">No train stops nearby</string>

PTVGlass/Resources/layout/ErrorScreen.axml

@@ -24,13 +24,6 @@ protected override async void OnCreate (Bundle bundle)
 		{
 			base.OnCreate (bundle);
 
-			// Show loading screen
-			SetContentView (Resource.Layout.LoadingScreen);
-			var loadingText = FindViewById<TextView> (Resource.Id.loading_text);
-			loadingText.SetText(Resource.String.getting_departures); // set loading text
-			var progressBar = FindViewById<SliderView> (Resource.Id.indeterm_slider);
-			progressBar.StartIndeterminate (); // start indeterminate progress bar
-
 			// get station ID from intent
 			int intentStationId = int.Parse(Intent.GetStringExtra ("stationId"));
 
@@ -43,16 +36,18 @@ protected override async void OnCreate (Bundle bundle)
 				// show error card
 				var errorCard = new Card(this);
 				errorCard.SetText (e.ToString());
-				errorCard.SetFootnote (Resource.String.error);
 				SetContentView (errorCard.ToView ());
+
 				return;
 			}
 
 			// if there are no departures, show no departure message
 			if (stationDepartures.Count == 0) {
-				var noDeparturesCard = new Card(this);
-				noDeparturesCard.SetText (Resource.String.no_upcoming_departures);
-				SetContentView (noDeparturesCard.ToView ());
+				// Show error screen
+				SetContentView (Resource.Layout.ErrorScreen);
+				var errorText = FindViewById<TextView> (Resource.Id.error_text);
+				errorText.SetText(Resource.String.no_upcoming_departures); // set error text
+
 				return;
 			}