From 2b617ceca5c12195cdaaa84df12857ecda9e5dfb Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Sun, 5 Mar 2017 14:40:30 -0500
Subject: [PATCH 1/2] Remove mention of Freepik icons from README

The main application icon was replaced, and the icon from
Freepik is no longer used.
---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 11118902d..811fb3339 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,3 @@ Windows:
 ./gradlew.bat build
 ```
 
-# Thanks
-
-App icon originals by [Freepik](https://www.flaticon.com) and distributed under the [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/) license,
-and formatted using [Android Asset Studio](https://romannurik.github.io/AndroidAssetStudio/index.html).

From 2bca8b738afa9cac66e2a63817befebeb7182d6b Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Sun, 5 Mar 2017 14:41:31 -0500
Subject: [PATCH 2/2] Change about dialog info to use map instead of String[][]

---
 .../protect/card_locker/MainActivity.java     | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index c22c64649..bf48e3512 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -23,7 +23,10 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.common.collect.ImmutableMap;
+
 import java.util.Calendar;
+import java.util.Map;
 
 public class MainActivity extends AppCompatActivity
 {
@@ -160,18 +163,18 @@ public class MainActivity extends AppCompatActivity
 
     private void displayAboutDialog()
     {
-        final String[][] USED_LIBRARIES = new String[][]
-        {
-            new String[] {"Commons CSV", "https://commons.apache.org/proper/commons-csv/"},
-            new String[] {"Guava", "https://github.com/google/guava"},
-            new String[] {"ZXing", "https://github.com/zxing/zxing"},
-            new String[] {"ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded"},
-        };
+        final Map<String, String> USED_LIBRARIES = ImmutableMap.of
+        (
+            "Commons CSV", "https://commons.apache.org/proper/commons-csv/",
+            "Guava", "https://github.com/google/guava",
+            "ZXing", "https://github.com/zxing/zxing",
+            "ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded"
+        );
 
         StringBuilder libs = new StringBuilder().append("<ul>");
-        for (String[] library : USED_LIBRARIES)
+        for (Map.Entry<String, String> entry : USED_LIBRARIES.entrySet())
         {
-            libs.append("<li><a href=\"").append(library[1]).append("\">").append(library[0]).append("</a></li>");
+            libs.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
         }
         libs.append("</ul>");