From 6dc9cf9659e2c4356c2a7eaa1227931458e7a7d9 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Mon, 25 May 2015 19:30:09 +0200
Subject: Add feeds

---
 app/src/main/res/layout/activity_feeds.xml   | 13 +++++++++++++
 app/src/main/res/layout/activity_filters.xml |  2 +-
 app/src/main/res/layout/item_feed.xml        | 19 +++++++++++++++++++
 app/src/main/res/menu/menu_feeds.xml         | 13 +++++++++++++
 app/src/main/res/menu/menu_unified_inbox.xml |  2 ++
 app/src/main/res/values/strings.xml          | 10 ++++++++++
 6 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/layout/activity_feeds.xml
 create mode 100644 app/src/main/res/layout/item_feed.xml
 create mode 100644 app/src/main/res/menu/menu_feeds.xml

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

diff --git a/app/src/main/res/layout/activity_feeds.xml b/app/src/main/res/layout/activity_feeds.xml
new file mode 100644
index 0000000..f71eb1e
--- /dev/null
+++ b/app/src/main/res/layout/activity_feeds.xml
@@ -0,0 +1,13 @@
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="org.rssin.android.FeedsActivity">
+
+    <ListView
+        android:id="@+id/feeds_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_filters.xml b/app/src/main/res/layout/activity_filters.xml
index 700e939..c948344 100644
--- a/app/src/main/res/layout/activity_filters.xml
+++ b/app/src/main/res/layout/activity_filters.xml
@@ -12,6 +12,6 @@
     <ListView
         android:id="@+id/filters_list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"></ListView>
+        android:layout_height="match_parent"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_feed.xml b/app/src/main/res/layout/item_feed.xml
new file mode 100644
index 0000000..8c78f62
--- /dev/null
+++ b/app/src/main/res/layout/item_feed.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="10dp">
+
+    <TextView android:id="@+id/feed_item_title"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:textSize="@dimen/font_size_large"/>
+
+    <TextView android:id="@+id/feed_item_url"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:textSize="@dimen/font_size_small"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_feeds.xml b/app/src/main/res/menu/menu_feeds.xml
new file mode 100644
index 0000000..20a4fea
--- /dev/null
+++ b/app/src/main/res/menu/menu_feeds.xml
@@ -0,0 +1,13 @@
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.rssin.android.FeedsActivity">
+
+    <item
+        android:id="@+id/feeds_action_add"
+        android:title="@string/feeds_action_add"
+        android:orderInCategory="100"
+        app:showAsAction="ifRoom" />
+
+</menu>
diff --git a/app/src/main/res/menu/menu_unified_inbox.xml b/app/src/main/res/menu/menu_unified_inbox.xml
index 2800171..021ceb5 100644
--- a/app/src/main/res/menu/menu_unified_inbox.xml
+++ b/app/src/main/res/menu/menu_unified_inbox.xml
@@ -6,4 +6,6 @@
         android:orderInCategory="100" app:showAsAction="never" />
     <item android:id="@+id/action_filters" android:title="@string/action_filters"
         android:orderInCategory="100" app:showAsAction="never" />
+    <item android:id="@+id/action_feeds" android:title="@string/action_feeds"
+        android:orderInCategory="100" app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 09d325e..0a6e649 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
 
     <string name="action_settings">Settings</string>
     <string name="action_filters">Filters</string>
+    <string name="action_feeds">Feeds</string>
 
     <string name="button_ok">OK</string>
     <string name="button_apply">Apply</string>
@@ -22,13 +23,22 @@
     <string name="filter_settings_action_title">Title</string>
     <string name="filter_settings_action_delete">Delete</string>
 
+    <string name="feeds_action_add">Add</string>
+
     <string name="error_save_filters">Couldn\'t save filter</string>
     <string name="error_load_filters">Couldn\'t load filters</string>
     <string name="error_delete_filter">Couldn\'t delete filter</string>
 
+    <string name="error_save_feeds">Couldn\'t save feeds</string>
+    <string name="error_load_feeds">Couldn\'t load feeds</string>
+    <string name="error_delete_feed">Couldn\'t delete feed</string>
+
     <string name="error_invalid_url">Invalid URL</string>
 
     <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>
 </resources>
-- 
cgit v1.2.3