integrated

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/AndroidManifest.xml

@@ -69,6 +69,7 @@
         <activity android:name=".ImageProcessing.MedBlur"/>
         <activity android:name=".ImageProcessing.BackgroundCustomization"/>
         <activity android:name=".ImageProcessing.Bokeh"/>
+        <activity android:name=".ImageProcessing.Vignette"/>
 
 
         <meta-data

app/src/main/java/com/app/smartphotoeditor/ImageProcessing/BackgroundCustomization.java

@@ -31,6 +31,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
+import okhttp3.FormBody;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
@@ -42,7 +43,9 @@ public class BackgroundCustomization extends AppCompatActivity
 
     private Button btnedit,btnselectimage;
 
-    private static final String UPLOAD_IMAGE_URL = "http://10.0.2.2:5000/upload";
+    //private static final String UPLOAD_IMAGE_URL = "http://10.0.2.2:5000/upload";
+    private static final String UPLOAD_IMAGE_URL = "http://2989-112-134-170-172.ngrok.io/upload";
+
     ImageView image;
     String f_path,filePath,fileExtn;
     String f_extension;
@@ -67,7 +70,7 @@ public class BackgroundCustomization extends AppCompatActivity
         btnedit = (Button) findViewById(R.id.btnedit);
         image = findViewById(R.id.img);
 
-        displayFileChoose();
+        //displayFileChoose();
 
 
 
@@ -78,12 +81,12 @@ public class BackgroundCustomization extends AppCompatActivity
         {
             @Override
             public void onClick(View v) {
-                if(filePath==null)
-                {
-                    Toast.makeText(BackgroundCustomization.this,"Select An Image", Toast.LENGTH_LONG).show();
-
-                }else{
+               // if(filePath==null)
+               // {
+                    //Toast.makeText(BackgroundCustomization.this,"Select An Image", Toast.LENGTH_LONG).show();
 
+                //}else{
+                    //****
                     progress = new ProgressDialog(BackgroundCustomization.this);
                     progress.setTitle("Uploading");
                     progress.setMessage("Please Wait...");
@@ -94,11 +97,13 @@ public class BackgroundCustomization extends AppCompatActivity
                     f_path = filePath;
                     f_extension = fileExtn;
 
+
+
                     try
                     {
-                        if(fileExtn.equals("img") || fileExtn.equals("jpg") || fileExtn.equals("jpeg") || fileExtn.equals("gif") || fileExtn.equals("png")) {
+                        //if(fileExtn.equals("img") || fileExtn.equals("jpg") || fileExtn.equals("jpeg") || fileExtn.equals("gif") || fileExtn.equals("png")) {
 
-                            Toast.makeText(BackgroundCustomization.this, filePath, Toast.LENGTH_SHORT).show();
+                            //Toast.makeText(BackgroundCustomization.this, filePath, Toast.LENGTH_SHORT).show();
 
                             Thread t = new Thread(new Runnable()
                             {
@@ -108,20 +113,20 @@ public class BackgroundCustomization extends AppCompatActivity
                                     //To upload the image to server
                                     String input = convert(ImageList.getInstance().getCurrentBitmap());
                                     System.out.println(input);
-                                    File file = new File(f_path);
-                                    String content_type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(f_extension);
+                                    //File file = new File(f_path);
+                                    //String content_type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(f_extension);
                                     OkHttpClient okHttpClient = new OkHttpClient().newBuilder()
                                             .connectTimeout(320, TimeUnit.SECONDS)
                                             .readTimeout(320, TimeUnit.SECONDS)
                                             .writeTimeout(320, TimeUnit.SECONDS)
                                             .build();
 
-                                    RequestBody file_body = RequestBody.create(MediaType.parse(content_type), file);
+                                    //RequestBody file_body = RequestBody.create(MediaType.parse(content_type), file);
+
+                                    RequestBody request_body = new FormBody.Builder()
 
-                                    RequestBody request_body = new MultipartBody.Builder()
-                                            .setType(MultipartBody.FORM)
-                                            .addFormDataPart("type", content_type)
-                                            .addFormDataPart("image", f_path.substring(f_path.lastIndexOf("/") +1), file_body)
+                                            .add("image", input)
+                                            //.addFormDataPart("image", f_path.substring(f_path.lastIndexOf("/") +1), file_body)
                                             .build();
 
                                     Request request = new Request.Builder()
@@ -145,14 +150,14 @@ public class BackgroundCustomization extends AppCompatActivity
                                 }
                             });
                             t.start();
-                        }else
-                        {
-                        }
+                        //}else
+                        //{
+                        //}
                     }catch (Exception e)
                     {
                         e.printStackTrace();
-                    }
-                }
+                    }//******
+                //}
             }
         });
 

app/src/main/java/com/app/smartphotoeditor/ImageProcessing/Backgroundupload.java

@@ -38,7 +38,7 @@ public class Backgroundupload extends AppCompatActivity {
     private Button btncutprocess, btnselectimage;
 
     ImageView image;
-    private static final String UPLOAD_IMAGE_URL="http://10.0.2.2:5000/upload";
+    private static final String UPLOAD_IMAGE_URL="http://727a-112-134-169-152.ngrok.io/uploadbg";
     String f_path, filePath, fileExtn;
     String f_extension;
     ProgressDialog progress;
@@ -136,11 +136,11 @@ public class Backgroundupload extends AppCompatActivity {
                                                 public void onResponse(Call<ResponseBody> call, retrofit2.Response<ResponseBody> response)
                                                 {
                                                     try {
-                                                        String s = response.body().string();
-                                                        Toast.makeText(Backgroundupload.this, s, Toast.LENGTH_LONG).show();
+                                                        //String s = response.body().string();
+                                                        //Toast.makeText(Backgroundupload.this, s, Toast.LENGTH_LONG).show();
                                                         progress.dismiss();
                                                         openCutActivity();
-                                                    } catch (IOException e) {
+                                                    } catch (Exception e) {
                                                         e.printStackTrace();
                                                     }
 

app/src/main/java/com/app/smartphotoeditor/ImageProcessing/Blur.java

@@ -9,6 +9,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 
 import com.app.smartphotoeditor.R;
+import com.app.smartphotoeditor.activities.EditorActivity;
 import com.squareup.picasso.MemoryPolicy;
 import com.squareup.picasso.NetworkPolicy;
 import com.squareup.picasso.Picasso;
@@ -33,20 +34,19 @@ public class Blur extends AppCompatActivity {
                 .networkPolicy(NetworkPolicy.NO_CACHE)
                 .memoryPolicy(MemoryPolicy.NO_CACHE)
                 .resize(300, 300)
-                .into(imgView);
+                .into(imgView);//
 
         btnBack.setOnClickListener(new View.OnClickListener()
         {
             @Override
             public void onClick(View v) {
-                openSelecteditActivity();
+                openEditorAcitivity();
             }
         });
     }
 
-    public void openSelecteditActivity()
-    {
-        Intent intent = new Intent(this, Selectedit.class);
+    public void openEditorAcitivity() {
+        Intent intent = new Intent(this, EditorActivity.class);
         startActivity(intent);
     }
 }
\ No newline at end of file

app/src/main/java/com/app/smartphotoeditor/ImageProcessing/Bokeh.java

@@ -9,6 +9,7 @@ import android.widget.ImageView;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.app.smartphotoeditor.R;
+import com.app.smartphotoeditor.activities.EditorActivity;
 import com.squareup.picasso.MemoryPolicy;
 import com.squareup.picasso.NetworkPolicy;
 import com.squareup.picasso.Picasso;
@@ -38,13 +39,13 @@ public class Bokeh extends AppCompatActivity {
         btnBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                openSelecteditAcitivity();
+                openEditorAcitivity();
             }
         });
     }
 
-    public void openSelecteditAcitivity() {
-        Intent intent = new Intent(this, Selectedit.class);
+    public void openEditorAcitivity() {
+        Intent intent = new Intent(this, EditorActivity.class);
         startActivity(intent);
     }
 

app/src/main/java/com/app/smartphotoeditor/ImageProcessing/Constants.java

@@ -3,6 +3,6 @@ package com.app.smartphotoeditor.ImageProcessing;
 public class Constants {
 
 //    This should be replaced with the server link when server starts running
-    public static final String IMGLINK = "4e11-112-134-169-32";
+    public static final String IMGLINK = "727a-112-134-169-152";
 
 }

app/src/main/java/com/app/smartphotoeditor/ImageProcessing/Cut.java

@@ -9,6 +9,7 @@ import android.widget.ImageView;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.app.smartphotoeditor.R;
+import com.app.smartphotoeditor.activities.EditorActivity;
 import com.squareup.picasso.MemoryPolicy;
 import com.squareup.picasso.NetworkPolicy;
 import com.squareup.picasso.Picasso;
@@ -38,14 +39,13 @@ public class Cut extends AppCompatActivity {
         btnBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                openSelecteditActivity();
+                openEditorAcitivity();
             }
         });
     }
 
-    public void openSelecteditActivity()
-    {
-        Intent intent = new Intent(this, Selectedit.class);
+    public void openEditorAcitivity() {
+        Intent intent = new Intent(this, EditorActivity.class);
         startActivity(intent);
     }
 }
\ No newline at end of file

app/src/main/java/com/app/smartphotoeditor/ImageProcessing/MedBlur.java

@@ -9,6 +9,7 @@ import android.widget.ImageView;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.app.smartphotoeditor.R;
+import com.app.smartphotoeditor.activities.EditorActivity;
 import com.squareup.picasso.MemoryPolicy;
 import com.squareup.picasso.NetworkPolicy;
 import com.squareup.picasso.Picasso;
@@ -38,13 +39,13 @@ public class MedBlur extends AppCompatActivity {
         btnBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                openSelecteditAcitivity();
+                openEditorAcitivity();
             }
         });
     }
 
-    public void openSelecteditAcitivity() {
-        Intent intent = new Intent(this, Selectedit.class);
+    public void openEditorAcitivity() {
+        Intent intent = new Intent(this, EditorActivity.class);
         startActivity(intent);
     }
 }
\ No newline at end of file

app/src/main/java/com/app/smartphotoeditor/ImageProcessing/RetrofitClient.java

@@ -9,7 +9,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
 public class RetrofitClient {
 
 //    private static final String baseurl="http://10.0.2.15:5000";
-    private static final String baseurl="http://4e11-112-134-169-32.ngrok.io";
+    private static final String baseurl="http://727a-112-134-169-152.ngrok.io";
 
     private static RetrofitClient mInstance;
     private Retrofit retrofit;

app/src/main/java/com/app/smartphotoeditor/ImageProcessing/Selectedit.java

@@ -44,7 +44,7 @@ public class Selectedit extends AppCompatActivity {
 
         Picasso
                 .get()
-                .load("https:///" + Constants.IMGLINK + ".ngrok.io/static/masked.jpg")
+                .load("https:///" + Constants.IMGLINK + ".ngrok.io/static/theimage.jpg")
                 .placeholder(R.drawable.progress_bar_material)
                 .resize(300, 300)
                 .networkPolicy(NetworkPolicy.NO_CACHE)
@@ -82,7 +82,6 @@ public class Selectedit extends AppCompatActivity {
                                 try {
                                     String s = response.body().string();
                                     Toast.makeText(Selectedit.this, s, Toast.LENGTH_LONG).show();
-                                    progress.dismiss();
                                     openBlurActivity();
                                 } catch (IOException e) {
                                     e.printStackTrace();
@@ -126,11 +125,11 @@ public class Selectedit extends AppCompatActivity {
                             @Override
                             public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
                                 try {
-                                    String s = response.body().string();
-                                    Toast.makeText(Selectedit.this, s, Toast.LENGTH_LONG).show();
+                                    //String s = response.body().string();
+                                    //Toast.makeText(Selectedit.this, s, Toast.LENGTH_LONG).show();
                                     progress.dismiss();
                                     openBokehActivity();
-                                } catch (IOException e) {
+                                } catch (Exception e) {
                                     e.printStackTrace();
                                 }
                             }

app/src/main/java/com/app/smartphotoeditor/ImageProcessing/Splashedit.java

@@ -9,6 +9,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 
 import com.app.smartphotoeditor.R;
+import com.app.smartphotoeditor.activities.EditorActivity;
 import com.squareup.picasso.MemoryPolicy;
 import com.squareup.picasso.NetworkPolicy;
 import com.squareup.picasso.Picasso;
@@ -41,14 +42,13 @@ public class Splashedit extends AppCompatActivity {
             @Override
             public void onClick(View v)
             {
-                openSelecteditActivity();
+                openEditorAcitivity();
             }
         });
     }
 
-    public void openSelecteditActivity()
-    {
-        Intent intent = new Intent(this, Selectedit.class);
+    public void openEditorAcitivity() {
+        Intent intent = new Intent(this, EditorActivity.class);
         startActivity(intent);
     }
 }
\ No newline at end of file

app/src/main/java/com/app/smartphotoeditor/ImageProcessing/Vignette.java

@@ -9,6 +9,7 @@ import android.widget.ImageView;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.app.smartphotoeditor.R;
+import com.app.smartphotoeditor.activities.EditorActivity;
 import com.squareup.picasso.MemoryPolicy;
 import com.squareup.picasso.NetworkPolicy;
 import com.squareup.picasso.Picasso;
@@ -38,13 +39,13 @@ public class Vignette extends AppCompatActivity {
         btnBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                openSelecteditAcitivity();
+                openEditorAcitivity();
             }
         });
     }
 
-    public void openSelecteditAcitivity() {
-        Intent intent = new Intent(this, Selectedit.class);
+    public void openEditorAcitivity() {
+        Intent intent = new Intent(this, EditorActivity.class);
         startActivity(intent);
     }
 }
\ No newline at end of file