Yeah but the S7 doesn't have a swappable battery.

I pretty much never charge my S4 these days. I have an external battery charger at home, a charger at work, and 3 batteries. It takes about 30 seconds to swap in a new one and then my phone is at full power instantly.