From 3f02f646053b3cb3b6cb5db51cc176beec66afd6 Mon Sep 17 00:00:00 2001
From: seungjikim <43927910+seungjikim@users.noreply.github.com>
Date: Tue, 4 Aug 2020 01:40:59 +0900
Subject: [PATCH 1/4] changed UI structure

---
 .../main/java/com/mp/test_cv/HistoryView.java |   4 +
 .../mp/test_cv/ui/login/LoggedInUserView.java |  17 -----
 .../mp/test_cv/ui/login/LoginFormState.java   |  40 ----------
 .../com/mp/test_cv/ui/login/LoginResult.java  |  31 --------
 .../mp/test_cv/ui/login/LoginViewModel.java   |  70 ------------------
 .../ui/login/LoginViewModelFactory.java       |  26 -------
 app/src/main/res/layout/activity_main.xml     |  69 ++++++-----------
 .../debug/obj/x86/libopencv_jni_shared.a      | Bin 784 -> 784 bytes
 .../debug-mergeNativeLibs/merge-state         | Bin 1146 -> 1373 bytes
 9 files changed, 27 insertions(+), 230 deletions(-)
 create mode 100644 app/src/main/java/com/mp/test_cv/HistoryView.java
 delete mode 100644 app/src/main/java/com/mp/test_cv/ui/login/LoggedInUserView.java
 delete mode 100644 app/src/main/java/com/mp/test_cv/ui/login/LoginFormState.java
 delete mode 100644 app/src/main/java/com/mp/test_cv/ui/login/LoginResult.java
 delete mode 100644 app/src/main/java/com/mp/test_cv/ui/login/LoginViewModel.java
 delete mode 100644 app/src/main/java/com/mp/test_cv/ui/login/LoginViewModelFactory.java

diff --git a/app/src/main/java/com/mp/test_cv/HistoryView.java b/app/src/main/java/com/mp/test_cv/HistoryView.java
new file mode 100644
index 0000000..df9e6c9
--- /dev/null
+++ b/app/src/main/java/com/mp/test_cv/HistoryView.java
@@ -0,0 +1,4 @@
+package com.mp.test_cv;
+
+public class HistoryView {
+}
diff --git a/app/src/main/java/com/mp/test_cv/ui/login/LoggedInUserView.java b/app/src/main/java/com/mp/test_cv/ui/login/LoggedInUserView.java
deleted file mode 100644
index e394fbe..0000000
--- a/app/src/main/java/com/mp/test_cv/ui/login/LoggedInUserView.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mp.test_cv.ui.login;
-
-/**
- * Class exposing authenticated user details to the UI.
- */
-class LoggedInUserView {
-    private String displayName;
-    //... other data fields that may be accessible to the UI
-
-    LoggedInUserView(String displayName) {
-        this.displayName = displayName;
-    }
-
-    String getDisplayName() {
-        return displayName;
-    }
-}
diff --git a/app/src/main/java/com/mp/test_cv/ui/login/LoginFormState.java b/app/src/main/java/com/mp/test_cv/ui/login/LoginFormState.java
deleted file mode 100644
index 8c7ee1e..0000000
--- a/app/src/main/java/com/mp/test_cv/ui/login/LoginFormState.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.mp.test_cv.ui.login;
-
-import androidx.annotation.Nullable;
-
-/**
- * Data validation state of the login form.
- */
-class LoginFormState {
-    @Nullable
-    private Integer usernameError;
-    @Nullable
-    private Integer passwordError;
-    private boolean isDataValid;
-
-    LoginFormState(@Nullable Integer usernameError, @Nullable Integer passwordError) {
-        this.usernameError = usernameError;
-        this.passwordError = passwordError;
-        this.isDataValid = false;
-    }
-
-    LoginFormState(boolean isDataValid) {
-        this.usernameError = null;
-        this.passwordError = null;
-        this.isDataValid = isDataValid;
-    }
-
-    @Nullable
-    Integer getUsernameError() {
-        return usernameError;
-    }
-
-    @Nullable
-    Integer getPasswordError() {
-        return passwordError;
-    }
-
-    boolean isDataValid() {
-        return isDataValid;
-    }
-}
diff --git a/app/src/main/java/com/mp/test_cv/ui/login/LoginResult.java b/app/src/main/java/com/mp/test_cv/ui/login/LoginResult.java
deleted file mode 100644
index 1968b5c..0000000
--- a/app/src/main/java/com/mp/test_cv/ui/login/LoginResult.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.mp.test_cv.ui.login;
-
-import androidx.annotation.Nullable;
-
-/**
- * Authentication result : success (user details) or error message.
- */
-class LoginResult {
-    @Nullable
-    private LoggedInUserView success;
-    @Nullable
-    private Integer error;
-
-    LoginResult(@Nullable Integer error) {
-        this.error = error;
-    }
-
-    LoginResult(@Nullable LoggedInUserView success) {
-        this.success = success;
-    }
-
-    @Nullable
-    LoggedInUserView getSuccess() {
-        return success;
-    }
-
-    @Nullable
-    Integer getError() {
-        return error;
-    }
-}
diff --git a/app/src/main/java/com/mp/test_cv/ui/login/LoginViewModel.java b/app/src/main/java/com/mp/test_cv/ui/login/LoginViewModel.java
deleted file mode 100644
index 9873d80..0000000
--- a/app/src/main/java/com/mp/test_cv/ui/login/LoginViewModel.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.mp.test_cv.ui.login;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-import android.util.Patterns;
-
-import com.mp.test_cv.data.LoginRepository;
-import com.mp.test_cv.data.Result;
-import com.mp.test_cv.data.model.LoggedInUser;
-import com.mp.test_cv.R;
-
-public class LoginViewModel extends ViewModel {
-
-    private MutableLiveData<LoginFormState> loginFormState = new MutableLiveData<>();
-    private MutableLiveData<LoginResult> loginResult = new MutableLiveData<>();
-    private LoginRepository loginRepository;
-
-    LoginViewModel(LoginRepository loginRepository) {
-        this.loginRepository = loginRepository;
-    }
-
-    LiveData<LoginFormState> getLoginFormState() {
-        return loginFormState;
-    }
-
-    LiveData<LoginResult> getLoginResult() {
-        return loginResult;
-    }
-
-    public void login(String username, String password) {
-        // can be launched in a separate asynchronous job
-        Result<LoggedInUser> result = loginRepository.login(username, password);
-
-        if (result instanceof Result.Success) {
-            LoggedInUser data = ((Result.Success<LoggedInUser>) result).getData();
-            loginResult.setValue(new LoginResult(new LoggedInUserView(data.getDisplayName())));
-        } else {
-            loginResult.setValue(new LoginResult(R.string.login_failed));
-        }
-    }
-
-    public void loginDataChanged(String username, String password) {
-        if (!isUserNameValid(username)) {
-            loginFormState.setValue(new LoginFormState(R.string.invalid_username, null));
-        } else if (!isPasswordValid(password)) {
-            loginFormState.setValue(new LoginFormState(null, R.string.invalid_password));
-        } else {
-            loginFormState.setValue(new LoginFormState(true));
-        }
-    }
-
-    // A placeholder username validation check
-    private boolean isUserNameValid(String username) {
-        if (username == null) {
-            return false;
-        }
-        if (username.contains("@")) {
-            return Patterns.EMAIL_ADDRESS.matcher(username).matches();
-        } else {
-            return !username.trim().isEmpty();
-        }
-    }
-
-    // A placeholder password validation check
-    private boolean isPasswordValid(String password) {
-        return password != null && password.trim().length() > 5;
-    }
-}
diff --git a/app/src/main/java/com/mp/test_cv/ui/login/LoginViewModelFactory.java b/app/src/main/java/com/mp/test_cv/ui/login/LoginViewModelFactory.java
deleted file mode 100644
index 19a0983..0000000
--- a/app/src/main/java/com/mp/test_cv/ui/login/LoginViewModelFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mp.test_cv.ui.login;
-
-import androidx.lifecycle.ViewModel;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.annotation.NonNull;
-
-import com.mp.test_cv.data.LoginDataSource;
-import com.mp.test_cv.data.LoginRepository;
-
-/**
- * ViewModel provider factory to instantiate LoginViewModel.
- * Required given LoginViewModel has a non-empty constructor
- */
-public class LoginViewModelFactory implements ViewModelProvider.Factory {
-
-    @NonNull
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
-        if (modelClass.isAssignableFrom(LoginViewModel.class)) {
-            return (T) new LoginViewModel(LoginRepository.getInstance(new LoginDataSource()));
-        } else {
-            throw new IllegalArgumentException("Unknown ViewModel class");
-        }
-    }
-}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cc70ef1..b8cf764 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -87,45 +87,26 @@
                 android:background="@null"
                 android:textAlignment="center"
                 />
-
-        </LinearLayout>
-
-
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="@drawable/back_white"
-            android:layout_marginTop="10dp"
-            android:weightSum="10"
-            android:padding="10dp"
-            >
-
             <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="@null"
-                android:textSize="20dp"
-                android:text="▼ 영양성분 별 섭취량"
+                android:id="@+id/BMI_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:gravity="center"
-                android:textAlignment="center"
-                android:layout_weight="9"
-                />
-
-            <Button
-                android:id="@+id/NutritionInfoButton"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="@drawable/btn_edge_purple"
-                android:padding="5dp"
-                android:text="상세정보"
-                android:textSize="10sp"
-                android:layout_weight="1"
-                />
+                android:text="BMI 정보가 나타납니다."
+                android:layout_marginTop="10dp"
+                android:textSize="15sp" />
 
         </LinearLayout>
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:gravity="center"
+            android:text="오늘 섭취량 정보"
+            android:textColor="#FFFFFF"
+            android:textSize="25dp"
+            android:textStyle="bold"></TextView>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -142,21 +123,17 @@
                 android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
-
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/BMI_info"
+        <Button
+            android:id="@+id/NutritionInfoButton"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/back_white"
-            android:gravity="center"
-            android:layout_gravity="center"
-            android:textAlignment="center"
-            android:paddingTop="15dp"
-            android:text="BMI 정보가 나타납니다."
-            android:layout_marginTop="10dp"
-            android:textSize="20sp" />
+            android:layout_height="50dp"
+            android:background="@drawable/btn_edge_purple"
+            android:weightSum="10"
+            android:padding="10dp"
+            android:text="영양성분 별 섭취량 입력하기"
+            android:textSize="10sp" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/opencv/build/intermediates/cmake/debug/obj/x86/libopencv_jni_shared.a b/opencv/build/intermediates/cmake/debug/obj/x86/libopencv_jni_shared.a
index 1a4009912bcb9b70fc610a633d9da7542048d5a4..91900c514d969160cd5f13ae613f1a1c7b2053c5 100644
GIT binary patch
delta 29
fcmbQhHi2z|G`op`siCQ*$wVbfDARaj(mEypYcU6G

delta 29
hcmbQhHi2z|G`oR`g{hf=;Y1}%Fw@l1a%0juCID+w2Xz1d

diff --git a/opencv/build/intermediates/incremental/debug-mergeNativeLibs/merge-state b/opencv/build/intermediates/incremental/debug-mergeNativeLibs/merge-state
index 96fbdf86f8c796c9c5b4d9ee45020db176368b76..81f3e9201c611993e580db3573702657ab027558 100644
GIT binary patch
delta 237
zcmeyxahGdDJ(CP`34=sVW|Dq|g_%B(PS)0rFV09TN=?x#&fna?WW@+n5H~rI(RK1)
zM#;%>jN$dgg$#8JETtfloq>UY9mEg;5&R%R6hsJs2tg1b1|q}}iou#C;Cx1qG#55O
Z8Ek?emCSVv5|bTSL>R%ODlukp0RVQQGyebp

delta 162
zcmcc1^^0ReJrg6-=GjbEj2?vybqrh}g0mPzvXp{Ib_NCpHV{J?M2LV0eh?u5B1A!i
i7(yLbpZMepEFz3xQd=A@#|TmiF&MibNS6Sb6c+%0Mj^id


From c3ed2f5ef144a8e5b717c6b4193d1fa4c531d5eb Mon Sep 17 00:00:00 2001
From: seungjikim <43927910+seungjikim@users.noreply.github.com>
Date: Tue, 4 Aug 2020 02:26:42 +0900
Subject: [PATCH 2/4] changed mainActivity layout structure

---
 .../java/com/mp/test_cv/MainActivity.java     |  2 +-
 app/src/main/res/layout/activity_main.xml     | 57 ++++++++++++-------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/mp/test_cv/MainActivity.java b/app/src/main/java/com/mp/test_cv/MainActivity.java
index 06920b9..bbe5320 100644
--- a/app/src/main/java/com/mp/test_cv/MainActivity.java
+++ b/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");
                     }
                 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b8cf764..8f199e2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
@@ -9,10 +9,14 @@
     android:orientation="vertical"
     android:weightSum="12"
     >
-
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:orientation="vertical"
+        android:paddingBottom="20dp">
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="50dp"
         android:background="@android:color/white"
         android:layout_weight="11"
         android:padding="5dp"
@@ -98,15 +102,34 @@
 
         </LinearLayout>
 
-        <TextView
-            android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:gravity="center"
-            android:text="오늘 섭취량 정보"
-            android:textColor="#FFFFFF"
-            android:textSize="25dp"
-            android:textStyle="bold"></TextView>
+            android:layout_gravity="center_horizontal|center_vertical"
+            android:orientation="horizontal"
+            android:padding="10dp">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:gravity="center"
+                android:text="오늘 섭취량 정보"
+                android:textColor="#FFFFFF"
+                android:textSize="25dp"
+                android:textStyle="bold"></TextView>
+
+            <Button
+                android:id="@+id/NutritionInfoButton"
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:layout_marginLeft="20dp"
+                android:background="@drawable/btn_edge_purple"
+                android:padding="10dp"
+                android:text="섭취량 기록"
+                android:textSize="10sp"
+                android:weightSum="10" />
+        </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -125,15 +148,7 @@
                 android:layout_height="match_parent"/>
         </LinearLayout>
 
-        <Button
-            android:id="@+id/NutritionInfoButton"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="@drawable/btn_edge_purple"
-            android:weightSum="10"
-            android:padding="10dp"
-            android:text="영양성분 별 섭취량 입력하기"
-            android:textSize="10sp" />
     </LinearLayout>
-</LinearLayout>
+    </LinearLayout>
+</ScrollView>
 

From f5344f0141da79252ca4ab4146b05fd9bfb34af4 Mon Sep 17 00:00:00 2001
From: seungjikim <43927910+seungjikim@users.noreply.github.com>
Date: Tue, 4 Aug 2020 03:15:08 +0900
Subject: [PATCH 3/4] add user check dialog adding daily intake

---
 .../main/java/com/mp/test_cv/CheckDialog.java |  54 ++++
 .../com/mp/test_cv/NutritionInfoActivity.java | 248 ++++++++++--------
 app/src/main/res/values/strings.xml           |   4 +
 3 files changed, 197 insertions(+), 109 deletions(-)
 create mode 100644 app/src/main/java/com/mp/test_cv/CheckDialog.java

diff --git a/app/src/main/java/com/mp/test_cv/CheckDialog.java b/app/src/main/java/com/mp/test_cv/CheckDialog.java
new file mode 100644
index 0000000..dd0f118
--- /dev/null
+++ b/app/src/main/java/com/mp/test_cv/CheckDialog.java
@@ -0,0 +1,54 @@
+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());
+        builder.setMessage(R.string.dialog_message)
+                .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();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/mp/test_cv/NutritionInfoActivity.java b/app/src/main/java/com/mp/test_cv/NutritionInfoActivity.java
index c51b687..e362656 100644
--- a/app/src/main/java/com/mp/test_cv/NutritionInfoActivity.java
+++ b/app/src/main/java/com/mp/test_cv/NutritionInfoActivity.java
@@ -1,5 +1,6 @@
 package com.mp.test_cv;
 
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -14,6 +15,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.DialogFragment;
 
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
@@ -30,7 +32,7 @@
 
 import org.opencv.android.CameraActivity;
 
-public class NutritionInfoActivity extends AppCompatActivity {
+public class NutritionInfoActivity extends AppCompatActivity implements CheckDialog.CheckDialogListener  {
     final String TAG = getClass().getSimpleName();
     PersonalDailyIntake inputIntake;
     TotalDailyIntake inputTotal;
@@ -41,6 +43,7 @@ public class NutritionInfoActivity extends AppCompatActivity {
     String date;
     boolean getUser = false;
     boolean getDocument = false;
+    boolean dialogCheck = false;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -88,117 +91,17 @@ public void onClick(View v) {
                     myStartActivity(CameraView.class);
                     break;
                 case R.id.submit:
-                    calories = Integer.valueOf(((EditText)findViewById(R.id.editCalorie)).getText().toString());
-                    carbohydrate = Integer.valueOf(((EditText)findViewById(R.id.editCarbo)).getText().toString());
-                    protein = Integer.valueOf(((EditText)findViewById(R.id.editProtein)).getText().toString());
-                    fat = Integer.valueOf(((EditText)findViewById(R.id.editFat)).getText().toString());
-                    saturatedFat = Integer.valueOf(((EditText)findViewById(R.id.editSaturFat)).getText().toString());
-                    sugar = Integer.valueOf(((EditText)findViewById(R.id.editSugar)).getText().toString());
-                    sodium = Integer.valueOf(((EditText)findViewById(R.id.editSodium)).getText().toString());
-                    dietaryFiber = Integer.valueOf(((EditText)findViewById(R.id.editFiber)).getText().toString());
-                    inputIntake = new PersonalDailyIntake(calories, carbohydrate, protein, fat, saturatedFat, sugar, sodium, dietaryFiber);
-                    inputTotal = new TotalDailyIntake(calories, carbohydrate, protein, fat, saturatedFat, sugar, sodium, dietaryFiber);
-                    //사용자 정보 db 받고,inputIntake로 해당 정보들 갱신
-                    //모든 정보 갱신 과정이 끝나면 mainActivity로 간다. (ui업데이트)
-                    if (carbohydrate >= 0 && protein >= 0 && fat >= 0 && saturatedFat >= 0 && sugar >= 0 && sodium >= 0 && dietaryFiber >= 0 ) {
-                        user = FirebaseAuth.getInstance().getCurrentUser();
-                        db = FirebaseFirestore.getInstance();
-
-                        Date today = new Date();
-                        SimpleDateFormat timeFormat = new SimpleDateFormat("yyyyMMddhhmmss");
-                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
-                        String time = timeFormat.format(today);
-                        date = dateFormat.format(today);
-                        DocumentReference totalDB = db.collection("TotalDailyIntake").document(date);
-                        Log.d(TAG, "totalDB error : "+totalDB.equals(date));
-
-                        if (user != null){
-                            // DailyIntake 생성
-                            db.collection("User").document(user.getUid())
-                                    .collection("DailyIntake").document(time)
-                                    .set(inputIntake)
-                                    .addOnSuccessListener(new OnSuccessListener<Void>() {
-                                        @Override
-                                        public void onSuccess(Void aVoid) {
-                                            startToast("정보 입력에 성공했습니다..");
-                                            getUser = true;
-                                            finish();
-                                        }
-                                    })
-                                    .addOnFailureListener(new OnFailureListener() {
-                                        @Override
-                                        public void onFailure(@NonNull Exception e) {
-                                            startToast("정보 입력에 실패했습니다..");
-                                            Log.w(TAG, "Error writing document", e);
-                                        }
-                                    });
-
-                            DocumentReference docRef = db.collection("User").document(user.getUid()).collection("TotalDailyIntake").document(date);
-                            docRef.get().addOnCompleteListener(new OnCompleteListener<DocumentSnapshot>() {
-                                @Override
-                                public void onComplete(@NonNull Task<DocumentSnapshot> task) {
-                                    if (task.isSuccessful()) {
-                                        DocumentSnapshot document = task.getResult();
-                                        Log.d(TAG, "Document: " + document);
-                                        docRefMap = document.getData();
-                                        if (document.exists()) {
-                                            Log.d(TAG, "docRefMap: " + docRefMap);
-
-                                        } else {
-                                            Log.d(TAG, "docRefMap: " + docRefMap);
-                                            Log.d(TAG, "No such document");
-                                        }
-                                    } else {
-                                        Log.d(TAG, "get failed with ", task.getException());
-                                    }
-                                    // TotalDailyIntake 생성
-                                    if(docRefMap == null){
-                                        db.collection("User").document(user.getUid())
-                                                .collection("TotalDailyIntake").document(date)
-                                                .set(inputTotal)
-                                                .addOnSuccessListener(new OnSuccessListener<Void>() {
-                                                    @Override
-                                                    public void onSuccess(Void aVoid) {
-                                                        startToast("정보를 초기화했습니다.");
-                                                        getDocument = true;
-                                                        finish();
-                                                    }
-                                                })
-                                                .addOnFailureListener(new OnFailureListener() {
-                                                    @Override
-                                                    public void onFailure(@NonNull Exception e) {
-                                                        startToast("정보 초기화를 실패했습니다.");
-                                                        Log.w(TAG, "Error writing document", e);
-                                                    }
-                                                });
-                                    }else{
-                                        // TotalDailyIntake Increment
-                                        DocumentReference tdb = db.collection("User").document(user.getUid())
-                                                .collection("TotalDailyIntake").document(date);
-                                        tdb.update("totalCalories", FieldValue.increment(calories));
-                                        tdb.update("totalCarbohydrate", FieldValue.increment(carbohydrate));
-                                        tdb.update("totalDietaryFiber", FieldValue.increment(dietaryFiber));
-                                        tdb.update("totalFat", FieldValue.increment(protein));
-                                        tdb.update("totalProtein", FieldValue.increment(fat));
-                                        tdb.update("totalSaturatedFat", FieldValue.increment(saturatedFat));
-                                        tdb.update("totalSodium", FieldValue.increment(sugar));
-                                        tdb.update("totalSugar", FieldValue.increment(sodium));
-                                        getDocument = true;
-                                    }
-                                }
-                            });
-                        }
-                    }
-                    else {
-                        startToast("사용자정보를 입력하세요.");
-                    }
-                    Intent intent = new Intent(getApplicationContext(), MainActivity.class );
-                    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    //로그인 한 상태에서 뒤로가기 눌렀을 때 메인액티비로 이동, 나머지 스택 없어짐.
-                    startActivity(intent);
+                    showCheckDialog();
+                    break;
             }
         }
     };
+   /* private void setUpDialog() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setMessage(R.string.dialog_message)
+                .setTitle(R.string.dialog_title);
+        AlertDialog dialog = builder.create();
+    }*/
     private void startToast(String msg) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
     }
@@ -208,4 +111,131 @@ private void myStartActivity(Class c) {
         //로그인 한 상태에서 뒤로가기 눌렀을 때 메인액티비로 이동, 나머지 스택 없어짐.
         startActivity(intent);
     }
+    public void showCheckDialog() {
+        // Create an instance of the dialog fragment and show it
+        DialogFragment dialog = new CheckDialog();
+        dialog.show(getSupportFragmentManager(), "NoticeDialogFragment");
+    }
+    public void sendData() {
+        if(dialogCheck) {
+            calories = Integer.valueOf(((EditText) findViewById(R.id.editCalorie)).getText().toString());
+            carbohydrate = Integer.valueOf(((EditText) findViewById(R.id.editCarbo)).getText().toString());
+            protein = Integer.valueOf(((EditText) findViewById(R.id.editProtein)).getText().toString());
+            fat = Integer.valueOf(((EditText) findViewById(R.id.editFat)).getText().toString());
+            saturatedFat = Integer.valueOf(((EditText) findViewById(R.id.editSaturFat)).getText().toString());
+            sugar = Integer.valueOf(((EditText) findViewById(R.id.editSugar)).getText().toString());
+            sodium = Integer.valueOf(((EditText) findViewById(R.id.editSodium)).getText().toString());
+            dietaryFiber = Integer.valueOf(((EditText) findViewById(R.id.editFiber)).getText().toString());
+            inputIntake = new PersonalDailyIntake(calories, carbohydrate, protein, fat, saturatedFat, sugar, sodium, dietaryFiber);
+            inputTotal = new TotalDailyIntake(calories, carbohydrate, protein, fat, saturatedFat, sugar, sodium, dietaryFiber);
+            //사용자 정보 db 받고,inputIntake로 해당 정보들 갱신
+            //모든 정보 갱신 과정이 끝나면 mainActivity로 간다. (ui업데이트)
+            if (carbohydrate >= 0 && protein >= 0 && fat >= 0 && saturatedFat >= 0 && sugar >= 0 && sodium >= 0 && dietaryFiber >= 0) {
+                user = FirebaseAuth.getInstance().getCurrentUser();
+                db = FirebaseFirestore.getInstance();
+
+                Date today = new Date();
+                SimpleDateFormat timeFormat = new SimpleDateFormat("yyyyMMddhhmmss");
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+                String time = timeFormat.format(today);
+                date = dateFormat.format(today);
+                DocumentReference totalDB = db.collection("TotalDailyIntake").document(date);
+                Log.d(TAG, "totalDB error : " + totalDB.equals(date));
+
+                if (user != null) {
+                    // DailyIntake 생성
+                    db.collection("User").document(user.getUid())
+                            .collection("DailyIntake").document(time)
+                            .set(inputIntake)
+                            .addOnSuccessListener(new OnSuccessListener<Void>() {
+                                @Override
+                                public void onSuccess(Void aVoid) {
+                                    startToast("정보 입력에 성공했습니다..");
+                                    getUser = true;
+                                    finish();
+                                }
+                            })
+                            .addOnFailureListener(new OnFailureListener() {
+                                @Override
+                                public void onFailure(@NonNull Exception e) {
+                                    startToast("정보 입력에 실패했습니다..");
+                                    Log.w(TAG, "Error writing document", e);
+                                }
+                            });
+
+                    DocumentReference docRef = db.collection("User").document(user.getUid()).collection("TotalDailyIntake").document(date);
+                    docRef.get().addOnCompleteListener(new OnCompleteListener<DocumentSnapshot>() {
+                        @Override
+                        public void onComplete(@NonNull Task<DocumentSnapshot> task) {
+                            if (task.isSuccessful()) {
+                                DocumentSnapshot document = task.getResult();
+                                Log.d(TAG, "Document: " + document);
+                                docRefMap = document.getData();
+                                if (document.exists()) {
+                                    Log.d(TAG, "docRefMap: " + docRefMap);
+
+                                } else {
+                                    Log.d(TAG, "docRefMap: " + docRefMap);
+                                    Log.d(TAG, "No such document");
+                                }
+                            } else {
+                                Log.d(TAG, "get failed with ", task.getException());
+                            }
+                            // TotalDailyIntake 생성
+                            if (docRefMap == null) {
+                                db.collection("User").document(user.getUid())
+                                        .collection("TotalDailyIntake").document(date)
+                                        .set(inputTotal)
+                                        .addOnSuccessListener(new OnSuccessListener<Void>() {
+                                            @Override
+                                            public void onSuccess(Void aVoid) {
+                                                startToast("정보를 초기화했습니다.");
+                                                getDocument = true;
+                                                finish();
+                                            }
+                                        })
+                                        .addOnFailureListener(new OnFailureListener() {
+                                            @Override
+                                            public void onFailure(@NonNull Exception e) {
+                                                startToast("정보 초기화를 실패했습니다.");
+                                                Log.w(TAG, "Error writing document", e);
+                                            }
+                                        });
+                            } else {
+                                // TotalDailyIntake Increment
+                                DocumentReference tdb = db.collection("User").document(user.getUid())
+                                        .collection("TotalDailyIntake").document(date);
+                                tdb.update("totalCalories", FieldValue.increment(calories));
+                                tdb.update("totalCarbohydrate", FieldValue.increment(carbohydrate));
+                                tdb.update("totalDietaryFiber", FieldValue.increment(dietaryFiber));
+                                tdb.update("totalFat", FieldValue.increment(protein));
+                                tdb.update("totalProtein", FieldValue.increment(fat));
+                                tdb.update("totalSaturatedFat", FieldValue.increment(saturatedFat));
+                                tdb.update("totalSodium", FieldValue.increment(sugar));
+                                tdb.update("totalSugar", FieldValue.increment(sodium));
+                                getDocument = true;
+                            }
+                        }
+                    });
+                }
+            } else {
+                startToast("사용자정보를 입력하세요.");
+            }
+            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            //로그인 한 상태에서 뒤로가기 눌렀을 때 메인액티비로 이동, 나머지 스택 없어짐.
+            startActivity(intent);
+        }
+    }
+    @Override
+    public void onDialogPositiveClick(DialogFragment dialog) {
+        dialogCheck = true;
+        sendData();
+    }
+
+    @Override
+    public void onDialogNegativeClick(DialogFragment dialog) {
+        dialogCheck = true;
+        sendData();
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b69048..a7dbb45 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,4 +24,8 @@
     <string name="invalid_username">Not a valid username</string>
     <string name="invalid_password">Password must be >5 characters</string>
     <string name="login_failed">"Login failed"</string>
+    <string name="dialog_message">아래와 같이 섭취량을 변경하시겠습니까?</string>
+    <string name="dialog_title">변경 확인</string>
+    <string name="cancel">취소</string>
+    <string name="submit">확인</string>
 </resources>

From 02cf3b7c4999d81a28db2149982b903912ac8f7a Mon Sep 17 00:00:00 2001
From: seungjikim <43927910+seungjikim@users.noreply.github.com>
Date: Tue, 4 Aug 2020 20:13:16 +0900
Subject: [PATCH 4/4] show nutrition info dialog before send data

---
 .../main/java/com/mp/test_cv/CheckDialog.java |  12 +-
 .../com/mp/test_cv/NutritionInfoActivity.java |  36 +++--
 .../java/com/mp/test_cv/PreviewActivity.java  |  35 ++++-
 app/src/main/res/layout/activity_preview.xml  | 126 +++++++++---------
 4 files changed, 127 insertions(+), 82 deletions(-)

diff --git a/app/src/main/java/com/mp/test_cv/CheckDialog.java b/app/src/main/java/com/mp/test_cv/CheckDialog.java
index dd0f118..6c28923 100644
--- a/app/src/main/java/com/mp/test_cv/CheckDialog.java
+++ b/app/src/main/java/com/mp/test_cv/CheckDialog.java
@@ -34,7 +34,17 @@ public void onAttach(Context context) {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         // Use the Builder class for convenient dialog construction
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setMessage(R.string.dialog_message)
+        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) {
diff --git a/app/src/main/java/com/mp/test_cv/NutritionInfoActivity.java b/app/src/main/java/com/mp/test_cv/NutritionInfoActivity.java
index e362656..a92dfe2 100644
--- a/app/src/main/java/com/mp/test_cv/NutritionInfoActivity.java
+++ b/app/src/main/java/com/mp/test_cv/NutritionInfoActivity.java
@@ -112,22 +112,25 @@ private void myStartActivity(Class c) {
         startActivity(intent);
     }
     public void showCheckDialog() {
+        calories = Integer.valueOf(((EditText) findViewById(R.id.editCalorie)).getText().toString());
+        carbohydrate = Integer.valueOf(((EditText) findViewById(R.id.editCarbo)).getText().toString());
+        protein = Integer.valueOf(((EditText) findViewById(R.id.editProtein)).getText().toString());
+        fat = Integer.valueOf(((EditText) findViewById(R.id.editFat)).getText().toString());
+        saturatedFat = Integer.valueOf(((EditText) findViewById(R.id.editSaturFat)).getText().toString());
+        sugar = Integer.valueOf(((EditText) findViewById(R.id.editSugar)).getText().toString());
+        sodium = Integer.valueOf(((EditText) findViewById(R.id.editSodium)).getText().toString());
+        dietaryFiber = Integer.valueOf(((EditText) findViewById(R.id.editFiber)).getText().toString());
+        inputIntake = new PersonalDailyIntake(calories, carbohydrate, protein, fat, saturatedFat, sugar, sodium, dietaryFiber);
+        inputTotal = new TotalDailyIntake(calories, carbohydrate, protein, fat, saturatedFat, sugar, sodium, dietaryFiber);
         // Create an instance of the dialog fragment and show it
         DialogFragment dialog = new CheckDialog();
-        dialog.show(getSupportFragmentManager(), "NoticeDialogFragment");
+        Bundle scanInfo = new Bundle();
+        makeBundles(scanInfo);
+        dialog.setArguments(scanInfo);
+        dialog.show(getSupportFragmentManager(), "CheckDialogFragment");
     }
     public void sendData() {
         if(dialogCheck) {
-            calories = Integer.valueOf(((EditText) findViewById(R.id.editCalorie)).getText().toString());
-            carbohydrate = Integer.valueOf(((EditText) findViewById(R.id.editCarbo)).getText().toString());
-            protein = Integer.valueOf(((EditText) findViewById(R.id.editProtein)).getText().toString());
-            fat = Integer.valueOf(((EditText) findViewById(R.id.editFat)).getText().toString());
-            saturatedFat = Integer.valueOf(((EditText) findViewById(R.id.editSaturFat)).getText().toString());
-            sugar = Integer.valueOf(((EditText) findViewById(R.id.editSugar)).getText().toString());
-            sodium = Integer.valueOf(((EditText) findViewById(R.id.editSodium)).getText().toString());
-            dietaryFiber = Integer.valueOf(((EditText) findViewById(R.id.editFiber)).getText().toString());
-            inputIntake = new PersonalDailyIntake(calories, carbohydrate, protein, fat, saturatedFat, sugar, sodium, dietaryFiber);
-            inputTotal = new TotalDailyIntake(calories, carbohydrate, protein, fat, saturatedFat, sugar, sodium, dietaryFiber);
             //사용자 정보 db 받고,inputIntake로 해당 정보들 갱신
             //모든 정보 갱신 과정이 끝나면 mainActivity로 간다. (ui업데이트)
             if (carbohydrate >= 0 && protein >= 0 && fat >= 0 && saturatedFat >= 0 && sugar >= 0 && sodium >= 0 && dietaryFiber >= 0) {
@@ -236,6 +239,15 @@ public void onDialogPositiveClick(DialogFragment dialog) {
     @Override
     public void onDialogNegativeClick(DialogFragment dialog) {
         dialogCheck = true;
-        sendData();
+    }
+    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(saturatedFat));
+        arg.putString("sugar", Integer.toString(sugar));
+        arg.putString("dietaryFiber", Integer.toString(dietaryFiber));
+        arg.putString("sodium", Integer.toString(sodium));
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/mp/test_cv/PreviewActivity.java b/app/src/main/java/com/mp/test_cv/PreviewActivity.java
index af7ebcb..08443b4 100644
--- a/app/src/main/java/com/mp/test_cv/PreviewActivity.java
+++ b/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,7 +209,7 @@ protected void onPostExecute(String result) {
             }
 
             // 결과를 화면에 띄어줌
-            txt.setText("칼로리(Calories) : " + calories +
+            /*txt.setText("칼로리(Calories) : " + calories +
                     "\n탄수화물(Total Carbohydrate) : " + carbohydrate +
                     "\n단백질(Protein) : " + protein +
                     "\n지방(Total Fat) : " + fat +
@@ -216,8 +217,7 @@ protected void onPostExecute(String result) {
                     "\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));
+        }
 }
diff --git a/app/src/main/res/layout/activity_preview.xml b/app/src/main/res/layout/activity_preview.xml
index 2ba9298..0b6adb4 100644
--- a/app/src/main/res/layout/activity_preview.xml
+++ b/app/src/main/res/layout/activity_preview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -9,62 +9,73 @@
     tools:context=".PreviewActivity">
 
 
-        <LinearLayout
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:id="@+id/frameLayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_height="500dp"
+            android:padding="1dp">
 
-            <FrameLayout
-                android:id="@+id/frameLayout"
+            <ImageView
+                android:id="@+id/preview"
                 android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:adjustViewBounds="true"
+                android:scaleType="fitStart"
+                app:srcCompat="@drawable/ic_launcher_foreground" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <!--                <Button-->
+            <!--                    android:id="@+id/btnRecognized"-->
+            <!--                    android:layout_width="wrap_content"-->
+            <!--                    android:layout_height="wrap_content"-->
+            <!--                    android:text="인식"/>-->
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/btnSave"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="20dp"
-                android:padding="1dp">
-
-                <ImageView
-                    android:id="@+id/preview"
-                    android:layout_width="250dp"
-                    android:layout_height="250dp"
-                    android:adjustViewBounds="true"
-                    android:scaleType="fitStart"
-                    android:layout_gravity="center"
-                    app:srcCompat="@drawable/ic_launcher_foreground" />
-            </FrameLayout>
-
-            <LinearLayout
+                android:layout_gravity="center"
+                android:layout_marginRight="20dp"
+                android:clickable="true"
+                app:backgroundTint="@color/colorPrimary"
+                app:fabCustomSize="80dp"
+                app:maxImageSize="40dp"
+                app:srcCompat="@drawable/ic_save_24dp" />
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/btnRetry"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-<!--                <Button-->
-<!--                    android:id="@+id/btnRecognized"-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:text="인식"/>-->
-                <com.google.android.material.floatingactionbutton.FloatingActionButton
-                    android:id="@+id/btnSave"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_margin="10dp"
-                    android:clickable="true"
-                    app:backgroundTint="@color/colorPrimary"
-                    app:fabCustomSize="80dp"
-                    app:maxImageSize="40dp"
-                    app:srcCompat="@drawable/ic_save_24dp" />
-
-                <com.google.android.material.floatingactionbutton.FloatingActionButton
-                    android:id="@+id/btnRetry"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    app:backgroundTint="@color/colorPrimaryDark"
-                    app:srcCompat="@drawable/ic_refresh_24px" />
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:clickable="true"
+                app:backgroundTint="@color/colorPrimaryDark"
+                app:srcCompat="@drawable/ic_refresh_24px" />
 
-            </LinearLayout>
         </LinearLayout>
-                <LinearLayout
+
+        <Button
+            android:id="@+id/btnHome"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="10dp"
+            android:background="@drawable/btn_purple"
+            android:text="인식 완료"
+            android:textColor="@android:color/white" />
+
+    </LinearLayout>
+    <!--            <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:orientation="vertical">
@@ -85,20 +96,9 @@
 
 
                     </ScrollView>
-                    <Button
-                        android:id="@+id/btnHome"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_margin="10dp"
-                        android:background="@drawable/btn_purple"
-                        android:textColor="@android:color/white"
-                        android:text="인식 완료"/>
-
-
 
 
                 </LinearLayout>
+-->
 
-
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file