v3.0.0

sailthru · Mar 16, 2016 · 1a0cfb4 · 1a0cfb4
1 parent 5359176
commit 1a0cfb4
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 1 deletion.
diff --git a/Carnival-Eclipse/libs/Carnival-2.16.0.jar → Carnival-Eclipse/libs/Carnival-3.0.0.jar b/Carnival-Eclipse/libs/Carnival-2.16.0.jar → Carnival-Eclipse/libs/Carnival-3.0.0.jar
diff --git a/Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_refresh.png b/Carnival-Eclipse/res/drawable-xxhdpi/carnival_ic_refresh.png
diff --git a/Carnival-Eclipse/res/layout/carnival_activity_stream.xml b/Carnival-Eclipse/res/layout/carnival_activity_stream.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".CarnivalStreamActivity" >
+    tools:context=".sdk.MessageActivity" >
 
     <WebView
         android:id="@+id/webView"
@@ -11,4 +11,46 @@
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true" />
 
+    <RelativeLayout
+        android:id="@+id/errorLayout"
+        android:background="#212121"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@android:color/white"
+                android:gravity="center"
+                android:textStyle="bold"
+                android:text="@string/carnival_something_went_wrong"/>
+
+            <ImageButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_margin="16dp"
+                android:background="@null"
+                android:onClick="onRefreshPressed"
+                android:src="@drawable/carnival_ic_refresh"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@android:color/white"
+                android:layout_gravity="center"
+                android:textStyle="bold"
+                android:text="@string/carnival_try_again"/>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
 </RelativeLayout>
diff --git a/Carnival-Eclipse/res/values/strings.xml b/Carnival-Eclipse/res/values/strings.xml
@@ -20,5 +20,7 @@
     <string name="carnival_delete_message">Delete Message</string>
     <string name="carnival_deleting_message">Deleting Message</string>
     <string name="carnival_delete_message_failed">There was a problem deleting this message</string>
+    <string name="carnival_something_went_wrong">Something went wrong and we\ncouldn\'t load the page you\nrequested.</string>
+    <string name="carnival_try_again">Try Again</string>
 
 </resources>