Update dependency & fix merge conflicts

mobile/apps/locker/pubspec.lock

@@ -210,7 +210,7 @@ packages:
     source: hosted
     version: "3.1.0"
   email_validator:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: email_validator
       sha256: b19aa5d92fdd76fbc65112060c94d45ba855105a28bb6e462de7ff03b12fa1fb
@@ -312,7 +312,7 @@ packages:
     source: hosted
     version: "2.0.1"
   expandable:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: expandable
       sha256: "9604d612d4d1146dafa96c6d8eec9c2ff0994658d6d09fed720ab788c7f5afc2"
@@ -645,7 +645,7 @@ packages:
     source: hosted
     version: "4.5.4"
   intl:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: intl
       sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
@@ -1490,7 +1490,7 @@ packages:
     source: hosted
     version: "1.1.5"
   window_manager:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: window_manager
       sha256: "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd"

mobile/apps/locker/pubspec.yaml

@@ -10,7 +10,10 @@ dependencies:
   adaptive_theme: ^3.6.0
   bip39: ^1.0.6
   collection: ^1.18.0
+  crypto: ^3.0.6
   dio: ^5.8.0+1 
+  dotted_border: ^3.1.0
+  email_validator: ^3.0.0
   ente_accounts:
     path: ../../packages/accounts
   ente_base:
@@ -37,6 +40,7 @@ dependencies:
   ente_utils:
     path: ../../packages/utils
   event_bus: ^2.0.1 
+  expandable: ^5.0.1
   fast_base58: ^0.2.1
   file_picker: ^10.2.0
   flutter:
@@ -48,6 +52,7 @@ dependencies:
       ref: 1ac346a04592a05fd75acccf2e01fa3c7e955d96
   flutter_localizations:
     sdk: flutter 
+  intl: ^0.20.2
   io: ^1.0.5
   listen_sharing_intent: ^1.9.2
   logging: ^1.3.0
@@ -61,6 +66,7 @@ dependencies:
   tuple: ^2.0.2
   url_launcher: ^6.3.2
   uuid: ^4.5.1 
+  window_manager: ^0.5.1
 
 dev_dependencies:
   flutter_launcher_icons: ^0.14.3