diff --git a/AppMobile/app/src/main/AndroidManifest.xml b/AppMobile/app/src/main/AndroidManifest.xml index 81dc69c..63b7028 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/MainActivity.java b/AppMobile/app/src/main/java/com/example/appmobile/MainActivity.java index f497518..8a82ba0 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/MainActivity.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/MainActivity.java @@ -1,5 +1,6 @@ package com.example.appmobile; +import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import android.content.Intent; @@ -8,29 +9,36 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; +import com.example.appmobile.models.User; + public class MainActivity extends AppCompatActivity { - private EditText Email, Password; - private Button Enter, SignUp, ForgotPassword; - - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - Email = findViewById(R.id.logEmail); - Password = findViewById(R.id.logPassword); - Enter = findViewById(R.id.buttonEnter); - SignUp = findViewById(R.id.buttonSignUp); - ForgotPassword = findViewById(R.id.buttonForgotPassword); + setContentView(R.layout.activity_main);; } public void onEnter(View v){ - if(Email.getText().toString().equals("qw@qw") && Password.getText().toString().equals("qw")){ + String Email = ((EditText) findViewById(R.id.logEmail)).getText().toString(), + Password = ((EditText) findViewById(R.id.logPassword)).getText().toString(); + + if(Email.equals(User.email) && Password.equals(User.password)){ Intent intent = new Intent(this, TasksActivity.class); startActivity(intent); } + else{ + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle("ERROR!!") + .setMessage("Неверная почта или пароль " + Email + " " + User.email + " " + Password + " " + User.password) + .setCancelable(true) + .setPositiveButton("Ok", (dialog, which) -> { + dialog.cancel(); + }); + + AlertDialog dialog = builder.create(); + dialog.show(); + } } public void toRegistration(View v){ diff --git a/AppMobile/app/src/main/java/com/example/appmobile/NavigationFragment.java b/AppMobile/app/src/main/java/com/example/appmobile/NavigationFragment.java index 7e80551..f239df2 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/NavigationFragment.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/NavigationFragment.java @@ -1,18 +1,35 @@ package com.example.appmobile; +import android.content.Intent; import android.os.Bundle; +import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageButton; public class NavigationFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_navigation, container, false); + + View v = inflater.inflate(R.layout.fragment_navigation, container, false); + + ImageButton todo = v.findViewById(R.id.btn_todo); + todo.setOnClickListener(view -> { + Intent intent = new Intent(getActivity(), TasksActivity.class); + startActivity(intent); + }); + + ImageButton user = v.findViewById(R.id.btn_user); + user.setOnClickListener(view -> { + Intent intent = new Intent(getActivity(), ProfileActivity.class); + startActivity(intent); + }); + return v; } } \ No newline at end of file diff --git a/AppMobile/app/src/main/java/com/example/appmobile/ProfileActivity.java b/AppMobile/app/src/main/java/com/example/appmobile/ProfileActivity.java new file mode 100644 index 0000000..9d8961e --- /dev/null +++ b/AppMobile/app/src/main/java/com/example/appmobile/ProfileActivity.java @@ -0,0 +1,23 @@ +package com.example.appmobile; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.FragmentTransaction; + +import android.os.Bundle; +import android.widget.Button; +import android.widget.ImageButton; + +public class ProfileActivity extends AppCompatActivity { + + private ImageButton btn_todo, btn_idea, btn_user; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_profile); + + NavigationFragment navBar = new NavigationFragment(); + FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); + ft.replace(R.id.nav_bar_user, navBar); + ft.commit(); + } +} \ 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 238f483..1f3df3d 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/RegistrationActivity.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/RegistrationActivity.java @@ -1,10 +1,20 @@ package com.example.appmobile; +import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; +import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.view.View; +import android.widget.TextView; +import android.widget.Toast; + +import com.example.appmobile.models.User; + +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; public class RegistrationActivity extends AppCompatActivity { @@ -15,6 +25,30 @@ public class RegistrationActivity extends AppCompatActivity { } public void onReg(View v){ + TextView name = findViewById(R.id.regName); + TextView email = findViewById(R.id.regEmail); + TextView password = findViewById(R.id.regPassword); + TextView password2 = findViewById(R.id.regConfirmPassword); + + 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.name = name.getText().toString(); + User.email = email.getText().toString(); + User.password = password.getText().toString(); + Intent intent = new Intent(this, MainActivity.class); startActivity(intent); } diff --git a/AppMobile/app/src/main/java/com/example/appmobile/models/Task.java b/AppMobile/app/src/main/java/com/example/appmobile/models/Task.java new file mode 100644 index 0000000..39895b8 --- /dev/null +++ b/AppMobile/app/src/main/java/com/example/appmobile/models/Task.java @@ -0,0 +1,7 @@ +package com.example.appmobile.models; + +public class Task { + private String name; + private String description; + +} diff --git a/AppMobile/app/src/main/java/com/example/appmobile/models/User.java b/AppMobile/app/src/main/java/com/example/appmobile/models/User.java new file mode 100644 index 0000000..366be4d --- /dev/null +++ b/AppMobile/app/src/main/java/com/example/appmobile/models/User.java @@ -0,0 +1,7 @@ +package com.example.appmobile.models; + +public class User { + public static String name = "user"; + public static String email = "qw@qw"; + public static String password = "qw"; +} diff --git a/AppMobile/app/src/main/res/layout/activity_profile.xml b/AppMobile/app/src/main/res/layout/activity_profile.xml new file mode 100644 index 0000000..a3bd23c --- /dev/null +++ b/AppMobile/app/src/main/res/layout/activity_profile.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + +