From 2a4efbcf0dd087b9880be132fbee862eb8b80ae0 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 10 Jun 2015 17:55:51 +0200
Subject: Cleanup

---
 app/src/main/res/values/strings.xml | 2 ++
 app/src/main/res/values/styles.xml  | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res/values')

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>
-- 
cgit v1.2.3