Skip to content

Commit

Permalink
Merge pull request #300 from jeeljasani/development
Browse files Browse the repository at this point in the history 
code refactoring to improve readability and quality
  • Loading branch information
@CrazyMarvin
CrazyMarvin authored Dec 1, 2024
2 parents 3f56dae + 0a476f2 commit b689c31
Show file tree
Hide file tree
Showing 10 changed files with 382 additions and 461 deletions.
59 changes: 19 additions & 40 deletions app/src/main/java/rocks/poopjournal/todont/Adapters/AvoidedLogAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import rocks.poopjournal.todont.NotificationReceiver;
import rocks.poopjournal.todont.R;
import rocks.poopjournal.todont.databinding.UpdateLayoutBottomSheetTestBinding;
import rocks.poopjournal.todont.utils.CommonBottomSheetManager;


public class AvoidedLogAdapter extends RecyclerView.Adapter<AvoidedLogAdapter.RecyclerViewHolder> {
Expand Down Expand Up @@ -80,32 +81,11 @@ public void onBindViewHolder(@NonNull RecyclerViewHolder holder, final int posit
holder.task.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con, R.style.BottomSheetDialogTheme);
final UpdateLayoutBottomSheetTestBinding bottomsheetview = UpdateLayoutBottomSheetTestBinding.inflate(LayoutInflater.from(con));

// if (Helper.labels_array.size() == 0) {
// txt.setVisibility(View.VISIBLE);
// } else {
// txt.setVisibility(View.INVISIBLE);
// }

bottomsheetview.titleText.setText(dTask);
bottomsheetview.details.setText(Helper.habitsdata.get(position)[3]);
bottomSheetDialog.setContentView(bottomsheetview.getRoot());
bottomSheetDialog.show();
db.show_avoided_data();
db.show_done_data();
if (Helper.avoidedData.size() == 0) {
bottomsheetview.avoidedCount.setText("0");
} else {
bottomsheetview.avoidedCount.setText(getAvoidedCount(Helper.habitsdata.get(position)[2]));
}
if (Helper.donedata.size() == 0) {
bottomsheetview.doneCount.setText("0");
} else {
bottomsheetview.doneCount.setText(getDoneCount(Helper.habitsdata.get(position)[2]));
}
bottomsheetview.avoidedPlusButton.setOnClickListener(new View.OnClickListener() {


CommonBottomSheetManager bottomSheetManager =
new CommonBottomSheetManager(con, dTask, date, position);
bottomSheetManager.setAvoidedPlusButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
db.show_avoided_data();
Expand Down Expand Up @@ -149,15 +129,14 @@ public void onClick(View view) {
db.show_avoided_data();
db.show_done_data();
if (Helper.avoidedData.size() == 0) {
bottomsheetview.avoidedCount.setText("0");
bottomSheetManager.getBottomSheetView().avoidedCount.setText("0");
} else {
bottomsheetview.avoidedCount.setText(getAvoidedCount(Helper.habitsdata.get(position)[2]));
bottomSheetManager.getBottomSheetView().avoidedCount.setText(getAvoidedCount(Helper.habitsdata.get(position)[2]));
}
//holder.catagoryoftask.setText(String.valueOf(getCount(position)));
}
});

bottomsheetview.avoidedMinusButton.setOnClickListener(new View.OnClickListener() {
bottomSheetManager.setAvoidedMinusButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {

Expand Down Expand Up @@ -198,14 +177,14 @@ public void onClick(View view) {
db.show_avoided_data();
db.show_done_data();
if (Helper.avoidedData.size() == 0) {
bottomsheetview.avoidedCount.setText("0");
bottomSheetManager.getBottomSheetView().avoidedCount.setText("0");
} else {
bottomsheetview.avoidedCount.setText(getAvoidedCount(Helper.habitsdata.get(position)[2]));
bottomSheetManager.getBottomSheetView().avoidedCount.setText(getAvoidedCount(Helper.habitsdata.get(position)[2]));
}
//holder.catagoryoftask.setText(String.valueOf(getCount(position)));
}
});
bottomsheetview.donePlusButton.setOnClickListener(new View.OnClickListener() {
bottomSheetManager.setDonePlusButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
db.show_done_data();
Expand Down Expand Up @@ -241,16 +220,16 @@ public void onClick(View view) {
db.show_avoided_data();
db.show_done_data();
if (Helper.donedata.size() == 0) {
bottomsheetview.doneCount.setText("0");
bottomSheetManager.getBottomSheetView().doneCount.setText("0");
} else {
bottomsheetview.doneCount.setText(getDoneCount(Helper.habitsdata.get(position)[2]));
bottomSheetManager.getBottomSheetView().doneCount.setText(getDoneCount(Helper.habitsdata.get(position)[2]));
}
// holder.catagoryoftask.setText(String.valueOf(getCount(position)));

}

});
bottomsheetview.doneMinusButton.setOnClickListener(new View.OnClickListener() {
bottomSheetManager.setDoneMinusButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
db.show_done_data();
Expand Down Expand Up @@ -284,14 +263,14 @@ public void onClick(View view) {
db.show_avoided_data();
db.show_done_data();
if (Helper.donedata.size() == 0) {
bottomsheetview.doneCount.setText("0");
bottomSheetManager.getBottomSheetView().doneCount.setText("0");
} else {
bottomsheetview.doneCount.setText(getDoneCount(Helper.habitsdata.get(position)[2]));
bottomSheetManager.getBottomSheetView().doneCount.setText(getDoneCount(Helper.habitsdata.get(position)[2]));
}
// holder.catagoryoftask.setText(String.valueOf(getCount(position)));
}
});
bottomsheetview.tvNotification.setOnClickListener(new View.OnClickListener() {
bottomSheetManager.setNotificationButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {

Expand Down Expand Up @@ -354,7 +333,7 @@ public void onClick(DialogInterface dialog, int which) {

// Update tvNotification with selected time and frequency
String notificationText = String.format("Time: %02d:%02d, Frequency: %s", hourOfDay, minute, frequency);
bottomsheetview.tvNotification.setText(notificationText);
bottomSheetManager.getBottomSheetView().tvNotification.setText(notificationText);

// Schedule notification based on selected time and frequency
scheduleNotification(Integer.parseInt(Helper.habitsdata.get(position)[0]), calendar, frequency);
Expand Down
62 changes: 21 additions & 41 deletions app/src/main/java/rocks/poopjournal/todont/Adapters/DoneLogAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import rocks.poopjournal.todont.NotificationReceiver;
import rocks.poopjournal.todont.R;
import rocks.poopjournal.todont.databinding.UpdateLayoutBottomSheetTestBinding;
import rocks.poopjournal.todont.utils.CommonBottomSheetManager;


public class DoneLogAdapter extends RecyclerView.Adapter<DoneLogAdapter.RecyclerViewHolder> {
Expand Down Expand Up @@ -78,32 +79,11 @@ public void onBindViewHolder(@NonNull RecyclerViewHolder holder, final int posit
holder.task.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
final BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(con, R.style.BottomSheetDialogTheme);
final UpdateLayoutBottomSheetTestBinding bottomsheetview = UpdateLayoutBottomSheetTestBinding.inflate(LayoutInflater.from(con));

// if (Helper.labels_array.size() == 0) {
// txt.setVisibility(View.VISIBLE);
// } else {
// txt.setVisibility(View.INVISIBLE);
// }

bottomsheetview.titleText.setText(dTask);
bottomsheetview.details.setText(Helper.habitsdata.get(position)[3]);
bottomSheetDialog.setContentView(bottomsheetview.getRoot());
bottomSheetDialog.show();
db.show_avoided_data();
db.show_done_data();
if (Helper.avoidedData.size() == 0) {
bottomsheetview.avoidedCount.setText("0");
} else {
bottomsheetview.avoidedCount.setText(getAvoidedCount(Helper.habitsdata.get(position)[2]));
}
if (Helper.donedata.size() == 0) {
bottomsheetview.doneCount.setText("0");
} else {
bottomsheetview.doneCount.setText(getDoneCount(Helper.habitsdata.get(position)[2]));
}
bottomsheetview.avoidedPlusButton.setOnClickListener(new View.OnClickListener() {

CommonBottomSheetManager bottomSheetManager =
new CommonBottomSheetManager(con, dTask, date, position);

bottomSheetManager.setAvoidedPlusButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
db.show_avoided_data();
Expand Down Expand Up @@ -147,15 +127,15 @@ public void onClick(View view) {
db.show_avoided_data();
db.show_done_data();
if (Helper.avoidedData.size() == 0) {
bottomsheetview.avoidedCount.setText("0");
bottomSheetManager.getBottomSheetView() .avoidedCount.setText("0");
} else {
bottomsheetview.avoidedCount.setText(getAvoidedCount(Helper.habitsdata.get(position)[2]));
bottomSheetManager.getBottomSheetView() .avoidedCount.setText(getAvoidedCount(Helper.habitsdata.get(position)[2]));
}
//holder.catagoryoftask.setText(String.valueOf(getCount(position)));
}
});

bottomsheetview.avoidedMinusButton.setOnClickListener(new View.OnClickListener() {
bottomSheetManager.setAvoidedMinusButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {

Expand Down Expand Up @@ -196,14 +176,14 @@ public void onClick(View view) {
db.show_avoided_data();
db.show_done_data();
if (Helper.avoidedData.size() == 0) {
bottomsheetview.avoidedCount.setText("0");
bottomSheetManager.getBottomSheetView() .avoidedCount.setText("0");
} else {
bottomsheetview.avoidedCount.setText(getAvoidedCount(Helper.habitsdata.get(position)[2]));
bottomSheetManager.getBottomSheetView() .avoidedCount.setText(getAvoidedCount(Helper.habitsdata.get(position)[2]));
}
//holder.catagoryoftask.setText(String.valueOf(getCount(position)));
}
});
bottomsheetview.donePlusButton.setOnClickListener(new View.OnClickListener() {
bottomSheetManager.setDonePlusButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
db.show_done_data();
Expand Down Expand Up @@ -239,16 +219,16 @@ public void onClick(View view) {
db.show_avoided_data();
db.show_done_data();
if (Helper.donedata.size() == 0) {
bottomsheetview.doneCount.setText("0");
bottomSheetManager.getBottomSheetView() .doneCount.setText("0");
} else {
bottomsheetview.doneCount.setText(getDoneCount(Helper.habitsdata.get(position)[2]));
bottomSheetManager.getBottomSheetView() .doneCount.setText(getDoneCount(Helper.habitsdata.get(position)[2]));
}
// holder.catagoryoftask.setText(String.valueOf(getCount(position)));
// holder.catagoryoftask.setText(String.valueOf(getCount(position)));

}

});
bottomsheetview.doneMinusButton.setOnClickListener(new View.OnClickListener() {
bottomSheetManager.setDoneMinusButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
db.show_done_data();
Expand Down Expand Up @@ -282,14 +262,14 @@ public void onClick(View view) {
db.show_avoided_data();
db.show_done_data();
if (Helper.donedata.size() == 0) {
bottomsheetview.doneCount.setText("0");
bottomSheetManager.getBottomSheetView() .doneCount.setText("0");
} else {
bottomsheetview.doneCount.setText(getDoneCount(Helper.habitsdata.get(position)[2]));
bottomSheetManager.getBottomSheetView() .doneCount.setText(getDoneCount(Helper.habitsdata.get(position)[2]));
}
// holder.catagoryoftask.setText(String.valueOf(getCount(position)));
// holder.catagoryoftask.setText(String.valueOf(getCount(position)));
}
});
bottomsheetview.tvNotification.setOnClickListener(new View.OnClickListener() {
bottomSheetManager.setNotificationButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {

Expand Down Expand Up @@ -352,7 +332,7 @@ public void onClick(DialogInterface dialog, int which) {

// Update tvNotification with selected time and frequency
String notificationText = String.format("Time: %02d:%02d, Frequency: %s", hourOfDay, minute, frequency);
bottomsheetview.tvNotification.setText(notificationText);
bottomSheetManager.getBottomSheetView() .tvNotification.setText(notificationText);

// Schedule notification based on selected time and frequency
scheduleNotification(Integer.parseInt(Helper.habitsdata.get(position)[0]), calendar, frequency);
Expand Down
Loading

0 comments on commit b689c31

Please sign in to comment.