From 4beb99b2b9ceea36b7c13c127f01b512e09a6cf7 Mon Sep 17 00:00:00 2001 From: tienthanh214 <39771202+tienthanh214@users.noreply.github.com> Date: Mon, 24 Jan 2022 11:38:18 +0700 Subject: [PATCH] update language - Vietnamese for bubble notification --- .../notification/receiver/GoalBroadcastReceiver.java | 2 +- .../hcmus/group14/moneytor/ui/login/LoginActivity.java | 8 ++++---- src/app/src/main/res/values-ja-rJP/strings.xml | 1 + src/app/src/main/res/values-vi-rVN/strings.xml | 1 + src/app/src/main/res/values/strings.xml | 1 + 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/src/main/java/com/hcmus/group14/moneytor/services/notification/receiver/GoalBroadcastReceiver.java b/src/app/src/main/java/com/hcmus/group14/moneytor/services/notification/receiver/GoalBroadcastReceiver.java index 6542c4c..d5cc568 100644 --- a/src/app/src/main/java/com/hcmus/group14/moneytor/services/notification/receiver/GoalBroadcastReceiver.java +++ b/src/app/src/main/java/com/hcmus/group14/moneytor/services/notification/receiver/GoalBroadcastReceiver.java @@ -76,7 +76,7 @@ private void notifyUser(Context context) { .build(); builder.setBubbleMetadata(bubbleData); builder.setContentTitle("Widget"); - builder.setContentText("Click me to fast note a spending"); + builder.setContentText(context.getString(R.string.bubble_notif)); } // TODO set what happen when press notification diff --git a/src/app/src/main/java/com/hcmus/group14/moneytor/ui/login/LoginActivity.java b/src/app/src/main/java/com/hcmus/group14/moneytor/ui/login/LoginActivity.java index af5a767..c9adaee 100644 --- a/src/app/src/main/java/com/hcmus/group14/moneytor/ui/login/LoginActivity.java +++ b/src/app/src/main/java/com/hcmus/group14/moneytor/ui/login/LoginActivity.java @@ -91,8 +91,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { try { // Google Sign In was successful, authenticate with Firebase GoogleSignInAccount account = task.getResult(ApiException.class); - Toast.makeText(LoginActivity.this, "firebaseAuthWithGoogle:" + account.getId(), - Toast.LENGTH_SHORT).show(); +// Toast.makeText(LoginActivity.this, "firebaseAuthWithGoogle:" + account.getId(), +// Toast.LENGTH_SHORT).show(); firebaseAuthWithGoogle(account.getIdToken()); } catch (ApiException e) { // Google Sign In failed, update UI appropriately @@ -125,8 +125,8 @@ public void onComplete(@NonNull Task task) { private void onLoginComplete(FirebaseUser user, boolean isFirstLogin) { if (user == null) { - Toast.makeText(LoginActivity.this, "No user", - Toast.LENGTH_SHORT).show(); +// Toast.makeText(LoginActivity.this, "No user", +// Toast.LENGTH_SHORT).show(); } else { Intent intent = new Intent(LoginActivity.this, MainActivity.class); if (isFirstLogin) intent.putExtra(LOGIN_TYPE, FIRST_TIME_LOGIN); diff --git a/src/app/src/main/res/values-ja-rJP/strings.xml b/src/app/src/main/res/values-ja-rJP/strings.xml index e094e0d..ab9d98f 100644 --- a/src/app/src/main/res/values-ja-rJP/strings.xml +++ b/src/app/src/main/res/values-ja-rJP/strings.xml @@ -90,4 +90,5 @@ Sync data Reminder notification Select time + Click me to fast note a spending \ No newline at end of file diff --git a/src/app/src/main/res/values-vi-rVN/strings.xml b/src/app/src/main/res/values-vi-rVN/strings.xml index cd6f2cf..4fc52c4 100644 --- a/src/app/src/main/res/values-vi-rVN/strings.xml +++ b/src/app/src/main/res/values-vi-rVN/strings.xml @@ -107,4 +107,5 @@ Đồng bộ dữ liệu Nhắc nhở ghi chú Chọn thời điểm + Nhấn vào bong bóng để ghi chú chi tiêu nhanh chóng \ No newline at end of file diff --git a/src/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml index ef81115..862edb3 100644 --- a/src/app/src/main/res/values/strings.xml +++ b/src/app/src/main/res/values/strings.xml @@ -107,4 +107,5 @@ Sync data Reminder notification Select time + Click me to fast note a spending \ No newline at end of file