Skip to content

Commit f37f022

Browse files
lukassobotiklukassobotik
committed
Enhanced Structure
1 parent dcf9ab9 commit f37f022

File tree

11 files changed

+51
-30
lines changed

11 files changed

+51
-30
lines changed

‎app/src/main/java/lukas/sobotik/tasklooper/MainActivity.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
import androidx.recyclerview.widget.RecyclerView;
99
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
1010
import com.google.android.material.floatingactionbutton.FloatingActionButton;
11+
import lukas.sobotik.tasklooper.recycler.RecyclerTouchListener;
12+
import lukas.sobotik.tasklooper.recycler.TaskAdapter;
13+
import lukas.sobotik.tasklooper.entity.Task;
14+
import lukas.sobotik.tasklooper.entity.TaskCheckState;
15+
import lukas.sobotik.tasklooper.fragment.TaskCreationDialog;
16+
import lukas.sobotik.tasklooper.fragment.TaskEditDialog;
1117

1218
import java.util.ArrayList;
1319
import java.util.List;
@@ -52,7 +58,7 @@ public void onLongClick(View view, int position) {
5258
});
5359
}
5460

55-
void readDataFromDB() {
61+
public void readDataFromDB() {
5662
List<Task> tasks = new ArrayList<>();
5763

5864
Cursor cursor = dbHelper.readAllData();

‎app/src/main/java/lukas/sobotik/tasklooper/TaskDatabaseHelper.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
import android.database.sqlite.SQLiteOpenHelper;
88
import android.widget.Toast;
99
import androidx.annotation.Nullable;
10+
import lukas.sobotik.tasklooper.entity.Task;
1011

11-
class TaskDatabaseHelper extends SQLiteOpenHelper {
12+
public class TaskDatabaseHelper extends SQLiteOpenHelper {
1213
Context context;
1314
public static final String DATABASE_NAME = "UserTasks.db";
1415
public static final int DATABASE_VERSION = 1;
@@ -42,7 +43,7 @@ public void onUpgrade(SQLiteDatabase db, int i, int i1) {
4243
onCreate(db);
4344
}
4445

45-
void addTask(String taskTitle, String taskDescription) {
46+
public void addTask(String taskTitle, String taskDescription) {
4647
SQLiteDatabase db = this.getWritableDatabase();
4748
ContentValues cv = new ContentValues();
4849

@@ -65,25 +66,25 @@ Cursor readAllData() {
6566
return cursor;
6667
}
6768

68-
void updateData(Task task) {
69+
public void updateData(Task task) {
6970
SQLiteDatabase db = getWritableDatabase();
7071
ContentValues cv = new ContentValues();
71-
cv.put(COLUMN_TASK_TITLE, task.taskName);
72-
cv.put(COLUMN_TASK_DESCRIPTION, task.taskDescription);
73-
cv.put(COLUMN_TASK_CHECK_STATE, task.state.toString());
74-
cv.put(COLUMN_TASK_CHECK_DATE, task.checkedDate);
72+
cv.put(COLUMN_TASK_TITLE, task.getTaskName());
73+
cv.put(COLUMN_TASK_DESCRIPTION, task.getTaskDescription());
74+
cv.put(COLUMN_TASK_CHECK_STATE, task.getState().toString());
75+
cv.put(COLUMN_TASK_CHECK_DATE, task.getCheckedDate());
7576

76-
String stringId = String.valueOf(task.id);
77+
String stringId = String.valueOf(task.getId());
7778

7879
long result = db.update(TABLE_NAME, cv, COLUMN_ID + "= ?", new String[]{stringId});
7980
if (result == -1) {
8081
Toast.makeText(context, "Failed to edit the Task", Toast.LENGTH_SHORT).show();
8182
}
8283
}
8384

84-
void deleteItem(Task task) {
85+
public void deleteItem(Task task) {
8586
SQLiteDatabase db = this.getWritableDatabase();
86-
String stringId = String.valueOf(task.id);
87+
String stringId = String.valueOf(task.getId());
8788

8889
long result = db.delete(TABLE_NAME,COLUMN_ID + "= ?", new String[]{stringId});
8990
if (result == -1) {

‎app/src/main/java/lukas/sobotik/tasklooper/Task.java renamed to ‎app/src/main/java/lukas/sobotik/tasklooper/entity/Task.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package lukas.sobotik.tasklooper;
1+
package lukas.sobotik.tasklooper.entity;
22

33
import androidx.annotation.NonNull;
44

‎app/src/main/java/lukas/sobotik/tasklooper/TaskCheckState.java renamed to ‎app/src/main/java/lukas/sobotik/tasklooper/entity/TaskCheckState.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package lukas.sobotik.tasklooper;
1+
package lukas.sobotik.tasklooper.entity;
22

33
public enum TaskCheckState {
44
checked,

‎app/src/main/java/lukas/sobotik/tasklooper/TaskCreationDialog.java renamed to ‎app/src/main/java/lukas/sobotik/tasklooper/fragment/TaskCreationDialog.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package lukas.sobotik.tasklooper;
1+
package lukas.sobotik.tasklooper.fragment;
22

33
import android.app.Dialog;
44
import android.graphics.Color;
@@ -11,6 +11,9 @@
1111
import androidx.fragment.app.DialogFragment;
1212
import com.google.android.material.button.MaterialButton;
1313
import com.google.android.material.textfield.TextInputEditText;
14+
import lukas.sobotik.tasklooper.MainActivity;
15+
import lukas.sobotik.tasklooper.R;
16+
import lukas.sobotik.tasklooper.TaskDatabaseHelper;
1417
import org.jetbrains.annotations.NotNull;
1518

1619
import java.util.Objects;

‎app/src/main/java/lukas/sobotik/tasklooper/TaskEditDialog.java renamed to ‎app/src/main/java/lukas/sobotik/tasklooper/fragment/TaskEditDialog.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package lukas.sobotik.tasklooper;
1+
package lukas.sobotik.tasklooper.fragment;
22

33
import android.app.Dialog;
44
import android.graphics.Color;
@@ -11,6 +11,10 @@
1111
import androidx.fragment.app.DialogFragment;
1212
import com.google.android.material.button.MaterialButton;
1313
import com.google.android.material.textfield.TextInputEditText;
14+
import lukas.sobotik.tasklooper.MainActivity;
15+
import lukas.sobotik.tasklooper.R;
16+
import lukas.sobotik.tasklooper.TaskDatabaseHelper;
17+
import lukas.sobotik.tasklooper.entity.Task;
1418
import org.jetbrains.annotations.NotNull;
1519

1620
import java.util.Objects;
@@ -19,7 +23,7 @@ public class TaskEditDialog extends DialogFragment {
1923

2024
public static String TAG = "TaskEditDialog";
2125

22-
TaskEditDialog(Task task) {
26+
public TaskEditDialog(Task task) {
2327
this.task = task;
2428
}
2529
Task task;
@@ -40,14 +44,14 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
4044
taskName = view.findViewById(R.id.task_edit_name_edit_text);
4145
taskDescription = view.findViewById(R.id.task_edit_description_edit_text);
4246

43-
taskName.setText(task.taskName);
44-
taskDescription.setText(task.taskDescription);
47+
taskName.setText(task.getTaskName());
48+
taskDescription.setText(task.getTaskDescription());
4549

4650
editButton.setOnClickListener(clickedView -> {
4751
if (!Objects.requireNonNull(taskName.getText()).toString().equals("")) {
4852
TaskDatabaseHelper dbHelper = new TaskDatabaseHelper(getContext());
4953

50-
Task newTask = new Task(task.id, taskName.getText().toString(), Objects.requireNonNull(taskDescription.getText()).toString(), task.state, task.checkedDate);
54+
Task newTask = new Task(task.getId(), taskName.getText().toString(), Objects.requireNonNull(taskDescription.getText()).toString(), task.getState(), task.getCheckedDate());
5155
dbHelper.updateData(newTask);
5256

5357
dismiss();
@@ -61,7 +65,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
6165
deleteButton.setOnClickListener(clickedView -> {
6266
TaskDatabaseHelper dbHelper = new TaskDatabaseHelper(getContext());
6367

64-
Task newTask = new Task(task.id, taskName.getText().toString(), Objects.requireNonNull(taskDescription.getText()).toString(), task.state, task.checkedDate);
68+
Task newTask = new Task(task.getId(), Objects.requireNonNull(taskName.getText()).toString(), Objects.requireNonNull(taskDescription.getText()).toString(), task.getState(), task.getCheckedDate());
6569
dbHelper.deleteItem(newTask);
6670

6771
dismiss();

‎app/src/main/java/lukas/sobotik/tasklooper/RecyclerTouchListener.java renamed to ‎app/src/main/java/lukas/sobotik/tasklooper/recycler/RecyclerTouchListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package lukas.sobotik.tasklooper;
1+
package lukas.sobotik.tasklooper.recycler;
22

33
import android.content.Context;
44
import android.view.GestureDetector;

‎app/src/main/java/lukas/sobotik/tasklooper/TaskAdapter.java renamed to ‎app/src/main/java/lukas/sobotik/tasklooper/recycler/TaskAdapter.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package lukas.sobotik.tasklooper;
1+
package lukas.sobotik.tasklooper.recycler;
22

33
import android.content.Context;
44
import android.os.Build;
@@ -10,6 +10,10 @@
1010
import androidx.annotation.RequiresApi;
1111
import androidx.recyclerview.widget.RecyclerView;
1212
import com.google.android.material.checkbox.MaterialCheckBox;
13+
import lukas.sobotik.tasklooper.R;
14+
import lukas.sobotik.tasklooper.entity.Task;
15+
import lukas.sobotik.tasklooper.entity.TaskCheckState;
16+
import lukas.sobotik.tasklooper.TaskDatabaseHelper;
1317
import org.jetbrains.annotations.NotNull;
1418

1519
import java.time.LocalDate;
@@ -46,19 +50,22 @@ public void onBindViewHolder(@NonNull @NotNull TaskVH holder, int position) {
4650
TaskDatabaseHelper taskDatabaseHelper = new TaskDatabaseHelper(context);
4751
Task task = list.get(position);
4852

49-
holder.taskName.setText(list.get(position).taskName);
50-
holder.taskDescription.setText(list.get(position).taskDescription);
53+
holder.taskName.setText(list.get(position).getTaskName());
54+
holder.taskDescription.setText(list.get(position).getTaskDescription());
5155

52-
if (!task.checkedDate.equals(LocalDate.now().toString())) {
56+
if (!task.getCheckedDate().equals(LocalDate.now().toString())) {
5357
task.setState(TaskCheckState.unchecked);
5458
task.setCheckedDate("");
5559
taskDatabaseHelper.updateData(task);
60+
holder.itemView.setAlpha(1);
5661
}
5762

58-
if (task.state.equals(TaskCheckState.checked)) {
63+
if (task.getState().equals(TaskCheckState.checked)) {
5964
holder.checkBox.setChecked(true);
65+
holder.itemView.setAlpha(0.5f);
6066
} else {
6167
holder.checkBox.setChecked(false);
68+
holder.itemView.setAlpha(1);
6269
}
6370

6471
Log.d("Custom Logging", holder.taskDescription.getText().toString() + holder.taskDescription.getText().toString().isEmpty());

‎app/src/main/java/lukas/sobotik/tasklooper/TaskVH.java renamed to ‎app/src/main/java/lukas/sobotik/tasklooper/recycler/TaskVH.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
package lukas.sobotik.tasklooper;
1+
package lukas.sobotik.tasklooper.recycler;
22

33
import android.view.View;
44
import android.widget.TextView;
55
import androidx.annotation.NonNull;
66
import androidx.recyclerview.widget.RecyclerView;
77
import com.google.android.material.checkbox.MaterialCheckBox;
8+
import lukas.sobotik.tasklooper.R;
89
import org.jetbrains.annotations.NotNull;
910

1011
public class TaskVH extends RecyclerView.ViewHolder {

‎app/src/main/res/layout/fragment_task_creation.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
6-
tools:context=".TaskCreationDialog"
6+
tools:context=".fragment.TaskCreationDialog"
77
android:padding="16dp"
88
style="@style/DialogFragment"
99
android:orientation="vertical"

‎app/src/main/res/layout/fragment_task_edit.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
xmlns:app="http://schemas.android.com/apk/res-auto"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent"
7-
tools:context=".TaskCreationDialog"
6+
tools:context=".fragment.TaskCreationDialog"
87
android:padding="16dp"
98
style="@style/DialogFragment"
109
android:orientation="vertical"

0 commit comments

Comments
 (0)