Dev

app/src/main/java/com/mp/test_cv/CheckDialog.java

@@ -0,0 +1,64 @@
+package com.mp.test_cv;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import androidx.fragment.app.DialogFragment;
+
+public class CheckDialog extends DialogFragment {
+    public interface CheckDialogListener {
+        public void onDialogPositiveClick(DialogFragment dialog);
+        public void onDialogNegativeClick(DialogFragment dialog);
+    }
+
+    // Use this instance of the interface to deliver action events
+    CheckDialogListener listener;
+
+    // Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        // Verify that the host activity implements the callback interface
+        try {
+            // Instantiate the NoticeDialogListener so we can send events to the host
+            listener = (CheckDialogListener) context;
+        } catch (ClassCastException e) {
+            // The activity doesn't implement the interface, throw exception
+            throw new ClassCastException("CheckDialog"
+                    + " must implement NoticeDialogListener");
+        }
+    }
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Use the Builder class for convenient dialog construction
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        Bundle scanedInfo = getArguments();
+        String contextMessage =  "Caloires: "+ scanedInfo.getString("calories") +
+                "\nCarbohydrate: " + scanedInfo.getString("carbohydrate") +
+                "\nProten: " + scanedInfo.getString("protein") +
+                "\nFat: " + scanedInfo.getString("fat") +
+                "\nSaturFat: " + scanedInfo.getString("saturFat") +
+                "\nSugars: " + scanedInfo.getString("sugar") +
+                "\nSodium: " + scanedInfo.getString("sodium") +
+                "\nDietaryFiber: " + scanedInfo.getString("dietaryFiber");
+
+                builder.setMessage(contextMessage)
+                .setTitle(R.string.dialog_title)
+                .setPositiveButton(R.string.submit, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        // FIRE ZE MISSILES!
+                        listener.onDialogPositiveClick(CheckDialog.this);
+                    }
+                })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        // User cancelled the dialog
+                        listener.onDialogNegativeClick(CheckDialog.this);
+                    }
+                });
+        // Create the AlertDialog object and return it
+        return builder.create();
+    }
+}

app/src/main/java/com/mp/test_cv/HistoryView.java

@@ -0,0 +1,4 @@
+package com.mp.test_cv;
+
+public class HistoryView {
+}

app/src/main/java/com/mp/test_cv/MainActivity.java

@@ -115,7 +115,7 @@ public void onSuccess(DocumentSnapshot documentSnapshot) {
                             startToast("기본 정보를 기록해주세요.");
                             myStartActivity(MemberInitActivity.class);
                         }
-                        startToast("잘못된 접근입니다..");
+                        //startToast("잘못된 접근입니다..");
                         Log.d(TAG, "No such document");
                     }
                 }

app/src/main/java/com/mp/test_cv/PreviewActivity.java

@@ -19,6 +19,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.DialogFragment;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -35,7 +36,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class PreviewActivity extends AppCompatActivity {
+public class PreviewActivity extends AppCompatActivity implements CheckDialog.CheckDialogListener {
     ImageView preview;
     FrameLayout frameLayout;
     TextView txt;
@@ -63,7 +64,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         frameLayout = findViewById(R.id.frameLayout);
 
-        txt = findViewById(R.id.txt);
+        //txt = findViewById(R.id.txt);
 
         preview = findViewById(R.id.preview);
 
@@ -208,16 +209,15 @@ protected void onPostExecute(String result) {
             }
 
             // 결과를 화면에 띄어줌
-            txt.setText("칼로리(Calories) : " + calories +
+            /*txt.setText("칼로리(Calories) : " + calories +
                     "\n탄수화물(Total Carbohydrate) : " + carbohydrate +
                     "\n단백질(Protein) : " + protein +
                     "\n지방(Total Fat) : " + fat +
                     "\n포화지방(Saturated Fat) : " + saturFat +
                     "\n당류(Total Sugars) : " + sugars +
                     "\n나트륨(Sodium) : " + sodium +
                     "\n식이섬유(Dietary Fiber) : " + dietaryFiber);
-
-
+*/
             /*
             System.out.println("Calories : " + calories);
             System.out.println("Total Fat : " + fat);
@@ -230,11 +230,11 @@ protected void onPostExecute(String result) {
             // tockenizing --
             //txt.setText(result);
             //Toast.makeText(PreviewActivity.this, "" + result, Toast.LENGTH_LONG).show();
-
             btnHome.setEnabled(true);
             btnHome.setText("인식 완료");
             //button.setEnabled(true);
             //button.setText("텍스트 인식");
+            showCheckDialog();
         }
 
         // tockenizing --
@@ -275,4 +275,27 @@ protected int tokenizing(String oneline, String nutrition) {
             return intake;
         }
         // tockenizing end
+        private void showCheckDialog() {
+            // Create an instance of the dialog fragment and show it
+            DialogFragment dialog = new CheckDialog();
+            Bundle scanInfo = new Bundle();
+            makeBundles(scanInfo);
+            dialog.setArguments(scanInfo);
+            dialog.show(getSupportFragmentManager(), "CheckDialogFragment");
+        }
+    public void onDialogPositiveClick(DialogFragment dialog) {
+    }
+
+    public void onDialogNegativeClick(DialogFragment dialog) {
+    }
+        private void makeBundles(Bundle arg) {
+            arg.putString("calories", Integer.toString(calories));
+            arg.putString("fat", Integer.toString(fat));
+            arg.putString("carbohydrate", Integer.toString(carbohydrate));
+            arg.putString("protein", Integer.toString(protein));
+            arg.putString("saturFat", Integer.toString(saturFat));
+            arg.putString("sugar", Integer.toString(sugars));
+            arg.putString("dietaryFiber", Integer.toString(dietaryFiber));
+            arg.putString("sodium", Integer.toString(sodium));
+        }
 }