From 196108f1b7ad3ccdc4299599f8a5a6eb449411e3 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Sat, 7 Nov 2015 03:29:15 -0500
Subject: [PATCH 01/19] updated json parsing to accommodate booleans on image

---
 app/build.gradle                                              | 4 ++--
 .../java/com/spielpark/steve/bernieapp/tasks/NewsTask.java    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3f3710a..b818048 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.spielpark.steve.bernieapp"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 15
-        versionName "1.51R"
+        versionCode 16
+        versionName "1.52R"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/tasks/NewsTask.java b/app/src/main/java/com/spielpark/steve/bernieapp/tasks/NewsTask.java
index 62b2ded..98fd0e5 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/tasks/NewsTask.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/tasks/NewsTask.java
@@ -129,6 +129,9 @@ private void readObjects(JsonReader reader) throws IOException {
                     if (reader.peek() == JsonToken.NULL) {
                         a.setImgSrc(NULL_IMAGE);
                         reader.nextNull();
+                    } else if (reader.peek() == JsonToken.BOOLEAN) {
+                        a.setImgSrc(NULL_IMAGE);
+                        reader.nextBoolean();
                     } else {
                         a.setImgSrc(reader.nextString());
                     }

From 9b9399ddd1dd6b5a7756183a2e0f4b5f82463a7c Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Fri, 15 Jan 2016 16:03:39 -0500
Subject: [PATCH 02/19] fixes a weird webview loading bug

---
 .../steve/bernieapp/fragments/BernRateFragment.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/BernRateFragment.java b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/BernRateFragment.java
index 5eafcc2..c7bd930 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/BernRateFragment.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/BernRateFragment.java
@@ -4,10 +4,13 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -63,16 +66,18 @@ private String[] generateURLs() {
     private void displayWebViews(String[] urls) {
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
                 RelativeLayout.LayoutParams.WRAP_CONTENT,
-                RelativeLayout.LayoutParams.MATCH_PARENT
+900
         );
         LinearLayout parent = (LinearLayout) getView().findViewById(R.id.layoutBernRate);
         params.setMargins(8, 8, 8, 8);
         params.gravity = Gravity.CENTER_HORIZONTAL;
         for (String s : urls) {
             WebView wv = new WebView(getActivity());
-            wv.getSettings().setJavaScriptEnabled(true);
+            WebSettings settings = wv.getSettings();
+            settings.setJavaScriptEnabled(true);
             wv.setLayoutParams(params);
-            wv.loadData(s, "text/Html", "UTF-8");
+            wv.setWebChromeClient(new WebChromeClient());
+            wv.loadDataWithBaseURL("http://www.bernrate.com", s, "text/html", "UTF-8", null);
             parent.addView(wv);
         }
     }

From 067d33f8db4f2c7d28035598808898bff1429618 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Fri, 15 Jan 2016 16:07:52 -0500
Subject: [PATCH 03/19] new ver

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b818048..0f24eaf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.spielpark.steve.bernieapp"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 16
-        versionName "1.52R"
+        versionCode 17
+        versionName "1.32R"
     }
     buildTypes {
         release {

From ca5be60222308d7199276eb407831e93c1886450 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Sun, 28 Feb 2016 17:00:59 -0500
Subject: [PATCH 04/19] removes unnecessary code

---
 .../steve/bernieapp/fragments/BottomNavFragment.java         | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/BottomNavFragment.java b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/BottomNavFragment.java
index 3569189..7f442ee 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/BottomNavFragment.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/BottomNavFragment.java
@@ -25,11 +25,6 @@ public static BottomNavFragment getInstance() {
         }
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {

From ba419c075c0d5edba8a078ab31ba08bd3627000d Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Sun, 28 Feb 2016 17:02:08 -0500
Subject: [PATCH 05/19] Finally! Adds Donate Fragment

---
 .../steve/bernieapp/actMainPage.java          |  84 ++++++++++++++----
 .../bernieapp/fragments/DonateFragment.java   |  50 +++++++++++
 .../ic_attach_money_white_24dp.png            | Bin 0 -> 397 bytes
 .../ic_attach_money_white_24dp.png            | Bin 0 -> 256 bytes
 .../ic_attach_money_white_24dp.png            | Bin 0 -> 448 bytes
 .../ic_attach_money_white_24dp.png            | Bin 0 -> 640 bytes
 .../ic_attach_money_white_24dp.png            | Bin 0 -> 819 bytes
 app/src/main/res/layout/frag_donate.xml       |  65 ++++++++++++++
 app/src/main/res/values/strings.xml           |   5 +-
 9 files changed, 188 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/java/com/spielpark/steve/bernieapp/fragments/DonateFragment.java
 create mode 100644 app/src/main/res/drawable-hdpi/ic_attach_money_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_attach_money_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_attach_money_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_attach_money_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_attach_money_white_24dp.png
 create mode 100644 app/src/main/res/layout/frag_donate.xml

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/actMainPage.java b/app/src/main/java/com/spielpark/steve/bernieapp/actMainPage.java
index 09e2789..5aa0562 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/actMainPage.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/actMainPage.java
@@ -1,21 +1,31 @@
 package com.spielpark.steve.bernieapp;
 
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
+import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.ShareActionProvider;
 import android.util.Log;
 import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
+import com.google.android.gms.appindexing.Action;
+import com.google.android.gms.appindexing.AppIndex;
+import com.google.android.gms.common.api.GoogleApiClient;
 import com.spielpark.steve.bernieapp.fragments.BernRateFragment;
 import com.spielpark.steve.bernieapp.fragments.ConnectFragment;
+import com.spielpark.steve.bernieapp.fragments.DonateFragment;
 import com.spielpark.steve.bernieapp.fragments.FeedbackFragment;
 import com.spielpark.steve.bernieapp.fragments.IssuesFragment;
 import com.spielpark.steve.bernieapp.fragments.NavigationDrawerFragment;
@@ -36,14 +46,28 @@ public class actMainPage extends ActionBarActivity
     private NavigationDrawerFragment mNavigationDrawerFragment;
     private static SharedPreferences preferences;
     private static Fragment curFrag;
-    /**
-     * Used to store the last screen title. For use in {@link #restoreActionBar()}.
-     */
+
     private CharSequence mTitle;
 
+    private GoogleApiClient client;
+
     @Override
     protected void onStop() {
         super.onStop();
+        Action viewAction = Action.newAction(
+                Action.TYPE_VIEW, // TODO: choose an action type.
+                "actMainPage Page", // TODO: Define a title for the content shown.
+                // TODO: If you have web page content that matches this app activity's content,
+                // make sure this auto-generated web page URL is correct.
+                // Otherwise, set the URL to null.
+                Uri.parse("http://host/path"),
+                // TODO: Make sure this auto-generated app deep link URI is correct.
+                Uri.parse("android-app://com.spielpark.steve.bernieapp/http/host/path")
+        );
+        AppIndex.AppIndexApi.end(client, viewAction);
+        // ATTENTION: This was auto-generated to implement the App Indexing API.
+        // See https://g.co/AppIndexing/AndroidStudio for more information.
+        client.disconnect();
     }
 
     @Override
@@ -62,44 +86,50 @@ protected void onCreate(Bundle savedInstanceState) {
         mTitle = "News";
         preferences = getApplicationContext().getSharedPreferences("bernie_app_prefs", 0);
         adjustNavBarText(0);
+        // ATTENTION: This was auto-generated to implement the App Indexing API.
+        // See https://g.co/AppIndexing/AndroidStudio for more information.
+        client = new GoogleApiClient.Builder(this).addApi(AppIndex.API).build();
     }
 
     @Override
     public void onNavigationDrawerItemSelected(int position) {
         if (curFrag instanceof ConnectFragment) {
             ConnectFragment.cancelTask(); //cancel loading the map.
-            Log.d("AMP - ONDIS", "Cancelled loading the map.");
         }
         // update the main content by replacing fragments
         FragmentManager fragmentManager = getSupportFragmentManager();
         fragmentManager.popBackStack("base", FragmentManager.POP_BACK_STACK_INCLUSIVE);
         Fragment replacement;
-        switch(position) {
-            case 0 : {
+        switch (position) {
+            case 0: {
                 replacement = NewsFragment.getInstance();
                 break;
             }
-            case 1 : {
+            case 1: {
                 replacement = IssuesFragment.getInstance();
                 break;
             }
-            case 2 : {
+            case 2: {
                 replacement = OrganizeFragment.getInstance();
                 break;
             }
-            case 3 : {
+            case 3: {
                 replacement = ConnectFragment.getInstance();
                 break;
             }
-            case 4 : {
+            case 4: {
                 replacement = BernRateFragment.getInstance();
                 break;
             }
-            case 5 : {
+            case 5: {
+                replacement = DonateFragment.getInstance();
+                break;
+            }
+            case 6: {
                 replacement = FeedbackFragment.getInstance();
                 break;
             }
-            default:  {
+            default: {
                 replacement = NewsFragment.getInstance();
             }
         }
@@ -132,6 +162,9 @@ public void onSectionAttached(int number) {
             case 6:
                 mTitle = getString(R.string.title_section6);
                 break;
+            case 7:
+                mTitle = getString(R.string.title_section7);
+                break;
         }
     }
 
@@ -142,12 +175,11 @@ public void restoreActionBar() {
         actionBar.setTitle(mTitle);
     }
 
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         if (!mNavigationDrawerFragment.isDrawerOpen()) {
             restoreActionBar();
-            return true;
+            //return true;
         }
         return super.onCreateOptionsMenu(menu);
     }
@@ -176,6 +208,7 @@ public void loadEvent(NewsArticle e) {
             manager.popBackStack();
         }
         manager.beginTransaction().addToBackStack("base").replace(R.id.container, f).commit();
+        curFrag = f;
     }
 
     public void loadIssue(Issue i) {
@@ -185,6 +218,7 @@ public void loadIssue(Issue i) {
             manager.popBackStack();
         }
         manager.beginTransaction().addToBackStack("base").replace(R.id.container, f).commit();
+        curFrag = f;
     }
 
     public SharedPreferences getPrefs() {
@@ -203,7 +237,7 @@ public void loadHeaderArticle(View view) {
     }
 
     public void adjustNavBarText(int selected) {
-        TextView[] views = new TextView[] {
+        TextView[] views = new TextView[]{
                 (TextView) findViewById(R.id.newsTxt),
                 (TextView) findViewById(R.id.issuesTxt),
                 (TextView) findViewById(R.id.organizeTxt),
@@ -230,4 +264,24 @@ public void switchPage(View view) {
         adjustNavBarText(selected);
         NavigationDrawerFragment.setSelected(selected);
     }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        // ATTENTION: This was auto-generated to implement the App Indexing API.
+        // See https://g.co/AppIndexing/AndroidStudio for more information.
+        client.connect();
+        Action viewAction = Action.newAction(
+                Action.TYPE_VIEW, // TODO: choose an action type.
+                "actMainPage Page", // TODO: Define a title for the content shown.
+                // TODO: If you have web page content that matches this app activity's content,
+                // make sure this auto-generated web page URL is correct.
+                // Otherwise, set the URL to null.
+                Uri.parse("http://host/path"),
+                // TODO: Make sure this auto-generated app deep link URI is correct.
+                Uri.parse("android-app://com.spielpark.steve.bernieapp/http/host/path")
+        );
+        AppIndex.AppIndexApi.start(client, viewAction);
+    }
 }
diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/DonateFragment.java b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/DonateFragment.java
new file mode 100644
index 0000000..d0e9aa3
--- /dev/null
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/DonateFragment.java
@@ -0,0 +1,50 @@
+package com.spielpark.steve.bernieapp.fragments;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.spielpark.steve.bernieapp.R;
+import com.squareup.picasso.Picasso;
+
+/**
+ * Created by Steve on 2/28/2016.
+ */
+public class DonateFragment extends Fragment{
+    private static DonateFragment mInstance;
+
+    public static DonateFragment getInstance() {
+        if (mInstance == null) {
+            mInstance = new DonateFragment();
+        }
+        return mInstance;
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ImageView thermometer = ((ImageView) view.findViewById(R.id.d_imgThermometer));
+        Picasso.with(getContext()).invalidate("https://secure.actblue.com/x/object/actblue-badges/page/reddit-for-bernie/thermometer/dark.png");
+        Picasso.with(getContext()).load("https://secure.actblue.com/x/object/actblue-badges/page/reddit-for-bernie/thermometer/dark.png").into(thermometer);
+        view.findViewById(R.id.d_btnDonate).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent i = new Intent(Intent.ACTION_VIEW);
+                i.setData(Uri.parse(getResources().getString(R.string.donate_url)));
+                startActivity(i);
+            }
+        });
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.frag_donate, container, false);
+    }
+}
diff --git a/app/src/main/res/drawable-hdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_attach_money_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee833c667ac49d6204cbc7ee1a5939809d98d341
GIT binary patch
literal 397
zcmV;80doF{P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00040Nkl<ZNDbA&
zzbk}s0LSr<5=REQ8zhsBlq^@5Qe?8A9wdVpWF?#N;x8~L7Rk?Y$zqd|&BQ=5$lymT
z3g@~zZ#{jV!yW2-&og<wq<;sGg2JPq@F*xe@{ckGStn<gF+wUH-CR-Vnl2TGao+h&
znqJwXg$%|Kqr`|Z%s$2wwX(%3#ylnZ#1h7wY;l9@iIBb_LI&4~Y>~!wssdc#O3D@w
zxL&AM9;%5DAuL-YFb=3!5X8u0q}ZU3O8LbE8NR%dz@bcj(8e+OZkeWBe$dG(FMM}K
zll-BQezr)G^GJjIqlOutG4>P;t-NB?%La`&I5;$^04o?hvcV+Af(j7F7?lk=Fz%^R
z9+olsWP?(!F?I;)6H(r9WvP=L2FbZ(igscQut*AHP4<ZMmvh1@21DHO(<WgRiwZ{A
rCg+e@n&lrJ1%*dJ;Zaa{^zVECRo?{`$&K!S00000NkvXXu0mjf&&{Z>

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_attach_money_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..707d167616765fe8f34d8e637cb2a2a1ba681389
GIT binary patch
literal 256
zcmV+b0ssDqP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002TNkl<ZcmdVY
zF)K$=90uT{aFb0biOFiRn3$A-?qs!DEG8Lbwek&g4L*RxHzB2rl!5U73s*h1Gu_TF
z1LeHad+Hh9`lWyI41zDID;-}y1*^^hCuU=C2;SZKz?;P~SOD89$*2a`Ww3{<+{VF7
z32fonbnfBk2~T*mZ_a=iNao!F?j4wlK{9OJnOD$L2Owui?Gk;HA;=l?g3S^*!m-@l
zV7CNT(ArQ*M(lv4_%!(Rpao4ldf6%9!rHH#cMRhEE%*jzx;+l;APyz~0000<MNUMn
GLSTZdXKuj&

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_attach_money_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..20efc6cb79e2985663aa98dc445ccf32cffd7e39
GIT binary patch
literal 448
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}cwPFt&TTIEF-UzCCE@F(pyv_{aNC
zi=CTYW>1)?c<tVU0B4JkfQSTMA-;3Fc60_iTe5Uonz#ryUbrN2b%L&!CFdeJT|d61
z*Lk^k+4#SgR@7G9tI=<N{_lCo{QfJ~%A5*Z;=Uo_Z5oCLbOPsUR;9F7|5<S2bKB-D
zG1)y&{+sPw@a#j=p4_m=rEVb)w_GZmd%)OvJzrs~K1=_UzV9sGzw*m;r>rW`5VcO3
z7IMJ1scz{azh_gqUL1M+vBGUim#xw1EZ%)WJ}X2kJiav6MJ_(VR4FP~EUIoj=b^Ow
z+fRLtb8-TnasC#`HEf&Ad+u}3eUY^nw6!hrKFl$F^(1tsPIQUkF{z7IsX(0?^&D<j
zx$Y?aSaR)w^~`v$!vY5_O%FsH{q}N}Ke$6Gq4P{%P@rP)<4JuF_zt=+O`4G~-E&uI
zN4L-C=?@w&8T!Xf<<+`!;`f@g2Nh=v#a@JL-f^0(_fN{4;7tcj=Lub%`PeKq@{nNV
h&BF-1b?e*}%)6wI&zqA}ng@&-22WQ%mvv4FO#m=J$oBvM

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_attach_money_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4bde8132b78b2c4214c69287b57063147cdd86a
GIT binary patch
literal 640
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXoKNz~t`f;uw;_`u1RKMsFd*@sIbn
zrQbfdM&xK#ib&x@C!xr**;}~HgRY$5&E{4W(>um`b85=kfHKF6dK{HEPibm;W}aMg
z!aH%T&QjH4v-9V!-~DF)|MRx1mGl0e{ruBoqKAr*rie|>zL-OYpPg34V8~9p)RQ}>
zDv3+_smzk;Ic=HCqaG%T-#?MwBGx5pbLvIPs&|6H8#EqsUj8^ih_zFDiT8(TdG9Ve
z+yCFNRm&phNZIt<DcMX@Wgc)Z3!J8*VRP8z3}5PjoJTX(X-b4l&RV@GfzN)%m)S+E
zjkYtYrZBIau}y<x&Y_YR%MDV&-AxA~eR@wdM$WJjVd+cUrE`77@h{y!i@Lpz8GH>=
z-M+(j)qImcwepB#8rvMtZFX8$Fy)M0!Nj*`LVjc@?`FAcV&wnukwE>))E?_Anm#(u
zHGl3&n0x4m+AhyY-jn!}xP(pTESw(`XBeKCY}i|3=#rMdVgk3w#x^rHk8<aC4>nHs
zzmfG+$Z*}HSB)`?nJ;ThE$WtNo?&*{^p>IN$_pCD(l3=hJ(%dTJhY-F@ly5EgPcC<
zp%r%yg{+=a(ULiztN-qdUn>H_auhl<mvZ$R?MtpY>6Ch;s?DG_#2`cAs=VIDX+pjW
zrdZ_}`K?N0ZPmNfd%=Cq@gtS)O(p9;iio5Mq*t*;EKvybQxCrG-rIEC&u(&j6Za7j
zKCjFNmY$n_p0ZpeVkWjhK6;Y!nnfOY4-!8=6_PWH*L#T00LSr`|I&|yH{Eth)CHz2
N22WQ%mvv4FO#qM@Am0E0

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_attach_money_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_attach_money_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3c568542d1a733c45204f1ed5c6b9bf6a926d2d
GIT binary patch
literal 819
zcmV-31I+x1P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0008|Nkl<ZcmeI&
zOGs329EWl5^H*>(jc!6<w#W>FGXE_?3M6S`p_sHP)J+%&hSjD`6m1NG(g?$nAdMEu
zNUZ{6k`f{bQG!CsM0BFtWHQ8=@u~HD&Wx{)&F>7npYL{liw7K>TZ&;AhG7_nv0BK$
zS(uc6vlLc$Ccp%k025#W;#f9SQ3DFy9pIq>A0c8HrHy<y2IO#_IrPkP1+TjT>X>19
zW~g>cz<>0x5)sb1A;62DmAfb%kcFT4G|L8b65Sj_+^75R`tb7&XCX@D0xEGfK`TYd
zV^b;TIw9<a<N}7V3(`nx)QfGr!LCXsU^jLFb}Vs~#{?>$Ou%JSiyY9n+ry%AXR%fy
zz>jKB^YSsOdWnF~s7`2JHlpf~2neJ4U-PmQ)u2Q`1XYFh3%{_kml6R#H2#G2ClD}-
z>S=NX+{W%?G6mFOXVH{A0UiQ4dBj%P0R6S&%%YcyWC+M&oan~6K&ecC{z?cE+Xrq@
zOP)Z0<|<iWX<?qzPO&>b*xJi1x?a)38u<Wq8+d}gU)*4ee1N(JrqK7BYvf4>sLP^-
zN%RG%kq=OpP7OXRbajv>A7Ebr&G=YAM?dKT0b28LkW0M4BDQXs0R4HXr;i1qYmy7l
zUv7-2_;=Pz2Iwz?(*$vHRXRX_MT}t=Bu6?xfBC${?x=i#{&o>T)#>g4bpxpU$raFq
zYC6#YgQ$w*`exy0q62QCs@1<{AF5EI15Tm3tAEXLRDnbX>_io!Q2V+M)kxx>#P3o0
zNY%P5!$Q@S_<*z6b!oi5-^e@cY7!sd<qLMtmiXGVnrZ9;WJ>%WXvRr|0gkcG_UO$t
zGK{k`QZMEPi0%_ZJm3z!JjBl|(T$NQ6_Cqo;uU1O<Qtj-Mu^8e`=#GfX4At;O;YBL
zPbH2p#d1aHBG)~i3wdbeBf2d5DRtkE{?a+jJ-!l4m|@!3<mR7UrcsWw2#4^RAHJFZ
x6R`R-0Vco%NY4bw%><YL6JP>NfC(@Ge*n6{IDmJ|3g!R+002ovPDHLkV1fXzd(Z#?

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/frag_donate.xml b/app/src/main/res/layout/frag_donate.xml
new file mode 100644
index 0000000..b8967fd
--- /dev/null
+++ b/app/src/main/res/layout/frag_donate.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="60dp">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:src="@drawable/logo"/>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="16dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp">
+
+        <TextView
+            android:id="@+id/d_txtDesc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="150dp"
+            android:textSize="14sp"
+            android:text="Join grassroots supporters from Reddit, Facebook, Twitter and elsewhere in supporting Bernie Sanders' run for president.\n\nAmerica is ready for a new path to the future. Make a contribution to our presidential campaign today. We can't wait to see what we will accomplish together."/>
+
+            <ImageView
+                android:id="@+id/d_imgThermometer"
+                android:layout_width="130dp"
+                android:layout_height="256dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignTop="@id/d_txtDesc"
+                android:layout_alignBottom="@id/d_txtDesc"
+                android:paddingTop="2dp"
+                android:paddingBottom="2dp"
+                android:src="@drawable/darkshort"
+                android:scaleType="fitXY"/>
+
+        <TextView
+            android:id="@+id/d_txtDescMini"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="I can not host a direct donation through the app! Please donate through the official page &#9658;"
+            android:layout_alignRight="@id/d_txtDesc"
+            android:layout_below="@+id/d_txtDesc"
+            android:layout_marginTop="40dp"
+            android:textStyle="italic"/>
+
+        <Button
+            android:id="@+id/d_btnDonate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Donate Through ActBlue"
+            android:textColor="#FFFFFF"
+            android:background="#AA147FD7"
+            android:layout_below="@id/d_imgThermometer"
+            android:layout_alignLeft="@id/d_imgThermometer"
+            android:layout_alignRight="@id/d_imgThermometer"
+            android:layout_alignTop="@id/d_txtDescMini"
+            android:layout_alignBottom="@id/d_txtDescMini"/>
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad42beb..9523768 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,7 +6,8 @@
     <string name="title_section3">Organize</string>
     <string name="title_section4">Connect</string>
     <string name="title_section5">BernRate</string>
-    <string name="title_section6">App Feedback</string>
+    <string name="title_section6">Donate</string>
+    <string name="title_section7">App Feedback</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
@@ -15,6 +16,8 @@
 
     <string name="action_settings">Settings</string>
 
+    <string name="donate_url">https://secure.actblue.com/contribute/page/reddit-for-bernie</string>
+
 <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string-array name="radius_choices">

From efa38db0fb078bc84d5fc1c6e17ec0ea12878e87 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Sun, 28 Feb 2016 17:02:17 -0500
Subject: [PATCH 06/19] Finally! Adds Donate Fragment

---
 .../steve/bernieapp/fragments/NavigationDrawerFragment.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/NavigationDrawerFragment.java b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/NavigationDrawerFragment.java
index c939f28..4e9a2f3 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/NavigationDrawerFragment.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/NavigationDrawerFragment.java
@@ -111,7 +111,8 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                 new NavDrawerItem(R.drawable.ic_people_white_24dp, getString(R.string.title_section3)),
                 new NavDrawerItem(R.drawable.ic_map_white_24dp, getString(R.string.title_section4)),
                 new NavDrawerItem(R.drawable.ic_insert_chart_white_24dp, getString(R.string.title_section5)),
-                new NavDrawerItem(R.drawable.ic_feedback_white_24dp, getString(R.string.title_section6)),
+                new NavDrawerItem(R.drawable.ic_attach_money_white_24dp, getString(R.string.title_section6)),
+                new NavDrawerItem(R.drawable.ic_feedback_white_24dp, getString(R.string.title_section7)),
         };
         mDrawerListView.setAdapter(new NavDrawerAdapter(getActivity(), R.layout.list_drawer_item, datas));
         mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);

From 060a39cbd3a02d84fca1617fa61727d7a23d0750 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Sun, 28 Feb 2016 17:02:31 -0500
Subject: [PATCH 07/19] removes comments

---
 .../steve/bernieapp/fragments/NewsFragment.java | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/NewsFragment.java b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/NewsFragment.java
index 761eaaa..d71d0d4 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/NewsFragment.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/NewsFragment.java
@@ -39,23 +39,6 @@ public void onViewCreated(final View view, @Nullable Bundle savedInstanceState)
         final ListView newsList = (ListView) view.findViewById(R.id.listNews);
         ((TextView) view.findViewById(R.id.txtSubHeader)).setMovementMethod(new ScrollingMovementMethod());
         new NewsTask(getActivity(), newsList, (ProgressBar) view.findViewById(R.id.progressBar), (TextView) view.findViewById(R.id.txtSubHeader), (TextView) view.findViewById(R.id.txtHeader)).execute();
-
-        /*if (!(NewsTask.hasData())) {
-            new NewsTask(getActivity(), newsList, (ProgressBar) view.findViewById(R.id.progressBar), (TextView) view.findViewById(R.id.txtSubHeader), (TextView) view.findViewById(R.id.txtHeader)).execute();
-        } else {
-            for (NewsArticle a : NewsTask.getData()) {
-                if (a.getUrl().contains("press-release")) {
-                    ((TextView) view.findViewById(R.id.txtSubHeader)).setText(Html.fromHtml(a.getDesc()));
-                    String s = a.getTitle();
-                    s = s.length() > 42 ? s.substring(0, 42) + "..." : s;
-                    ((TextView) view.findViewById(R.id.txtHeader)).setText(s);
-                    break;
-                }\
-            }
-            newsList.setVisibility(View.VISIBLE);
-            view.findViewById(R.id.progressBar).setVisibility(View.GONE);
-            newsList.setAdapter(new ImgTxtAdapter(getActivity(), R.layout.list_news_item, NewsTask.getData()));
-        }*/
     }
 
     @Override

From 188039ababf420f8c644e5d0791d0d3abed603c8 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Sun, 28 Feb 2016 17:03:14 -0500
Subject: [PATCH 08/19] adds share capabilities

---
 .../fragments/SingleIssueFragment.java        | 45 ++++++++++++++++---
 .../fragments/SingleNewsFragment.java         | 33 +++++++++++++-
 app/src/main/res/layout/frag_event.xml        |  4 +-
 app/src/main/res/layout/frag_single_issue.xml |  2 +-
 app/src/main/res/layout/layout_main_page.xml  | 24 +++-------
 app/src/main/res/menu/global.xml              |  5 ---
 app/src/main/res/menu/share_menu.xml          |  9 ++++
 7 files changed, 91 insertions(+), 31 deletions(-)
 delete mode 100644 app/src/main/res/menu/global.xml
 create mode 100644 app/src/main/res/menu/share_menu.xml

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/SingleIssueFragment.java b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/SingleIssueFragment.java
index bdf1f67..9138170 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/SingleIssueFragment.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/SingleIssueFragment.java
@@ -1,16 +1,21 @@
 package com.spielpark.steve.bernieapp.fragments;
 
-
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.widget.ShareActionProvider;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.widget.TextView;
 
@@ -21,6 +26,7 @@
  * A simple {@link Fragment} subclass.
  */
 public class SingleIssueFragment extends Fragment {
+    private ShareActionProvider shareActionProvider;
     private static Issue mIssue;
 
     public static SingleIssueFragment newInstance(Issue i) {
@@ -40,7 +46,7 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+    public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         if (mIssue == null) {
             //User exited the app and returned to it, but android cleared some stuff from memory...
@@ -52,14 +58,43 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         ((TextView) root.findViewById(R.id.i_txtDate)).setText("Published " + mIssue.getPubDate());
         ((TextView) root.findViewById(R.id.i_txtDesc)).setText(Html.fromHtml(mIssue.getDesc()));
         ((TextView) root.findViewById(R.id.i_txtDesc)).setMovementMethod(new LinkMovementMethod());
-        ((WebView) root.findViewById(R.id.i_video)).getSettings().setJavaScriptEnabled(true);
-        ((WebView) root.findViewById(R.id.i_video)).loadData(mIssue.getEmbedURL(getActivity()), "text/Html", "UTF-8");
+        WebView wv = ((WebView) root.findViewById(R.id.i_video));
+        wv.setWebChromeClient(new WebChromeClient());
+        wv.getSettings().setJavaScriptEnabled(true);
+        wv.loadDataWithBaseURL(null, mIssue.getEmbedURL(getActivity()), "text/Html", "UTF-8", null);
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.share_menu, menu);
+        MenuItem item = menu.findItem(R.id.menu_item_share);
+        shareActionProvider = (ShareActionProvider) MenuItemCompat.getActionProvider(item);
+        shareActionProvider.setShareIntent(getShareIntent());
+        shareActionProvider.setOnShareTargetSelectedListener(new ShareActionProvider.OnShareTargetSelectedListener() {
+            @Override
+            public boolean onShareTargetSelected(ShareActionProvider source, Intent intent) {
+                getActivity().onBackPressed();
+                return false;
+            }
+        });
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    private Intent getShareIntent() {
+        Intent shareIntent = new Intent(Intent.ACTION_SEND);
+        shareIntent.setType("text/plain");
+        StringBuilder text = new StringBuilder("Hey, here's Bernie Sanders' official stance on this issue -- \n");
+        text.append(mIssue.getTitle());
+        text.append("\n\nRead more here: " + mIssue.getUrl());
+        text.append("\n\nSent from Bernie Sanders for President 2016 Android Application");
+        shareIntent.putExtra(Intent.EXTRA_TEXT, text.toString());
+        return shareIntent;
+    }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
+        setHasOptionsMenu(true);
         return inflater.inflate(R.layout.frag_single_issue, container, false);
     }
 
diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/SingleNewsFragment.java b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/SingleNewsFragment.java
index 3814c80..3361ae1 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/SingleNewsFragment.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/SingleNewsFragment.java
@@ -5,9 +5,15 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.widget.ShareActionProvider;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
+import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -20,6 +26,7 @@
 public class SingleNewsFragment extends Fragment {
     private static NewsArticle mEvent;
     private static SingleNewsFragment mInstance;
+    private ShareActionProvider shareActionProvider;
 
     public static SingleNewsFragment getInstance(NewsArticle e) {
         mEvent = e;
@@ -52,14 +59,36 @@ public void onClick(View v) {
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.share_menu, menu);
+        MenuItem item = menu.findItem(R.id.menu_item_share);
+        shareActionProvider = (ShareActionProvider) MenuItemCompat.getActionProvider(item);
+        shareActionProvider.setShareIntent(getShareIntent());
+        shareActionProvider.setOnShareTargetSelectedListener(new ShareActionProvider.OnShareTargetSelectedListener() {
+            @Override
+            public boolean onShareTargetSelected(ShareActionProvider source, Intent intent) {
+                return false;
+            }
+        });
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    private Intent getShareIntent() {
+        Intent shareIntent = new Intent(Intent.ACTION_SEND);
+        shareIntent.setType("text/plain");
+        StringBuilder text = new StringBuilder("Hey, check out this article on Bernie Sanders!\n");
+        text.append(mEvent.getTitle());
+        text.append("\n\nRead more here: " + mEvent.getUrl());
+        text.append("\n\nSent from Bernie Sanders for President 2016 Android Application");
+        shareIntent.putExtra(Intent.EXTRA_TEXT, text.toString());
+        return shareIntent;
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
+        setHasOptionsMenu(true);
         return inflater.inflate(R.layout.frag_event, container, false);
     }
 }
diff --git a/app/src/main/res/layout/frag_event.xml b/app/src/main/res/layout/frag_event.xml
index 572e0ad..48979df 100644
--- a/app/src/main/res/layout/frag_event.xml
+++ b/app/src/main/res/layout/frag_event.xml
@@ -1,8 +1,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.spielpark.steve.bernieapp.fragments.SingleNewsFragment"
     android:layout_marginBottom="60dp">
+
     <com.emilsjolander.components.StickyScrollViewItems.StickyScrollView
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
diff --git a/app/src/main/res/layout/frag_single_issue.xml b/app/src/main/res/layout/frag_single_issue.xml
index a7d353f..75b7147 100644
--- a/app/src/main/res/layout/frag_single_issue.xml
+++ b/app/src/main/res/layout/frag_single_issue.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.spielpark.steve.bernieapp.fragments.SingleNewsFragment"
+    tools:context="com.spielpark.steve.bernieapp.fragments.SingleIssueFragment"
     android:layout_marginBottom="60dp">
 
     <com.emilsjolander.components.StickyScrollViewItems.StickyScrollView
diff --git a/app/src/main/res/layout/layout_main_page.xml b/app/src/main/res/layout/layout_main_page.xml
index 5112b4d..c88e40e 100644
--- a/app/src/main/res/layout/layout_main_page.xml
+++ b/app/src/main/res/layout/layout_main_page.xml
@@ -1,4 +1,3 @@
-<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
 <android.support.v4.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -7,31 +6,22 @@
     android:layout_height="match_parent"
     tools:context=".actMainPage">
 
-    <!-- As the main content view, the view below consumes the entire
-         space available using match_parent in both dimensions. -->
     <RelativeLayout
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#F1F1F1">
 
-    <fragment
-        android:id="@+id/bottom_navigation"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:name="com.spielpark.steve.bernieapp.fragments.BottomNavFragment"
-        tools:layout="@layout/frag_bottom_nav"
-        android:layout_alignParentBottom="true"/>
+        <fragment
+            android:id="@+id/bottom_navigation"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:name="com.spielpark.steve.bernieapp.fragments.BottomNavFragment"
+            tools:layout="@layout/frag_bottom_nav"
+            android:layout_alignParentBottom="true"/>
 
     </RelativeLayout>
 
-    <!-- android:layout_gravity="start" tells DrawerLayout to treat
-         this as a sliding drawer on the left side for left-to-right
-         languages and on the right side for right-to-left languages.
-         If you're not building against API 17 or higher, use
-         android:layout_gravity="left" instead. -->
-    <!-- The drawer is given a fixed width in dp and extends the full height of
-         the container. -->
     <fragment android:id="@+id/navigation_drawer"
         android:layout_width="@dimen/navigation_drawer_width"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml
deleted file mode 100644
index 326a6a7..0000000
--- a/app/src/main/res/menu/global.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_settings" android:title="@string/action_settings"
-        android:orderInCategory="100" app:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/menu/share_menu.xml b/app/src/main/res/menu/share_menu.xml
new file mode 100644
index 0000000..15eec56
--- /dev/null
+++ b/app/src/main/res/menu/share_menu.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_item_share"
+        app:showAsAction="ifRoom"
+        android:title="Share"
+        app:actionProviderClass="android.support.v7.widget.ShareActionProvider"/>
+
+</menu>

From ecefa87368470421823ea9f82ad16352e02c462c Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Sun, 28 Feb 2016 17:03:32 -0500
Subject: [PATCH 09/19] removes more html code from text

---
 .../spielpark/steve/bernieapp/tasks/NewsTask.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/tasks/NewsTask.java b/app/src/main/java/com/spielpark/steve/bernieapp/tasks/NewsTask.java
index 98fd0e5..5d75109 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/tasks/NewsTask.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/tasks/NewsTask.java
@@ -119,9 +119,23 @@ private void readObjects(JsonReader reader) throws IOException {
                 }
                 case "content" : {
                     String content = reader.nextString();
+                    content = content.replaceAll("\\[.*?\\]",""); //at the risk of removing innocuous []'s
                     if (content.contains("<style>") && content.contains("</style")) {
                         content = content.substring(content.indexOf("</style") + "</style>".length());
                     }
+                    if (content.contains("<img")) {
+                        content = content.replaceAll("(<(/)img>)|(<img.+?>)", "");
+                    }
+                    //This shouldn't have to happen but I can't change the text formatting from the source. /me shrugs "it works"
+                    try {
+                        while (content.contains(("[rwd"))) {
+                            String p1 = content.substring(0, content.indexOf(("[rwd")));
+                            String p2 = content.substring(content.indexOf(']', p1.length()) + 1);
+                            content = p1.concat(p2);
+                        }
+                    } catch (Exception e) { //can't win'm all.
+                        a.setDesc(content); //just roll with it.
+                    }
                     a.setDesc(content);
                     break;
                 }

From 52517b829edd93358f83f9e213e1daf63f26121a Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Sun, 28 Feb 2016 17:04:38 -0500
Subject: [PATCH 10/19] Removes unnecessary image reference

---
 app/src/main/res/layout/frag_donate.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/layout/frag_donate.xml b/app/src/main/res/layout/frag_donate.xml
index b8967fd..47f9bb8 100644
--- a/app/src/main/res/layout/frag_donate.xml
+++ b/app/src/main/res/layout/frag_donate.xml
@@ -35,7 +35,6 @@
                 android:layout_alignBottom="@id/d_txtDesc"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
-                android:src="@drawable/darkshort"
                 android:scaleType="fitXY"/>
 
         <TextView

From 48b65c6f277fcde883a94ce9f4326ee985154330 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Mon, 29 Feb 2016 01:17:36 -0500
Subject: [PATCH 11/19] cuts memory down in half

---
 .../java/com/spielpark/steve/bernieapp/misc/ImgTxtAdapter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/misc/ImgTxtAdapter.java b/app/src/main/java/com/spielpark/steve/bernieapp/misc/ImgTxtAdapter.java
index 75c0673..fa0a39b 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/misc/ImgTxtAdapter.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/misc/ImgTxtAdapter.java
@@ -45,7 +45,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         } else {
             v = (ViewHolder) convertView.getTag();
         }
-        Util.getPicasso(ctx).load(item.getImgSrc()).into(v.img);
+        Util.getPicasso(ctx).load(item.getImgSrc()).fit().into(v.img);
         v.txt.setTypeface(Typeface.createFromAsset(ctx.getAssets(), "Jubilat.otf"));
         v.txt.setText(Html.fromHtml(item.getTxt()));
         return convertView;

From d642c668e31d45fd01469eb76b89ed85aecd3745 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Mon, 29 Feb 2016 01:18:28 -0500
Subject: [PATCH 12/19] adds dates to connect events

---
 .../spielpark/steve/bernieapp/fragments/ConnectFragment.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/ConnectFragment.java b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/ConnectFragment.java
index 02cf42a..56d4df3 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/ConnectFragment.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/ConnectFragment.java
@@ -104,6 +104,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
             }
         });
         fetchCountry = true;
+        Toast.makeText(getActivity(), "Only Start Date Listed, Events May End at a Later Date", Toast.LENGTH_LONG).show();
         setUpMap();
         MapsInitializer.initialize(getActivity().getApplicationContext());
         super.onViewCreated(view, savedInstanceState);
@@ -182,7 +183,7 @@ public void onClick(View view) {
         ((TextView) base.findViewById(R.id.cd_txtDescContent)).setText(Html.fromHtml(e.getDescription()));
         ((TextView) base.findViewById(R.id.cd_txtDescContent)).setMovementMethod(new ScrollingMovementMethod());
         if (e.getVenue_city() != null) ((TextView) base.findViewById(R.id.cd_txtLocation)).setText(e.getVenue_addr() + "\n" + e.getVenue_city() + ", " + e.getState() + " - " + e.getZip());
-        if (e.getAttendee_count() != 0) ((TextView) base.findViewById(R.id.cd_txtRSVP)).setText(e.isOfficial() ? "N/A" : Integer.toString(e.getAttendee_count()));
+        ((TextView) base.findViewById(R.id.cd_txtRSVP)).setText(e.isOfficial() ? "N/A" : Integer.toString(e.getAttendee_count()));
         Animation fadeIn = AnimationUtils.loadAnimation(getActivity(), alreadyLoaded ? R.anim.view_fade_in_fast : R.anim.view_fade_in);
         fadeIn.setAnimationListener(new Animation.AnimationListener() {
             @Override
@@ -308,7 +309,7 @@ public void updateViews(ArrayAdapter a) {
         if (parent == null) {
             return; //We switched out of this view.
         }
-        ListView list = (ListView) getView().findViewById(R.id.c_listEvents);
+        ListView list = (ListView) parent.findViewById(R.id.c_listEvents);
         list.setAdapter(a);
         list.setVisibility(View.VISIBLE);
         parent.findViewById(R.id.c_mapContainer).setVisibility(View.VISIBLE);

From 677242646573deb0ee23bb6dcddc263944e331da Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Mon, 29 Feb 2016 01:18:43 -0500
Subject: [PATCH 13/19] cuts down on image memory

---
 .../spielpark/steve/bernieapp/fragments/SingleNewsFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/SingleNewsFragment.java b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/SingleNewsFragment.java
index 3361ae1..76099e6 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/fragments/SingleNewsFragment.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/fragments/SingleNewsFragment.java
@@ -47,7 +47,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
         ((TextView) root.findViewById(R.id.e_txtDate)).setText(mEvent.getPubDate());
         ((TextView) root.findViewById(R.id.e_txtDesc)).setText(Html.fromHtml(mEvent.getDesc()));
         ((TextView) root.findViewById(R.id.e_txtDesc)).setMovementMethod(new LinkMovementMethod());
-        Util.getPicasso(getActivity()).load(mEvent.getImgSrc()).placeholder(R.drawable.logo).into((ImageView)root.findViewById(R.id.e_imgLogo));
+        Util.getPicasso(getActivity()).load(mEvent.getImgSrc()).placeholder(R.drawable.logo).fit().into((ImageView)root.findViewById(R.id.e_imgLogo));
         root.findViewById(R.id.e_btnWebsite).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

From c947cfe78fd5388725c2e910acb74ac6070449f5 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Mon, 29 Feb 2016 01:18:58 -0500
Subject: [PATCH 14/19] small typo

---
 .../main/java/com/spielpark/steve/bernieapp/misc/Util.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/misc/Util.java b/app/src/main/java/com/spielpark/steve/bernieapp/misc/Util.java
index 8e2d4e2..013532a 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/misc/Util.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/misc/Util.java
@@ -54,8 +54,8 @@ public static int getFullScreenHeight(Activity ctx) {
     }
 
     public static AlertDialog getShowAgainDialogue(Context ctx, final SharedPreferences prefs, final Preferences p, String message) {
-        LayoutInflater inflator = LayoutInflater.from(ctx);
-        final View view = inflator.inflate(R.layout.dialogue_checkbox, null);
+        LayoutInflater inflater = LayoutInflater.from(ctx);
+        final View view = inflater.inflate(R.layout.dialogue_checkbox, null);
         AlertDialog.Builder bld = new AlertDialog.Builder(ctx, 4);
         bld.setMessage(message)
                 .setTitle("Welcome!")

From c7e2ed2eb9de7ea03958dec91d803da58197f085 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Mon, 29 Feb 2016 01:38:56 -0500
Subject: [PATCH 15/19] sets a realistic limit for json results, adds dates

---
 .../steve/bernieapp/tasks/ConnectTask.java    | 69 +++++++++++++++++--
 1 file changed, 63 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/tasks/ConnectTask.java b/app/src/main/java/com/spielpark/steve/bernieapp/tasks/ConnectTask.java
index edd5e00..ec1e0fd 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/tasks/ConnectTask.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/tasks/ConnectTask.java
@@ -1,16 +1,25 @@
 package com.spielpark.steve.bernieapp.tasks;
 
+import android.app.Activity;
 import android.content.Context;
+import android.graphics.Typeface;
 import android.os.AsyncTask;
 import android.text.Html;
 import android.util.JsonReader;
 import android.util.JsonToken;
 import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.spielpark.steve.bernieapp.R;
 import com.spielpark.steve.bernieapp.fragments.ConnectFragment;
+import com.spielpark.steve.bernieapp.misc.Util;
 import com.spielpark.steve.bernieapp.wrappers.Event;
+import com.spielpark.steve.bernieapp.wrappers.ImgTxtItem;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -45,7 +54,7 @@ protected Object doInBackground(Object[] params) {
         BufferedReader in = null;
         try {
             URL url = frag.fetchCountry ?
-                    new URL("https://go.berniesanders.com/page/event/search_results?orderby=date&format=json") :
+                    new URL("https://go.berniesanders.com/page/event/search_results?orderby=date&format=json&limit=500") :
                     new URL("https://go.berniesanders.com/page/event/search_results?orderby=date&format=json&zip_radius=" + frag.mRadius + "&zip=" + frag.mZip);
             Log.d("URL", url.toString());
             in = new BufferedReader(new InputStreamReader(url.openStream()));
@@ -75,10 +84,12 @@ protected void onPostExecute(Object o) {
         Log.d("OPE", "There are " + events.size() + " events.");
         Collections.sort(events);
         String[] titles = new String[events.size()];
+        String[] dates = new String[events.size()];
         for (int i = 0; i < events.size(); i++) {
             titles[i] = getHTMLForTitle(events.get(i));
+            dates[i] = getHTMLForDate(events.get(i).getDate());
         }
-        NewsAdapter adapter = new NewsAdapter(ctx, R.layout.list_news_item, R.id.txtItem, titles);
+        ConnectAdapter adapter = new ConnectAdapter(ctx, R.layout.list_connect_events, dates, titles);
         frag.setMarkers();
         frag.updateViews(adapter);
         frag = null;
@@ -104,6 +115,18 @@ private String getHTMLForTitle(Event e) {
         return bld.toString();
     }
 
+    private String getHTMLForDate(String s) {
+        String ret = s;
+        SimpleDateFormat ft = new SimpleDateFormat("MMMM d, yyyy");
+        try {
+            Date date = ft.parse(s);
+            ret = new SimpleDateFormat("'<big><font color=\"#EA504E\">'d'</font><br><font color=\"#147FD7\">'MMM'</font>'").format(date);
+        } catch (ParseException e1) {
+            e1.printStackTrace();
+        }
+        return ret;
+    }
+
     private void readObjects(JsonReader reader) throws IOException {
         Log.d("JsonReader", "Beginning parsing");
         Event e = new Event();
@@ -226,16 +249,50 @@ private void readObjects(JsonReader reader) throws IOException {
         reader.close();
     }
 
-    private class NewsAdapter extends ArrayAdapter {
+    private class ConnectAdapter extends ArrayAdapter {
+        private String[] dates;
+        private String[] titles;
+        private int res;
 
-        private NewsAdapter(Context context, int resource, int textViewResourceId, Object[] objects) {
-            super(context, resource, textViewResourceId, objects);
+        public ConnectAdapter(Context context, int resource, String[] dates, String[] titles) {
+            super(context, resource, dates);
+            this.dates = dates;
+            this.titles = titles;
+            this.res = resource;
         }
 
         @Override
         public Object getItem(int position) {
-            return Html.fromHtml( (String) super.getItem(position));
+            return Html.fromHtml( dates[position] + " " + titles[position]);
+        }
+
+        @Override
+        public int getCount() {
+            return dates.length;
         }
 
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            ViewHolder v;
+            if (convertView == null) {
+                LayoutInflater inflater = ((Activity) ctx).getLayoutInflater();
+                convertView = inflater.inflate(res, parent, false);
+                v = new ViewHolder();
+                v.date = (TextView) convertView.findViewById(R.id.list_con_txtDate);
+                v.title = (TextView) convertView.findViewById(R.id.list_con_txtDesc);
+                convertView.setTag(v);
+            } else {
+                v = (ViewHolder) convertView.getTag();
+            }
+            v.date.setText(Html.fromHtml(dates[position]));
+            v.date.setTypeface(Typeface.createFromAsset(ctx.getAssets(), "Jubilat.otf"));
+            v.title.setText(Html.fromHtml(titles[position]));
+            return convertView;
+        }
+
+        private class ViewHolder {
+            TextView date;
+            TextView title;
+        }
     }
 }

From 70a3ce174f1b3fb37c5e4713f6220327d0abdce6 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Mon, 29 Feb 2016 01:39:38 -0500
Subject: [PATCH 16/19] date/desc listview

---
 app/src/main/res/layout/list_connect_events.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/src/main/res/layout/list_connect_events.xml b/app/src/main/res/layout/list_connect_events.xml
index 4d87955..b953c54 100644
--- a/app/src/main/res/layout/list_connect_events.xml
+++ b/app/src/main/res/layout/list_connect_events.xml
@@ -4,4 +4,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <TextView
+        android:id="@+id/list_con_txtDate"
+        android:layout_width="75dp"
+        android:layout_height="match_parent"
+        android:layout_alignTop="@+id/list_con_txtDesc"
+        android:layout_alignBottom="@+id/list_con_txtDesc"
+        android:gravity="center_horizontal"/>
+
+    <TextView
+        android:id="@+id/list_con_txtDesc"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/list_con_txtDate"/>
 </RelativeLayout>
\ No newline at end of file

From 9979cd516fae6426ac4d3a0ccd3a3348be65fb72 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Mon, 29 Feb 2016 01:39:52 -0500
Subject: [PATCH 17/19] google api stuff

---
 app/src/main/AndroidManifest.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5874307..450480c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,6 +25,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <!-- ATTENTION: This was auto-generated to add Google Play services to your project for
+             App Indexing.  See https://g.co/AppIndexing/AndroidStudio for more information. -->
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
     </application>
 
 </manifest>

From c6c5540b569332b7e5b090a8bc4c1b8b783c8252 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Mon, 29 Feb 2016 01:40:21 -0500
Subject: [PATCH 18/19] next-version changes

---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0f24eaf..15d5bf9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.spielpark.steve.bernieapp"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 17
-        versionName "1.32R"
+        versionCode 18
+        versionName "1.6R"
     }
     buildTypes {
         release {
@@ -23,6 +23,6 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:23.1.0'
     compile 'se.emilsjolander:StickyScrollViewItems:1.1.0'
-    compile 'com.google.android.gms:play-services:7.5.0'
+    compile 'com.google.android.gms:play-services:8.1.0'
     compile 'com.squareup.picasso:picasso:2.5.2'
 }

From c76187f451cad5abec4664a57990b0ad206643d6 Mon Sep 17 00:00:00 2001
From: Steve <steve.vernyi@gmail.com>
Date: Mon, 29 Feb 2016 01:58:28 -0500
Subject: [PATCH 19/19] Language Update

---
 .../java/com/spielpark/steve/bernieapp/tasks/ConnectTask.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/spielpark/steve/bernieapp/tasks/ConnectTask.java b/app/src/main/java/com/spielpark/steve/bernieapp/tasks/ConnectTask.java
index ec1e0fd..e1eb5c2 100644
--- a/app/src/main/java/com/spielpark/steve/bernieapp/tasks/ConnectTask.java
+++ b/app/src/main/java/com/spielpark/steve/bernieapp/tasks/ConnectTask.java
@@ -110,7 +110,7 @@ private String getHTMLForTitle(Event e) {
         bld.append("<big><font color =\"#147FD7\">").append(e.getName()).append("</font></big><br>");
         if (e.getVenue_city() != null) {
             bld.append("&emsp;").append(e.getVenue_city()).append(", ").append(e.getState()).append(" - ").append(e.getZip()).append("<br>");
-            bld.append("&emsp;# of RSVP: ").append(e.isOfficial() ? "N/A" : Integer.toString(e.getAttendee_count()));
+            bld.append("&emsp;Participating: ").append(e.isOfficial() ? "N/A" : Integer.toString(e.getAttendee_count()));
         }
         return bld.toString();
     }