wrote:
Lifesum has both, I think. Fats, carbs, protein + water is free. I would also try out madfit. It tracks differently from most apps. It is categorized into "how many vegetables you should eat in a day, how many fruits, carbs, proteins and fats + water."
Both cost money tho for some functions.
Both has a calorie tracker too.