From 3056f2e47a839962ab5c7fffbe3a9a5160806651 Mon Sep 17 00:00:00 2001 From: jvvlives2005 Date: Sat, 13 Jun 2015 00:36:41 -0400 Subject: [PATCH] updated some parts of the code-Joshelyn --- .idea/.name | 1 + .idea/compiler.xml | 23 ++ .idea/copyright/profiles_settings.xml | 3 + .idea/encodings.xml | 5 + .idea/libraries/gradle_wrapper.xml | 9 + .idea/misc.xml | 26 ++ .idea/modules.xml | 10 + .idea/scopes/scope_settings.xml | 5 + .idea/vcs.xml | 7 + .idea/workspace.xml | 382 ++++++++++++++++++ MemeProject/.idea/compiler.xml | 5 +- MemeProject/.idea/encodings.xml | 5 + MemeProject/.idea/gradle.xml | 4 +- MemeProject/.idea/misc.xml | 32 +- MemeProject/.idea/modules.xml | 3 +- MemeProject/.idea/vcs.xml | 3 +- MemeProject/MemeProject.iml | 6 +- MemeProject/app/app.iml | 8 +- .../app/src/androidTest/androidTest.iml | 12 + .../assets/fonts/Alegreya Sans SC 800.ttf | Bin 0 -> 111828 bytes .../c4q/nyc/memeproject/BuildConfig.java | 8 + .../c4q/nyc/memeproject/Manifest.java | 7 + .../gen/madelyntav/c4q/nyc/memeproject/R.java | 7 + MemeProject/app/src/main/ic_launcher-web.png | Bin 0 -> 196692 bytes .../c4q/nyc/memeproject/MainActivity.java | 7 + MemeProject/app/src/main/main.iml | 18 + .../app/src/main/res/drawable/adventure.jpg | Bin 0 -> 16028 bytes .../app/src/main/res/drawable/other.png | Bin 0 -> 714082 bytes .../app/src/main/res/drawable/victorian.jpg | Bin 0 -> 191124 bytes .../app/src/main/res/drawable/victorian1.jpg | Bin 0 -> 27658 bytes .../app/src/main/res/drawable/victorian2.gif | Bin 0 -> 1013941 bytes .../app/src/main/res/drawable/victorian3.jpeg | Bin 0 -> 23049 bytes .../main/res/layout/activity_edit_photo.xml | 2 +- .../app/src/main/res/layout/activity_main.xml | 7 +- .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 11345 -> 6420 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 3087 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 10305 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 21240 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 35577 bytes 39 files changed, 575 insertions(+), 30 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/libraries/gradle_wrapper.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/scopes/scope_settings.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 MemeProject/.idea/encodings.xml create mode 100644 MemeProject/app/src/androidTest/androidTest.iml create mode 100644 MemeProject/app/src/main/assets/fonts/Alegreya Sans SC 800.ttf create mode 100644 MemeProject/app/src/main/gen/madelyntav/c4q/nyc/memeproject/BuildConfig.java create mode 100644 MemeProject/app/src/main/gen/madelyntav/c4q/nyc/memeproject/Manifest.java create mode 100644 MemeProject/app/src/main/gen/madelyntav/c4q/nyc/memeproject/R.java create mode 100644 MemeProject/app/src/main/ic_launcher-web.png create mode 100644 MemeProject/app/src/main/main.iml create mode 100644 MemeProject/app/src/main/res/drawable/adventure.jpg create mode 100644 MemeProject/app/src/main/res/drawable/other.png create mode 100644 MemeProject/app/src/main/res/drawable/victorian.jpg create mode 100644 MemeProject/app/src/main/res/drawable/victorian1.jpg create mode 100644 MemeProject/app/src/main/res/drawable/victorian2.gif create mode 100644 MemeProject/app/src/main/res/drawable/victorian3.jpeg create mode 100644 MemeProject/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 MemeProject/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 MemeProject/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 MemeProject/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..1158627 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +MemeProject \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..e206d70 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/libraries/gradle_wrapper.xml b/.idea/libraries/gradle_wrapper.xml new file mode 100644 index 0000000..8211102 --- /dev/null +++ b/.idea/libraries/gradle_wrapper.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6766b47 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + 1.7 + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..f2a1975 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..def6a6a --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..103abda --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,382 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + 1434151770946 + 1434151770946 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MemeProject/.idea/compiler.xml b/MemeProject/.idea/compiler.xml index 96cc43e..217af47 100644 --- a/MemeProject/.idea/compiler.xml +++ b/MemeProject/.idea/compiler.xml @@ -1,6 +1,7 @@ + - \ 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 @@