Correct electrical diagram and component advice

Job ID: 33005861

Budget: €8 – €30 EUR

I need some advice on the electrical diagram and selection of components.

Goal:
- Be able to safely charge the 18650 (or different 1 cell LIPO) battery when an arduino is still being connected (the load). Secondary goal is to read the battery voltage level.

Challenge:
From reading several blogs I've understood that the Arduino (the load) may not be connected during charging. A solution suggested could be to disconnect the battery when charging and use the power of the charger directly and still be able to use the Arduino.

Tasks:
- Check electrical diagram for correctness.
-- Is this the right solution? Are there any diodes or resistors missing? (Check P Channel mosfet but also the voltage level divider)
-- Are the drawn connections all correct?
- Check the diagram for safety. Is there any risk when charging or using the arduino like this?
- What values for the voltage divider should be used?
- Regarding the MOSFET (and possibly additional) which components of the website https://conrad.nl can be used? Note: A small component such as a SOP, SOT or TO is fine but I prefer no QFN parts as they are a bit hard to solder with hand.

(Bonus)
Expand the diagram to have a solution for knowing if the charger is connected. By using a secondary input pin.