diff --git a/AppMobile/app/src/main/AndroidManifest.xml b/AppMobile/app/src/main/AndroidManifest.xml index e52f556..a44900a 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 index 720a202..3c2ef71 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/ForgotPasswordActivity.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/ForgotPasswordActivity.java @@ -31,7 +31,7 @@ public class ForgotPasswordActivity extends AppCompatActivity { if(!email.getText().toString().equals(User.email)){ 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/MainActivity.java b/AppMobile/app/src/main/java/com/example/appmobile/MainActivity.java index 56415f9..e8ffec5 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/MainActivity.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/MainActivity.java @@ -9,6 +9,7 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; +import com.example.appmobile.models.Task; import com.example.appmobile.models.User; public class MainActivity extends AppCompatActivity { @@ -24,6 +25,13 @@ public class MainActivity extends AppCompatActivity { Password = ((EditText) findViewById(R.id.logPassword)).getText().toString(); if(Email.equals(User.email) && Password.equals(User.password)){ + User.tasks.add(new Task("1", "asdasdas", true)); + User.tasks.add(new Task("2", "dwa", false)); + User.tasks.add(new Task("3", "vfgdfgdf", false)); + User.tasks.add(new Task("4", "wafafwfwafw", true)); + User.tasks.add(new Task("5", "ytuukyuk", true)); + User.tasks.add(new Task("6", "ytuukfefeeeeyuk", true)); + Intent intent = new Intent(this, TasksActivity.class); startActivity(intent); } diff --git a/AppMobile/app/src/main/java/com/example/appmobile/NewTaskActivity.java b/AppMobile/app/src/main/java/com/example/appmobile/NewTaskActivity.java new file mode 100644 index 0000000..7e8da77 --- /dev/null +++ b/AppMobile/app/src/main/java/com/example/appmobile/NewTaskActivity.java @@ -0,0 +1,40 @@ +package com.example.appmobile; + +import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.EditText; +import android.widget.Toast; + +import com.example.appmobile.models.Task; +import com.example.appmobile.models.User; + +public class NewTaskActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_new_task); + } + + public void onCancel(View v){ + Intent intent = new Intent(this, TasksActivity.class); + startActivity(intent); + } + + public void onSave(View v){ + String title = ((EditText)findViewById(R.id.input_title)).getText().toString(); + String desc = ((EditText)findViewById(R.id.input_desc)).getText().toString(); + + if(title.isEmpty() || desc.isEmpty()){ + Toast.makeText(this, "Title or description is empty", Toast.LENGTH_LONG).show(); + return; + } + User.tasks.add(new Task(title, desc,false)); + + 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/TasksActivity.java b/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java index a41b6a1..ae3cb89 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/TasksActivity.java @@ -13,20 +13,17 @@ import android.widget.FrameLayout; 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); setContentView(R.layout.activity_tasks); - btn_open = findViewById(R.id.btn_open); + + + btn_open = findViewById(R.id.save_new_task); btn_closed = findViewById(R.id.btn_closed); - navBarFrameLayout = findViewById(R.id.nav_bar_ticks); + FrameLayout navBarFrameLayout = findViewById(R.id.nav_bar_ticks); NavigationFragment navBar = new NavigationFragment(); FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); @@ -34,6 +31,11 @@ public class TasksActivity extends AppCompatActivity { ft.commit(); } + public void onNew(View v){ + Intent intent = new Intent(this, NewTaskActivity.class); + startActivity(intent); + } + @SuppressLint("UseCompatLoadingForDrawables") public void showOpen(View v){ btn_open.setBackground(getDrawable(R.drawable.active_back)); 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 index 39895b8..da890b2 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/models/Task.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/models/Task.java @@ -1,7 +1,15 @@ package com.example.appmobile.models; public class Task { - private String name; - private String description; + public String title; + public String description; + + public boolean done; + + public Task(String title, String description, boolean done){ + this.title = title; + this.description = description; + this.done = done; + } } 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 index 366be4d..750ac7e 100644 --- a/AppMobile/app/src/main/java/com/example/appmobile/models/User.java +++ b/AppMobile/app/src/main/java/com/example/appmobile/models/User.java @@ -1,7 +1,12 @@ package com.example.appmobile.models; +import java.util.ArrayList; +import java.util.List; + public class User { public static String name = "user"; public static String email = "qw@qw"; public static String password = "qw"; + + public static ArrayList tasks = new ArrayList<>(); } diff --git a/AppMobile/app/src/main/res/drawable/back.xml b/AppMobile/app/src/main/res/drawable/back.xml new file mode 100644 index 0000000..7e981e5 --- /dev/null +++ b/AppMobile/app/src/main/res/drawable/back.xml @@ -0,0 +1,16 @@ + + + + + + + + + + \ No newline at end of file diff --git a/AppMobile/app/src/main/res/layout/activity_forgot_password.xml b/AppMobile/app/src/main/res/layout/activity_forgot_password.xml index c016214..6d3e468 100644 --- a/AppMobile/app/src/main/res/layout/activity_forgot_password.xml +++ b/AppMobile/app/src/main/res/layout/activity_forgot_password.xml @@ -85,7 +85,7 @@ app:layout_constraintTop_toBottomOf="@+id/viewConfNewPass" />