From 839bfb880706722c0f8ae55d1ec9e968481cf69e Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Tue, 7 Apr 2020 01:39:50 -0400
Subject: [PATCH] Updated app shortcuts

---
 app/shortcuts.xml                             | 28 +++++++------------
 app/src/main/res/drawable/sc_explore_48dp.xml | 19 -------------
 ...c_book_48dp.xml => sc_extensions_48dp.xml} |  2 +-
 app/src/main/res/drawable/sc_glasses_48dp.xml |  2 +-
 4 files changed, 12 insertions(+), 39 deletions(-)
 delete mode 100644 app/src/main/res/drawable/sc_explore_48dp.xml
 rename app/src/main/res/drawable/{sc_book_48dp.xml => sc_extensions_48dp.xml} (60%)

diff --git a/app/shortcuts.xml b/app/shortcuts.xml
index f0d74789ea..b0e2fd6c98 100644
--- a/app/shortcuts.xml
+++ b/app/shortcuts.xml
@@ -1,16 +1,5 @@
 <shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <shortcut
-        android:enabled="true"
-        android:icon="@drawable/sc_book_48dp"
-        android:shortcutDisabledMessage="@string/app_not_available"
-        android:shortcutId="show_library"
-        android:shortcutLongLabel="@string/label_library"
-        android:shortcutShortLabel="@string/label_library">
-        <intent
-            android:action="eu.kanade.tachiyomi.SHOW_LIBRARY"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-    </shortcut>
     <shortcut
         android:enabled="true"
         android:icon="@drawable/sc_update_48dp"
@@ -20,6 +9,7 @@
         android:shortcutShortLabel="@string/short_recent_updates">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_UPDATED"
+            android:targetPackage="${applicationId}"
             android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
     </shortcut>
     <shortcut
@@ -27,21 +17,23 @@
         android:icon="@drawable/sc_glasses_48dp"
         android:shortcutDisabledMessage="@string/app_not_available"
         android:shortcutId="show_recently_read"
-        android:shortcutLongLabel="@string/label_recent_manga"
-        android:shortcutShortLabel="@string/label_recent_manga">
+        android:shortcutLongLabel="@string/history"
+        android:shortcutShortLabel="@string/history">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_READ"
+            android:targetPackage="${applicationId}"
             android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
     </shortcut>
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/sc_explore_48dp"
+        android:icon="@drawable/sc_extensions_48dp"
         android:shortcutDisabledMessage="@string/app_not_available"
-        android:shortcutId="show_catalogues"
-        android:shortcutLongLabel="@string/label_catalogues"
-        android:shortcutShortLabel="@string/label_catalogues">
+        android:shortcutId="show_extensions"
+        android:shortcutLongLabel="@string/label_extensions"
+        android:shortcutShortLabel="@string/label_extensions">
         <intent
-            android:action="eu.kanade.tachiyomi.SHOW_CATALOGUES"
+            android:action="eu.kanade.tachiyomi.EXTENSIONS"
+            android:targetPackage="${applicationId}"
             android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
     </shortcut>
 </shortcuts>
diff --git a/app/src/main/res/drawable/sc_explore_48dp.xml b/app/src/main/res/drawable/sc_explore_48dp.xml
deleted file mode 100644
index 26cd282b1b..0000000000
--- a/app/src/main/res/drawable/sc_explore_48dp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportHeight="48"
-    android:viewportWidth="48">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
-
-    <group
-        android:translateX="12"
-        android:translateY="12">
-        <path
-            android:fillColor="@color/colorAccent"
-            android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z" />
-    </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sc_book_48dp.xml b/app/src/main/res/drawable/sc_extensions_48dp.xml
similarity index 60%
rename from app/src/main/res/drawable/sc_book_48dp.xml
rename to app/src/main/res/drawable/sc_extensions_48dp.xml
index 163ce55484..37377f0095 100644
--- a/app/src/main/res/drawable/sc_book_48dp.xml
+++ b/app/src/main/res/drawable/sc_extensions_48dp.xml
@@ -14,6 +14,6 @@
         android:translateY="12">
         <path
             android:fillColor="@color/colorAccent"
-            android:pathData="M18,2H6c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zM6,4h5v8l-2.5,-1.5L6,12V4z" />
+            android:pathData="M20.5,11H19V7c0,-1.1 -0.9,-2 -2,-2h-4V3.5C13,2.12 11.88,1 10.5,1S8,2.12 8,3.5V5H4c-1.1,0 -1.99,0.9 -1.99,2v3.8H3.5c1.49,0 2.7,1.21 2.7,2.7s-1.21,2.7 -2.7,2.7H2V20c0,1.1 0.9,2 2,2h3.8v-1.5c0,-1.49 1.21,-2.7 2.7,-2.7 1.49,0 2.7,1.21 2.7,2.7V22H17c1.1,0 2,-0.9 2,-2v-4h1.5c1.38,0 2.5,-1.12 2.5,-2.5S21.88,11 20.5,11z"/>
     </group>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sc_glasses_48dp.xml b/app/src/main/res/drawable/sc_glasses_48dp.xml
index 8c3a3e28bc..c90cfd147d 100644
--- a/app/src/main/res/drawable/sc_glasses_48dp.xml
+++ b/app/src/main/res/drawable/sc_glasses_48dp.xml
@@ -14,6 +14,6 @@
         android:translateY="12">
         <path
             android:fillColor="@color/colorAccent"
-            android:pathData="M3,10C2.76,10 2.55,10.09 2.41,10.25C2.27,10.4 2.21,10.62 2.24,10.86L2.74,13.85C2.82,14.5 3.4,15 4,15H7C7.64,15 8.36,14.44 8.5,13.82L9.56,10.63C9.6,10.5 9.57,10.31 9.5,10.19C9.39,10.07 9.22,10 9,10H3M7,17H4C2.38,17 0.96,15.74 0.76,14.14L0.26,11.15C0.15,10.3 0.39,9.5 0.91,8.92C1.43,8.34 2.19,8 3,8H9C9.83,8 10.58,8.35 11.06,8.96C11.17,9.11 11.27,9.27 11.35,9.45C11.78,9.36 12.22,9.36 12.64,9.45C12.72,9.27 12.82,9.11 12.94,8.96C13.41,8.35 14.16,8 15,8H21C21.81,8 22.57,8.34 23.09,8.92C23.6,9.5 23.84,10.3 23.74,11.11L23.23,14.18C23.04,15.74 21.61,17 20,17H17C15.44,17 13.92,15.81 13.54,14.3L12.64,11.59C12.26,11.31 11.73,11.31 11.35,11.59L10.43,14.37C10.07,15.82 8.56,17 7,17M15,10C14.78,10 14.61,10.07 14.5,10.19C14.42,10.31 14.4,10.5 14.45,10.7L15.46,13.75C15.64,14.44 16.36,15 17,15H20C20.59,15 21.18,14.5 21.25,13.89L21.76,10.82C21.79,10.62 21.73,10.4 21.59,10.25C21.45,10.09 21.24,10 21,10H15Z" />
+            android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
     </group>
 </vector>
\ No newline at end of file