thumbnails all working

Author: lamorie

QuestionApp/res/layout/answerviewactivitylayout.xml

@@ -5,15 +5,30 @@
     android:orientation="vertical" >
 
 
-    
-    <TextView
-        android:id="@+id/answer_body"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:scrollbars="vertical"
-        android:lines="10"
-        android:text="SomeDummyText so that I can see whats going on in the graphical editor"
-        />
+    <RelativeLayout 
+        android:layout_width="wrap_content"
+        android:layout_height="116dp"
+        android:gravity="start"
+        android:orientation="vertical"
+        >
+
+         <TextView
+             android:id="@+id/answer_body"
+             android:layout_width="fill_parent"
+             android:layout_height="wrap_content"
+             android:lines="10"
+             android:scrollbars="vertical"
+             android:text="SomeDummyText so that I can see whats going on in the graphical editor" />
+
+         <ImageView android:id="@+id/answerImage"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_alignParentRight="true"
+            android:gravity="right"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_action_image"/>
+    </RelativeLayout>
+   
 	<TextView 
         android:id="@+id/answer_username"
         android:layout_width="fill_parent"

QuestionApp/src/ca/ualberta/cs/cmput301f14t14/questionapp/AnswerViewActivity.java

@@ -24,6 +24,7 @@
 import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.ImageView;
 import android.widget.Toast;
 
 public class AnswerViewActivity extends Activity
@@ -144,6 +145,9 @@ public void run(Answer a) {
 			((TextView) findViewById(R.id.answer_body)).setText(answer.getBody());
 			((TextView) findViewById(R.id.answer_username)).setText(answer.getAuthor());
 			((TextView) findViewById(R.id.answer_upvotes)).setText(answer.getUpvotes().toString());
+			if(answer.getImage() != null){
+				((ImageView) findViewById(R.id.answerImage)).setImageBitmap(answer.getImage().getBitmap());
+			}
 
 			dataManager.getCommentList(answer, new UpdateCommentListCallback());
 		}

QuestionApp/src/ca/ualberta/cs/cmput301f14t14/questionapp/QuestionActivity.java

@@ -314,8 +314,10 @@ public void run(Question q) {
 			date.setText(question.getDate().toString());
 			dataManager.getAnswerList(question, new AnswerListUpdateCallback());
 			dataManager.getCommentList(question, new CommentListUpdateCallback());
+			if(q.getImage() != null){
 			ImageView imgV = (ImageView) findViewById(R.id.questionImage);
-			imgV.setImageBitmap(q.getImage().getBitmap(q.getImage()));
+			imgV.setImageBitmap(q.getImage().getBitmap());
+			}
 			// Set status of favorite button
 			ClientData cd = new ClientData(getApplicationContext());
 			if (cd.getFavoriteQuestions().contains(question.getId())) {

QuestionApp/src/ca/ualberta/cs/cmput301f14t14/questionapp/model/Image.java

@@ -50,13 +50,13 @@ public void setImageData(byte[] imageData) {
 		this.imageData = imageData;
 	}
 
-	public Bitmap getBitmap(Image img) {
+	public Bitmap getBitmap() {
 		int width = 100;
 		int height = 100;
 		BitmapFactory.Options op = new BitmapFactory.Options();
 		op.inPreferredConfig = Bitmap.Config.ARGB_8888;
-		Bitmap bmp = BitmapFactory.decodeByteArray(img.getImageData(), 0,
-				img.getImageData().length);
+		Bitmap bmp = BitmapFactory.decodeByteArray(getImageData(), 0,
+				getImageData().length);
 		bmp = Bitmap.createScaledBitmap(bmp, width, height, true);
 		return bmp;
 	}

QuestionApp/src/ca/ualberta/cs/cmput301f14t14/questionapp/view/AddAnswerDialogFragment.java

@@ -56,6 +56,8 @@ public void onClick(DialogInterface dialog, int which) {
 
 							}
 						}
+						QuestionActivity qa = (QuestionActivity) getActivity();
+						img = qa.img;
 						((QuestionActivity) getActivity()).addAnswerCallback(body.getText().toString(), img, loc);
 					}
 				})
@@ -72,12 +74,12 @@ public void onClick(DialogInterface dialog,
 
 	public void onResume(){
 		super.onResume();
-		QuestionActivity ma = (QuestionActivity) getActivity();
-		img = ma.img;
+		QuestionActivity qa = (QuestionActivity) getActivity();
+		img = qa.img;
 
 		if (img != null) {
 			ImageView imgV = (ImageView) text.findViewById(R.id.imageViewAns);
-			Bitmap bmp = img.getBitmap(img);
+			Bitmap bmp = img.getBitmap();
 			imgV.setImageBitmap(bmp);
 		}
 

QuestionApp/src/ca/ualberta/cs/cmput301f14t14/questionapp/view/AddQuestionDialogFragment.java

@@ -105,7 +105,7 @@ public void onResume() {
 
 		if (img != null) {
 			ImageView imgV = (ImageView) text.findViewById(R.id.imageView1);
-			Bitmap bmp = img.getBitmap(img);
+			Bitmap bmp = img.getBitmap();
 			imgV.setImageBitmap(bmp);
 		}
 	}