diff --git a/.DS_Store b/.DS_Store index f260456..b15a21f 100644 Binary files a/.DS_Store and b/.DS_Store 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 d1ee61a..53177b3 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 @@ -55,7 +55,7 @@ public void takePic(View v) { } public void chooseMeme(View view){ - Intent popularMemeIntent = new Intent(MainActivity.this, MemeList.class); + Intent popularMemeIntent = new Intent(MainActivity.this, TemplateActivity.class); startActivity(popularMemeIntent); } diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/Template.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/Template.java new file mode 100644 index 0000000..4c9ad86 --- /dev/null +++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/Template.java @@ -0,0 +1,42 @@ +package madelyntav.c4q.nyc.memeproject; + +public class Template { + + private int _id; + private String _name; + private int _image; + + public Template() { + + } + + public Template(int _id, String _name, int _image) { + this._id = _id; + this._name = _name; + this._image = _image; + } + + public int get_id() { + return _id; + } + + public void set_id(int _id) { + this._id = _id; + } + + public String get_name() { + return _name; + } + + public void set_name(String _name) { + this._name = _name; + } + + public int get_image() { + return _image; + } + + public void set_image(int _image) { + this._image = _image; + } +} diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/TemplateActivity.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/TemplateActivity.java new file mode 100644 index 0000000..ac1f3ee --- /dev/null +++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/TemplateActivity.java @@ -0,0 +1,47 @@ +package madelyntav.c4q.nyc.memeproject; + +import android.app.Activity; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ListView; +import android.widget.Toast; + +import java.util.concurrent.ExecutionException; + +public class TemplateActivity extends Activity { + + ListView listView; + TemplateDBAsyncTask templateDBAsyncTask; + TemplateAdapter templateAdapter; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_meme_list); + + listView = (ListView) findViewById(R.id.listView); + templateDBAsyncTask.execute(); + + try { + templateAdapter = new TemplateAdapter(this, templateDBAsyncTask.get()); + } catch (InterruptedException e) { + e.printStackTrace(); + } catch (ExecutionException e) { + e.printStackTrace(); + } + + listView.setAdapter(templateAdapter); + + listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + Intent intent = new Intent(TemplateActivity.this, EditPhoto.class); + + //todo: select image from db and load + } + }); + } +} diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/TemplateAdapter.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/TemplateAdapter.java new file mode 100644 index 0000000..a0005c9 --- /dev/null +++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/TemplateAdapter.java @@ -0,0 +1,57 @@ +package madelyntav.c4q.nyc.memeproject; + +import android.app.Activity; +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; + +public class TemplateAdapter extends BaseAdapter { + + Context context; + List