Yes, this is solved. Samsung makes rugged IP68 phones with user swappable batteries that are thinner than an iPhone 17 Pro when factoring the camera bump [1].

It's kind of comical how accurate this comment is https://news.ycombinator.com/item?id=48807174

[1] https://www.gsmarena.com/samsung_galaxy_xcover7-12784.php