diff --git a/app/build.gradle b/app/build.gradle index 650b76e..5c0aa4f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,10 +18,17 @@ android { } } +repositories { + google() +} + dependencies { + implementation 'com.wajahatkarim3.EasyFlipView:EasyFlipView:2.1.2' + implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'com.android.support:support-v4:28.0.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c6de255..79bd1dd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,11 @@ + + + + + diff --git a/app/src/main/java/com/example/csun_compt/MainActivity.java b/app/src/main/java/com/example/csun_compt/MainActivity.java index 52c2b16..dedbbef 100644 --- a/app/src/main/java/com/example/csun_compt/MainActivity.java +++ b/app/src/main/java/com/example/csun_compt/MainActivity.java @@ -1,13 +1,43 @@ package com.example.csun_compt; +import android.content.Intent; +import android.graphics.Bitmap; +import android.provider.MediaStore; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.ImageButton; +import android.widget.ImageView; +import android.widget.Toast; public class MainActivity extends AppCompatActivity { - + private Button cameraButton; + private ImageView capturedImage; + private static final int Image_Capture_Code = 1; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + cameraButton =(Button)findViewById(R.id.cameraButton); + capturedImage = (ImageView) findViewById(R.id.meme_view); + cameraButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent cInt = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + startActivityForResult(cInt,Image_Capture_Code); + } + }); + } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode == Image_Capture_Code) { + if (resultCode == RESULT_OK) { + Bitmap bp = (Bitmap) data.getExtras().get("data"); + capturedImage.setImageBitmap(bp); + } else if (resultCode == RESULT_CANCELED) { + Toast.makeText(this, "Cancelled", Toast.LENGTH_LONG).show(); + } + } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/example/csun_compt/UserSubmissionPopUp.java b/app/src/main/java/com/example/csun_compt/UserSubmissionPopUp.java new file mode 100644 index 0000000..84d30cb --- /dev/null +++ b/app/src/main/java/com/example/csun_compt/UserSubmissionPopUp.java @@ -0,0 +1,13 @@ +package com.example.csun_compt; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class UserSubmissionPopUp extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_user_submission_pop_up); + } +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 84f1951..43403b9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -2,17 +2,87 @@ + + + + + + + +