diff --git a/MemeFyMe/.idea/misc.xml b/MemeFyMe/.idea/misc.xml
index e8ef76e..fdb926d 100644
--- a/MemeFyMe/.idea/misc.xml
+++ b/MemeFyMe/.idea/misc.xml
@@ -6,14 +6,6 @@
-<<<<<<< HEAD
-
-=======
-<<<<<<< HEAD
-
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
@@ -24,12 +16,7 @@
-=======
->>>>>>> 08677ca45b9f173651c9ec20655f2cbfab4f5cc2
-=======
->>>>>>> joshelyn
->>>>>>> joshelyn
@@ -138,6 +125,5 @@
->>>>>>> master
diff --git a/MemeFyMe/.idea/vcs.xml b/MemeFyMe/.idea/vcs.xml
index 9973d24..a424d2e 100644
--- a/MemeFyMe/.idea/vcs.xml
+++ b/MemeFyMe/.idea/vcs.xml
@@ -7,4 +7,5 @@
-
\ No newline at end of file
+
+
diff --git a/MemeFyMe/MemeFyMe.iml b/MemeFyMe/MemeFyMe.iml
index eaee7fd..0bb6048 100644
--- a/MemeFyMe/MemeFyMe.iml
+++ b/MemeFyMe/MemeFyMe.iml
@@ -1,10 +1,9 @@
-
+
-
@@ -16,4 +15,5 @@
-
\ No newline at end of file
+
+
diff --git a/MemeFyMe/app/app.iml b/MemeFyMe/app/app.iml
index e31f11b..cce3ea8 100644
--- a/MemeFyMe/app/app.iml
+++ b/MemeFyMe/app/app.iml
@@ -1,5 +1,5 @@
-
+
@@ -12,9 +12,8 @@
-
-
+
@@ -69,8 +68,6 @@
-
-
@@ -92,4 +89,5 @@
-
\ No newline at end of file
+
+
diff --git a/MemeFyMe/app/src/main/java/lighterletter/c4q/nyc/memefymeapp/MainActivity.java b/MemeFyMe/app/src/main/java/lighterletter/c4q/nyc/memefymeapp/MainActivity.java
index 2558a2e..e9b2ec0 100644
--- a/MemeFyMe/app/src/main/java/lighterletter/c4q/nyc/memefymeapp/MainActivity.java
+++ b/MemeFyMe/app/src/main/java/lighterletter/c4q/nyc/memefymeapp/MainActivity.java
@@ -1,10 +1,11 @@
package lighterletter.c4q.nyc.memefymeapp;
+import android.content.ContentValues;
import android.content.Intent;
-
-
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
import android.graphics.Typeface;
-
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
@@ -12,16 +13,23 @@
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarActivity;
import android.view.View;
-import android.widget.ImageButton;
import android.widget.Button;
+import android.widget.ImageButton;
import android.widget.TextView;
+
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
-
public class MainActivity extends ActionBarActivity {
+ private MyDataBase mdb=null;
+ private SQLiteDatabase db=null;
+ private byte[] img=null;
+ private static final String DATABASE_NAME = "ImageDb.db";
+ public static final int DATABASE_VERSION = 1;
+
Button buttonTemplate;
@@ -39,6 +47,21 @@ public class MainActivity extends ActionBarActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ mdb = new MyDataBase(getApplicationContext(), DATABASE_NAME, null, DATABASE_VERSION);
+
+
+ Bitmap b = BitmapFactory.decodeResource(getResources(), R.drawable.futuramafry);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ b.compress(Bitmap.CompressFormat.PNG, 100, bos);
+ img = bos.toByteArray();
+ db = mdb.getWritableDatabase();
+ ContentValues cv=new ContentValues();
+ cv.put("image", img);
+ db.insert("tableimage", null, cv);
+
+
+
+
// to hide the action bar
setContentView(R.layout.activity_main);
ActionBar actionBar = getSupportActionBar();
diff --git a/MemeFyMe/app/src/main/java/lighterletter/c4q/nyc/memefymeapp/MyDataBase.java b/MemeFyMe/app/src/main/java/lighterletter/c4q/nyc/memefymeapp/MyDataBase.java
new file mode 100644
index 0000000..b345c52
--- /dev/null
+++ b/MemeFyMe/app/src/main/java/lighterletter/c4q/nyc/memefymeapp/MyDataBase.java
@@ -0,0 +1,27 @@
+package lighterletter.c4q.nyc.memefymeapp;
+
+/**
+ * Created by c4q-raynaldie on 7/13/15.
+ */
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.database.sqlite.SQLiteDatabase.CursorFactory;
+
+public class MyDataBase extends SQLiteOpenHelper{
+
+ public MyDataBase(Context context, String dbname, CursorFactory factory, int dbversion) {
+ super(context, dbname, factory, dbversion);
+ }
+
+ @Override
+ public void onCreate(SQLiteDatabase db) {
+ db.execSQL("create table tableimage(image blob);");
+ }
+
+ @Override
+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+
+ }
+
+}
\ No newline at end of file
diff --git a/MemeFyMe/app/src/main/java/lighterletter/c4q/nyc/memefymeapp/ShareActivity.java b/MemeFyMe/app/src/main/java/lighterletter/c4q/nyc/memefymeapp/ShareActivity.java
index 4dd9205..178acfd 100644
--- a/MemeFyMe/app/src/main/java/lighterletter/c4q/nyc/memefymeapp/ShareActivity.java
+++ b/MemeFyMe/app/src/main/java/lighterletter/c4q/nyc/memefymeapp/ShareActivity.java
@@ -1,7 +1,9 @@
package lighterletter.c4q.nyc.memefymeapp;
+import android.content.ContentValues;
import android.content.Intent;
+import android.database.sqlite.SQLiteDatabase;
import android.graphics.Bitmap;
import android.graphics.Typeface;
import android.net.Uri;
@@ -14,6 +16,8 @@
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
+
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -24,6 +28,15 @@ public class ShareActivity extends ActionBarActivity {
Button sharePicture;
+ private MyDataBase mdb=null;
+ private SQLiteDatabase db=null;
+
+ private byte[] img=null;
+ private static final String DATABASE_NAME = "ImageDb.db";
+ public static final int DATABASE_VERSION = 1;
+
+
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -69,6 +82,20 @@ protected void onCreate(Bundle savedInstanceState) {
sharePicture.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+
+ mdb = new MyDataBase(getApplicationContext(), DATABASE_NAME, null, DATABASE_VERSION);
+
+ bitmap.buildDrawingCache();
+ Bitmap bitmap2 = bitmap.getDrawingCache();
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ bitmap2.compress(Bitmap.CompressFormat.PNG, 100, bos);
+ img = bos.toByteArray();
+ db = mdb.getWritableDatabase();
+ ContentValues cv=new ContentValues();
+ cv.put("image", img);
+ db.insert("tableimage", null, cv);
+
Intent intent = new Intent(Intent.ACTION_SEND);
intent.setType("image/*");
intent.putExtra(Intent.EXTRA_STREAM, resultUri);