Change Password Function

This commit is contained in:
phanhuuloi27
2022-06-16 16:54:05 +07:00
parent 10350388a7
commit 4f6deaf160
10 changed files with 297 additions and 91 deletions
+1
View File
@@ -58,6 +58,7 @@ dependencies {
implementation 'com.stepstone.apprating:app-rating:2.0.0'
implementation 'com.squareup.retrofit2:retrofit:2.7.1'
implementation 'com.squareup.retrofit2:converter-gson:2.7.1'
implementation 'com.github.d-max:spots-dialog:0.7@aar'
implementation 'com.squareup.picasso:picasso:2.5.2'
implementation 'com.firebaseui:firebase-ui-database:1.2.0'
@@ -1,7 +1,9 @@
package com.waterbase.foodify;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -10,6 +12,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.view.GravityCompat;
@@ -19,10 +22,14 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.firebase.ui.database.FirebaseRecyclerAdapter;
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.OnFailureListener;
import com.google.android.gms.tasks.Task;
import com.google.android.material.navigation.NavigationView;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.iid.FirebaseInstanceId;
import com.rengwuxian.materialedittext.MaterialEditText;
import com.squareup.picasso.Picasso;
import com.waterbase.foodify.Common.Common;
import com.waterbase.foodify.Interface.ItemClickListener;
@@ -30,6 +37,10 @@ import com.waterbase.foodify.Model.Category;
import com.waterbase.foodify.Model.Token;
import com.waterbase.foodify.ViewHolder.MenuViewHolder;
import java.util.HashMap;
import java.util.Map;
import dmax.dialog.SpotsDialog;
import io.paperdb.Paper;
@@ -148,7 +159,10 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
} else if (id == R.id.nav_order) {
Intent orderIntent = new Intent(Home.this, OrderStatus.class);
startActivity(orderIntent);
} else if (id == R.id.nav_log_out) {
} else if (id == R.id.nav_change_pwd) {
showChangePasswordDialog();
}
else if (id == R.id.nav_log_out) {
//Delete Remember user & password
Paper.book().destroy();
@@ -165,4 +179,66 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
return true;
}
private void showChangePasswordDialog() {
AlertDialog.Builder alertDialog = new AlertDialog.Builder(Home.this);
alertDialog.setTitle("Đổi mật khẩu");
alertDialog.setMessage("Vui lòng điền đầy đủ thông tin");
LayoutInflater inflater = LayoutInflater.from(this);
View layout_pwd = inflater.inflate(R.layout.change_password_layout, null);
MaterialEditText edtPassword = (MaterialEditText) layout_pwd.findViewById(R.id.edtPassword);
MaterialEditText edtNewPassword = (MaterialEditText) layout_pwd.findViewById(R.id.edtNewPassword);
MaterialEditText edtRepeatPassword = (MaterialEditText) layout_pwd.findViewById(R.id.edtRepeatPassword);
alertDialog.setView(layout_pwd);
//Button
alertDialog.setPositiveButton("Đổi mật khẩu", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
android.app.AlertDialog waitingDialog = new SpotsDialog(Home.this);
waitingDialog.show();
//Check old password
if(edtPassword.getText().toString().equals(Common.currentUser.getPassword())) {
//Check new password and repeat password
if(edtNewPassword.getText().toString().equals(edtRepeatPassword.getText().toString())){
Map<String, Object> passwordUpdate = new HashMap<>();
passwordUpdate.put("password", edtNewPassword.getText().toString());
//Make update
DatabaseReference user = FirebaseDatabase.getInstance().getReference("User");
user.child(Common.currentUser.getPhone())
.updateChildren(passwordUpdate)
.addOnCompleteListener(new OnCompleteListener<Void>() {
@Override
public void onComplete(@NonNull Task<Void> task) {
waitingDialog.dismiss();
Toast.makeText(Home.this, "Mật khẩu đã được cập nhật!", Toast.LENGTH_SHORT).show();
}
})
.addOnFailureListener(new OnFailureListener() {
@Override
public void onFailure(@NonNull Exception e) {
Toast.makeText(Home.this, "Đã xảy ra lỗi hệ thống: " + e.getMessage(), Toast.LENGTH_SHORT).show();
}
});
} else {
waitingDialog.dismiss();
Toast.makeText(Home.this, "Mật khẩu chưa khớp! Vui lòng thử lại!", Toast.LENGTH_SHORT).show();
}
} else {
waitingDialog.dismiss();
Toast.makeText(Home.this, "Sai mật khẩu! Vui lòng thử lại!", Toast.LENGTH_SHORT).show();
}
}
});
AlertDialog dialog = alertDialog.create();
dialog.show();
}
}
@@ -86,6 +86,8 @@ public class SignIn extends AppCompatActivity {
Common.currentUser = user;
startActivity(homeIntent);
finish();
table_user.removeEventListener(this);
} else {
Toast.makeText(SignIn.this, "Số điện thoại hoặc mật khẩu không đúng. Xin vui lòng thử lại!", Toast.LENGTH_SHORT).show();
}
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"/>
</vector>
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:cardElevation="10dp"
>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp">
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/edtPassword"
android:hint="Mật khẩu"
android:inputType="textPassword"
android:text=""
android:textColor="@color/colorPrimary"
android:textColorHint="@color/colorPrimary"
android:textSize="24sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:met_baseColor="@color/colorPrimary"
app:met_floatingLabel="highlight"
app:met_primaryColor="@color/colorPrimary"
app:met_singleLineEllipsis="true"
/>
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/edtNewPassword"
android:hint="Mật khẩu mới"
android:inputType="textPassword"
android:text=""
android:textColor="@color/colorPrimary"
android:textColorHint="@color/colorPrimary"
android:textSize="24sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:met_baseColor="@color/colorPrimary"
app:met_floatingLabel="highlight"
app:met_primaryColor="@color/colorPrimary"
app:met_singleLineEllipsis="true"
/>
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/edtRepeatPassword"
android:hint="Nhập lại mật khẩu"
android:inputType="textPassword"
android:text=""
android:textColor="@color/colorPrimary"
android:textColorHint="@color/colorPrimary"
android:textSize="24sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:met_baseColor="@color/colorPrimary"
app:met_floatingLabel="highlight"
app:met_primaryColor="@color/colorPrimary"
app:met_singleLineEllipsis="true"
/>
</LinearLayout>
</androidx.cardview.widget.CardView>
@@ -12,6 +12,13 @@
android:id="@+id/nav_order"
android:icon="@drawable/ic_baseline_access_time_24"
android:title="Tình trạng đơn hàng" />
<item
android:id="@+id/nav_change_pwd"
android:icon="@drawable/ic_baseline_security_24"
android:title="Đổi mật khẩu"
android:iconTint="@color/white"
/>
<item
android:id="@+id/nav_log_out"
android:icon="@drawable/ic_baseline_exit_to_app_24"
+1 -1
View File
@@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.0'
classpath 'com.android.tools.build:gradle:7.0.1'
classpath 'com.google.gms:google-services:4.3.10'
}
}
@@ -85,20 +85,37 @@ public class OrderStatus extends AppCompatActivity {
viewHolder.txtOrderAddress.setText(model.getAddress());
viewHolder.txtOrderPhone.setText(model.getPhone());
viewHolder.setItemClickListener(new ItemClickListener() {
//Event Button
viewHolder.btnEdit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view, int position, boolean isLongClick) {
if(!isLongClick){
Intent trackingOrder = new Intent(OrderStatus.this, TrackingOrder.class);
Common.currentRequest = model;
startActivity(trackingOrder);
}
// else {
// Intent orderDetail = new Intent(OrderStatus.this, OrderDetail.class);
// Common.currentRequest = model;
// orderDetail.putExtra("OrderId", adapter.getRef(position).getKey());
// startActivity(orderDetail);
// }
public void onClick(View v) {
showUpdateDialog(adapter.getRef(i).getKey(), adapter.getItem(i));
}
});
viewHolder.btnRemove.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
deleteOrder(adapter.getRef(i).getKey());
}
});
viewHolder.btnDetail.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent orderDetail = new Intent(OrderStatus.this, OrderDetail.class);
Common.currentRequest = model;
orderDetail.putExtra("OrderId", adapter.getRef(i).getKey());
startActivity(orderDetail);
}
});
viewHolder.btnDirection.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent trackingOrder = new Intent(OrderStatus.this, TrackingOrder.class);
Common.currentRequest = model;
startActivity(trackingOrder);
}
});
}
@@ -107,18 +124,9 @@ public class OrderStatus extends AppCompatActivity {
recyclerView.setAdapter(adapter);
}
@Override
public boolean onContextItemSelected(@NonNull MenuItem item) {
if(item.getTitle().equals(Common.UPDATE))
showUpdateDialog(adapter.getRef(item.getOrder()).getKey(), adapter.getItem(item.getOrder()));
else if(item.getTitle().equals(Common.DELETE))
deleteOrder(adapter.getRef(item.getOrder()).getKey());
return super.onContextItemSelected(item);
}
private void deleteOrder(String key) {
requests.child(key).removeValue();
adapter.notifyDataSetChanged();
}
private void showUpdateDialog(String key, Request item) {
@@ -142,6 +150,7 @@ public class OrderStatus extends AppCompatActivity {
item.setStatus(String.valueOf(spinner.getSelectedIndex()));
requests.child(localKey).setValue(item);
adapter.notifyDataSetChanged();
sendOrderStatusToUser(localKey, item);
}
@@ -2,6 +2,7 @@ package com.waterbase.foodifyServer.ViewHolder;
import android.view.ContextMenu;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -10,11 +11,11 @@ import androidx.recyclerview.widget.RecyclerView;
import com.waterbase.foodifyServer.Interface.ItemClickListener;
import com.waterbase.foodifyServer.R;
public class OrderViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnCreateContextMenuListener{
public class OrderViewHolder extends RecyclerView.ViewHolder{
public TextView txtOrderId, txtOrderStatus, txtOrderPhone, txtOrderAddress;
private ItemClickListener itemClickListener;
public Button btnEdit, btnRemove, btnDetail, btnDirection;
public OrderViewHolder(@NonNull View itemView) {
super(itemView);
@@ -24,25 +25,11 @@ public class OrderViewHolder extends RecyclerView.ViewHolder implements View.OnC
txtOrderStatus = (TextView) itemView.findViewById(R.id.order_status);
txtOrderPhone = (TextView) itemView.findViewById(R.id.order_phone);
itemView.setOnClickListener(this);
itemView.setOnCreateContextMenuListener(this);
btnEdit = (Button) itemView.findViewById(R.id.btnEdit);
btnDetail = (Button)itemView.findViewById(R.id.btnDetail);
btnDirection = (Button)itemView.findViewById(R.id.btnDirection);
btnRemove = (Button)itemView.findViewById(R.id.btnRemove);
}
public void setItemClickListener(ItemClickListener itemClickListener) {
this.itemClickListener = itemClickListener;
}
@Override
public void onClick(View v) {
itemClickListener.onClick(v, getAdapterPosition(), false);
}
@Override
public void onCreateContextMenu(ContextMenu contextMenu, View v, ContextMenu.ContextMenuInfo menuInfo) {
contextMenu.setHeaderTitle("Tuỳ chọn");
contextMenu.add(0,0, getAdapterPosition(), "Cập nhật");
contextMenu.add(0,1, getAdapterPosition(), "Xoá");
}
}
@@ -9,59 +9,113 @@
>
<LinearLayout
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:orientation="horizontal"
android:layout_gravity="center_vertical"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_weight="9"
android:layout_width="0dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:orientation="horizontal"
android:layout_gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/order_id"
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="bold"
android:text="#11111"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<LinearLayout
android:orientation="vertical"
android:layout_weight="9"
android:layout_width="0dp"
android:layout_height="wrap_content">
<TextView
android:id="@+id/order_status"
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:text="Status"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/order_id"
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="bold"
android:text="#11111"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/order_phone"
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:text="Phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/order_status"
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:text="Status"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/order_phone"
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:text="Phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/order_address"
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:text="Address"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:id="@+id/order_address"
android:layout_marginLeft="10dp"
android:gravity="center_vertical|start"
android:textAllCaps="true"
android:textStyle="italic"
android:text="Address"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_weight="4"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<info.hoang8f.widget.FButton
android:id="@+id/btnEdit"
android:text="Chỉnh sửa"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:cornerRadius="0dp"
app:fButtonColor="@color/white"
/>
<info.hoang8f.widget.FButton
android:id="@+id/btnRemove"
android:text="Xoá"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:cornerRadius="0dp"
app:fButtonColor="@color/white"
/>
<info.hoang8f.widget.FButton
android:id="@+id/btnDetail"
android:text="Chi tiết"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:cornerRadius="0dp"
app:fButtonColor="@color/white"
/>
<info.hoang8f.widget.FButton
android:id="@+id/btnDirection"
android:text="Hướng đi"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:cornerRadius="0dp"
app:fButtonColor="@color/white"
/>
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>