From 4fd38738cb857da5814e12fd124154ced14c6157 Mon Sep 17 00:00:00 2001
From: lwhittaker00 <latejah.whittaker.938@my.csun.edu>
Date: Sat, 2 Feb 2019 14:25:33 -0800
Subject: [PATCH 1/4] Layout (not yet finished with constraints for different
 phones, but it compiles and runs in emulator)

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../csun_compt/UserSubmissionPopUp.java       | 13 ++++
 app/src/main/res/layout/activity_main.xml     | 65 +++++++++++++++++--
 .../activity_user_submission_pop_up.xml       | 56 ++++++++++++++++
 app/src/main/res/values/colors.xml            |  5 ++
 5 files changed, 134 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/com/example/csun_compt/UserSubmissionPopUp.java
 create mode 100644 app/src/main/res/layout/activity_user_submission_pop_up.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c6de255..beaae1c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity android:name=".UserSubmissionPopUp"></activity>
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/example/csun_compt/UserSubmissionPopUp.java b/app/src/main/java/com/example/csun_compt/UserSubmissionPopUp.java
new file mode 100644
index 0000000..84d30cb
--- /dev/null
+++ b/app/src/main/java/com/example/csun_compt/UserSubmissionPopUp.java
@@ -0,0 +1,13 @@
+package com.example.csun_compt;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+public class UserSubmissionPopUp extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_user_submission_pop_up);
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 84f1951..c167e6c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/black"
     tools:context=".MainActivity">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:id="@+id/text_view"/>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+    <ImageView
+        android:layout_width="290dp"
+        android:layout_height="290dp"
+        android:id="@+id/meme_view"
+        android:layout_centerHorizontal="true"
+        android:layout_alignBaseline="@id/text_view"/>
+
+    <View
+        android:layout_width="290dp"
+        android:layout_height="290dp"
+
+
+        android:layout_alignLeft="@+id/meme_view"
+        android:layout_alignStart="@+id/meme_view"
+        android:layout_alignTop="@+id/meme_view"
+        android:background="@color/white" />
+
+    <Button
+        android:id="@+id/back_button"
+        android:layout_width="145dp"
+        android:layout_height="55dp"
+        android:layout_alignLeft="@+id/description_text_view"
+        android:layout_alignStart="@+id/description_text_view"
+        android:layout_below="@+id/description_text_view"
+        android:layout_marginTop="20dp"
+        android:text="BACK" />
+
+    <Button
+        android:id="@+id/next_button"
+        android:layout_width="145dp"
+        android:layout_height="55dp"
+        android:layout_above="@+id/more_button"
+        android:layout_toEndOf="@+id/back_button"
+        android:layout_toRightOf="@+id/back_button"
+        android:text="NEXT >" />
+    <TextView
+        android:layout_width="290dp"
+        android:layout_height="100dp"
+        android:layout_centerHorizontal="true"
+        android:id="@+id/description_text_view"
+        android:textSize="14pt"
+        android:textColor="@color/white"
+        android:text="Yo! I'm trying to see if its possible to scroll on this in the emulator."
+        android:scrollbars="vertical"
+        android:layout_below="@id/meme_view"/>
+
+    <Button
+        android:id="@+id/more_button"
+        android:layout_width="145dp"
+        android:layout_height="55dp"
+        android:layout_below="@+id/back_button"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="12dp"
+        android:text="More" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_user_submission_pop_up.xml b/app/src/main/res/layout/activity_user_submission_pop_up.xml
new file mode 100644
index 0000000..a447e44
--- /dev/null
+++ b/app/src/main/res/layout/activity_user_submission_pop_up.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="350dp"
+    android:layout_height="475dp"
+    android:background="@color/gray"
+    android:padding="5dp"
+    android:layout_gravity="center">
+    <Button
+        android:id="@+id/txtclose"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:textColor="@color/white"
+        android:text="X"
+        android:background="@color/black"
+        android:textStyle="bold"
+        android:layout_alignParentRight="true"/>
+
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Please onclude a description of the image, any text in the image, and a little info about why it's funny."
+        android:textStyle="bold"
+        android:textSize="12pt"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@id/txtclose"
+        android:textAlignment="center"
+        android:id="@+id/instr_text"
+        android:textColor="@color/white"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="5dp"/>
+
+
+    <EditText
+        android:id="@+id/user_input_box"
+        android:layout_width="300dp"
+        android:layout_height="150dp"
+
+        android:layout_below="@+id/instr_text"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="12dp"
+        android:background="@color/white" />
+
+    <Button
+        android:id="@+id/submit_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Submit"
+        android:layout_marginTop="25dp"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@+id/user_input_box"
+        android:textColor="@color/white"
+        android:background="@color/black"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 69b2233..040b8e7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,9 @@
     <color name="colorPrimary">#008577</color>
     <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
+    <color name="purple">#4B244A</color>
+    <color name="black">#000000</color>
+    <color name="white">#FFFFFF</color>
+    <color name="gray">#808080</color>
+
 </resources>

From d37fafb07d518afc0c760eb8633a97be98647b21 Mon Sep 17 00:00:00 2001
From: lwhittaker00 <latejah.whittaker.938@my.csun.edu>
Date: Sat, 2 Feb 2019 14:35:27 -0800
Subject: [PATCH 2/4] removed the temporary view so now theres just the image
 view

---
 app/src/main/res/layout/activity_main.xml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c167e6c..6b38ae1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -17,18 +17,10 @@
         android:layout_width="290dp"
         android:layout_height="290dp"
         android:id="@+id/meme_view"
+        android:background="@color/gray"
         android:layout_centerHorizontal="true"
         android:layout_alignBaseline="@id/text_view"/>
 
-    <View
-        android:layout_width="290dp"
-        android:layout_height="290dp"
-
-
-        android:layout_alignLeft="@+id/meme_view"
-        android:layout_alignStart="@+id/meme_view"
-        android:layout_alignTop="@+id/meme_view"
-        android:background="@color/white" />
 
     <Button
         android:id="@+id/back_button"
@@ -47,7 +39,7 @@
         android:layout_above="@+id/more_button"
         android:layout_toEndOf="@+id/back_button"
         android:layout_toRightOf="@+id/back_button"
-        android:text="NEXT >" />
+        android:text="NEXT" />
     <TextView
         android:layout_width="290dp"
         android:layout_height="100dp"

From 458bce79acd7a0faf3c06c4172e1636add21cd0c Mon Sep 17 00:00:00 2001
From: lwhittaker00 <latejah.whittaker.938@my.csun.edu>
Date: Sat, 2 Feb 2019 15:19:49 -0800
Subject: [PATCH 3/4] added comments and made the layout constraint layouts to
 be universal across different devices

---
 app/build.gradle                              |  5 ++
 app/src/main/AndroidManifest.xml              |  2 +-
 .../com/example/csun_compt/MainActivity.java  |  1 +
 app/src/main/res/layout/activity_main.xml     | 68 +++++++++++--------
 .../activity_user_submission_pop_up.xml       | 59 +++++++++-------
 5 files changed, 81 insertions(+), 54 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 650b76e..1593786 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,7 +18,12 @@ android {
     }
 }
 
+repositories {
+    google()
+}
+
 dependencies {
+    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index beaae1c..2c626db 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".UserSubmissionPopUp"></activity>
+        <activity android:name=".UserSubmissionPopUp" />
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/example/csun_compt/MainActivity.java b/app/src/main/java/com/example/csun_compt/MainActivity.java
index 52c2b16..09612e8 100644
--- a/app/src/main/java/com/example/csun_compt/MainActivity.java
+++ b/app/src/main/java/com/example/csun_compt/MainActivity.java
@@ -9,5 +9,6 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6b38ae1..090fc46 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,63 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/relativeLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"
     tools:context=".MainActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        android:id="@+id/text_view"/>
+    <!--spacer for aesthetics-->
+    <Space
+        android:id="@+id/spacer"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
+    <!--this is the image view for the meme(gray right now just for visibility)-->
     <ImageView
+        android:id="@+id/meme_view"
         android:layout_width="290dp"
         android:layout_height="290dp"
-        android:id="@+id/meme_view"
         android:background="@color/gray"
-        android:layout_centerHorizontal="true"
-        android:layout_alignBaseline="@id/text_view"/>
-
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/spacer" />
 
+    <!--this is the button that takes you to the previous meme image-->
     <Button
         android:id="@+id/back_button"
         android:layout_width="145dp"
         android:layout_height="55dp"
-        android:layout_alignLeft="@+id/description_text_view"
-        android:layout_alignStart="@+id/description_text_view"
-        android:layout_below="@+id/description_text_view"
         android:layout_marginTop="20dp"
-        android:text="BACK" />
+        android:text="BACK"
+        app:layout_constraintLeft_toLeftOf="@+id/description_text_view"
+        app:layout_constraintStart_toStartOf="@+id/description_text_view"
+        app:layout_constraintTop_toBottomOf="@+id/description_text_view" />
 
+    <!--this is the button that brings you to the next meme image-->
     <Button
         android:id="@+id/next_button"
         android:layout_width="145dp"
         android:layout_height="55dp"
-        android:layout_above="@+id/more_button"
-        android:layout_toEndOf="@+id/back_button"
-        android:layout_toRightOf="@+id/back_button"
-        android:text="NEXT" />
+        android:layout_marginBottom="12dp"
+        android:text="NEXT"
+        app:layout_constraintBottom_toTopOf="@+id/more_button"
+        app:layout_constraintLeft_toRightOf="@+id/back_button"
+        app:layout_constraintStart_toEndOf="@+id/back_button" />
+
+    <!--this is an editable text view for user submissions-->
     <TextView
+        android:id="@+id/description_text_view"
         android:layout_width="290dp"
         android:layout_height="100dp"
-        android:layout_centerHorizontal="true"
-        android:id="@+id/description_text_view"
-        android:textSize="14pt"
-        android:textColor="@color/white"
-        android:text="Yo! I'm trying to see if its possible to scroll on this in the emulator."
         android:scrollbars="vertical"
-        android:layout_below="@id/meme_view"/>
+        android:text="Yo! I'm trying to see if its possible to scroll on this in the emulator."
+        android:textColor="@color/white"
+        android:textSize="14pt"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/meme_view" />
 
+    <!--this is the button that brings up the user submission pop up-->
     <Button
         android:id="@+id/more_button"
         android:layout_width="145dp"
         android:layout_height="55dp"
-        android:layout_below="@+id/back_button"
-        android:layout_centerHorizontal="true"
         android:layout_marginTop="12dp"
-        android:text="More" />
+        android:text="More"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/back_button" />
 
-</RelativeLayout>
\ No newline at end of file
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_user_submission_pop_up.xml b/app/src/main/res/layout/activity_user_submission_pop_up.xml
index a447e44..9207ab2 100644
--- a/app/src/main/res/layout/activity_user_submission_pop_up.xml
+++ b/app/src/main/res/layout/activity_user_submission_pop_up.xml
@@ -1,56 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/relativeLayout2"
     android:layout_width="350dp"
     android:layout_height="475dp"
+    android:layout_gravity="center"
     android:background="@color/gray"
-    android:padding="5dp"
-    android:layout_gravity="center">
+    android:orientation="vertical"
+    android:padding="5dp">
+
+    <!--button to close popup(or show the main activity page)-->
     <Button
         android:id="@+id/txtclose"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        android:textColor="@color/white"
-        android:text="X"
         android:background="@color/black"
+        android:text="X"
+        android:textColor="@color/white"
         android:textStyle="bold"
-        android:layout_alignParentRight="true"/>
-
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
+    <!--text view of description of what user should do on this page-->
     <TextView
+        android:id="@+id/instr_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Please onclude a description of the image, any text in the image, and a little info about why it's funny."
-        android:textStyle="bold"
-        android:textSize="12pt"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@id/txtclose"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="5dp"
+        android:text="Please include a description of the image, any text in the image, and a little info about why it's funny."
         android:textAlignment="center"
-        android:id="@+id/instr_text"
         android:textColor="@color/white"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="5dp"/>
-
+        android:textSize="12pt"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/txtclose" />
 
+    <!--editable text box for submissions-->
     <EditText
         android:id="@+id/user_input_box"
         android:layout_width="300dp"
         android:layout_height="150dp"
 
-        android:layout_below="@+id/instr_text"
-        android:layout_centerHorizontal="true"
         android:layout_marginTop="12dp"
-        android:background="@color/white" />
+        android:background="@color/white"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/instr_text" />
 
+    <!--button to submit and save the user submission-->
     <Button
         android:id="@+id/submit_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Submit"
         android:layout_marginTop="25dp"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@+id/user_input_box"
+        android:background="@color/black"
+        android:text="Submit"
         android:textColor="@color/white"
-        android:background="@color/black"/>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/user_input_box" />
 
-</RelativeLayout>
\ No newline at end of file
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

From 93d34db815b05409b27e2bec2558de951fe9412c Mon Sep 17 00:00:00 2001
From: lwhittaker00 <latejah.whittaker.938@my.csun.edu>
Date: Sat, 2 Feb 2019 21:54:03 -0800
Subject: [PATCH 4/4] camera function works now too

---
 app/build.gradle                              |  2 ++
 app/src/main/AndroidManifest.xml              |  5 +++
 .../com/example/csun_compt/MainActivity.java  | 35 +++++++++++++++++--
 app/src/main/res/layout/activity_main.xml     | 19 ++++++++--
 app/src/main/res/values/strings.xml           |  2 ++
 5 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1593786..5c0aa4f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,10 +23,12 @@ repositories {
 }
 
 dependencies {
+    implementation 'com.wajahatkarim3.EasyFlipView:EasyFlipView:2.1.2'
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support:support-v4:28.0.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2c626db..79bd1dd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.csun_compt">
 
+    <uses-feature android:name="android.hardware.camera"
+        android:required="true" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"  />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/example/csun_compt/MainActivity.java b/app/src/main/java/com/example/csun_compt/MainActivity.java
index 09612e8..dedbbef 100644
--- a/app/src/main/java/com/example/csun_compt/MainActivity.java
+++ b/app/src/main/java/com/example/csun_compt/MainActivity.java
@@ -1,14 +1,43 @@
 package com.example.csun_compt;
 
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.provider.MediaStore;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.Toast;
 
 public class MainActivity extends AppCompatActivity {
-
+    private Button cameraButton;
+    private ImageView capturedImage;
+    private static final int Image_Capture_Code = 1;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
+        cameraButton =(Button)findViewById(R.id.cameraButton);
+        capturedImage = (ImageView) findViewById(R.id.meme_view);
+        cameraButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent cInt = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                startActivityForResult(cInt,Image_Capture_Code);
+            }
+        });
+    }
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == Image_Capture_Code) {
+            if (resultCode == RESULT_OK) {
+                Bitmap bp = (Bitmap) data.getExtras().get("data");
+                capturedImage.setImageBitmap(bp);
+            } else if (resultCode == RESULT_CANCELED) {
+                Toast.makeText(this, "Cancelled", Toast.LENGTH_LONG).show();
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 090fc46..43403b9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,7 +12,7 @@
     <Space
         android:id="@+id/spacer"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="100dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -22,9 +22,10 @@
         android:layout_width="290dp"
         android:layout_height="290dp"
         android:background="@color/gray"
+        app:layout_constraintHorizontal_bias="0.504"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/spacer" />
+        app:layout_constraintTop_toBottomOf="@id/cameraButton" />
 
     <!--this is the button that takes you to the previous meme image-->
     <Button
@@ -37,6 +38,15 @@
         app:layout_constraintStart_toStartOf="@+id/description_text_view"
         app:layout_constraintTop_toBottomOf="@+id/description_text_view" />
 
+
+    <!--this is the take a picture button-->
+    <Button
+        android:id="@+id/cameraButton"
+        android:layout_width="82dp"
+        android:layout_height="65dp"
+        android:text="CAMERA"
+        tools:layout_editor_absoluteX="26dp"
+        tools:layout_editor_absoluteY="0dp" />
     <!--this is the button that brings you to the next meme image-->
     <Button
         android:id="@+id/next_button"
@@ -67,9 +77,12 @@
         android:layout_width="145dp"
         android:layout_height="55dp"
         android:layout_marginTop="12dp"
+        android:layout_marginBottom="8dp"
         android:text="More"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/back_button" />
+        app:layout_constraintTop_toBottomOf="@+id/back_button"
+        app:layout_constraintVertical_bias="0.0" />
 
 </android.support.constraint.ConstraintLayout>
\ 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 97b85c9..1418b2b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">CSUN-COMPT</string>
+
+    <string name="meme_description">Description: This is just a really long string that really has no relevance to anything whatsoever but I need it to be long enough to try a scroll view So Im just gonna keep adding random words to try it out. k byeeeeeeee</string>
 </resources>