Fix dengan fadli merge

app/src/main/java/com/yono/messeripos/RegisterState.java

@@ -12,15 +12,24 @@ import android.widget.RelativeLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textfield.TextInputEditText;
+import com.yono.messeripos.api.client.Client;
+import com.yono.messeripos.api.service.UsersService;
 import com.yono.messeripos.models.MainViewModels;
+import com.yono.messeripos.models.UsersModels;
+import com.yono.messeripos.response.DataResponse;
 import com.yono.messeripos.utils.Utils;
 
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
 public class RegisterState extends BottomSheetDialogFragment {
 
     private static final String TAG = "RegisterState";
@@ -78,9 +87,12 @@ public class RegisterState extends BottomSheetDialogFragment {
 
         Log.d(TAG, "onCreateDialog: " + sheetBehavior2.getState());
 
-//        loginButton.setOnClickListener(view1 -> {
-//            if (sheetBehavior.getState() != BottomSheetBehavior.STATE_EXPANDED) loginAuth(view1);
-//        });
+        registerButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mainViewModels.postRegis(new UsersModels(username.getText().toString(),email.getText().toString(),password.getText().toString(),repassword.getText().toString()));
+            }
+        });
 
 //        close btn is clicked
         closeBtn.setOnClickListener(view12 -> {
@@ -91,5 +103,21 @@ public class RegisterState extends BottomSheetDialogFragment {
         return sheetDialog2;
     }
 
+    private void registerUser(View view){
+//        Client client = new Client();
+//        UsersService usersService = client.Client(UsersService.class);
+//        usersService.postRegister(new UsersModels(username.getText().toString(),email.getText().toString(),password.getText().toString(),repassword.getText().toString()).enqueue(new Callback<DataResponse<UsersModels>>() {
+//            @Override
+//            public void onResponse(Call<DataResponse<UsersModels>> call, Response<DataResponse<UsersModels>> response) {
+//
+//            }
+//
+//            @Override
+//            public void onFailure(Call<DataResponse<UsersModels>> call, Throwable t) {
+//
+//            }
+//        });
+    }
+
 
 }

app/src/main/java/com/yono/messeripos/models/MainViewModels.java

@@ -151,12 +151,13 @@ public class MainViewModels extends ViewModel {
         return usersLogin;
     }
 
-    public  MutableLiveData<DataResponse<UsersModels>> checkRegis(UsersModels usersModels){
-        usersRegister = new MutableLiveData<>();
+    public MutableLiveData<DataResponse<UsersModels>> postRegis(UsersModels usersModels) {
+        usersRegister= new MutableLiveData<>();
         CreateRegister(usersModels);
-        return  usersRegister;
+        return usersRegister;
     }
 
+
     private void PeriksaLogin(UsersModels usersModels) {
         UsersService usersService = client.Client(UsersService.class);
 

app/src/main/java/com/yono/messeripos/models/UsersModels.java

@@ -12,17 +12,23 @@ public class UsersModels {
     @SerializedName("password")
     private String passwordUsers;
 
-    public UsersModels(String usernameUsers,String passwordUsers) {
+    @SerializedName("password_confirmation")
+    private String passwordConfirmationUsers;
+
+    public UsersModels(String usernameUsers, String passwordUsers) {
         this.usernameUsers = usernameUsers;
         this.passwordUsers = passwordUsers;
     }
 
-    public UsersModels(String usernameUsers, String emailUsers, String passwordUsers) {
+    public UsersModels(String usernameUsers, String emailUsers, String passwordUsers,String passwordConfirmationUsers) {
         this.usernameUsers = usernameUsers;
         this.emailUsers = emailUsers;
         this.passwordUsers = passwordUsers;
+        this.passwordConfirmationUsers = passwordConfirmationUsers;
     }
 
+
+
     public String getEmailUsers() {
         return emailUsers;
     }
@@ -46,4 +52,12 @@ public class UsersModels {
     public void setPasswordUsers(String passwordUsers) {
         this.passwordUsers = passwordUsers;
     }
+
+    public String getPasswordConfirmationUsers() {
+        return passwordConfirmationUsers;
+    }
+
+    public void setPasswordConfirmationUsers(String passwordConfirmationUsers) {
+        this.passwordConfirmationUsers = passwordConfirmationUsers;
+    }
 }