From aeadcfedc025ebd42edab7be5146419e50938812 Mon Sep 17 00:00:00 2001
From: cr554 <cody.roy@yale.edu>
Date: Thu, 2 Mar 2017 17:40:25 -0500
Subject: [PATCH] syncronizedimages with their info, removed the progress bar,
 sped loads

---
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                | 18 ++++++++-
 .idea/vcs.xml                                 |  6 ---
 .../com/example/samplegallery/APIKeys.java    |  2 +-
 .../samplegallery/PhotoBlowupFragment.java    | 39 +++++++++++++------
 .../main/res/layout/photo_blowup_fragment.xml |  3 +-
 6 files changed, 49 insertions(+), 21 deletions(-)
 delete mode 100644 .idea/vcs.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0e23f8e..fe72da5 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
+        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb6828..7158618 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,10 +37,26 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/samplegallery/APIKeys.java b/app/src/main/java/com/example/samplegallery/APIKeys.java
index b24e26e..779744d 100644
--- a/app/src/main/java/com/example/samplegallery/APIKeys.java
+++ b/app/src/main/java/com/example/samplegallery/APIKeys.java
@@ -10,5 +10,5 @@
  * keys publically!
  */
 public class APIKeys {
-    public static final String FLICKR_API_KEY = "64ffdc1fd4b18211f4f98513848d2335";
+    public static final String FLICKR_API_KEY = "b189cbcb6aeea9a8ae5d0a10ec002496";
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/samplegallery/PhotoBlowupFragment.java b/app/src/main/java/com/example/samplegallery/PhotoBlowupFragment.java
index 62ecbd4..902a65e 100644
--- a/app/src/main/java/com/example/samplegallery/PhotoBlowupFragment.java
+++ b/app/src/main/java/com/example/samplegallery/PhotoBlowupFragment.java
@@ -1,5 +1,6 @@
 package com.example.samplegallery;
 
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -7,13 +8,16 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.android.volley.Request;
 import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.ImageRequest;
 import com.android.volley.toolbox.JsonObjectRequest;
-import com.android.volley.toolbox.NetworkImageView;
 import com.example.samplegallery.Utilities.VolleyErrorListener;
 import com.example.samplegallery.Utilities.VolleyRequestQueue;
 
@@ -43,11 +47,11 @@ public void onCreate(Bundle savedInstanceState) {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         RelativeLayout rootView = (RelativeLayout) inflater.
                 inflate(R.layout.photo_blowup_fragment, container, false);
-        final NetworkImageView img = (NetworkImageView) rootView.findViewById(R.id.photo_blowup);
+        final ImageView img = (ImageView) rootView.findViewById(R.id.photo_blowup);
         final TextView photoTitleView = (TextView) rootView.findViewById(R.id.photo_title);
-        final TextView photoDescriptionView =
-                (TextView) rootView.findViewById(R.id.photo_description);
-        // create a request for photo title
+        final TextView photoDescriptionView = (TextView) rootView.findViewById(R.id.photo_description);
+        final ProgressBar progressBar = (ProgressBar) rootView.findViewById(R.id.blowup_progress_bar);
+        // / create a request for photo title
         JsonObjectRequest photoInfoRequest = new JsonObjectRequest(
                 Request.Method.GET,
                 getPhotosInfoUrl(),
@@ -86,16 +90,29 @@ public void onResponse(JSONObject response) {
                         try {
                             sizes = response.getJSONObject("sizes").getJSONArray("size");
                             photoUrl = sizes
-                                    .getJSONObject(sizes.length() - 1)
+                                    .getJSONObject(sizes.length() - 3) //finding a smaller size will speed up load times
                                     .getString("source");
                         } catch (JSONException e) {
                             e.printStackTrace();
                         }
-
-                        // finally set the url for the image
-                        img.setImageUrl(
-                                photoUrl,
-                                VolleyRequestQueue.getInstance(getContext()).getImgLoader());
+                        Response.Listener<Bitmap> imgListener = new Response.Listener<Bitmap>() {
+                            @Override
+                            public void onResponse(Bitmap response) {
+                                img.setImageBitmap(response);
+                                photoDescriptionView.setVisibility(View.VISIBLE);
+                                photoTitleView.setVisibility(View.VISIBLE);
+                                progressBar.setVisibility(View.GONE);
+                            }
+                        };
+                        Response.ErrorListener errorListener = new Response.ErrorListener() {
+                            @Override
+                            public void onErrorResponse(VolleyError error) {
+                                //things2
+                            }
+                        };
+                        //solution is deprecated: better, worse or equivalent to hacky?
+                        ImageRequest getImgReq = new ImageRequest(photoUrl, imgListener, 0,0,null,errorListener);
+                        VolleyRequestQueue.getInstance(getContext()).addToRequestQueue(getImgReq);
                     }
                 },
                 new VolleyErrorListener(getContext())
diff --git a/app/src/main/res/layout/photo_blowup_fragment.xml b/app/src/main/res/layout/photo_blowup_fragment.xml
index b75fe3d..defede5 100644
--- a/app/src/main/res/layout/photo_blowup_fragment.xml
+++ b/app/src/main/res/layout/photo_blowup_fragment.xml
@@ -8,10 +8,11 @@
     <ProgressBar
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:id="@+id/blowup_progress_bar"
         style="@android:style/Widget.ProgressBar.Large"
         android:layout_centerInParent="true"/>
 
-    <com.android.volley.toolbox.NetworkImageView
+    <ImageView
         android:id="@+id/photo_blowup"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"