Skip to content

Commit ad6a768

Browse files
committed
add filter to list read
1 parent 5b15434 commit ad6a768

File tree

3 files changed

+32
-19
lines changed

3 files changed

+32
-19
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import android.widget.Toast;
1616

1717
import java.util.ArrayList;
18+
import java.util.Date;
1819
import java.util.HashMap;
1920
import java.util.Locale;
2021
import java.util.Map;
@@ -28,6 +29,7 @@
2829
import com.google.android.gms.tasks.OnFailureListener;
2930
import com.google.android.gms.tasks.OnSuccessListener;
3031
import com.google.android.gms.tasks.Task;
32+
import com.google.firebase.Timestamp;
3133
import com.google.firebase.auth.FirebaseAuth;
3234
import com.google.firebase.auth.FirebaseUser;
3335
import com.google.firebase.firestore.DocumentReference;
@@ -288,13 +290,14 @@ public void addToDB() {
288290

289291
for (int i = 0; i < resultArray.length; i++) {
290292

291-
Map<String, String> translation = new HashMap<>();
293+
Map<String, Object> translation = new HashMap<>();
292294
translation.put("sourceText", resultArray[i]);
293295
// replace with actual values
294296
translation.put("sourceLang", user.get("sourceLangPref").toString());
295297
translation.put("resultText", translateArray[i]);
296298
translation.put("resultLang", user.get("targetLangPref").toString());
297299
translation.put("userID", user.getId());
300+
translation.put("createdAt", new Timestamp(new Date()));
298301

299302
mDB.collection("translations")
300303
.add(translation)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.google.android.gms.tasks.OnFailureListener;
2626
import com.google.android.gms.tasks.OnSuccessListener;
2727
import com.google.android.gms.tasks.Task;
28+
import com.google.firebase.Timestamp;
2829
import com.google.firebase.auth.FirebaseAuth;
2930
import com.google.firebase.auth.FirebaseUser;
3031
import com.google.firebase.firestore.DocumentReference;
@@ -43,6 +44,7 @@
4344
import com.google.firebase.ml.vision.text.FirebaseVisionText;
4445
import com.google.firebase.ml.vision.text.FirebaseVisionTextRecognizer;
4546

47+
import java.util.Date;
4648
import java.util.HashMap;
4749
import java.util.Locale;
4850
import java.util.Map;
@@ -224,13 +226,14 @@ public void addToDB() {
224226

225227
for (int i = 0; i < resultArray.length; i++) {
226228

227-
Map<String, String> translation = new HashMap<>();
229+
Map<String, Object> translation = new HashMap<>();
228230
translation.put("sourceText", resultArray[i]);
229231
// replace with actual values
230232
translation.put("sourceLang", user.get("sourceLangPref").toString());
231233
translation.put("resultText", translateArray[i]);
232234
translation.put("resultLang", user.get("targetLangPref").toString());
233235
translation.put("userID", user.getId());
236+
translation.put("createdAt", new Timestamp(new Date()));
234237

235238
mDB.collection("translations")
236239
.add(translation)

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

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.google.firebase.firestore.DocumentReference;
3030
import com.google.firebase.firestore.DocumentSnapshot;
3131
import com.google.firebase.firestore.FirebaseFirestore;
32+
import com.google.firebase.firestore.Query;
3233
import com.google.firebase.firestore.QueryDocumentSnapshot;
3334
import com.google.firebase.firestore.QuerySnapshot;
3435

@@ -76,25 +77,31 @@ public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
7677

7778
private void makeListFromDB() {
7879

79-
mDB.collection(COLLECTION_PATH).get().addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
80-
@Override
81-
public void onComplete(@NonNull Task<QuerySnapshot> task) {
82-
if (task.isSuccessful()) {
83-
for (QueryDocumentSnapshot document : task.getResult()) {
84-
StringBuilder fields = new StringBuilder("");
85-
fields.append("Original Text: ").append(document.getString(SOURCE_TEXT));
86-
fields.append("\nTranslation: ").append(document.getString(RESULT_TEXT));
87-
fields.append("\nOriginal Language: ").append(document.getString(SOURCE_LANGUAGE));
88-
fields.append("\nTranslated to: ").append(document.getString(RESULT_LANGUAGE));
89-
arrayAdapter.add(fields.toString());
90-
80+
Log.d("uid", FirebaseAuth.getInstance().getCurrentUser().getUid());
9181

82+
mDB.collection(COLLECTION_PATH)
83+
.whereEqualTo("userID", FirebaseAuth.getInstance().getCurrentUser().getUid())
84+
.orderBy("createdAt", Query.Direction.DESCENDING)
85+
.get()
86+
.addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
87+
@Override
88+
public void onComplete(@NonNull Task<QuerySnapshot> task) {
89+
if (task.isSuccessful()) {
90+
for (QueryDocumentSnapshot document : task.getResult()) {
91+
StringBuilder fields = new StringBuilder("");
92+
fields.append("Original Text: ").append(document.getString(SOURCE_TEXT));
93+
fields.append("\nTranslation: ").append(document.getString(RESULT_TEXT));
94+
fields.append("\nOriginal Language: ").append(document.getString(SOURCE_LANGUAGE));
95+
fields.append("\nTranslated to: ").append(document.getString(RESULT_LANGUAGE));
96+
arrayAdapter.add(fields.toString());
97+
98+
99+
}
100+
} else {
101+
Log.d("collection", "Error getting documents: ", task.getException());
102+
}
92103
}
93-
} else {
94-
Log.d("collection", "Error getting documents: ", task.getException());
95-
}
96-
}
97-
})
104+
})
98105
.addOnFailureListener(new OnFailureListener() {
99106
@Override
100107
public void onFailure(@NonNull Exception e) {

0 commit comments

Comments
 (0)