Merge branch 'develop' into 'feat/settings-page'

# Conflicts:
#   app/src/main/java/com/example/bondoman/fragments/SettingsFragment.kt
#   app/src/main/res/layout/activity_main.xml
#   app/src/main/res/layout/fragment_settings.xml
#   app/src/main/res/navigation/nav_graph.xml
#   app/src/main/res/values/themes.xml