Homework Submission

README.md

@@ -1,13 +1,5 @@
-Group Members:
-
-Pooja Pasawala: Worked on allowing the user to select an image from their gallery, and saving the meme to the camera roll once it was generated. Coordinated with the team on what needed to be done (mostly via slack), kept team updated on what everyone was working on and what features had been merged or needed to be reviewed, noted any bugs that needed to be fixed as they came up, and reviewed all pull requests.
-Time Spent: 12 hours
-
-Anthony Fermin: Worked on allowing the user to use their camera to take a picture, generating demotivational memes, and reviewed pull requests.
-Time Spent: 
-
-Tasha Smith: Created the layout for choosing a Vanilla or Demotivational Meme and worked on generating vanilla memes.
-Time Spent: 12 hours
-
-Jorge Reina: Created the layout for choosing camera or gallery image, created the layout for choosing save or share, and added share capability.
-Time Spent:
+Updates:
+Added some comments,
+Added save to ExternalPublicDir Method,
+Refactored some of the code and
+Got rid of some extra activities

app/src/main/AndroidManifest.xml

@@ -14,34 +14,35 @@
         android:largeHeap="true">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            >
+
         </activity>
 
         <activity
             android:name=".ChooseMemeStyle"
-            android:label="@string/title_activity_choose_meme_style" >
+            android:label="@string/title_activity_choose_meme_style"
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name=".VanillaMeme"
-            android:label="@string/title_activity_vanilla_test" >
+            android:label="@string/title_activity_vanilla_test"
+            android:screenOrientation="portrait">
 
         </activity>
 
-        <activity
-            android:name=".add_text"
-            android:label="@string/title_activity_add_text">
-        </activity>
-
         <activity
             android:name=".DemotivationalMemeActivity"
-            android:label="@string/title_activity_demotivational_meme">
+            android:label="@string/title_activity_demotivational_meme"
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name=".SplashScreen"
-            android:label="@string/title_activity_splash_screen" >
+            android:label="@string/title_activity_splash_screen"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

app/src/main/java/meme5/c4q/nyc/meme_project/ChooseMemeStyle.java

@@ -23,13 +23,10 @@
 
 public class ChooseMemeStyle extends Activity {
 
-
     public static final String TAG = "MEME_ACTIVITY";
-    protected RadioGroup styleGroup;
-    protected RadioButton styleButton;
+    Button small, medium, large;
     protected Button nextButton;
     protected boolean vanilla;
-    protected Random slideShow;
     ImageView img, thumbnail;
     AnimationDrawable frameAnimation;
     String imgFilePath;
@@ -40,6 +37,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_choose_meme_style);
 
+        //Get Image Chosen and place it on the thumbnail ImageView
         Bundle bundle = getIntent().getExtras();
         if(bundle.getString("imgFilePath") != null)
         {
@@ -50,20 +48,17 @@ protected void onCreate(Bundle savedInstanceState) {
         thumbnail.setImageBitmap(bmp2);
 
         //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);
-        TextView step3 = (TextView) findViewById(R.id.step3);
+
         TextView title = (TextView) findViewById(R.id.title);
-        TextView vanillaRadio = (TextView) findViewById(R.id.chooseVanilla);
+        small=(Button) findViewById(R.id.small);
+        medium=(Button) findViewById(R.id.medium);
+        large=(Button) findViewById(R.id.large);
+
         TextView demotivationalRadio = (TextView) findViewById(R.id.chooseDemotivational);
 
         Typeface tf = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/ubuntu.ttf");
-        step1.setTypeface(tf);
-        step2.setTypeface(tf);
-        step3.setTypeface(tf);
         title.setTypeface(tf);
-        vanillaRadio.setTypeface(tf);
+
         demotivationalRadio.setTypeface(tf);
 
         RadioGroup group = (RadioGroup) findViewById(R.id.styleGroup);
@@ -72,8 +67,7 @@ protected void onCreate(Bundle savedInstanceState) {
             public void onCheckedChanged(RadioGroup radioGroup, int checkedId) {
                 Log.d(TAG, "onCheckedChanged()");
                 // Is the button now checked?
-//                boolean checked = ((RadioButton) view).isChecked();
-
+                //boolean checked = ((RadioButton) view).isChecked();
                 // Check which radio button was clicked
                 switch (checkedId) {
                     case R.id.chooseVanilla:
@@ -105,6 +99,8 @@ public void onCheckedChanged(RadioGroup radioGroup, int checkedId) {
             }
         });
 
+        //Intents to go to corresponding activity
+
         group.check(R.id.chooseDemotivational);
 
         nextButton = (Button) findViewById(R.id.nextButton);