diff --git a/.DS_Store b/.DS_Store index f260456..5008ddf 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/MemeProject/.idea/MemeProject.iml b/MemeProject/.idea/MemeProject.iml new file mode 100644 index 0000000..39a81c5 --- /dev/null +++ b/MemeProject/.idea/MemeProject.iml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + diff --git a/MemeProject/.idea/misc.xml b/MemeProject/.idea/misc.xml index 5689cf8..03a159d 100644 --- a/MemeProject/.idea/misc.xml +++ b/MemeProject/.idea/misc.xml @@ -1,8 +1,5 @@ - - - @@ -13,26 +10,6 @@ - - - - - - - - - - 1.7 - - - - - - - - \ No newline at end of file + + + diff --git a/MemeProject/.idea/modules.xml b/MemeProject/.idea/modules.xml index db189d3..ad4f2e4 100644 --- a/MemeProject/.idea/modules.xml +++ b/MemeProject/.idea/modules.xml @@ -2,8 +2,7 @@ - - + diff --git a/MemeProject/.idea/vcs.xml b/MemeProject/.idea/vcs.xml index def6a6a..275077f 100644 --- a/MemeProject/.idea/vcs.xml +++ b/MemeProject/.idea/vcs.xml @@ -1,7 +1,7 @@ - + diff --git a/MemeProject/.idea/workspace.xml b/MemeProject/.idea/workspace.xml new file mode 100644 index 0000000..898412d --- /dev/null +++ b/MemeProject/.idea/workspace.xml @@ -0,0 +1,706 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + 1433721249069 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Android + + + + + + + + + + + + + + + 1.7 + + + + + + + + MemeProject + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MemeProject/.gitignore b/MemeProject/MemeProject/.gitignore similarity index 100% rename from MemeProject/.gitignore rename to MemeProject/MemeProject/.gitignore diff --git a/MemeProject/MemeProject/.idea/.name b/MemeProject/MemeProject/.idea/.name new file mode 100644 index 0000000..1158627 --- /dev/null +++ b/MemeProject/MemeProject/.idea/.name @@ -0,0 +1 @@ +MemeProject \ No newline at end of file diff --git a/MemeProject/MemeProject/.idea/compiler.xml b/MemeProject/MemeProject/.idea/compiler.xml new file mode 100644 index 0000000..9a8b7e5 --- /dev/null +++ b/MemeProject/MemeProject/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/MemeProject/MemeProject/.idea/copyright/profiles_settings.xml b/MemeProject/MemeProject/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/MemeProject/MemeProject/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/MemeProject/.idea/gradle.xml b/MemeProject/MemeProject/.idea/gradle.xml similarity index 100% rename from MemeProject/.idea/gradle.xml rename to MemeProject/MemeProject/.idea/gradle.xml diff --git a/MemeProject/MemeProject/.idea/misc.xml b/MemeProject/MemeProject/.idea/misc.xml new file mode 100644 index 0000000..5689cf8 --- /dev/null +++ b/MemeProject/MemeProject/.idea/misc.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 1.7 + + + + + + + + \ No newline at end of file diff --git a/MemeProject/MemeProject/.idea/modules.xml b/MemeProject/MemeProject/.idea/modules.xml new file mode 100644 index 0000000..d953495 --- /dev/null +++ b/MemeProject/MemeProject/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/MemeProject/MemeProject/.idea/vcs.xml b/MemeProject/MemeProject/.idea/vcs.xml new file mode 100644 index 0000000..6564d52 --- /dev/null +++ b/MemeProject/MemeProject/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/MemeProject/MemeProject.iml b/MemeProject/MemeProject/MemeProject.iml similarity index 100% rename from MemeProject/MemeProject.iml rename to MemeProject/MemeProject/MemeProject.iml diff --git a/MemeProject/app/.gitignore b/MemeProject/MemeProject/app/.gitignore similarity index 100% rename from MemeProject/app/.gitignore rename to MemeProject/MemeProject/app/.gitignore diff --git a/MemeProject/app/app.iml b/MemeProject/MemeProject/app/app.iml similarity index 97% rename from MemeProject/app/app.iml rename to MemeProject/MemeProject/app/app.iml index d049220..4ec8429 100644 --- a/MemeProject/app/app.iml +++ b/MemeProject/MemeProject/app/app.iml @@ -87,6 +87,8 @@ + + diff --git a/MemeProject/app/build.gradle b/MemeProject/MemeProject/app/build.gradle similarity index 91% rename from MemeProject/app/build.gradle rename to MemeProject/MemeProject/app/build.gradle index 77da775..ef7ecdf 100644 --- a/MemeProject/app/build.gradle +++ b/MemeProject/MemeProject/app/build.gradle @@ -22,4 +22,6 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:22.1.1' + compile 'com.j256.ormlite:ormlite-android:4.48' + } diff --git a/MemeProject/app/proguard-rules.pro b/MemeProject/MemeProject/app/proguard-rules.pro similarity index 100% rename from MemeProject/app/proguard-rules.pro rename to MemeProject/MemeProject/app/proguard-rules.pro diff --git a/MemeProject/app/src/androidTest/java/madelyntav/c4q/nyc/memeproject/ApplicationTest.java b/MemeProject/MemeProject/app/src/androidTest/java/madelyntav/c4q/nyc/memeproject/ApplicationTest.java similarity index 100% rename from MemeProject/app/src/androidTest/java/madelyntav/c4q/nyc/memeproject/ApplicationTest.java rename to MemeProject/MemeProject/app/src/androidTest/java/madelyntav/c4q/nyc/memeproject/ApplicationTest.java diff --git a/MemeProject/app/src/main/AndroidManifest.xml b/MemeProject/MemeProject/app/src/main/AndroidManifest.xml similarity index 100% rename from MemeProject/app/src/main/AndroidManifest.xml rename to MemeProject/MemeProject/app/src/main/AndroidManifest.xml diff --git a/MemeProject/app/src/main/assets/fonts/impact.ttf b/MemeProject/MemeProject/app/src/main/assets/fonts/impact.ttf similarity index 100% rename from MemeProject/app/src/main/assets/fonts/impact.ttf rename to MemeProject/MemeProject/app/src/main/assets/fonts/impact.ttf diff --git a/MemeProject/app/src/main/ic_launcher-web.png b/MemeProject/MemeProject/app/src/main/ic_launcher-web.png similarity index 100% rename from MemeProject/app/src/main/ic_launcher-web.png rename to MemeProject/MemeProject/app/src/main/ic_launcher-web.png diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ApplyFilters.java b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ApplyFilters.java similarity index 100% rename from MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ApplyFilters.java rename to MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ApplyFilters.java diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ColorPicker.java b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ColorPicker.java similarity index 100% rename from MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ColorPicker.java rename to MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ColorPicker.java diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ConvolutionMatrix.java b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ConvolutionMatrix.java similarity index 100% rename from MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ConvolutionMatrix.java rename to MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/ConvolutionMatrix.java diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/CustomArrayAdapter.java b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/CustomArrayAdapter.java similarity index 92% rename from MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/CustomArrayAdapter.java rename to MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/CustomArrayAdapter.java index b462b33..776242e 100644 --- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/CustomArrayAdapter.java +++ b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/CustomArrayAdapter.java @@ -46,9 +46,9 @@ private View newView(ViewGroup parent) { } private void bindView(int position, View row) { - TextView label=(TextView)row.findViewById(R.id.memeName); +// TextView label=(TextView)row.findViewById(R.id.memeName); - label.setText(memeNames.get(position)); +// label.setText(memeNames.get(position)); ImageView icon=(ImageView)row.findViewById(R.id.memeImage); diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java similarity index 98% rename from MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java rename to MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java index dd518c6..26f459e 100644 --- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java +++ b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java @@ -465,6 +465,7 @@ public void setTwentyFive(View v) { //----------------------------------IMAGE EFFECTS METHODS---------------------------------// + // Applies engrave effect to image public void clearImage(View view) { Handler handler= new Handler(); @@ -591,14 +592,6 @@ public void vanillaM(View v) { colorPicker.setVisibility(View.VISIBLE); memeLayout.setBackgroundColor(Color.parseColor("#CCCCCC")); - if (colorPicker.isSelected()) { - editText.setVisibility(View.VISIBLE); - editText2.setVisibility(View.VISIBLE); - } else { - editText.setVisibility(View.GONE); - editText2.setVisibility(View.GONE); - } - } diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java similarity index 91% rename from MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java rename to MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java index 2618d2e..d1ee61a 100644 --- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java +++ b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java @@ -66,6 +66,14 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { Intent intent = new Intent(MainActivity.this, EditPhoto.class); if (requestCode == REQUEST_IMAGE_CAPTURE && resultCode == RESULT_OK) { + + Bundle extras = data.getExtras(); + Bitmap imageBitmap = (Bitmap) extras.get("data"); + ByteArrayOutputStream bs = new ByteArrayOutputStream(); + imageBitmap.compress(Bitmap.CompressFormat.JPEG, 50, bs); + intent.putExtra("byteArray", bs.toByteArray()); + startActivity(intent); + // Bundle extras = data.getExtras(); // Bitmap imageBitmap = (Bitmap) extras.get("data"); // ByteArrayOutputStream bs = new ByteArrayOutputStream(); @@ -77,6 +85,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { + } if (requestCode == EXTERNAL_CONTENT_URI && resultCode == RESULT_OK & data!= null) { diff --git a/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeAdapter.java b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeAdapter.java new file mode 100644 index 0000000..c4a31ce --- /dev/null +++ b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeAdapter.java @@ -0,0 +1,70 @@ +package madelyntav.c4q.nyc.memeproject; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import java.util.List; + +import madelyntav.c4q.nyc.memeproject.MemeBm; + +/** + * Created by alvin2 on 7/13/15. + */ +public class MemeAdapter extends BaseAdapter { + + LayoutInflater mLayoutInflater; + List memes; + + @Override + public int getCount() { + // ternary; IF [condition] ? THEN : ELSE + return memes != null ? memes.size() : 0; + } + + @Override + public Object getItem(int i) { + return memes.get(i); + } + + // leave as default + @Override + public long getItemId(int i) { + return 0; + } + + @Override + public View getView(int i, View view, ViewGroup viewGroup) { + ViewHolder holder; + MemeBm memeBm = (MemeBm) getItem(i); + + if (view == null) { + view = mLayoutInflater.inflate(R.layout.list_item, viewGroup, false); + + holder = new ViewHolder(); + holder.imageView = (ImageView) view.findViewById(R.id.memeImage); + + view.setTag(holder); + } else { + holder = (ViewHolder) view.getTag(); + } + + holder.imageView.setImageBitmap(memeBm.getImageBitmap()); + + return view; + } + + // matches up with adapter + public class ViewHolder { + ImageView imageView; + } + + public MemeAdapter(List memeBmList, Context context) { + this.memes = memeBmList; + mLayoutInflater = LayoutInflater.from(context); + } +} diff --git a/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeBm.java b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeBm.java new file mode 100644 index 0000000..d7c4592 --- /dev/null +++ b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeBm.java @@ -0,0 +1,35 @@ +package madelyntav.c4q.nyc.memeproject; + +/** + * Created by alvin2 on 7/15/15. + */ + + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; + +import com.j256.ormlite.field.DataType; +import com.j256.ormlite.field.DatabaseField; +import com.j256.ormlite.table.DatabaseTable; + +@DatabaseTable +public class MemeBm { + + @DatabaseField(dataType = DataType.BYTE_ARRAY) + private byte[] imageBlob; + + + public byte[] getImageBlob() { + return imageBlob; + } + + public void setImageBlob(byte[] imageBlob) { + this.imageBlob = imageBlob; + } + + public Bitmap getImageBitmap() { + return BitmapFactory.decodeByteArray(imageBlob, 0, imageBlob.length); + } + + +} diff --git a/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeList.java b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeList.java new file mode 100644 index 0000000..8ba1e44 --- /dev/null +++ b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MemeList.java @@ -0,0 +1,107 @@ +package madelyntav.c4q.nyc.memeproject; + +import android.app.Activity; +import android.content.ContentResolver; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.Toast; + +import java.io.InputStream; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +/** + * Created by kadeemmaragh on 6/5/15. + */ +public class MemeList extends Activity { + + List memeBm; + ListView listView; + HashMap memePairs; + private Uri uri; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_meme_list); + + + try { + MySQLiteOpenHelper mySQLiteOpenHelper = MySQLiteOpenHelper.getInstance(getApplicationContext()); + mySQLiteOpenHelper.insertData(); + memeBm = mySQLiteOpenHelper.loadData(); + + } catch (SQLException e) { + e.printStackTrace(); + } + + + + listView = (ListView) findViewById(R.id.listView); + +// +// memePairs = new HashMap<>(); +// memePairs.put(R.drawable.actual_advice_mallard, "Actual Advice Mallard"); +// memePairs.put(R.drawable.but_thats_none_of_my_business, "But That's None Of My Business"); +// memePairs.put(R.drawable.creepy_condescending_wonka, "Creepy Condescending Wonka"); +// memePairs.put(R.drawable.futurama_fry, "Skeptical Fry"); +// memePairs.put(R.drawable.good_guy_greg, "Good Guy Greg"); +// memePairs.put(R.drawable.liam_neeson_taken, "Liam Neeson Taken"); +// memePairs.put(R.drawable.one_does_not_simply, "One Does Not Simply"); +// memePairs.put(R.drawable.scumbag_steve, "Scumbag Steve"); +// memePairs.put(R.drawable.shut_up_and_take_my_money_fry, "Shut Up And Take My Money"); +// memePairs.put(R.drawable.ten_guy, "Ten Guy"); +// memePairs.put(R.drawable.the_most_interesting_man_in_the_world, "The Most Interesting Man In The World"); +// memePairs.put(R.drawable.third_world_skeptical_kid, "Third World Skeptical Kid"); +// memePairs.put(R.drawable.unhelpful_high_school_teacher, "Unhelpful High School Teacher"); +// memePairs.put(R.drawable.yao_ming, "Yao Ming"); +// memePairs.put(R.drawable.you_the_real_mvp, "You The Real MVP"); + + + final ArrayList memeImages = new ArrayList(); +// ArrayList memeNames = new ArrayList(); +// addItemsToArrays(memeImages, memeNames); + +// CustomArrayAdapter memeAdapter = new CustomArrayAdapter(getApplicationContext(), memeNames, memeImages); + +// listView.setAdapter(memeAdapter); + + listView.setAdapter(new MemeAdapter(memeBm, this)); + + listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + Intent intent = new Intent(MemeList.this, EditPhoto.class); + + uri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + getResources().getResourcePackageName(memeImages.get(position)) + '/' + getResources().getResourceTypeName(memeImages.get(position)) + '/' + getResources().getResourceEntryName(memeImages.get(position))); + + intent.putExtra("image", uri); + startActivity(intent); + Toast.makeText(getApplicationContext(), "Please select VANILLA or DEMO layout to begin", Toast.LENGTH_SHORT).show(); + + } + }); + + + + + } + + public void addItemsToArrays(ArrayList images, ArrayList titles) { + int position = 0; + for (Integer image : memePairs.keySet()) { + + images.add(position, image); + titles.add(position, memePairs.get(image)); + position++; + } + } + +} diff --git a/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MySQLiteOpenHelper.java b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MySQLiteOpenHelper.java new file mode 100644 index 0000000..f46bb4f --- /dev/null +++ b/MemeProject/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MySQLiteOpenHelper.java @@ -0,0 +1,123 @@ +package madelyntav.c4q.nyc.memeproject; + +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.os.Handler; +import android.support.v4.content.ContextCompat; + +import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper; +import com.j256.ormlite.dao.Dao; +import com.j256.ormlite.support.ConnectionSource; +import com.j256.ormlite.table.TableUtils; + +import java.io.ByteArrayOutputStream; +import java.sql.SQLException; +import java.util.List; + +import madelyntav.c4q.nyc.memeproject.MemeBm; + +/** + * Created by kgalligan on 7/11/15. + */ +public class MySQLiteOpenHelper extends OrmLiteSqliteOpenHelper { + + public static final String MYDB = "mydb"; + public static final int VERSION = 1; + + private static MySQLiteOpenHelper INSTANCE; + private Context context; + + + public static synchronized MySQLiteOpenHelper getInstance(Context context) { + if (INSTANCE == null) { + INSTANCE = new MySQLiteOpenHelper(context.getApplicationContext()); + } + + return INSTANCE; + } + + private MySQLiteOpenHelper(Context context) { + super(context, MYDB, null, VERSION); + this.context = context; + } + + @Override + public void onCreate(SQLiteDatabase database, ConnectionSource connectionSource) { + try { + TableUtils.createTable(connectionSource, madelyntav.c4q.nyc.memeproject.MemeBm.class); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + @Override + public void onUpgrade(SQLiteDatabase database, ConnectionSource connectionSource, int oldVersion, int newVersion) { + try { + TableUtils.dropTable(connectionSource, madelyntav.c4q.nyc.memeproject.MemeBm.class, false); + onCreate(database, connectionSource); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + + public static byte[] getBitmapAsByteArray(Bitmap bitmap) { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + bitmap.compress(Bitmap.CompressFormat.PNG, 0, outputStream); + return outputStream.toByteArray(); + } + + public void insertData() throws SQLException { + Dao dao = getDao(MemeBm.class); + + dao.delete(dao.deleteBuilder().prepare()); + + Bitmap icon2 = BitmapFactory.decodeResource(context.getResources(), R.drawable.actual_advice_mallard); + Bitmap icon3 = BitmapFactory.decodeResource(context.getResources(), R.drawable.but_thats_none_of_my_business); + Bitmap icon4 = BitmapFactory.decodeResource(context.getResources(), R.drawable.creepy_condescending_wonka); + Bitmap icon5 = BitmapFactory.decodeResource(context.getResources(), R.drawable.futurama_fry); + Bitmap icon6 = BitmapFactory.decodeResource(context.getResources(), R.drawable.good_guy_greg); + Bitmap icon7 = BitmapFactory.decodeResource(context.getResources(), R.drawable.liam_neeson_taken); + Bitmap icon8 = BitmapFactory.decodeResource(context.getResources(), R.drawable.one_does_not_simply); + Bitmap icon9 = BitmapFactory.decodeResource(context.getResources(), R.drawable.scumbag_steve); + Bitmap icon10 = BitmapFactory.decodeResource(context.getResources(), R.drawable.shut_up_and_take_my_money_fry); + Bitmap icon11 = BitmapFactory.decodeResource(context.getResources(), R.drawable.ten_guy); + Bitmap icon12 = BitmapFactory.decodeResource(context.getResources(), R.drawable.the_most_interesting_man_in_the_world); + Bitmap icon13 = BitmapFactory.decodeResource(context.getResources(), R.drawable.third_world_skeptical_kid); + Bitmap icon14 = BitmapFactory.decodeResource(context.getResources(), R.drawable.unhelpful_high_school_teacher); + Bitmap icon15 = BitmapFactory.decodeResource(context.getResources(), R.drawable.yao_ming); + Bitmap icon16 = BitmapFactory.decodeResource(context.getResources(), R.drawable.you_the_real_mvp); + + insertRow(icon2); + insertRow(icon3); + insertRow(icon4); + insertRow(icon5); + insertRow(icon6); + insertRow(icon7); + insertRow(icon8); + insertRow(icon9); + insertRow(icon10); + insertRow(icon11); + insertRow(icon12); + insertRow(icon13); + insertRow(icon14); + insertRow(icon15); + insertRow(icon16); + + } + + private void insertRow(Bitmap bm) throws SQLException { + + MemeBm memeBm = new MemeBm(); + memeBm.setImageBlob(getBitmapAsByteArray(bm)); + getDao(MemeBm.class).create(memeBm); + } + + + public List loadData() throws SQLException { + return getDao(MemeBm.class).queryForAll(); + } + +} diff --git a/MemeProject/app/src/main/res/drawable/actual_advice_mallard.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/actual_advice_mallard.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/actual_advice_mallard.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/actual_advice_mallard.jpg diff --git a/MemeProject/app/src/main/res/drawable/but_thats_none_of_my_business.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/but_thats_none_of_my_business.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/but_thats_none_of_my_business.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/but_thats_none_of_my_business.jpg diff --git a/MemeProject/app/src/main/res/drawable/buttons.xml b/MemeProject/MemeProject/app/src/main/res/drawable/buttons.xml similarity index 100% rename from MemeProject/app/src/main/res/drawable/buttons.xml rename to MemeProject/MemeProject/app/src/main/res/drawable/buttons.xml diff --git a/MemeProject/app/src/main/res/drawable/buttons2.xml b/MemeProject/MemeProject/app/src/main/res/drawable/buttons2.xml similarity index 100% rename from MemeProject/app/src/main/res/drawable/buttons2.xml rename to MemeProject/MemeProject/app/src/main/res/drawable/buttons2.xml diff --git a/MemeProject/app/src/main/res/drawable/cam.png b/MemeProject/MemeProject/app/src/main/res/drawable/cam.png similarity index 100% rename from MemeProject/app/src/main/res/drawable/cam.png rename to MemeProject/MemeProject/app/src/main/res/drawable/cam.png diff --git a/MemeProject/app/src/main/res/drawable/confirm.png b/MemeProject/MemeProject/app/src/main/res/drawable/confirm.png similarity index 100% rename from MemeProject/app/src/main/res/drawable/confirm.png rename to MemeProject/MemeProject/app/src/main/res/drawable/confirm.png diff --git a/MemeProject/app/src/main/res/drawable/creepy_condescending_wonka.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/creepy_condescending_wonka.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/creepy_condescending_wonka.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/creepy_condescending_wonka.jpg diff --git a/MemeProject/app/src/main/res/drawable/demo_pic.xml b/MemeProject/MemeProject/app/src/main/res/drawable/demo_pic.xml similarity index 100% rename from MemeProject/app/src/main/res/drawable/demo_pic.xml rename to MemeProject/MemeProject/app/src/main/res/drawable/demo_pic.xml diff --git a/MemeProject/app/src/main/res/drawable/filter_button.xml b/MemeProject/MemeProject/app/src/main/res/drawable/filter_button.xml similarity index 100% rename from MemeProject/app/src/main/res/drawable/filter_button.xml rename to MemeProject/MemeProject/app/src/main/res/drawable/filter_button.xml diff --git a/MemeProject/app/src/main/res/drawable/folder.png b/MemeProject/MemeProject/app/src/main/res/drawable/folder.png similarity index 100% rename from MemeProject/app/src/main/res/drawable/folder.png rename to MemeProject/MemeProject/app/src/main/res/drawable/folder.png diff --git a/MemeProject/app/src/main/res/drawable/futurama_fry.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/futurama_fry.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/futurama_fry.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/futurama_fry.jpg diff --git a/MemeProject/app/src/main/res/drawable/good_guy_greg.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/good_guy_greg.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/good_guy_greg.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/good_guy_greg.jpg diff --git a/MemeProject/app/src/main/res/drawable/liam_neeson_taken.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/liam_neeson_taken.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/liam_neeson_taken.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/liam_neeson_taken.jpg diff --git a/MemeProject/app/src/main/res/drawable/list.png b/MemeProject/MemeProject/app/src/main/res/drawable/list.png similarity index 100% rename from MemeProject/app/src/main/res/drawable/list.png rename to MemeProject/MemeProject/app/src/main/res/drawable/list.png diff --git a/MemeProject/app/src/main/res/drawable/logo.png b/MemeProject/MemeProject/app/src/main/res/drawable/logo.png similarity index 100% rename from MemeProject/app/src/main/res/drawable/logo.png rename to MemeProject/MemeProject/app/src/main/res/drawable/logo.png diff --git a/MemeProject/app/src/main/res/drawable/meme_button.xml b/MemeProject/MemeProject/app/src/main/res/drawable/meme_button.xml similarity index 100% rename from MemeProject/app/src/main/res/drawable/meme_button.xml rename to MemeProject/MemeProject/app/src/main/res/drawable/meme_button.xml diff --git a/MemeProject/app/src/main/res/drawable/meme_list.xml b/MemeProject/MemeProject/app/src/main/res/drawable/meme_list.xml similarity index 100% rename from MemeProject/app/src/main/res/drawable/meme_list.xml rename to MemeProject/MemeProject/app/src/main/res/drawable/meme_list.xml diff --git a/MemeProject/app/src/main/res/drawable/one_does_not_simply.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/one_does_not_simply.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/one_does_not_simply.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/one_does_not_simply.jpg diff --git a/MemeProject/app/src/main/res/drawable/popular_meme.xml b/MemeProject/MemeProject/app/src/main/res/drawable/popular_meme.xml similarity index 100% rename from MemeProject/app/src/main/res/drawable/popular_meme.xml rename to MemeProject/MemeProject/app/src/main/res/drawable/popular_meme.xml diff --git a/MemeProject/app/src/main/res/drawable/save.png b/MemeProject/MemeProject/app/src/main/res/drawable/save.png similarity index 100% rename from MemeProject/app/src/main/res/drawable/save.png rename to MemeProject/MemeProject/app/src/main/res/drawable/save.png diff --git a/MemeProject/app/src/main/res/drawable/scumbag_steve.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/scumbag_steve.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/scumbag_steve.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/scumbag_steve.jpg diff --git a/MemeProject/app/src/main/res/drawable/share.png b/MemeProject/MemeProject/app/src/main/res/drawable/share.png similarity index 100% rename from MemeProject/app/src/main/res/drawable/share.png rename to MemeProject/MemeProject/app/src/main/res/drawable/share.png diff --git a/MemeProject/app/src/main/res/drawable/shut_up_and_take_my_money_fry.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/shut_up_and_take_my_money_fry.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/shut_up_and_take_my_money_fry.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/shut_up_and_take_my_money_fry.jpg diff --git a/MemeProject/app/src/main/res/drawable/templatememeicon.png b/MemeProject/MemeProject/app/src/main/res/drawable/templatememeicon.png similarity index 100% rename from MemeProject/app/src/main/res/drawable/templatememeicon.png rename to MemeProject/MemeProject/app/src/main/res/drawable/templatememeicon.png diff --git a/MemeProject/app/src/main/res/drawable/ten_guy.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/ten_guy.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/ten_guy.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/ten_guy.jpg diff --git a/MemeProject/app/src/main/res/drawable/text_button.xml b/MemeProject/MemeProject/app/src/main/res/drawable/text_button.xml similarity index 100% rename from MemeProject/app/src/main/res/drawable/text_button.xml rename to MemeProject/MemeProject/app/src/main/res/drawable/text_button.xml diff --git a/MemeProject/app/src/main/res/drawable/the_most_interesting_man_in_the_world.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/the_most_interesting_man_in_the_world.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/the_most_interesting_man_in_the_world.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/the_most_interesting_man_in_the_world.jpg diff --git a/MemeProject/app/src/main/res/drawable/third_world_skeptical_kid.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/third_world_skeptical_kid.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/third_world_skeptical_kid.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/third_world_skeptical_kid.jpg diff --git a/MemeProject/app/src/main/res/drawable/unhelpful_high_school_teacher.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/unhelpful_high_school_teacher.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/unhelpful_high_school_teacher.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/unhelpful_high_school_teacher.jpg diff --git a/MemeProject/app/src/main/res/drawable/yao_ming.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/yao_ming.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/yao_ming.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/yao_ming.jpg diff --git a/MemeProject/app/src/main/res/drawable/you_the_real_mvp.jpg b/MemeProject/MemeProject/app/src/main/res/drawable/you_the_real_mvp.jpg similarity index 100% rename from MemeProject/app/src/main/res/drawable/you_the_real_mvp.jpg rename to MemeProject/MemeProject/app/src/main/res/drawable/you_the_real_mvp.jpg diff --git a/MemeProject/app/src/main/res/layout/activity_edit_photo.xml b/MemeProject/MemeProject/app/src/main/res/layout/activity_edit_photo.xml similarity index 98% rename from MemeProject/app/src/main/res/layout/activity_edit_photo.xml rename to MemeProject/MemeProject/app/src/main/res/layout/activity_edit_photo.xml index 0e3a58b..144a91c 100644 --- a/MemeProject/app/src/main/res/layout/activity_edit_photo.xml +++ b/MemeProject/MemeProject/app/src/main/res/layout/activity_edit_photo.xml @@ -103,6 +103,13 @@ android:text="GREEN " style="@style/FilterButtons" android:onClick="shadingFilterGreen"/> + +