Merge branch 'master' into jeff-edits

Author: mattyiceunc

app/src/main/java/com/example/menumap/CameraActivity.java

@@ -237,6 +237,7 @@ public void addToDB() {
                     .addOnSuccessListener(new OnSuccessListener<DocumentReference>() {
                         @Override
                         public void onSuccess(DocumentReference documentReference) {
+                            Toast.makeText(getApplicationContext(), "Translation Successfully Added!", Toast.LENGTH_SHORT).show();
                             Log.d("added doc", documentReference.getId());
                         }
                     })

app/src/main/java/com/example/menumap/ui/dashboard/DashboardFragment.java

@@ -76,8 +76,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 explicit.putExtra("photo", bm);
                 startActivity(explicit);
 
-
-
             }
         }
     }

app/src/main/java/com/example/menumap/ui/home/HomeFragment.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,31 +21,44 @@
 import java.util.ArrayList;
 
 import com.example.menumap.R;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.DocumentSnapshot;
+import com.google.firebase.firestore.FirebaseFirestore;
+import com.google.firebase.firestore.QueryDocumentSnapshot;
+import com.google.firebase.firestore.QuerySnapshot;
 
 import java.util.List;
 
 public class HomeFragment extends Fragment {
+    private static final String SOURCE_TEXT = "sourceText";
+    private static final String SOURCE_LANGUAGE = "sourceLang";
+    private static final String RESULT_TEXT = "resultText";
+    private static final String RESULT_LANGUAGE = "resultLang";
+    private static final String COLLECTION_PATH = "translations";
+
+    private FirebaseFirestore mDB;
+    private DocumentSnapshot mTranslationsDB;
+    ListView listView;
 
-    private HomeViewModel homeViewModel;
 
-    ListView listView;
 
     ArrayList<String> foodList;
     ArrayAdapter<String> arrayAdapter;
 
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
-        homeViewModel =
-                ViewModelProviders.of(this).get(HomeViewModel.class);
+
         View root = inflater.inflate(R.layout.fragment_home, container, false);
+        mDB = FirebaseFirestore.getInstance();
 
         listView = root.findViewById(R.id.ListView);
 
         foodList = new ArrayList<>();
-        foodList.add("Apple");
-        foodList.add("Salad");
-        foodList.add("Junk food");
-        foodList.add("Burrito");
 
         arrayAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_list_item_1, foodList);
 
@@ -56,9 +70,40 @@ public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                 String footName = foodList.get(i);
             }
         });
-
+        makeListFromDB();
         return root;
     }
 
+    private void makeListFromDB() {
+
+        mDB.collection(COLLECTION_PATH).get().addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
+            @Override
+            public void onComplete(@NonNull Task<QuerySnapshot> task) {
+                if (task.isSuccessful()) {
+                    for (QueryDocumentSnapshot document : task.getResult()) {
+                        StringBuilder fields = new StringBuilder("");
+                        fields.append("Original Text: ").append(document.getString(SOURCE_TEXT));
+                        fields.append("\nTranslation: ").append(document.getString(RESULT_TEXT));
+                        fields.append("\nOriginal Language: ").append(document.getString(SOURCE_LANGUAGE));
+                        fields.append("\nTranslated to: ").append(document.getString(RESULT_LANGUAGE));
+                        arrayAdapter.add(fields.toString());
+
+
+                    }
+                } else {
+                    Log.d("collection", "Error getting documents: ", task.getException());
+                }
+            }
+        })
+                .addOnFailureListener(new OnFailureListener() {
+                    @Override
+                    public void onFailure(@NonNull Exception e) {
+                        Log.d("collection", "Error getting documents: ");
+                    }
+                });
+
+
+    }
+
 
 }

app/src/main/res/drawable/ic_home_black_24dp.xml

@@ -5,5 +5,6 @@
     android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+        android:pathData="M18,2H6c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zM6,4h5v8l-2.5,-1.5L6,12V4z"/>
+
 </vector>

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

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#CCE5FF"
+
+
     android:orientation="vertical">
 
     <TextView
@@ -16,12 +17,13 @@
         />
 
     <ListView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
         android:id="@+id/ListView"
-        android:divider="#62B2FF"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="#ec1886"
         android:dividerHeight="2dp"
-        android:layout_weight="0.9">
+        android:padding="20sp">
+
 
 
     </ListView>

app/src/main/res/navigation/mobile_navigation.xml

@@ -8,13 +8,13 @@
     <fragment
         android:id="@+id/navigation_home"
         android:name="com.example.menumap.ui.home.HomeFragment"
-        android:label="@string/title_home"
+        android:label="Dictionary"
         tools:layout="@layout/fragment_home" />
 
     <fragment
         android:id="@+id/navigation_dashboard"
         android:name="com.example.menumap.ui.dashboard.DashboardFragment"
-        android:label="Camera"
+        android:label="Translation"
         tools:layout="@layout/fragment_dashboard" />
 
     <fragment