From ad12b2b945d23af48d3930c1602971dc8e4924d8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 24 Mar 2013 19:43:03 +0400 Subject: integrate share app stuff into tt-rss app --- AndroidManifest.xml | 129 ++++++++++- 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 + src/org/fox/ttrss/OnlineActivity.java | 6 + src/org/fox/ttrss/share/CommonActivity.java | 57 +++++ src/org/fox/ttrss/share/CommonShareActivity.java | 186 +++++++++++++++ src/org/fox/ttrss/share/FeedCategory.java | 58 +++++ src/org/fox/ttrss/share/FeedCategoryList.java | 52 +++++ src/org/fox/ttrss/share/ShareActivity.java | 146 ++++++++++++ src/org/fox/ttrss/share/SubscribeActivity.java | 275 +++++++++++++++++++++++ 16 files changed, 1078 insertions(+), 42 deletions(-) create mode 100644 res/layout/share.xml create mode 100644 res/layout/subscribe.xml create mode 100644 res/menu/share_menu.xml create mode 100644 src/org/fox/ttrss/share/CommonActivity.java create mode 100644 src/org/fox/ttrss/share/CommonShareActivity.java create mode 100644 src/org/fox/ttrss/share/FeedCategory.java create mode 100644 src/org/fox/ttrss/share/FeedCategoryList.java create mode 100644 src/org/fox/ttrss/share/ShareActivity.java create mode 100644 src/org/fox/ttrss/share/SubscribeActivity.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4bad3740..b45a2850 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="147" + android:versionName="1.3" > - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + +