Skip to content

Commit

Permalink
Update MainActivity.java
Browse files Browse the repository at this point in the history
  • Loading branch information
siyeonkm authored Sep 20, 2020
1 parent 1dcc9ec commit 278a290
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion app/src/main/java/com/appsolute/todolist/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ public class MainActivity extends AppCompatActivity {
ImageButton btnHelp;
ConstraintLayout layoutBackground;
TextView tvDate;
ImageView heart;
TextView prgper;

DDayFragment d_dayFrag;
ToDoFragment todoFrag;
Expand Down Expand Up @@ -117,6 +119,10 @@ public void onClick(View view) {
});

isDDay = false;

heart = binding.heart;
prgper = binding.percent;
prgbar = binding.loveprg;

btnDDay = binding.btnDDay;
btnDDay.setOnClickListener(new View.OnClickListener(){
Expand All @@ -126,6 +132,9 @@ public void onClick(View view) {
currFrag = 1;
setFragment(currFrag);
btnDDay.setText("To To Do List");
prgbar.setVisibility(View.INVISIBLE);
heart.setVisibility(View.INVISIBLE);
prgper.setVisibility(View.INVISIBLE);
if(isOasis) {
btnOasis.setText("To Oasis");
tvDate.setTextColor(getResources().getColor(R.color.blackText));
Expand All @@ -141,6 +150,9 @@ public void onClick(View view) {
currFrag = 0;
setFragment(currFrag);
btnDDay.setText(getDdayfromDB());
prgbar.setVisibility(View.VISIBLE);
heart.setVisibility(View.VISIBLE);
prgper.setVisibility(View.VISIBLE);
if(isOasis) {
btnOasis.setText("To Oasis");
tvDate.setTextColor(getResources().getColor(R.color.blackText));
Expand Down Expand Up @@ -201,6 +213,9 @@ public void onClick(View view) {
layoutBackground.setBackground(ContextCompat.getDrawable(mcontext, R.drawable.dday_background));
btnToOasis2.setVisibility(View.GONE);
btnToOasis1.setVisibility(View.GONE);
prgbar.setVisibility(View.VISIBLE);
heart.setVisibility(View.VISIBLE);
prgper.setVisibility(View.VISIBLE);
tvDate.setTextColor(getResources().getColor(R.color.blackText));
btnDDay.setText(getDdayfromDB());
currFrag = 0;
Expand Down Expand Up @@ -604,4 +619,4 @@ public void isNextWeek(){

}

}
}

0 comments on commit 278a290

Please sign in to comment.