Merge branch 'IT18073638' into 'master'

loading dialog cancel button fix

See merge request !29

.idea/gradle.xml

@@ -12,7 +12,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/openCVLibrary3410" />
+            <option value="$PROJECT_DIR$/openCVLibrary3413" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

app/build.gradle

@@ -21,7 +21,7 @@ android {
         }
 
         python {
-            buildPython "C:\\Users\\user\\AppData\\Local\\Programs\\Python\\Python39/python.exe"
+            buildPython "C:/Users/Acer/AppData/Local/Programs/Python/Python38/python.exe"
             pip {
                 install "opencv-contrib-python-headless"
                 install "pillow"

app/src/main/java/com/app/smartphotoeditor/activities/DenoisingActivity.java

@@ -38,7 +38,7 @@ public class DenoisingActivity extends AppCompatActivity {
     private Button revertButton, nextButton2;
     private LoadingDialogAdapter loadingDialog;
     private ImageDenoising imageDenoising;
-    private boolean switchImage = false, alreadyDenoised = false;
+    private boolean switchImage = false, alreadyDenoised = true;
     private Handler handler = null;
 
     @Override
@@ -120,7 +120,7 @@ public class DenoisingActivity extends AppCompatActivity {
             outputImage.recycle();
 
             //Pop intent
-            Intent in1 = new Intent(this, GalleryPickerActivity.class); //change this
+            Intent in1 = new Intent(this, CustomGallery.class); //change this
             in1.putExtra("editedimage", filename);
             startActivity(in1);
         } catch (Exception e) {

app/src/main/java/com/app/smartphotoeditor/activities/GalleryPickerActivity.java

@@ -12,6 +12,7 @@ import android.provider.MediaStore;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -31,13 +32,14 @@ public class GalleryPickerActivity extends AppCompatActivity {
     Button pickBtn, btnForEnhance, btnForDenoise, btnForRestoration;
     private Bitmap image, pickedImage, outputImage, editedImage = null;
     private ImageView mainImage;
+    private TextView titleEnhancementMethod;
     private Handler handler = null;
     private LoadingDialogAdapter loadingDialog;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_gallery_picker);
+        setContentView(R.layout.activity_gallery_picker_2);
 
 
         OpenCVLoader.initDebug();
@@ -47,8 +49,11 @@ public class GalleryPickerActivity extends AppCompatActivity {
         btnForEnhance = (Button) findViewById(R.id.button_light);
         btnForDenoise = (Button) findViewById(R.id.buttonDenoise);
         btnForRestoration = (Button) findViewById(R.id.buttonRestoration);
+        titleEnhancementMethod = (TextView) findViewById(R.id.textView13);
         loadingDialog = new LoadingDialogAdapter(GalleryPickerActivity.this);
 
+        titleEnhancementMethod.setVisibility(View.GONE);
+        pickBtn.setText("PICK AN IMAGE");
         btnForEnhance.setVisibility(View.GONE);
         btnForDenoise.setVisibility(View.GONE);
         btnForRestoration.setVisibility(View.GONE);
@@ -58,7 +63,6 @@ public class GalleryPickerActivity extends AppCompatActivity {
             FileInputStream is = this.openFileInput(filename);
             editedImage = BitmapFactory.decodeStream(is);
             if(editedImage != null) {
-                pickBtn.setVisibility(View.GONE);
                 visibleButtons();
                 mainImage.setImageBitmap(editedImage);
             }
@@ -107,6 +111,8 @@ public class GalleryPickerActivity extends AppCompatActivity {
 
     private void visibleButtons() {
         btnForEnhance.setVisibility(View.VISIBLE);
+        titleEnhancementMethod.setVisibility(View.VISIBLE);
+        pickBtn.setText("PICK AN ANOTHER IMAGE");
         btnForDenoise.setVisibility(View.VISIBLE);
         btnForRestoration.setVisibility(View.VISIBLE);
     }

app/src/main/java/com/app/smartphotoeditor/activities/LowLightEnhanceActivity.java

@@ -59,8 +59,9 @@ public class LowLightEnhanceActivity extends AppCompatActivity {
     private LoadingDialogAdapter loadingDialog;
     private Bitmap inputImage, editedImage, outputImage;
     private Button revertButton;
-    private boolean switchImage = false, alreadyEnhanced = false;
+    private boolean switchImage = false, alreadyEnhanced = true;
     private Handler handler = null;
+    Thread lowlightThread;
     private EqualizeHistogram equalizeHistogram;
 
     @Override
@@ -89,6 +90,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity {
 
     }
 
+
     public void goToNext(View v) {
         loadingDialog.startLoadingDialog();
         BitmapDrawable drawable = (BitmapDrawable) imageDisplay.getDrawable();
@@ -106,7 +108,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity {
             outputImage.recycle();
 
             //Pop intent
-            Intent in1 = new Intent(this, GalleryPickerActivity.class); //change this
+            Intent in1 = new Intent(this, CustomGallery.class); //change this
             in1.putExtra("editedimage", filename);
             startActivity(in1);
         } catch (Exception e) {

app/src/main/java/com/app/smartphotoeditor/activities/RestorationActivity.java

@@ -30,7 +30,7 @@ public class RestorationActivity extends AppCompatActivity {
     private ImageView imageDisplay;
     private ImageRestoration imageRestoration;
     private Button revertButton;
-    private boolean switchImage = false, alreadyRestored = false;
+    private boolean switchImage = false, alreadyRestored = true;
     private LoadingDialogAdapter loadingDialog;
     private Handler handler = null;
 
@@ -115,7 +115,7 @@ public class RestorationActivity extends AppCompatActivity {
             outputImage.recycle();
 
             //Pop intent
-            Intent in1 = new Intent(this, GalleryPickerActivity.class); //change this
+            Intent in1 = new Intent(this, CustomGallery.class); //change this
             in1.putExtra("editedimage", filename);
             startActivity(in1);
         } catch (Exception e) {

app/src/main/java/com/app/smartphotoeditor/adapters/LoadingDialogAdapter.java

@@ -4,6 +4,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
@@ -12,6 +13,7 @@ import android.widget.TextView;
 
 import com.app.smartphotoeditor.R;
 
+import org.w3c.dom.Text;
 
 
 public class LoadingDialogAdapter {
@@ -30,15 +32,27 @@ public class LoadingDialogAdapter {
 
             LayoutInflater inflater = activity.getLayoutInflater();
             builder.setView(inflater.inflate(R.layout.loading_dialog, null));
+            builder.setCancelable(true);
 
-            builder.setCancelable(false);
+           builder.setNegativeButton("Cancel",
+                   new DialogInterface.OnClickListener() {
+                       public void onClick(DialogInterface dialog, int id) {
+                           alertDialog.cancel();
+                       }
+                   });
 
-            alertDialog = builder.create();
-            alertDialog.show();
+           alertDialog = builder.create();
+           alertDialog.show();
 
         }
 
+
+
         public void dismissDialog() {
             alertDialog.dismiss();
         }
+
+        public void cancelDialog() {
+        alertDialog.cancel();
+    }
     }

app/src/main/java/com/app/smartphotoeditor/services/ImageDenoising.java

@@ -50,7 +50,7 @@ public class ImageDenoising {
 
         imageString = getStringImage(inputImage);
 
-        PyObject pyo = py.getModule("imageDenoising");
+        PyObject pyo = py.getModule("test");
         PyObject obj = pyo.callAttr("main", imageString);
 
         String str = obj.toString();

app/src/main/res/layout/loading_dialog.xml

@@ -6,34 +6,30 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@android:color/transparent"
-
     android:padding="10dp">
 
 
-    <com.airbnb.lottie.LottieAnimationView
-        android:id="@+id/animationView"
-        android:layout_width="382dp"
-        android:layout_height="167dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.543"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.078"
-        app:lottie_autoPlay="true"
-        app:lottie_loop="true"
-        app:lottie_rawRes="@raw/light_lottie" />
-
     <TextView
         android:id="@+id/textLoading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:layout_marginEnd="8dp"
         android:text="Please wait..!"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.541"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/animationView" />
+        app:layout_constraintTop_toBottomOf="@+id/progressBar" />
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file