@@ -11,7 +12,6 @@
-
@@ -19,4 +19,5 @@
-
\ No newline at end of file
+
+
diff --git a/MemeProject/.idea/encodings.xml b/MemeProject/.idea/encodings.xml
new file mode 100644
index 0000000..e206d70
--- /dev/null
+++ b/MemeProject/.idea/encodings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/MemeProject/.idea/gradle.xml b/MemeProject/.idea/gradle.xml
index 3ec5955..fe865d3 100644
--- a/MemeProject/.idea/gradle.xml
+++ b/MemeProject/.idea/gradle.xml
@@ -6,7 +6,6 @@
-
@@ -16,4 +15,5 @@
-
\ No newline at end of file
+
+
diff --git a/MemeProject/.idea/misc.xml b/MemeProject/.idea/misc.xml
index e930905..58ff01f 100644
--- a/MemeProject/.idea/misc.xml
+++ b/MemeProject/.idea/misc.xml
@@ -3,20 +3,24 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
+
diff --git a/MemeProject/.idea/modules.xml b/MemeProject/.idea/modules.xml
index d953495..db189d3 100644
--- a/MemeProject/.idea/modules.xml
+++ b/MemeProject/.idea/modules.xml
@@ -6,4 +6,5 @@
-
\ No newline at end of file
+
+
diff --git a/MemeProject/.idea/vcs.xml b/MemeProject/.idea/vcs.xml
index 6564d52..def6a6a 100644
--- a/MemeProject/.idea/vcs.xml
+++ b/MemeProject/.idea/vcs.xml
@@ -3,4 +3,5 @@
-
\ No newline at end of file
+
+
diff --git a/MemeProject/MemeProject.iml b/MemeProject/MemeProject.iml
index 9a5441c..0bb6048 100644
--- a/MemeProject/MemeProject.iml
+++ b/MemeProject/MemeProject.iml
@@ -1,10 +1,9 @@
-
+
-
@@ -16,4 +15,5 @@
-
\ No newline at end of file
+
+
diff --git a/MemeProject/app/app.iml b/MemeProject/app/app.iml
index f41a9f7..d30b36b 100644
--- a/MemeProject/app/app.iml
+++ b/MemeProject/app/app.iml
@@ -1,5 +1,5 @@
-
+
@@ -12,9 +12,8 @@
-
-
+
@@ -90,4 +89,5 @@
-
\ No newline at end of file
+
+
diff --git a/MemeProject/app/src/androidTest/androidTest.iml b/MemeProject/app/src/androidTest/androidTest.iml
new file mode 100644
index 0000000..798e7aa
--- /dev/null
+++ b/MemeProject/app/src/androidTest/androidTest.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MemeProject/app/src/main/assets/fonts/Alegreya Sans SC 800.ttf b/MemeProject/app/src/main/assets/fonts/Alegreya Sans SC 800.ttf
new file mode 100644
index 0000000..57d5c02
Binary files /dev/null and b/MemeProject/app/src/main/assets/fonts/Alegreya Sans SC 800.ttf differ
diff --git a/MemeProject/app/src/main/gen/madelyntav/c4q/nyc/memeproject/BuildConfig.java b/MemeProject/app/src/main/gen/madelyntav/c4q/nyc/memeproject/BuildConfig.java
new file mode 100644
index 0000000..41208c4
--- /dev/null
+++ b/MemeProject/app/src/main/gen/madelyntav/c4q/nyc/memeproject/BuildConfig.java
@@ -0,0 +1,8 @@
+/*___Generated_by_IDEA___*/
+
+package madelyntav.c4q.nyc.memeproject;
+
+/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
+public final class BuildConfig {
+ public final static boolean DEBUG = Boolean.parseBoolean(null);
+}
\ No newline at end of file
diff --git a/MemeProject/app/src/main/gen/madelyntav/c4q/nyc/memeproject/Manifest.java b/MemeProject/app/src/main/gen/madelyntav/c4q/nyc/memeproject/Manifest.java
new file mode 100644
index 0000000..0bd9f98
--- /dev/null
+++ b/MemeProject/app/src/main/gen/madelyntav/c4q/nyc/memeproject/Manifest.java
@@ -0,0 +1,7 @@
+/*___Generated_by_IDEA___*/
+
+package madelyntav.c4q.nyc.memeproject;
+
+/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
+public final class Manifest {
+}
\ No newline at end of file
diff --git a/MemeProject/app/src/main/gen/madelyntav/c4q/nyc/memeproject/R.java b/MemeProject/app/src/main/gen/madelyntav/c4q/nyc/memeproject/R.java
new file mode 100644
index 0000000..b2fa46b
--- /dev/null
+++ b/MemeProject/app/src/main/gen/madelyntav/c4q/nyc/memeproject/R.java
@@ -0,0 +1,7 @@
+/*___Generated_by_IDEA___*/
+
+package madelyntav.c4q.nyc.memeproject;
+
+/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
+public final class R {
+}
\ No newline at end of file
diff --git a/MemeProject/app/src/main/ic_launcher-web.png b/MemeProject/app/src/main/ic_launcher-web.png
new file mode 100644
index 0000000..18fd3c8
Binary files /dev/null and b/MemeProject/app/src/main/ic_launcher-web.png differ
diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java
index 6aa7d96..9f3627e 100644
--- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java
+++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java
@@ -5,13 +5,16 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.graphics.Typeface;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
import android.provider.MediaStore;
+import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarActivity;
import android.view.View;
import android.widget.ImageView;
+import android.widget.TextView;
import android.widget.Toast;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
@@ -29,6 +32,10 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
+ //Joshelyn-Hide the action bar
+ ActionBar actionBar = getSupportActionBar();
+ actionBar.hide();
+
// isExternalStorageReadable();
mImageView = (ImageView) findViewById(R.id.mImageView);
diff --git a/MemeProject/app/src/main/main.iml b/MemeProject/app/src/main/main.iml
new file mode 100644
index 0000000..6205e83
--- /dev/null
+++ b/MemeProject/app/src/main/main.iml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MemeProject/app/src/main/res/drawable/adventure.jpg b/MemeProject/app/src/main/res/drawable/adventure.jpg
new file mode 100644
index 0000000..79f8842
Binary files /dev/null and b/MemeProject/app/src/main/res/drawable/adventure.jpg differ
diff --git a/MemeProject/app/src/main/res/drawable/other.png b/MemeProject/app/src/main/res/drawable/other.png
new file mode 100644
index 0000000..322982d
Binary files /dev/null and b/MemeProject/app/src/main/res/drawable/other.png differ
diff --git a/MemeProject/app/src/main/res/drawable/victorian.jpg b/MemeProject/app/src/main/res/drawable/victorian.jpg
new file mode 100644
index 0000000..f5ccc8c
Binary files /dev/null and b/MemeProject/app/src/main/res/drawable/victorian.jpg differ
diff --git a/MemeProject/app/src/main/res/drawable/victorian1.jpg b/MemeProject/app/src/main/res/drawable/victorian1.jpg
new file mode 100644
index 0000000..eb5c5f1
Binary files /dev/null and b/MemeProject/app/src/main/res/drawable/victorian1.jpg differ
diff --git a/MemeProject/app/src/main/res/drawable/victorian2.gif b/MemeProject/app/src/main/res/drawable/victorian2.gif
new file mode 100644
index 0000000..77e9f5b
Binary files /dev/null and b/MemeProject/app/src/main/res/drawable/victorian2.gif differ
diff --git a/MemeProject/app/src/main/res/drawable/victorian3.jpeg b/MemeProject/app/src/main/res/drawable/victorian3.jpeg
new file mode 100644
index 0000000..bf56e8f
Binary files /dev/null and b/MemeProject/app/src/main/res/drawable/victorian3.jpeg differ
diff --git a/MemeProject/app/src/main/res/layout/activity_edit_photo.xml b/MemeProject/app/src/main/res/layout/activity_edit_photo.xml
index 845204d..afbe0b1 100644
--- a/MemeProject/app/src/main/res/layout/activity_edit_photo.xml
+++ b/MemeProject/app/src/main/res/layout/activity_edit_photo.xml
@@ -8,7 +8,7 @@
android:paddingBottom="@dimen/activity_vertical_margin"
android:id="@+id/root"
tools:context="madelyntav.c4q.nyc.memeproject.EditPhoto"
- android:background="@drawable/images">
+ android:background="@drawable/other">
+ android:background="@drawable/adventure"
+ >
+