Cleanup

4 files changed, 36 insertions, 5 deletions

diff --git a/app/src/main/res/drawable/msg_loading.xml b/app/src/main/res/drawable/msg_loading.xml
new file mode 100644
index 0000000..b44da14
--- /dev/null
+++ b/app/src/main/res/drawable/msg_loading.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@color/loading"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_screen.xml b/app/src/main/res/layout/fragment_home_screen.xml
index b8c5e17..d9db383 100755
--- a/app/src/main/res/layout/fragment_home_screen.xml
+++ b/app/src/main/res/layout/fragment_home_screen.xml
@@ -1,8 +1,23 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"

+<LinearLayout

+    xmlns:android="http://schemas.android.com/apk/res/android"

+    xmlns:tools="http://schemas.android.com/tools"

+    tools:context="org.rssin.android.HomeScreenActivity.AllFeedsFragment"

+    android:id="@+id/refreshlayout"

     android:layout_height="match_parent"

+    android:layout_width="match_parent"

     android:padding="0dp"

-    tools:context="org.rssin.android.HomeScreenActivity.AllFeedsFragment">

+    android:orientation="vertical">

+

+    <TextView

+        android:id="@+id/loading"

+        android:layout_width="fill_parent"

+        android:layout_height="wrap_content"

+        android:text="@string/loading"

+        android:visibility="visible"

+        android:padding="@dimen/listview_item_padding"

+        android:textSize="@dimen/font_size_normal"

+        android:gravity="center_horizontal"

+        android:background="@drawable/msg_loading"/>

 

     <android.support.v7.widget.RecyclerView

         android:id="@+id/unified_inbox_feeditems"

@@ -10,4 +25,4 @@
         android:layout_width="match_parent"

         android:layout_height="match_parent"/>

 

-</RelativeLayout>

+</LinearLayout>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9129913..c11dbeb 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,6 +59,8 @@
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
+    <string name="loading">Loading...</string>
+
     <string name="action_example">Example action</string>
 
     <string name="article_author">Written by:</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9036525..40abb7b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="android:actionBarStyle">@style/MyActionBar</item>
     </style>
@@ -10,4 +10,9 @@
         parent="@android:style/Widget.Holo.Light.ActionBar">
         <item name="android:background">@drawable/actionbar_color</item>
     </style>
+
+    <color name="loading">#ffc400</color>
+    <color name="warning">#ff9900</color>
+    <color name="error">#e32d2d</color>
+    <color name="info">#5ccbf7</color>
 </resources>