From 22afeddcbcb93876f65be4a90165b1a18f8b5e2a Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Sun, 26 Nov 2017 17:25:24 -0500
Subject: [PATCH 1/2] Add activity for handling shortcut add requests

---
 app/src/main/AndroidManifest.xml              | 10 +++
 .../card_locker/CardShortcutConfigure.java    | 83 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  2 +
 3 files changed, 95 insertions(+)
 create mode 100644 app/src/main/java/protect/card_locker/CardShortcutConfigure.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f9c1e7a43..e80d163c3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -56,6 +56,16 @@
             android:label=""
             android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar"/>
+        <activity
+            android:name=".CardShortcutConfigure"
+            android:label="@string/cardShortcut"
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:grantUriPermissions="true"
diff --git a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
new file mode 100644
index 000000000..78701dcab
--- /dev/null
+++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
@@ -0,0 +1,83 @@
+package protect.card_locker;
+
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.Toast;
+
+/**
+ * The configuration screen for creating a shortcut.
+ */
+public class CardShortcutConfigure extends AppCompatActivity
+{
+    static final String TAG = "LoyaltyCardLocker";
+
+    @Override
+    public void onCreate(Bundle bundle)
+    {
+        super.onCreate(bundle);
+
+        // Set the result to CANCELED.  This will cause nothing to happen if the
+        // aback button is pressed.
+        setResult(RESULT_CANCELED);
+
+        setContentView(R.layout.main_activity);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar.setVisibility(View.GONE);
+
+        final DBHelper db = new DBHelper(this);
+
+        // If there are no cards, bail
+        if(db.getLoyaltyCardCount() == 0)
+        {
+            Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
+            finish();
+        }
+
+        final ListView cardList = (ListView) findViewById(R.id.list);
+        cardList.setVisibility(View.VISIBLE);
+
+        Cursor cardCursor = db.getLoyaltyCardCursor();
+
+        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
+        cardList.setAdapter(adapter);
+
+        cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
+        {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+            {
+                Cursor selected = (Cursor) parent.getItemAtPosition(position);
+                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+
+                Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
+
+                Intent shortcutIntent = new Intent(CardShortcutConfigure.this, LoyaltyCardViewActivity.class);
+                shortcutIntent.setAction(Intent.ACTION_MAIN);
+                // Prevent instances of the view activity from piling up; if one exists let this
+                // one replace it.
+                shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                Bundle bundle = new Bundle();
+                bundle.putInt("id", loyaltyCard.id);
+                bundle.putBoolean("view", true);
+                shortcutIntent.putExtras(bundle);
+
+                Parcelable icon = Intent.ShortcutIconResource.fromContext(CardShortcutConfigure.this, R.mipmap.ic_launcher);
+                Intent intent = new Intent();
+                intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
+                intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, loyaltyCard.store);
+                intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon);
+                setResult(RESULT_OK, intent);
+
+                finish();
+            }
+        });
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 62c7039c2..d89b6bbc3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,6 +33,8 @@
     <string name="addCardTitle">Add Loyalty Card</string>
     <string name="viewCardTitle">View Loyalty Card</string>
     <string name="scanCardBarcode">Scan Card\'s Barcode</string>
+    <string name="cardShortcut">Card Shortcut</string>
+    <string name="noCardsMessage">There are no cards, add one first</string>
 
     <string name="barcodeImageDescription">Image of card\'s barcode</string>
 

From 1673c0229a452ffe65e59d9e3fb8ca4fd59e1062 Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Mon, 27 Nov 2017 14:50:18 -0500
Subject: [PATCH 2/2] Update strings around adding shortcuts

Chrome uses the wording "Add to home screen" when adding
a shortcut.

   https://developer.chrome.com/multidevice/android/installtohomescreen

That sounds more direct that this app's wording. Updating to match.
---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d89b6bbc3..3d7c07dfb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
 
     <string name="storeName">Store</string>
     <string name="note">Note</string>
-    <string name="addShortcut">Add Shortcut</string>
+    <string name="addShortcut">Add to Home Screen</string>
     <string name="cardId">Card ID</string>
     <string name="barcodeType">Barcode Type</string>
 
@@ -27,7 +27,7 @@
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copy ID to clipboard</string>
     <string name="sendLabel">Send&#8230;</string>
-    <string name="addedShortcut">Added shortcut</string>
+    <string name="addedShortcut">Added to Home Screen</string>
 
     <string name="editCardTitle">Edit Loyalty Card</string>
     <string name="addCardTitle">Add Loyalty Card</string>