Merge branch 'fix-code-integrery' into custom_loading_indicator_screen

# Conflicts:
#	.vscode/settings.json

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
-    "dart.lineLength": 80, // most used
-    "files.eol": "\r\n" // This makes sure, that the EOL (End of Line seperator) is always \r\n (CRLF) and not \n (LF) to avoid git difs errors
+    "dart.lineLength": 80,
+    "files.eol": "auto",
+    "prettier.endOfLine": "auto"
 }