merge

3 files changed, 18 insertions, 3 deletions

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0121f92..512350a 100644..100755
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,4 +9,8 @@
     <dimen name="font_size_large">20sp</dimen>
     <dimen name="font_size_normal">16sp</dimen>
     <dimen name="font_size_small">14sp</dimen>
+
+    <!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
+         https://developer.android.com/design/patterns/navigation-drawer.html -->
+    <dimen name="navigation_drawer_width">240dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml
new file mode 100755
index 0000000..d152eb1
--- /dev/null
+++ b/app/src/main/res/values/refs.xml
@@ -0,0 +1,4 @@
+<resources>

+

+

+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2362102..83cda21 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,8 @@
     <string name="title_activity_filters">Filters</string>
     <string name="title_activity_filter_settings">Filter</string>
     <string name="title_activity_filter">Filter</string>
+    <string name="title_activity_article">Article</string>
+    <string name="title_activity_feeds">Feeds</string>
 
     <string name="filters_action_add">Add</string>
 
@@ -39,11 +41,11 @@
     <string name="error_net_load">Internet problem</string>
 
     <string name="error_save_feedsorter">Couldn\'t store personal preferences</string>
-    <string name="title_activity_feeds">Feeds</string>
 
-    <string name="hello_world">Hello world!</string>
-    <string name="title_activity_article">ArticleActivity</string>
+    <string name="error_load_article">Couldn\'t load article</string>
+
     <string name="feeds">feeds</string>
+
     <string name="article_action_dislike">Dislike</string>
     <string name="article_action_like">Like</string>
     <string name="title_activity_home_screen">HomeScreenActivity</string>
@@ -56,4 +58,9 @@
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
     <string name="action_example">Example action</string>
+
+    <string name="article_author">Written by:</string>
+    <string name="article_author_unknown">Unknown author</string>
+    <string name="article_published_on">Published on:</string>
+    <string name="article_published_on_unknown"/>
 </resources>