diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3939b4f..cf7930a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,22 +1,23 @@
-
-
+
+ android:largeHeap="true"
+ android:theme="@style/AppTheme" >
-
@@ -24,17 +25,14 @@
-
-
+ android:label="@string/title_activity_add_text" >
-
+ android:label="@string/title_activity_demotivational_meme" >
-
+
+
+
+
diff --git a/app/src/main/java/meme5/c4q/nyc/meme_project/ChooseMemeStyle.java b/app/src/main/java/meme5/c4q/nyc/meme_project/ChooseMemeStyle.java
index e89f9ae..109c8d7 100644
--- a/app/src/main/java/meme5/c4q/nyc/meme_project/ChooseMemeStyle.java
+++ b/app/src/main/java/meme5/c4q/nyc/meme_project/ChooseMemeStyle.java
@@ -30,9 +30,10 @@ public class ChooseMemeStyle extends Activity {
protected Button nextButton;
protected boolean vanilla;
protected Random slideShow;
- ImageView img, thumbnail;
- AnimationDrawable frameAnimation;
- String imgFilePath;
+ private ImageView img, thumbnail;
+ private AnimationDrawable frameAnimation;
+ private String imgFilePath;
+ private String imageUri;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -45,11 +46,13 @@ protected void onCreate(Bundle savedInstanceState) {
{
imgFilePath = bundle.getString("imgFilePath");
}
+
+ Bundle popular = getIntent().getExtras();
thumbnail = (ImageView) findViewById(R.id.thumbnail);
Bitmap bmp2 = BitmapFactory.decodeFile(imgFilePath);
thumbnail.setImageBitmap(bmp2);
- //apply fonts -
+ //apply fonts
//TODO: need to find a way to add this font globally through style!
TextView step1 = (TextView) findViewById(R.id.step1);
TextView step2 = (TextView) findViewById(R.id.step2);
@@ -71,8 +74,6 @@ protected void onCreate(Bundle savedInstanceState) {
@Override
public void onCheckedChanged(RadioGroup radioGroup, int checkedId) {
Log.d(TAG, "onCheckedChanged()");
- // Is the button now checked?
-// boolean checked = ((RadioButton) view).isChecked();
// Check which radio button was clicked
switch (checkedId) {
@@ -80,15 +81,14 @@ public void onCheckedChanged(RadioGroup radioGroup, int checkedId) {
Log.d(TAG, "onCheckedChanged() -- chooseVanilla");
//determine if user chose vanilla or demotivational
-
vanilla = true;
img = (ImageView) findViewById(R.id.sampleImageHolder);
img.setImageResource(R.drawable.vanilla_animation);
frameAnimation = (AnimationDrawable) img.getDrawable();
-
frameAnimation.start();
break;
+
case R.id.chooseDemotivational:
Log.d(TAG, "onCheckedChanged() -- chooseDemotivational");
@@ -98,7 +98,6 @@ public void onCheckedChanged(RadioGroup radioGroup, int checkedId) {
img.setImageResource(R.drawable.demotivational_animation);
frameAnimation = (AnimationDrawable) img.getDrawable();
-
frameAnimation.start();
break;
}
diff --git a/app/src/main/java/meme5/c4q/nyc/meme_project/DemotivationalMemeActivity.java b/app/src/main/java/meme5/c4q/nyc/meme_project/DemotivationalMemeActivity.java
index 0f8ad99..166b5f5 100644
--- a/app/src/main/java/meme5/c4q/nyc/meme_project/DemotivationalMemeActivity.java
+++ b/app/src/main/java/meme5/c4q/nyc/meme_project/DemotivationalMemeActivity.java
@@ -22,11 +22,12 @@
*/
public class DemotivationalMemeActivity extends Activity {
- Bitmap image;
- Bitmap memeImage;
- ImageView preview;
- EditText largeText;
- EditText smallText;
+ //ELEMENTS
+ private Bitmap image;
+ private Bitmap memeImage;
+ private ImageView preview;
+ private EditText largeText;
+ private EditText smallText;
@Override
@@ -34,7 +35,10 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_demotivational_meme);
+ //INITIALIZE
preview = (ImageView) findViewById(R.id.preview);
+ largeText = (EditText) findViewById(R.id.large);
+ smallText = (EditText) findViewById(R.id.small);
String imgFilePath = "";
Bundle bundle = getIntent().getExtras();
@@ -44,8 +48,7 @@ protected void onCreate(Bundle savedInstanceState) {
decodeFile(imgFilePath);
}
- largeText = (EditText) findViewById(R.id.large);
- smallText = (EditText) findViewById(R.id.small);
+
Button previewText = (Button) findViewById(R.id.previewText);
previewText.setOnClickListener(new View.OnClickListener() {
@Override
@@ -109,6 +112,7 @@ private void decodeFile(String filePath) {
while (true) {
if (width_tmp < REQUIRED_SIZE && height_tmp < REQUIRED_SIZE)
break;
+
width_tmp /= 2;
height_tmp /= 2;
scale *= 2;
diff --git a/app/src/main/java/meme5/c4q/nyc/meme_project/MainActivity.java b/app/src/main/java/meme5/c4q/nyc/meme_project/MainActivity.java
index 75eafdf..1eab9fc 100644
--- a/app/src/main/java/meme5/c4q/nyc/meme_project/MainActivity.java
+++ b/app/src/main/java/meme5/c4q/nyc/meme_project/MainActivity.java
@@ -3,6 +3,8 @@
import android.app.Activity;
import android.graphics.Typeface;
import android.os.Bundle;
+import android.widget.Button;
+import android.widget.ImageView;
import android.widget.TextView;
import android.content.Intent;
import android.database.Cursor;
@@ -13,18 +15,34 @@
import android.view.View;
public class MainActivity extends Activity {
+
+ //ELEMENTS
+ private String imgFilePath, popMemes;
+ private ImageView popular_memes;
+
+ // KEY VALUE PAIRS
private static final int RESULT_LOAD_IMG = 1;
private static final int REQUEST_IMAGE_CAPTURE = 1;
- private String imgFilePath;
+
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
+ popular_memes = (ImageView) findViewById(R.id.ivPreset);
+// popular_memes.setOnClickListener(new View.OnClickListener() {
+// @Override
+// public void onClick(View v) {
+// Intent popular = new Intent(MainActivity.this, PopularMemes.class);
+// startActivity(popular);
+// }
+// });
+
}
private void launchChooseMeme(){
- Intent chooseMeme = new Intent(this,ChooseMemeStyle.class);
+ Intent chooseMeme = new Intent(this, ChooseMemeStyle.class);
chooseMeme.putExtra("imgFilePath",imgFilePath);
startActivity(chooseMeme);
}
@@ -45,9 +63,13 @@ public void loadImagefromGallery(View view) {
}
+ public void presetsMemes (View view) {
+ Intent popular_memes = new Intent(this, PopularMemes.class);
+ startActivity(popular_memes);
+ }
+
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-// super.onActivityResult(requestCode, resultCode, data);
try {
if (requestCode == REQUEST_IMAGE_CAPTURE && resultCode == RESULT_OK) {
@@ -59,9 +81,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
cursor.moveToFirst();
int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
+
//file path of captured image
imgFilePath = cursor.getString(columnIndex);
-
cursor.close();
launchChooseMeme();
@@ -80,6 +102,20 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
cursor.close();
launchChooseMeme();
+ } else if (requestCode == PopularMemes.RESULT_OK){
+
+ Uri selectedImage = data.getData();
+ String[] filePathColumn = { MediaStore.Images.Media.DATA };
+
+ Cursor cursor = getContentResolver().query(selectedImage, filePathColumn, null, null, null);
+ cursor.moveToFirst();
+
+ int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
+ //file path of gallery image
+ imgFilePath = cursor.getString(columnIndex);
+ cursor.close();
+ launchChooseMeme();
+
} else {
Toast.makeText(this, "You haven't picked Image",
Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/meme5/c4q/nyc/meme_project/PopularMemes.java b/app/src/main/java/meme5/c4q/nyc/meme_project/PopularMemes.java
new file mode 100644
index 0000000..00ce2bd
--- /dev/null
+++ b/app/src/main/java/meme5/c4q/nyc/meme_project/PopularMemes.java
@@ -0,0 +1,75 @@
+package meme5.c4q.nyc.meme_project;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.v7.app.ActionBarActivity;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+
+
+public class PopularMemes extends ActionBarActivity {
+
+ public static String IMAGE_URI_KEY = "uri";
+ private ListView memeListView;
+ private String imageUri = "";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_popular_memes);
+
+ memeListView = (ListView) findViewById(R.id.meme_list_view);
+
+ Integer[] memeResources = {
+ R.drawable.popular0,
+ R.drawable.popular1,
+ R.drawable.popular2,
+ R.drawable.popular3,
+ R.drawable.popular4,
+ R.drawable.popular5,
+ R.drawable.popular6,
+ R.drawable.popular7,
+ R.drawable.popular8,
+ R.drawable.popular9,
+ R.drawable.popular10,
+ R.drawable.popular11,
+
+ };
+ MemeAdapter memeAdapter = new MemeAdapter(this, memeResources);
+ memeListView.setAdapter(memeAdapter);
+ memeListView.setOnItemClickListener( new AdapterView.OnItemClickListener() {
+ @Override
+ public void onItemClick(AdapterView> parent, View view, int position, long id) {
+ int meme = (Integer) parent.getItemAtPosition(position);
+ Intent popularMemes = new Intent(PopularMemes.this, ChooseMemeStyle.class);
+ imageUri += meme;
+ popularMemes.putExtra(IMAGE_URI_KEY, imageUri);
+ startActivity(popularMemes);
+ }
+ });
+
+ }
+
+ class MemeAdapter extends ArrayAdapter {
+ public MemeAdapter(Context context, Integer[] memeList) {
+ super(context, 0, memeList);
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ int singleMeme = getItem(position);
+ if (convertView == null) {
+ convertView = LayoutInflater.from(getContext()).inflate(R.layout.imageholder, parent, false);
+ }
+ ImageView appIcon = (ImageView) convertView.findViewById(R.id.ivMemePopularHolder);
+ appIcon.setImageResource(singleMeme);
+ return convertView;
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/meme5/c4q/nyc/meme_project/SplashScreen.java b/app/src/main/java/meme5/c4q/nyc/meme_project/SplashScreen.java
index 3d1beab..d4295bc 100644
--- a/app/src/main/java/meme5/c4q/nyc/meme_project/SplashScreen.java
+++ b/app/src/main/java/meme5/c4q/nyc/meme_project/SplashScreen.java
@@ -16,9 +16,12 @@
public class SplashScreen extends Activity {
/** Duration of wait **/
- private final int SPLASH_DISPLAY_LENGTH = 2500;
- ImageView img;
- AnimationDrawable frameAnimation;
+ //ELEMENTS
+ private ImageView img;
+ private AnimationDrawable frameAnimation;
+
+ //KEY VALUE PAIR
+ private final int SPLASH_DISPLAY_LENGTH = 1000;
/** Called when the activity is first created. */
@Override
diff --git a/app/src/main/java/meme5/c4q/nyc/meme_project/VanillaMeme.java b/app/src/main/java/meme5/c4q/nyc/meme_project/VanillaMeme.java
index b3ff942..962436a 100644
--- a/app/src/main/java/meme5/c4q/nyc/meme_project/VanillaMeme.java
+++ b/app/src/main/java/meme5/c4q/nyc/meme_project/VanillaMeme.java
@@ -30,14 +30,15 @@
public class VanillaMeme extends Activity {
- ImageView image;
- EditText line1;
- Bitmap bmp, bmp2;
- String line1Text;
- String imgFilePath;
- Button nextButton;
- TextView title;
- RadioButton small, medium, large;
+ //ELEMENTS
+ private ImageView image;
+ private EditText line1;
+ private Bitmap bmp, bmp2;
+ private String line1Text;
+ private String imgFilePath;
+ private Button nextButton;
+ private TextView title;
+ private RadioButton small, medium, large;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -51,6 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
decodeFile(imgFilePath);
}
+ //INITIALIZE
line1 = (EditText) findViewById(R.id.top);
image = (ImageView) findViewById(R.id.testImage);
nextButton = (Button) findViewById(R.id.next);
@@ -60,7 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
large = (RadioButton) findViewById(R.id.large);
- //apply font
+ //APPLY FONT
Typeface tf = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/ubuntu.ttf");
title.setTypeface(tf);
small.setTypeface(tf);
@@ -69,7 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
line1.setTypeface(tf);
nextButton.setTypeface(tf);
- //create on check listener to see which size is chosen
+ //CREATE ON CHECK LISTENER TO SEE WHICH SIZE IS CHOSEN
RadioGroup group = (RadioGroup) findViewById(R.id.textSizes);
group.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
@@ -95,7 +97,7 @@ public void onCheckedChanged(RadioGroup radioGroup, int checkedId) {
});
}
- //method used to write text on image
+ //TEXT ON IMAGE
public Bitmap drawTextToBitmap(Bitmap bitmap, String mText1, int textSize, int strokeSize) {
try {
android.graphics.Bitmap.Config bitmapConfig = bitmap.getConfig();
@@ -123,7 +125,8 @@ public Bitmap drawTextToBitmap(Bitmap bitmap, String mText1, int textSize, int s
int xPos = (bitmap.getWidth() / 2) - 2; //-2 is for regulating the x position offset
// create a static layout for word wrapping
- StaticLayout mTextLayout = new StaticLayout(mText1, paint, canvas.getWidth(), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
+ StaticLayout mTextLayout = new StaticLayout(mText1, paint, canvas.getWidth(),
+ Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
canvas.translate(xPos, 10); //position the text
//draw text without stroke first
mTextLayout.draw(canvas);
diff --git a/app/src/main/java/meme5/c4q/nyc/meme_project/add_text.java b/app/src/main/java/meme5/c4q/nyc/meme_project/add_text.java
index cffe1fc..923003e 100644
--- a/app/src/main/java/meme5/c4q/nyc/meme_project/add_text.java
+++ b/app/src/main/java/meme5/c4q/nyc/meme_project/add_text.java
@@ -25,19 +25,18 @@
public class add_text extends ActionBarActivity {
- Bitmap memeImage;
- ImageView share;
- ImageView save;
- ImageView preview;
- Bitmap previewMeme;
+ //ELEMENTS
+ private Bitmap memeImage;
+ private ImageView share;
+ private ImageView save;
+ private ImageView preview;
+ private Bitmap previewMeme;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_add_text);
-
-
String filename = getIntent().getStringExtra("memeImage");
try {
FileInputStream is = this.openFileInput(filename);
@@ -71,8 +70,6 @@ public void onClick(View view) {
}
share.putExtra(Intent.EXTRA_STREAM, Uri.parse("file:///sdcard/temporary_file.jpg"));
startActivity(Intent.createChooser(share, "Share Image"));
-
-
}
});
diff --git a/app/src/main/res/drawable/albumblack.png b/app/src/main/res/drawable/albumblack.png
deleted file mode 100644
index 5d3c80a..0000000
Binary files a/app/src/main/res/drawable/albumblack.png and /dev/null differ
diff --git a/app/src/main/res/drawable/albumtext.png b/app/src/main/res/drawable/albumtext.png
deleted file mode 100644
index d3c4c8d..0000000
Binary files a/app/src/main/res/drawable/albumtext.png and /dev/null differ
diff --git a/app/src/main/res/drawable/albumwhite.png b/app/src/main/res/drawable/albumwhite.png
deleted file mode 100644
index d002f81..0000000
Binary files a/app/src/main/res/drawable/albumwhite.png and /dev/null differ
diff --git a/app/src/main/res/drawable/binding_dark.png b/app/src/main/res/drawable/binding_dark.png
deleted file mode 100644
index 2c69fa6..0000000
Binary files a/app/src/main/res/drawable/binding_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable/camerablack.png b/app/src/main/res/drawable/camerablack.png
deleted file mode 100644
index cc46afe..0000000
Binary files a/app/src/main/res/drawable/camerablack.png and /dev/null differ
diff --git a/app/src/main/res/drawable/cameratext.png b/app/src/main/res/drawable/cameratext.png
deleted file mode 100644
index a0cea28..0000000
Binary files a/app/src/main/res/drawable/cameratext.png and /dev/null differ
diff --git a/app/src/main/res/drawable/camerawhite.png b/app/src/main/res/drawable/camerawhite.png
deleted file mode 100644
index 1b2ca0d..0000000
Binary files a/app/src/main/res/drawable/camerawhite.png and /dev/null differ
diff --git a/app/src/main/res/drawable/carbon_fibre.png b/app/src/main/res/drawable/carbon_fibre.png
deleted file mode 100644
index b450f20..0000000
Binary files a/app/src/main/res/drawable/carbon_fibre.png and /dev/null differ
diff --git a/app/src/main/res/drawable/dark_exa.png b/app/src/main/res/drawable/dark_exa.png
deleted file mode 100644
index d4cbf94..0000000
Binary files a/app/src/main/res/drawable/dark_exa.png and /dev/null differ
diff --git a/app/src/main/res/drawable/grunge_paint.jpg b/app/src/main/res/drawable/grunge_paint.jpg
deleted file mode 100644
index c222939..0000000
Binary files a/app/src/main/res/drawable/grunge_paint.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/popular0.png b/app/src/main/res/drawable/popular0.png
new file mode 100644
index 0000000..e75fac6
Binary files /dev/null and b/app/src/main/res/drawable/popular0.png differ
diff --git a/app/src/main/res/drawable/popular1.png b/app/src/main/res/drawable/popular1.png
new file mode 100644
index 0000000..13a1d75
Binary files /dev/null and b/app/src/main/res/drawable/popular1.png differ
diff --git a/app/src/main/res/drawable/popular10.png b/app/src/main/res/drawable/popular10.png
new file mode 100644
index 0000000..189ae86
Binary files /dev/null and b/app/src/main/res/drawable/popular10.png differ
diff --git a/app/src/main/res/drawable/popular11.png b/app/src/main/res/drawable/popular11.png
new file mode 100644
index 0000000..81598ba
Binary files /dev/null and b/app/src/main/res/drawable/popular11.png differ
diff --git a/app/src/main/res/drawable/popular2.png b/app/src/main/res/drawable/popular2.png
new file mode 100644
index 0000000..7eef3a5
Binary files /dev/null and b/app/src/main/res/drawable/popular2.png differ
diff --git a/app/src/main/res/drawable/popular3.png b/app/src/main/res/drawable/popular3.png
new file mode 100644
index 0000000..d943e83
Binary files /dev/null and b/app/src/main/res/drawable/popular3.png differ
diff --git a/app/src/main/res/drawable/popular4.png b/app/src/main/res/drawable/popular4.png
new file mode 100644
index 0000000..e9e9b45
Binary files /dev/null and b/app/src/main/res/drawable/popular4.png differ
diff --git a/app/src/main/res/drawable/popular5.png b/app/src/main/res/drawable/popular5.png
new file mode 100644
index 0000000..3e8b8e3
Binary files /dev/null and b/app/src/main/res/drawable/popular5.png differ
diff --git a/app/src/main/res/drawable/popular6.png b/app/src/main/res/drawable/popular6.png
new file mode 100644
index 0000000..1ca6647
Binary files /dev/null and b/app/src/main/res/drawable/popular6.png differ
diff --git a/app/src/main/res/drawable/popular7.png b/app/src/main/res/drawable/popular7.png
new file mode 100644
index 0000000..0423c9b
Binary files /dev/null and b/app/src/main/res/drawable/popular7.png differ
diff --git a/app/src/main/res/drawable/popular8.png b/app/src/main/res/drawable/popular8.png
new file mode 100644
index 0000000..f378c01
Binary files /dev/null and b/app/src/main/res/drawable/popular8.png differ
diff --git a/app/src/main/res/drawable/popular9.png b/app/src/main/res/drawable/popular9.png
new file mode 100644
index 0000000..f8ddc4e
Binary files /dev/null and b/app/src/main/res/drawable/popular9.png differ
diff --git a/app/src/main/res/drawable/preset.png b/app/src/main/res/drawable/preset.png
new file mode 100644
index 0000000..fc1accc
Binary files /dev/null and b/app/src/main/res/drawable/preset.png differ
diff --git a/app/src/main/res/layout-land/activity_add_text.xml b/app/src/main/res/layout-land/activity_add_text.xml
index e4be82f..c7d39b9 100644
--- a/app/src/main/res/layout-land/activity_add_text.xml
+++ b/app/src/main/res/layout-land/activity_add_text.xml
@@ -21,7 +21,7 @@
android:id="@+id/step1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="1"
android:fontFamily="times"
android:gravity="center"
@@ -33,7 +33,7 @@
android:id="@+id/step2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="1"
android:fontFamily="times"
android:gravity="center"
@@ -45,7 +45,7 @@
android:id="@+id/step3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="1"
android:fontFamily="times"
android:gravity="center"
diff --git a/app/src/main/res/layout-land/activity_choose_meme_style.xml b/app/src/main/res/layout-land/activity_choose_meme_style.xml
index 5cd25d3..c815696 100644
--- a/app/src/main/res/layout-land/activity_choose_meme_style.xml
+++ b/app/src/main/res/layout-land/activity_choose_meme_style.xml
@@ -19,7 +19,7 @@
android:id="@+id/step1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="30"
android:textColor="#ffffff"
android:gravity="center"
@@ -30,7 +30,7 @@
android:id="@+id/step2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="30"
android:gravity="center"
android:src="@drawable/vanilla_sample"
@@ -41,7 +41,7 @@
android:id="@+id/step3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="30"
android:textColor="#ffffff"
android:gravity="center"
@@ -68,7 +68,7 @@
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_marginLeft="40dp"
android:fontFamily="times"
android:textColor="#ffffff"
@@ -88,7 +88,7 @@
android:id="@+id/sampleImageHolder"
android:layout_width="300dp"
android:layout_height="fill_parent"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 1092896..84f6817 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -23,61 +23,48 @@
android:id="@+id/step1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="1"
- android:fontFamily="times"
android:gravity="center"
android:text="STEP 1"
android:textColor="#ffffff"
android:textSize="20dp"
- android:textStyle="bold" />
+ android:fontFamily="times"
+ android:textStyle="bold"/>
+ android:textSize="15dp"
+ android:fontFamily="times"/>
+ android:textSize="15dp"
+ android:fontFamily="times"/>
-
-
-
-
+
+
-
+
+
+
+
+
+
diff --git a/app/src/main/res/layout-land/activity_popular_memes.xml b/app/src/main/res/layout-land/activity_popular_memes.xml
new file mode 100644
index 0000000..559e054
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_popular_memes.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_add_text.xml b/app/src/main/res/layout/activity_add_text.xml
index 4b9ea6b..155f469 100644
--- a/app/src/main/res/layout/activity_add_text.xml
+++ b/app/src/main/res/layout/activity_add_text.xml
@@ -21,7 +21,7 @@
android:id="@+id/step1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="1"
android:fontFamily="times"
android:gravity="center"
@@ -33,7 +33,7 @@
android:id="@+id/step2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="1"
android:fontFamily="times"
android:gravity="center"
@@ -45,7 +45,7 @@
android:id="@+id/step3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="1"
android:fontFamily="times"
android:gravity="center"
diff --git a/app/src/main/res/layout/activity_choose_meme_style.xml b/app/src/main/res/layout/activity_choose_meme_style.xml
index 4b12aee..b3b8572 100644
--- a/app/src/main/res/layout/activity_choose_meme_style.xml
+++ b/app/src/main/res/layout/activity_choose_meme_style.xml
@@ -20,7 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ffffff"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="30"
android:gravity="center"
android:src="@drawable/vanilla_sample"
@@ -30,7 +30,7 @@
android:id="@+id/step2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="30"
android:gravity="center"
android:src="@drawable/vanilla_sample"
@@ -41,7 +41,7 @@
android:id="@+id/step3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="30"
android:gravity="center"
android:textColor="#ffffff"
@@ -70,7 +70,7 @@
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:gravity="center"
android:textColor="#ffffff"
android:src="@drawable/vanilla_sample"
@@ -89,7 +89,7 @@
android:id="@+id/sampleImageHolder"
android:layout_width="match_parent"
android:layout_height="300dp"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e0bf225..7418b96 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,7 +23,7 @@
android:id="@+id/step1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="1"
android:gravity="center"
android:text="STEP 1"
@@ -36,7 +36,7 @@
android:id="@+id/step2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="1"
android:gravity="center"
android:text="STEP 2"
@@ -48,7 +48,7 @@
android:id="@+id/step3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/textView"
+ android:layout_below="@+id/tvCamera"
android:layout_weight="1"
android:gravity="center"
android:text="STEP 3"
@@ -62,50 +62,62 @@
-
-
-
-
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="#ffffff"
+ android:text="Gallery"
+ android:id="@+id/tvGallery"
+ android:layout_gravity="center_horizontal" />
-
+
+
+
+
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="#ffffff"
+ android:text="Preset Memes"
+ android:id="@+id/tvPreset"
+ android:layout_gravity="center_horizontal" />
diff --git a/app/src/main/res/layout/activity_popular_memes.xml b/app/src/main/res/layout/activity_popular_memes.xml
new file mode 100644
index 0000000..559e054
--- /dev/null
+++ b/app/src/main/res/layout/activity_popular_memes.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/imageholder.xml b/app/src/main/res/layout/imageholder.xml
new file mode 100644
index 0000000..6e36096
--- /dev/null
+++ b/app/src/main/res/layout/imageholder.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
diff --git a/app/src/main/res/menu/menu_popular_memes.xml b/app/src/main/res/menu/menu_popular_memes.xml
new file mode 100644
index 0000000..5d4fec7
--- /dev/null
+++ b/app/src/main/res/menu/menu_popular_memes.xml
@@ -0,0 +1,7 @@
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ed11598..a94cea2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,4 +21,5 @@
MainActivity2Activity
add_text
+ PopularMemes