add app launcher shortcuts, with associated icons

19 files changed, 63 insertions, 1 deletions

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 6deb6255..75dc436b 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -37,6 +37,9 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <meta-data android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity>
         <activity
             android:name=".OnlineActivity"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
index 4c4b544c..010949d3 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
@@ -126,6 +126,21 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 						int feedId = i.getIntExtra("feed_id", 0);
 						boolean isCat = i.getBooleanExtra("feed_is_cat", false);
 						String feedTitle = i.getStringExtra("feed_title");
+
+						// app shortcuts are not allowed to pass string extras
+						if (feedTitle == null) {
+							switch (feedId) {
+								case -1:
+									feedTitle = getString(R.string.feed_starred_articles);
+									break;
+								case -3:
+									feedTitle = getString(R.string.fresh_articles);
+									break;
+								case -4:
+									feedTitle = getString(R.string.feed_all_articles);
+									break;
+							}
+						}
 						
 						Feed tmpFeed = new Feed(feedId, feedTitle, isCat);
 						
@@ -159,7 +174,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 				ft.replace(R.id.feeds_fragment, new FeedsFragment(), FRAG_FEEDS);
 			}
 
-            if (m_prefs.getBoolean("open_fresh_on_startup", true)) {
+            if (!shortcutMode && m_prefs.getBoolean("open_fresh_on_startup", true)) {
                 HeadlinesFragment hf = new HeadlinesFragment();
 
                 if (BuildConfig.DEBUG) {
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_coffee.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_coffee.png
new file mode 100644
index 00000000..ec0bf525
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_coffee.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_folder_open.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_folder_open.png
new file mode 100644
index 00000000..8887429a
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_folder_open.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_star.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_star.png
new file mode 100644
index 00000000..0df481c4
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_star.png
diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_coffee.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_coffee.png
new file mode 100644
index 00000000..04e6677f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_coffee.png
diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_folder_open.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_folder_open.png
new file mode 100644
index 00000000..7430222a
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_folder_open.png
diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_star.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_star.png
new file mode 100644
index 00000000..6e36f8a6
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_star.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_coffee.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_coffee.png
new file mode 100644
index 00000000..35254abf
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_coffee.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_folder_open.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_folder_open.png
new file mode 100644
index 00000000..14c40b66
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_folder_open.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_star.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_star.png
new file mode 100644
index 00000000..345b0e22
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_star.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_coffee.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_coffee.png
new file mode 100644
index 00000000..49be2fd1
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_coffee.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_folder_open.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_folder_open.png
new file mode 100644
index 00000000..246a8e6d
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_folder_open.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_star.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_star.png
new file mode 100644
index 00000000..78044bb0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_star.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_coffee.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_coffee.png
new file mode 100644
index 00000000..78aac1a8
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_coffee.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_folder_open.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_folder_open.png
new file mode 100644
index 00000000..df88943d
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_folder_open.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_star.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_star.png
new file mode 100644
index 00000000..1f4cbd03
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_star.png
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index c7544266..86a0a97e 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -205,6 +205,7 @@
     <string name="headlines_sort_title">Title</string>
     <string name="headlines_sort_articles_title">Sort articles</string>
     <string name="fresh_articles">Fresh articles</string>
+    <string name="feed_starred_articles">Starred articles</string>
     <string name="feed_all_articles">All articles</string>
     <string name="prefs_enable_fab">Enable FAB</string>
     <string name="prefs_enable_fab_long">Show floating action button when reading</string>
diff --git a/org.fox.ttrss/src/main/res/xml/shortcuts.xml b/org.fox.ttrss/src/main/res/xml/shortcuts.xml
new file mode 100644
index 00000000..3328b165
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/xml/shortcuts.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:shortcutId="SHORTCUT:OPEN_MARKED"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_star"
+        android:shortcutShortLabel="@string/feed_starred_articles">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="org.fox.ttrss"
+            android:targetClass="org.fox.ttrss.MasterActivity">
+            <extra android:name="shortcut_mode" android:value="true"/>
+            <extra android:name="feed_id" android:value="-1"/>
+        </intent>
+    </shortcut>
+    <shortcut
+        android:shortcutId="SHORTCUT:OPEN_FRESH"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_coffee"
+        android:shortcutShortLabel="@string/fresh_articles">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="org.fox.ttrss"
+            android:targetClass="org.fox.ttrss.MasterActivity">
+                <extra android:name="shortcut_mode" android:value="true"/>
+                <extra android:name="feed_id" android:value="-3"/>
+        </intent>
+    </shortcut>
+    <shortcut
+        android:shortcutId="SHORTCUT:OPEN_ALL_ARTICLES"
+        android:enabled="true"
+        android:icon="@drawable/ic_shortcut_folder_open"
+        android:shortcutShortLabel="@string/feed_all_articles">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetPackage="org.fox.ttrss"
+            android:targetClass="org.fox.ttrss.MasterActivity">
+            <extra android:name="shortcut_mode" android:value="true"/>
+            <extra android:name="feed_id" android:value="-4"/>
+        </intent>
+    </shortcut>
+
+</shortcuts>
\ No newline at end of file