From a03e474261fefb29073664ddc305be5627d714c9 Mon Sep 17 00:00:00 2001
From: ishaandhamija <ishaan.dhamija@gmail.com>
Date: Thu, 19 Oct 2017 01:34:35 +0530
Subject: [PATCH 1/2] SUBMITTING Dialog made not cancelable on touching screen

---
 .idea/modules.xml                               |  5 ++---
 Menu.iml => BlogSpot.iml                        |  2 +-
 app/app.iml                                     | 17 +++++++++--------
 .../java/com/example/tushar/menu/SetupPage.java |  1 +
 4 files changed, 13 insertions(+), 12 deletions(-)
 rename Menu.iml => BlogSpot.iml (77%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 724d9e5..6520b72 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/Menu.iml" filepath="$PROJECT_DIR$/Menu.iml" />
+      <module fileurl="file://$PROJECT_DIR$/BlogSpot.iml" filepath="$PROJECT_DIR$/BlogSpot.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/Menu.iml b/BlogSpot.iml
similarity index 77%
rename from Menu.iml
rename to BlogSpot.iml
index 135b56d..0ddae56 100644
--- a/Menu.iml
+++ b/BlogSpot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="Menu" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="BlogSpot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
diff --git a/app/app.iml b/app/app.iml
index 303c1fe..319199b 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -63,13 +63,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -77,6 +70,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -95,6 +95,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="exifinterface-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="firebase-analytics-10.0.1" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
     <orderEntry type="library" exported="" name="firebase-core-10.0.1" level="project" />
@@ -113,6 +114,7 @@
     <orderEntry type="library" exported="" name="cardview-v7-24.1.1" level="project" />
     <orderEntry type="library" exported="" name="firebase-iid-10.0.1" level="project" />
     <orderEntry type="library" exported="" name="firebase-storage-10.0.1" level="project" />
+    <orderEntry type="library" exported="" name="android-image-cropper-2.4.7" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-24.1.1" level="project" />
     <orderEntry type="library" exported="" name="firebase-analytics-impl-10.0.1" level="project" />
     <orderEntry type="library" exported="" name="firebase-common-10.0.1" level="project" />
@@ -124,7 +126,6 @@
     <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="android-image-cropper-2.4.2" level="project" />
     <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
   </component>
diff --git a/app/src/main/java/com/example/tushar/menu/SetupPage.java b/app/src/main/java/com/example/tushar/menu/SetupPage.java
index 558c784..ebdee4a 100644
--- a/app/src/main/java/com/example/tushar/menu/SetupPage.java
+++ b/app/src/main/java/com/example/tushar/menu/SetupPage.java
@@ -54,6 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
         auths=FirebaseAuth.getInstance();
         pd=new ProgressDialog(this);
         pd.setMessage("SUBMITTING...");
+        pd.setCanceledOnTouchOutside(false);
         profile=(ImageButton)findViewById(R.id.imageButton3);
         datas= FirebaseDatabase.getInstance().getReference().child("Users");
         sref= FirebaseStorage.getInstance().getReference().child("Profiles");

From 580f2303eb8971745efa31a847b264da44775a7d Mon Sep 17 00:00:00 2001
From: ishaandhamija <ishaan.dhamija@gmail.com>
Date: Thu, 19 Oct 2017 02:09:30 +0530
Subject: [PATCH 2/2] camera option added

---
 .idea/.name                                   |  1 -
 .idea/inspectionProfiles/Project_Default.xml  | 10 ++++
 .../inspectionProfiles/profiles_settings.xml  |  7 +++
 app/src/main/AndroidManifest.xml              |  1 +
 .../com/example/tushar/menu/SetupPage.java    | 51 ++++++++++++++-----
 build.gradle                                  |  2 +-
 6 files changed, 57 insertions(+), 15 deletions(-)
 delete mode 100644 .idea/.name
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 9d70cd7..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Menu
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..73f66f6
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,10 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintGradleCompatible" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
+      <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..3b31283
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_PROFILE" value="true" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b79b1e3..ce433f4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CAMERA"/>
 
     <application
         android:name=".SimpleBlog"
diff --git a/app/src/main/java/com/example/tushar/menu/SetupPage.java b/app/src/main/java/com/example/tushar/menu/SetupPage.java
index ebdee4a..bacd4d5 100644
--- a/app/src/main/java/com/example/tushar/menu/SetupPage.java
+++ b/app/src/main/java/com/example/tushar/menu/SetupPage.java
@@ -1,19 +1,19 @@
 package com.example.tushar.menu;
 
-import android.app.Instrumentation;
+import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
-import android.media.Image;
+import android.graphics.Bitmap;
 import android.net.Uri;
-import android.provider.ContactsContract;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.TextView;
 
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.FirebaseAuth;
@@ -25,7 +25,7 @@
 import com.theartofdev.edmodo.cropper.CropImage;
 import com.theartofdev.edmodo.cropper.CropImageView;
 
-import java.util.Set;
+import static com.example.tushar.menu.R.id.imageView;
 
 public class SetupPage extends AppCompatActivity {
     private Button finish;
@@ -42,8 +42,7 @@ public class SetupPage extends AppCompatActivity {
     private ProgressDialog pd;
     public String downloaduri=null;
 
-
-
+    private static int CAMERA_REQUEST = 1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -61,11 +60,28 @@ protected void onCreate(Bundle savedInstanceState) {
         profile.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent gallery=new Intent();
-                gallery.setAction(Intent.ACTION_GET_CONTENT);
-                gallery.setType("image/*");
-                gallery.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                startActivityForResult(gallery,galleryRequest);
+
+                CharSequence cameraOptions[] = new CharSequence[] {"Camera", "Gallery"};
+
+                AlertDialog.Builder builder = new AlertDialog.Builder(SetupPage.this);
+                builder.setTitle("Choose an option");
+                builder.setItems(cameraOptions, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == 0){
+                            Intent cameraIntent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+                            startActivityForResult(cameraIntent, CAMERA_REQUEST);
+                        }
+                        else if (which == 1){
+                            Intent gallery=new Intent();
+                            gallery.setAction(Intent.ACTION_GET_CONTENT);
+                            gallery.setType("image/*");
+                            gallery.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                            startActivityForResult(gallery,galleryRequest);
+                        }
+                    }
+                });
+                builder.show();
             }
         });
         finish.setOnClickListener(new View.OnClickListener() {
@@ -110,6 +126,15 @@ public void onBackPressed() {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == CAMERA_REQUEST && resultCode == Activity.RESULT_OK) {
+            Bitmap photo = (Bitmap) data.getExtras().get("data");
+            Uri camUri = data.getData();
+            CropImage.activity(camUri)
+                    .setGuidelines(CropImageView.Guidelines.ON).setAspectRatio(1,1).setFixAspectRatio(true).setAutoZoomEnabled(false)
+                    .start(this);
+        }
+
         if(requestCode==galleryRequest&&resultCode==RESULT_OK){
             galleryuri=data.getData();
             CropImage.activity(galleryuri)
diff --git a/build.gradle b/build.gradle
index 436ccc6..121157d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files