diff --git a/AppMobile/app/src/main/AndroidManifest.xml b/AppMobile/app/src/main/AndroidManifest.xml index b80b598..e52f556 100644 --- a/AppMobile/app/src/main/AndroidManifest.xml +++ b/AppMobile/app/src/main/AndroidManifest.xml @@ -12,6 +12,9 @@ android:supportsRtl="true" android:theme="@style/Theme.AppMobile" tools:targetApi="31"> + diff --git a/AppMobile/app/src/main/java/com/example/appmobile/ForgotPasswordActivity.java b/AppMobile/app/src/main/java/com/example/appmobile/ForgotPasswordActivity.java new file mode 100644 index 0000000..720a202 --- /dev/null +++ b/AppMobile/app/src/main/java/com/example/appmobile/ForgotPasswordActivity.java @@ -0,0 +1,66 @@ +package com.example.appmobile; + +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.TextView; + +import com.example.appmobile.models.User; + +public class ForgotPasswordActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_forgot_password); + } + + public void onCancel(View v){ + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + } + + public void onSave(View v){ + TextView email = findViewById(R.id.inputEmail); + TextView password = findViewById(R.id.inputNewPass); + TextView password2 = findViewById(R.id.inputConfNewPass); + + if(!email.getText().toString().equals(User.email)){ + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle("ERROR!!") + .setMessage("Неверная почта") + .setCancelable(true) + .setPositiveButton("Ok", (dialog, which) -> { + dialog.cancel(); + }); + + AlertDialog dialog = builder.create(); + dialog.show(); + return; + } + + if(!password.getText().toString().equals(password2.getText().toString())){ + //Toast.makeText(this, "Пароли не одинаковые", Toast.LENGTH_LONG).show(); + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle("ERROR!!") + .setMessage("Пароли не совпадают") + .setCancelable(true) + .setPositiveButton("Ok", (dialog, which) -> { + dialog.cancel(); + }); + + AlertDialog dialog = builder.create(); + dialog.show(); + return; + } + + User.email = email.getText().toString(); + User.password = password.getText().toString(); + + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + } +} \ No newline at end of file diff --git a/AppMobile/app/src/main/java/com/example/appmobile/MainActivity.java b/AppMobile/app/src/main/java/com/example/appmobile/MainActivity.java index 8a82ba0..56415f9 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/MainActivity.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/MainActivity.java @@ -45,4 +45,9 @@ public class MainActivity extends AppCompatActivity { Intent intent = new Intent(this, RegistrationActivity.class); startActivity(intent); } + + public void toChangePassword(View v){ + Intent intent = new Intent(this, ForgotPasswordActivity.class); + startActivity(intent); + } } \ No newline at end of file diff --git a/AppMobile/app/src/main/java/com/example/appmobile/RegistrationActivity.java b/AppMobile/app/src/main/java/com/example/appmobile/RegistrationActivity.java index 1f3df3d..cdeeee1 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/RegistrationActivity.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/RegistrationActivity.java @@ -34,7 +34,7 @@ public class RegistrationActivity extends AppCompatActivity { //Toast.makeText(this, "Пароли не одинаковые", Toast.LENGTH_LONG).show(); AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle("ERROR!!") - .setMessage("Пароли не одинаковые") + .setMessage("Пароли не совпадают") .setCancelable(true) .setPositiveButton("Ok", (dialog, which) -> { dialog.cancel(); diff --git a/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java b/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java index 3ec8a00..a41b6a1 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java @@ -15,6 +15,10 @@ public class TasksActivity extends AppCompatActivity { private Button btn_open, btn_closed; private FrameLayout navBarFrameLayout; + private String[] open = new String[]{ + "", + }; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/AppMobile/app/src/main/res/layout/activity_forgot_password.xml b/AppMobile/app/src/main/res/layout/activity_forgot_password.xml new file mode 100644 index 0000000..c016214 --- /dev/null +++ b/AppMobile/app/src/main/res/layout/activity_forgot_password.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + +