From ad12b2b945d23af48d3930c1602971dc8e4924d8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 24 Mar 2013 19:43:03 +0400
Subject: integrate share app stuff into tt-rss app

---
 res/layout/share.xml     | 53 ++++++++++++++++++++++++++++++
 res/layout/subscribe.xml | 51 +++++++++++++++++++++++++++++
 res/menu/main_menu.xml   |  6 ++++
 res/menu/share_menu.xml  |  9 ++++++
 res/values-v11/style.xml |  3 ++
 res/values-v15/style.xml |  3 ++
 res/values/strings.xml   | 84 ++++++++++++++++++++++++++++++------------------
 res/values/style.xml     |  2 ++
 8 files changed, 179 insertions(+), 32 deletions(-)
 create mode 100644 res/layout/share.xml
 create mode 100644 res/layout/subscribe.xml
 create mode 100644 res/menu/share_menu.xml

(limited to 'res')

diff --git a/res/layout/share.xml b/res/layout/share.xml
new file mode 100644
index 00000000..f1803130
--- /dev/null
+++ b/res/layout/share.xml
@@ -0,0 +1,53 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="5dp" >
+
+    <EditText
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:ems="10"
+        android:hint="@string/share_title_hint"
+        android:singleLine="true" />
+
+    <EditText
+        android:id="@+id/url"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/title"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/title"
+        android:ems="10"
+        android:hint="@string/share_url_hint"
+        android:singleLine="true" />
+

+    <EditText
+        android:id="@+id/content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignRight="@+id/url"
+        android:layout_below="@+id/url"
+        android:ems="10"
+        android:hint="@string/share_content_hint"
+        android:inputType="textMultiLine"
+        android:maxLines="3" >
+
+        <requestFocus />
+    </EditText>
+

+    <Button
+        android:id="@+id/share_button"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignRight="@+id/content"
+        android:layout_below="@+id/content"
+        android:text="@string/share_share_button" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/subscribe.xml b/res/layout/subscribe.xml
new file mode 100644
index 00000000..3b61424a
--- /dev/null
+++ b/res/layout/subscribe.xml
@@ -0,0 +1,51 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="5dp" >
+
+    <EditText
+        android:id="@+id/feed_url"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:ems="10"
+        android:hint="@string/feed_url"
+        android:inputType="textUri"
+        android:maxLines="3" >
+
+        <requestFocus />
+    </EditText>
+
+    <Spinner
+        android:id="@+id/category_spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/feed_url"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/feed_url" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/category_spinner"
+        android:layout_alignRight="@+id/category_spinner"
+        android:layout_below="@+id/category_spinner" >
+
+        <Button
+            android:id="@+id/cats_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:text="Update categories" />
+
+        <Button
+            android:id="@+id/subscribe_button"
+		    android:layout_width="wrap_content"
+		    android:layout_weight="0.5"
+            android:layout_height="wrap_content"
+            android:text="@string/subscribe_to_feed" />
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index f5ccb879..aef776cc 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -11,6 +11,12 @@
                 android:title="@string/back_to_categories"/>
             -->
 
+            <item
+                android:id="@+id/subscribe_to_feed"
+                android:icon="@android:drawable/ic_menu_add"
+                android:showAsAction=""
+                android:title="Subscribe to feed"/>
+
             <item
                 android:id="@+id/show_feeds"
                 android:icon="@android:drawable/ic_menu_agenda"
diff --git a/res/menu/share_menu.xml b/res/menu/share_menu.xml
new file mode 100644
index 00000000..7eb79800
--- /dev/null
+++ b/res/menu/share_menu.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/preferences"
+        android:icon="@android:drawable/ic_menu_preferences"
+        android:showAsAction=""
+        android:title="@string/preferences"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml
index c1da4b43..918b1642 100644
--- a/res/values-v11/style.xml
+++ b/res/values-v11/style.xml
@@ -88,4 +88,7 @@
     	<item name="android:background">#232527</item>
 	</style>
 	
+	<style name="DarkDialogTheme" parent="android:Theme.Holo.Dialog">
+    </style>
+	
 </resources>
\ No newline at end of file
diff --git a/res/values-v15/style.xml b/res/values-v15/style.xml
index 52e16a18..b3bd7860 100644
--- a/res/values-v15/style.xml
+++ b/res/values-v15/style.xml
@@ -92,4 +92,7 @@
     	<item name="android:background">#232527</item>
 	</style>
 	
+	<style name="DarkDialogTheme" parent="android:Theme.Holo.Dialog">
+    </style>
+	
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f21ef831..18d50121 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -74,33 +74,33 @@
     <string name="error_api_incorrect_usage">Error: incorrect API usage</string>
     <string name="error_login_failed">Error: username or password incorrect</string>
     <string name="error_invalid_api_url">Error: invalid API URL</string>
-	<string name="combined_mode_summary">Displays full article text inline, instead of a separate panel</string>
-	<string name="combined_mode">Combined mode</string>
-	<string name="go_offline">Go offline</string>
-	<string name="go_online">Go online</string>
-	<string name="offline_switch_error">Failed to prepare offline mode (see log)</string>
-	<string name="no_feeds">No feeds to display</string>
-	<string name="no_headlines">No articles to display</string>
-	<string name="dialog_offline_prompt">Login failed, but you have stored offline data. Would you like to go offline?</string>
-	<string name="dialog_offline_success">Offline mode is ready</string>
-	<string name="dialog_offline_go">Go offline</string>
-	<string name="dialog_cancel">Cancel</string>
-	<string name="dialog_offline_switch_prompt">Download unread articles and go offline?</string>
-	<string name="notify_downloading_articles">Downloading articles (%1$d)…</string>
-	<string name="notify_downloading_init">Starting download…</string>
-	<string name="notify_downloading_feeds">Downloading feeds…</string>
-	<string name="notify_uploading_sending_data">Sending data to server…</string>
-	<string name="notify_downloading_title">Preparing offline mode</string>
-	<string name="notify_uploading_title">Synchronizing offline data</string>
-	<string name="offline_sync_success">Finished synchronizing your offline data</string>
-	<string name="offline_mode">Offline mode</string>
-	<string name="offline_image_cache_enabled">Cache images</string>
-	<string name="offline_image_cache_enabled_summary">Download images to sdcard. This might significantly increase time it takes to go offline.</string>
-	<string name="notify_downloading_images">Downloading images (%1$d)…</string>
-	<string name="article_set_labels">Set labels</string>
-	<string name="search">Search</string>
-	<string name="cancel">Cancel</string>
-	<string name="font_size_small">Small</string>
+    <string name="combined_mode_summary">Displays full article text inline, instead of a separate panel</string>
+    <string name="combined_mode">Combined mode</string>
+    <string name="go_offline">Go offline</string>
+    <string name="go_online">Go online</string>
+    <string name="offline_switch_error">Failed to prepare offline mode (see log)</string>
+    <string name="no_feeds">No feeds to display</string>
+    <string name="no_headlines">No articles to display</string>
+    <string name="dialog_offline_prompt">Login failed, but you have stored offline data. Would you like to go offline?</string>
+    <string name="dialog_offline_success">Offline mode is ready</string>
+    <string name="dialog_offline_go">Go offline</string>
+    <string name="dialog_cancel">Cancel</string>
+    <string name="dialog_offline_switch_prompt">Download unread articles and go offline?</string>
+    <string name="notify_downloading_articles">Downloading articles (%1$d)…</string>
+    <string name="notify_downloading_init">Starting download…</string>
+    <string name="notify_downloading_feeds">Downloading feeds…</string>
+    <string name="notify_uploading_sending_data">Sending data to server…</string>
+    <string name="notify_downloading_title">Preparing offline mode</string>
+    <string name="notify_uploading_title">Synchronizing offline data</string>
+    <string name="offline_sync_success">Finished synchronizing your offline data</string>
+    <string name="offline_mode">Offline mode</string>
+    <string name="offline_image_cache_enabled">Cache images</string>
+    <string name="offline_image_cache_enabled_summary">Download images to sdcard. This might significantly increase time it takes to go offline.</string>
+    <string name="notify_downloading_images">Downloading images (%1$d)…</string>
+    <string name="article_set_labels">Set labels</string>
+    <string name="search">Search</string>
+    <string name="cancel">Cancel</string>
+    <string name="font_size_small">Small</string>
     <string name="font_size_medium">Medium</string>
     <string name="font_size_large">Large</string>
     <string name="pref_font_size">Article text size</string>
@@ -156,8 +156,28 @@
     <string name="prefs_fullscreen_mode">Fullscreen mode</string>
     <string name="reading">Reading</string>
     <string name="theme_dark_gray">Dark gray</string>
-	<string name="offline_articles_to_download">Number of articles to download</string>
-  <string name="offline_articles_to_download_long">Number of articles to download for Offlinemode. (newest first)</string>
-  <string name="pref_headlines_show_content_long">Show content previews in headlines list</string>
-  <string name="pref_headlines_show_content">Preview article content</string>
-</resources>
+    <string name="offline_articles_to_download">Number of articles to download</string>
+    <string name="offline_articles_to_download_long">Number of articles to download for Offlinemode. (newest first)</string>
+    <string name="pref_headlines_show_content_long">Show content previews in headlines list</string>
+    <string name="pref_headlines_show_content">Preview article content</string>
+    <string name="api_too_low">This action requires newer version of Tiny Tiny RSS</string>
+    <string name="share_url_prompt">URL:</string>
+    <string name="share_url_hint">Article URL</string>
+    <string name="share_content_hint">Article Content</string>
+    <string name="share_title_prompt">Title:</string>
+    <string name="share_title_hint">Article Title</string>
+    <string name="share_share_button">Share</string>
+    <string name="share_article_posted">Article posted.</string>
+    <string name="subscribe_name">Subscribe with Tiny Tiny RSS</string>
+    <string name="feed_url">Feed URL</string>
+    <string name="subscribe_to_feed">Subscribe to feed</string>
+    <string name="error_while_subscribing">Error while subscribing.</string>
+    <string name="category_list_updated">Category list updated</string>
+    <string name="subscribed_to_feed">Subscribed to feed</string>
+    <string name="error_feed_already_exists_">Error: feed already exists.</string>
+    <string name="error_invalid_url">Error: Invalid URL.</string>
+    <string name="error_url_is_an_html_page_no_feeds_found">Error: URL is an HTML page, no feeds found.</string>
+    <string name="error_url_contains_multiple_feeds">Error: URL contains multiple feeds</string>
+    <string name="error_could_not_download_url">Error: Could not download URL</string>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/style.xml b/res/values/style.xml
index a817f33b..c8bd7207 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -84,5 +84,7 @@
         <item name="android:actionBarStyle">@style/ActionBarDarkGray</item>
 	</style>
     
+  	<style name="DarkDialogTheme" parent="android:Theme.Dialog">
+    </style>
     
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3