From b0d2882a6f6abfc90e8b12e8a42664e4281d0cf3 Mon Sep 17 00:00:00 2001 From: GMSyrimis Date: Sat, 18 Jul 2015 06:59:22 -0400 Subject: [PATCH 1/2] commit --- .DS_Store | Bin 6148 -> 6148 bytes MemeProject/.idea/compiler.xml | 3 +- MemeProject/.idea/encodings.xml | 5 - MemeProject/.idea/gradle.xml | 4 +- MemeProject/.idea/misc.xml | 12 +- MemeProject/.idea/modules.xml | 3 +- MemeProject/.idea/scopes/scope_settings.xml | 5 - MemeProject/.idea/vcs.xml | 3 +- MemeProject/MemeProject.iml | 4 +- MemeProject/app/app.iml | 11 +- MemeProject/app/build.gradle | 2 + .../c4q/nyc/memeproject/ApplyFilters.java | 0 .../c4q/nyc/memeproject/ColorPicker.java | 0 .../nyc/memeproject/ConvolutionMatrix.java | 0 .../nyc/memeproject/CustomArrayAdapter.java | 30 +++- .../c4q/nyc/memeproject/EditPhoto.java | 0 .../c4q/nyc/memeproject/MainActivity.java | 0 .../c4q/nyc/memeproject/MemeList.java | 134 +++++++++++++----- .../c4q/nyc/memeproject/Meme_API/Data.java | 30 ++++ .../c4q/nyc/memeproject/Meme_API/Meme.java | 114 +++++++++++++++ .../memeproject/Meme_API/MemeTemplate.java | 48 +++++++ .../memeproject/Meme_API/MemeTemplateAPI.java | 14 ++ .../Meme_DB/MySQLiteOpenHelper.java | 113 +++++++++++++++ 23 files changed, 471 insertions(+), 64 deletions(-) delete mode 100644 MemeProject/.idea/encodings.xml delete mode 100644 MemeProject/.idea/scopes/scope_settings.xml mode change 100644 => 100755 MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ApplyFilters.java mode change 100644 => 100755 MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ColorPicker.java mode change 100644 => 100755 MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ConvolutionMatrix.java mode change 100644 => 100755 MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/CustomArrayAdapter.java mode change 100644 => 100755 MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java mode change 100644 => 100755 MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java mode change 100644 => 100755 MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeList.java create mode 100755 MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/Meme_API/Data.java create mode 100755 MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/Meme_API/Meme.java create mode 100755 MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/Meme_API/MemeTemplate.java create mode 100755 MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/Meme_API/MemeTemplateAPI.java create mode 100755 MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/Meme_DB/MySQLiteOpenHelper.java diff --git a/.DS_Store b/.DS_Store index f26045601829641856e09333737aff8582ba5e50..4d553177b41f53b553e4272a800767e79a8d655b 100644 GIT binary patch delta 102 zcmZoMXfc@J&&a$nU^gQp^JE^T0!Hr1wM_kjoSYn-@d6Un)kdbKItoVSMw4Zk-E}z` yf*4#G92r~~e1WtcLoP##XHI@{Qcivn0|SEq5T5~JjsIYSIXL45B&w^8OigtZjLc0Z%QCxf Rp2A$rGO@v6Gdss$egONE5TF16 diff --git a/MemeProject/.idea/compiler.xml b/MemeProject/.idea/compiler.xml index 217af47..9a8b7e5 100644 --- a/MemeProject/.idea/compiler.xml +++ b/MemeProject/.idea/compiler.xml @@ -19,5 +19,4 @@ - - + \ No newline at end of file diff --git a/MemeProject/.idea/encodings.xml b/MemeProject/.idea/encodings.xml deleted file mode 100644 index e206d70..0000000 --- a/MemeProject/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/MemeProject/.idea/gradle.xml b/MemeProject/.idea/gradle.xml index 736c7b5..1bbc21d 100644 --- a/MemeProject/.idea/gradle.xml +++ b/MemeProject/.idea/gradle.xml @@ -5,6 +5,7 @@ - - + \ No newline at end of file diff --git a/MemeProject/.idea/misc.xml b/MemeProject/.idea/misc.xml index d415385..4684197 100644 --- a/MemeProject/.idea/misc.xml +++ b/MemeProject/.idea/misc.xml @@ -3,6 +3,13 @@ + + + @@ -13,7 +20,7 @@ - + @@ -35,5 +42,4 @@ - - + \ No newline at end of file diff --git a/MemeProject/.idea/modules.xml b/MemeProject/.idea/modules.xml index db189d3..d953495 100644 --- a/MemeProject/.idea/modules.xml +++ b/MemeProject/.idea/modules.xml @@ -6,5 +6,4 @@ - - + \ No newline at end of file diff --git a/MemeProject/.idea/scopes/scope_settings.xml b/MemeProject/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/MemeProject/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/MemeProject/.idea/vcs.xml b/MemeProject/.idea/vcs.xml index def6a6a..6564d52 100644 --- a/MemeProject/.idea/vcs.xml +++ b/MemeProject/.idea/vcs.xml @@ -3,5 +3,4 @@ - - + \ No newline at end of file diff --git a/MemeProject/MemeProject.iml b/MemeProject/MemeProject.iml index 29deca7..9a5441c 100644 --- a/MemeProject/MemeProject.iml +++ b/MemeProject/MemeProject.iml @@ -4,6 +4,7 @@ @@ -15,5 +16,4 @@ - - + \ No newline at end of file diff --git a/MemeProject/app/app.iml b/MemeProject/app/app.iml index eb0313a..a3753c9 100644 --- a/MemeProject/app/app.iml +++ b/MemeProject/app/app.iml @@ -12,8 +12,9 @@