Keep counting habits after completion

There are habits like “drink x glasses of water”. Reaching that goal is only one reason to use a habit tracker. I also want to collect data if or when I exceeded the planned (minimum) amount.

The only option is having a pop-up after completion but that forces me to edit a number over and over.

The button only should show that I met the minimum amount but it should act different and there is no reason to reset it when pressed again after completion (that should be a context menu option).