diff --git a/recipients_app/.tool-versions b/recipients_app/.tool-versions
index f6e159696..8645ab6c6 100644
--- a/recipients_app/.tool-versions
+++ b/recipients_app/.tool-versions
@@ -1 +1 @@
-flutter 3.19.6
+flutter 3.22.3
diff --git a/recipients_app/README.md b/recipients_app/README.md
index 78ae1f0f2..8a5a0e8d5 100644
--- a/recipients_app/README.md
+++ b/recipients_app/README.md
@@ -5,7 +5,7 @@ Mobile App for Recipients of a Social Income.
## Tools needed for building the app on an Apple Silicon Mac
- [Homebrew](https://brew.sh/de/)
-- Flutter 3.19.6, Dart 3.3.4
+- Flutter (Version see file .tool-versions)
- Java JDK 17
- Android Studio LadyBug or later
- Latest vsCode
@@ -39,9 +39,9 @@ Mobile App for Recipients of a Social Income.
- Restart your terminal so that these changes take effect
- Install Flutter
- Tell Flutter to use our Java 17 JDK and not the one bundle with
- Android Studio via `flutter config --jdk-dir $JAVA_HOME`. Otherwise,
- you will get the error "Unsupported class file major version 65”
- when building the app for Android.
+ Android Studio via `flutter config --jdk-dir "$JAVA_HOME"`.
+ Otherwise, you will get the error "Unsupported class file major
+ version 65” when building the app for Android.
- Restart your terminal and IDE so that these changes take effect
- Install vsCode
- Install Flutter extension
@@ -49,6 +49,8 @@ Mobile App for Recipients of a Social Income.
- Set is as default via `sudo xcode-select -s Xcode.app`
- To agree to the Xcode license from the command line, you can use the
following command: `sudo xcodebuild -license accept`
+- Install CocoaPods
+ - Install via Homebrew `brew install cocoapods`
## Optionally: Use the version manager [asdf](https://asdf-vm.com/)
@@ -153,10 +155,6 @@ locations as well:
- If you use 'asdf' run the comman `asdf local flutter x.y.z` #Replace
x.y.z with the new Flutter version.
- Otherwise just update the version number in the file
-- Adjust variable 'REQUIRED_VERSION' in 'clean_build.sh'
-- README.md
- - Find all places in the README.md which mentions the Flutter version
- number
## Testing
diff --git a/recipients_app/clean_build.sh b/recipients_app/clean_build.sh
index 6afeee605..2134d69f9 100755
--- a/recipients_app/clean_build.sh
+++ b/recipients_app/clean_build.sh
@@ -12,11 +12,14 @@ fi
# Verify Flutter version
echo "Verify Flutter version..."
-REQUIRED_VERSION="3.19.6"
+REQUIRED_VERSION=$(grep flutter .tool-versions | awk '{print $2}')
CURRENT_VERSION=$(flutter --version | head -n 1 | awk '{print $2}')
if [ "$CURRENT_VERSION" != "$REQUIRED_VERSION" ]; then
echo "Error: Flutter version $REQUIRED_VERSION is required (current: $CURRENT_VERSION)"
exit 1
+else
+ echo "Required version: $REQUIRED_VERSION == Current version: $CURRENT_VERSION"
+ echo "Flutter version is correct"
fi
echo "Cleaning Flutter build..."
@@ -31,4 +34,4 @@ dart run build_runner build --delete-conflicting-outputs
echo "Generating localizations..."
flutter gen-l10n
-echo "Build completed successfully!"
\ No newline at end of file
+echo "Build completed successfully!"
diff --git a/recipients_app/ios/Podfile b/recipients_app/ios/Podfile
index b14f062ad..95a28aa4c 100644
--- a/recipients_app/ios/Podfile
+++ b/recipients_app/ios/Podfile
@@ -30,7 +30,7 @@ flutter_ios_podfile_setup
target 'Runner' do
use_frameworks!
use_modular_headers!
- pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.24.0'
+ pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.25.0'
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
end
diff --git a/recipients_app/ios/Podfile.lock b/recipients_app/ios/Podfile.lock
index 1d15fb4b3..ba6dd0339 100644
--- a/recipients_app/ios/Podfile.lock
+++ b/recipients_app/ios/Podfile.lock
@@ -1,69 +1,70 @@
PODS:
- - AppCheckCore (10.19.0):
+ - AppCheckCore (10.19.2):
- GoogleUtilities/Environment (~> 7.13)
- GoogleUtilities/UserDefaults (~> 7.13)
- PromisesObjC (~> 2.3)
- - cloud_firestore (4.17.2):
- - Firebase/Firestore (= 10.24.0)
+ - cloud_firestore (4.17.5):
+ - Firebase/Firestore (= 10.25.0)
- firebase_core
- Flutter
- - Firebase/Auth (10.24.0):
+ - Firebase/Auth (10.25.0):
- Firebase/CoreOnly
- - FirebaseAuth (~> 10.24.0)
- - Firebase/CoreOnly (10.24.0):
- - FirebaseCore (= 10.24.0)
- - Firebase/Firestore (10.24.0):
+ - FirebaseAuth (~> 10.25.0)
+ - Firebase/CoreOnly (10.25.0):
+ - FirebaseCore (= 10.25.0)
+ - Firebase/Firestore (10.25.0):
- Firebase/CoreOnly
- - FirebaseFirestore (~> 10.24.0)
- - Firebase/Messaging (10.24.0):
+ - FirebaseFirestore (~> 10.25.0)
+ - Firebase/Messaging (10.25.0):
- Firebase/CoreOnly
- - FirebaseMessaging (~> 10.24.0)
- - firebase_app_check (0.2.2-4):
- - Firebase/CoreOnly (~> 10.24.0)
+ - FirebaseMessaging (~> 10.25.0)
+ - firebase_app_check (0.2.2-7):
+ - Firebase/CoreOnly (~> 10.25.0)
- firebase_core
- - FirebaseAppCheck (~> 10.24.0-beta)
+ - FirebaseAppCheck (~> 10.25.0-beta)
- Flutter
- - firebase_auth (4.19.4):
- - Firebase/Auth (= 10.24.0)
+ - firebase_auth (4.20.0):
+ - Firebase/Auth (= 10.25.0)
- firebase_core
- Flutter
- - firebase_core (2.30.1):
- - Firebase/CoreOnly (= 10.24.0)
+ - firebase_core (2.32.0):
+ - Firebase/CoreOnly (= 10.25.0)
- Flutter
- - firebase_messaging (14.9.1):
- - Firebase/Messaging (= 10.24.0)
+ - firebase_messaging (14.9.4):
+ - Firebase/Messaging (= 10.25.0)
- firebase_core
- Flutter
- - FirebaseAppCheck (10.24.0):
- - AppCheckCore (~> 10.18)
+ - FirebaseAppCheck (10.25.0):
+ - AppCheckCore (~> 10.19)
- FirebaseAppCheckInterop (~> 10.17)
- FirebaseCore (~> 10.0)
- - GoogleUtilities/Environment (~> 7.8)
+ - GoogleUtilities/Environment (~> 7.13)
+ - GoogleUtilities/UserDefaults (~> 7.13)
- PromisesObjC (~> 2.1)
- - FirebaseAppCheckInterop (10.24.0)
- - FirebaseAuth (10.24.0):
+ - FirebaseAppCheckInterop (10.29.0)
+ - FirebaseAuth (10.25.0):
- FirebaseAppCheckInterop (~> 10.17)
- FirebaseCore (~> 10.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.8)
- GoogleUtilities/Environment (~> 7.8)
- GTMSessionFetcher/Core (< 4.0, >= 2.1)
- RecaptchaInterop (~> 100.0)
- - FirebaseCore (10.24.0):
+ - FirebaseCore (10.25.0):
- FirebaseCoreInternal (~> 10.0)
- GoogleUtilities/Environment (~> 7.12)
- GoogleUtilities/Logger (~> 7.12)
- - FirebaseCoreExtension (10.24.0):
+ - FirebaseCoreExtension (10.25.0):
- FirebaseCore (~> 10.0)
- - FirebaseCoreInternal (10.24.0):
+ - FirebaseCoreInternal (10.29.0):
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- - FirebaseFirestore (10.24.0):
- - FirebaseFirestoreBinary (= 10.24.0)
+ - FirebaseFirestore (10.25.0):
+ - FirebaseFirestoreBinary (= 10.25.0)
- FirebaseFirestoreAbseilBinary (1.2024011601.0)
- - FirebaseFirestoreBinary (10.24.0):
- - FirebaseCore (= 10.24.0)
- - FirebaseCoreExtension (= 10.24.0)
- - FirebaseFirestoreInternalBinary (= 10.24.0)
- - FirebaseSharedSwift (= 10.24.0)
+ - FirebaseFirestoreBinary (10.25.0):
+ - FirebaseCore (= 10.25.0)
+ - FirebaseCoreExtension (= 10.25.0)
+ - FirebaseFirestoreInternalBinary (= 10.25.0)
+ - FirebaseSharedSwift (= 10.25.0)
- FirebaseFirestoreGRPCBoringSSLBinary (1.62.1)
- FirebaseFirestoreGRPCCoreBinary (1.62.1):
- FirebaseFirestoreAbseilBinary (= 1.2024011601.0)
@@ -71,18 +72,18 @@ PODS:
- FirebaseFirestoreGRPCCPPBinary (1.62.1):
- FirebaseFirestoreAbseilBinary (= 1.2024011601.0)
- FirebaseFirestoreGRPCCoreBinary (= 1.62.1)
- - FirebaseFirestoreInternalBinary (10.24.0):
- - FirebaseCore (= 10.24.0)
+ - FirebaseFirestoreInternalBinary (10.25.0):
+ - FirebaseCore (= 10.25.0)
- FirebaseFirestoreAbseilBinary (= 1.2024011601.0)
- FirebaseFirestoreGRPCCPPBinary (= 1.62.1)
- leveldb-library (~> 1.22)
- nanopb (< 2.30911.0, >= 2.30908.0)
- - FirebaseInstallations (10.27.0):
+ - FirebaseInstallations (10.29.0):
- FirebaseCore (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
- PromisesObjC (~> 2.1)
- - FirebaseMessaging (10.24.0):
+ - FirebaseMessaging (10.25.0):
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- GoogleDataTransport (~> 9.3)
@@ -91,7 +92,7 @@ PODS:
- GoogleUtilities/Reachability (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
- nanopb (< 2.30911.0, >= 2.30908.0)
- - FirebaseSharedSwift (10.24.0)
+ - FirebaseSharedSwift (10.25.0)
- Flutter (1.0.0)
- flutter_native_splash (0.0.1):
- Flutter
@@ -99,36 +100,33 @@ PODS:
- GoogleUtilities/Environment (~> 7.7)
- nanopb (< 2.30911.0, >= 2.30908.0)
- PromisesObjC (< 3.0, >= 1.2)
- - GoogleUtilities/AppDelegateSwizzler (7.13.0):
+ - GoogleUtilities/AppDelegateSwizzler (7.13.3):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Privacy
- - GoogleUtilities/Environment (7.13.0):
+ - GoogleUtilities/Environment (7.13.3):
- GoogleUtilities/Privacy
- PromisesObjC (< 3.0, >= 1.2)
- - GoogleUtilities/Logger (7.13.0):
+ - GoogleUtilities/Logger (7.13.3):
- GoogleUtilities/Environment
- GoogleUtilities/Privacy
- - GoogleUtilities/Network (7.13.0):
+ - GoogleUtilities/Network (7.13.3):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Privacy
- GoogleUtilities/Reachability
- - "GoogleUtilities/NSData+zlib (7.13.0)":
+ - "GoogleUtilities/NSData+zlib (7.13.3)":
- GoogleUtilities/Privacy
- - GoogleUtilities/Privacy (7.13.0)
- - GoogleUtilities/Reachability (7.13.0):
+ - GoogleUtilities/Privacy (7.13.3)
+ - GoogleUtilities/Reachability (7.13.3):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- - GoogleUtilities/UserDefaults (7.13.0):
+ - GoogleUtilities/UserDefaults (7.13.3):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- - GTMSessionFetcher/Core (3.4.1)
- - leveldb-library (1.22.5)
- - libphonenumber_plugin (0.0.1):
- - Flutter
- - PhoneNumberKit
+ - GTMSessionFetcher/Core (3.5.0)
+ - leveldb-library (1.22.6)
- nanopb (2.30910.0):
- nanopb/decode (= 2.30910.0)
- nanopb/encode (= 2.30910.0)
@@ -136,19 +134,13 @@ PODS:
- nanopb/encode (2.30910.0)
- package_info_plus (0.4.5):
- Flutter
- - PhoneNumberKit (3.7.10):
- - PhoneNumberKit/PhoneNumberKitCore (= 3.7.10)
- - PhoneNumberKit/UIKit (= 3.7.10)
- - PhoneNumberKit/PhoneNumberKitCore (3.7.10)
- - PhoneNumberKit/UIKit (3.7.10):
- - PhoneNumberKit/PhoneNumberKitCore
- PromisesObjC (2.4.0)
- RecaptchaInterop (100.0.0)
- - Sentry/HybridSDK (8.25.2)
- - sentry_flutter (8.2.0):
+ - Sentry/HybridSDK (8.40.1)
+ - sentry_flutter (8.10.1):
- Flutter
- FlutterMacOS
- - Sentry/HybridSDK (= 8.25.2)
+ - Sentry/HybridSDK (= 8.40.1)
- url_launcher_ios (0.0.1):
- Flutter
- webview_flutter_wkwebview (0.0.1):
@@ -160,10 +152,9 @@ DEPENDENCIES:
- firebase_auth (from `.symlinks/plugins/firebase_auth/ios`)
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
- firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
- - FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `10.24.0`)
+ - FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `10.25.0`)
- Flutter (from `Flutter`)
- flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
- - libphonenumber_plugin (from `.symlinks/plugins/libphonenumber_plugin/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@@ -193,7 +184,6 @@ SPEC REPOS:
- GTMSessionFetcher
- leveldb-library
- nanopb
- - PhoneNumberKit
- PromisesObjC
- RecaptchaInterop
- Sentry
@@ -211,13 +201,11 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/firebase_messaging/ios"
FirebaseFirestore:
:git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
- :tag: 10.24.0
+ :tag: 10.25.0
Flutter:
:path: Flutter
flutter_native_splash:
:path: ".symlinks/plugins/flutter_native_splash/ios"
- libphonenumber_plugin:
- :path: ".symlinks/plugins/libphonenumber_plugin/ios"
package_info_plus:
:path: ".symlinks/plugins/package_info_plus/ios"
sentry_flutter:
@@ -230,49 +218,47 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS:
FirebaseFirestore:
:git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
- :tag: 10.24.0
+ :tag: 10.25.0
SPEC CHECKSUMS:
- AppCheckCore: 58dbd968d93b7c56650c28a1ac404d7a54307c0e
- cloud_firestore: a291c7ca0e498f9b08bbabd47a2499a5ae02c152
- Firebase: 91fefd38712feb9186ea8996af6cbdef41473442
- firebase_app_check: 58bedde8d2f46e4ab206cec53511a748658833a2
- firebase_auth: b782567cafd5cfd64debf54638a9f29b63abd7bf
- firebase_core: 7f1e1156934d0da3be260174812842df9420e4ab
- firebase_messaging: 28b49260e70d10042fa2bea79f37e1edae48f1bd
- FirebaseAppCheck: afb42367002c12bbb5f58c4a954ecd2f0a171182
- FirebaseAppCheckInterop: fecc08c89936c8acb1428d8088313aabedb348e4
- FirebaseAuth: 711d01cccefaf10035b3090a92956d0dd4f99088
- FirebaseCore: 11dc8a16dfb7c5e3c3f45ba0e191a33ac4f50894
- FirebaseCoreExtension: af5fd85e817ea9d19f9a2659a376cf9cf99f03c0
- FirebaseCoreInternal: bcb5acffd4ea05e12a783ecf835f2210ce3dc6af
- FirebaseFirestore: 455ba4bf3f0e1da88f77aaa76dc506d920396346
+ AppCheckCore: 9feb4300caa596a36416cde10674dc5bec1e022e
+ cloud_firestore: 003d53b6b8b392600b7769acf9421cc4f23e5911
+ Firebase: 0312a2352584f782ea56f66d91606891d4607f06
+ firebase_app_check: 717089a2df93747620263dd6c8e444bde5699b7e
+ firebase_auth: 5719ddc9f654b813405899480e84971bd8e61235
+ firebase_core: a626d00494efa398e7c54f25f1454a64c8abf197
+ firebase_messaging: 06391e8f35dc65a00c56580266285263d2861f10
+ FirebaseAppCheck: 148fa858b8070710c8f83d3f545b5f1e85d104a4
+ FirebaseAppCheckInterop: 6a1757cfd4067d8e00fccd14fcc1b8fd78cfac07
+ FirebaseAuth: c0f93dcc570c9da2bffb576969d793e95c344fbb
+ FirebaseCore: 7ec4d0484817f12c3373955bc87762d96842d483
+ FirebaseCoreExtension: 8a47811d0b155501559ef05d089518152a0a1677
+ FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
+ FirebaseFirestore: d30223cc084fb1ea2d7aee742eea5392beaf3edd
FirebaseFirestoreAbseilBinary: bd0451946879e0e01327c8efc35896bb273009c4
- FirebaseFirestoreBinary: 7eccf62d9204bd1b8915bf4f30406f6b13a5f01a
+ FirebaseFirestoreBinary: bfcacce21af5109ab56bef3d41b4235b98b22861
FirebaseFirestoreGRPCBoringSSLBinary: c3007e61593e4583ec3bb8b34ce654663663b690
FirebaseFirestoreGRPCCoreBinary: 1243fc6604a52912694635f891916976924931ed
FirebaseFirestoreGRPCCPPBinary: e447b3a7c060c0abfc4e2c9f6fb53bf7635ded66
- FirebaseFirestoreInternalBinary: 264bc7678c6df6581477b139a216f6b3340efb64
- FirebaseInstallations: 766dabca09fd94aef922538aaf144cc4a6fb6869
- FirebaseMessaging: 4d52717dd820707cc4eadec5eb981b4832ec8d5d
- FirebaseSharedSwift: 76e1529c32101d80e4f1ca2fba7c39d59f0a390a
+ FirebaseFirestoreInternalBinary: 64bdfce9f9f44f131e47694b6287fce0f6f26019
+ FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
+ FirebaseMessaging: 88950ba9485052891ebe26f6c43a52bb62248952
+ FirebaseSharedSwift: 0274086954b1b2d5fd7e829eccc587044d72a4ba
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
- GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152
- GTMSessionFetcher: 8000756fc1c19d2e5697b90311f7832d2e33f6cd
- leveldb-library: e8eadf9008a61f9e1dde3978c086d2b6d9b9dc28
- libphonenumber_plugin: 48bf4078546377eedaab4aa54978cd0f6fa23072
+ GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
+ GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
+ leveldb-library: cc8b8f8e013647a295ad3f8cd2ddf49a6f19be19
nanopb: 438bc412db1928dac798aa6fd75726007be04262
- package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
- PhoneNumberKit: 3d9a20cfe8ee68f35c2a3ae9474093133f72a8a1
+ package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21
- Sentry: 51b056d96914a741f63eca774d118678b1eb05a1
- sentry_flutter: e8397d13e297a5d4b6be8a752e33140b21c5cc97
+ Sentry: e9215d7b17f7902692b4f8700e061e4f853e3521
+ sentry_flutter: 927eed60d66951d1b0f1db37fe94ff5cb7c80231
url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36
-PODFILE CHECKSUM: 61a1e298345136f87e92ae0a59c7ea2a430a8f66
+PODFILE CHECKSUM: f727177ee8bd2fa0ad40e98c3b4299dfade495ac
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/recipients_app/lib/kri_intl.dart b/recipients_app/lib/kri_intl.dart
index c31811f19..6f8322fbd 100644
--- a/recipients_app/lib/kri_intl.dart
+++ b/recipients_app/lib/kri_intl.dart
@@ -413,8 +413,7 @@ class KriCupertinoLocalizations extends GlobalCupertinoLocalizations {
required super.singleDigitSecondFormat,
});
- static const LocalizationsDelegate delegate =
- _KriCupertinoLocalizationsDelegate();
+ static const LocalizationsDelegate delegate = _KriCupertinoLocalizationsDelegate();
@override
String datePickerYear(int yearIndex) => yearIndex.toString();
@@ -459,8 +458,7 @@ class KriCupertinoLocalizations extends GlobalCupertinoLocalizations {
DatePickerDateOrder get datePickerDateOrder => DatePickerDateOrder.mdy;
@override
- DatePickerDateTimeOrder get datePickerDateTimeOrder =>
- DatePickerDateTimeOrder.date_time_dayPeriod;
+ DatePickerDateTimeOrder get datePickerDateTimeOrder => DatePickerDateTimeOrder.date_time_dayPeriod;
@override
String get anteMeridiemAbbreviation => "AM";
@@ -664,8 +662,7 @@ class KriMaterialLocalizations extends GlobalMaterialLocalizations {
required super.twoDigitZeroPaddedFormat,
});
- static const LocalizationsDelegate delegate =
- _KriMaterialLocalizationsDelegate();
+ static const LocalizationsDelegate delegate = _KriMaterialLocalizationsDelegate();
// #docregion Getters
@override
@@ -1134,4 +1131,10 @@ class KriMaterialLocalizations extends GlobalMaterialLocalizations {
@override
String get shareButtonLabel => "Share...";
+
+ @override
+ String get clearButtonTooltip => "Clear text";
+
+ @override
+ String get selectedDateLabel => "Selected";
}
diff --git a/recipients_app/lib/ui/buttons/button_outlined_big.dart b/recipients_app/lib/ui/buttons/button_outlined_big.dart
index eb996815c..3b44b891c 100644
--- a/recipients_app/lib/ui/buttons/button_outlined_big.dart
+++ b/recipients_app/lib/ui/buttons/button_outlined_big.dart
@@ -21,8 +21,8 @@ class ButtonOutlinedBig extends StatelessWidget {
height: _buttonHeight,
child: OutlinedButton(
style: Theme.of(context).outlinedButtonTheme.style?.copyWith(
- backgroundColor: MaterialStateProperty.all(Colors.white),
- side: MaterialStateProperty.all(
+ backgroundColor: WidgetStateProperty.all(Colors.white),
+ side: WidgetStateProperty.all(
const BorderSide(
color: AppColors.primaryColor,
width: 2,
diff --git a/recipients_app/lib/ui/buttons/button_small.dart b/recipients_app/lib/ui/buttons/button_small.dart
index fa105067d..bad171e01 100644
--- a/recipients_app/lib/ui/buttons/button_small.dart
+++ b/recipients_app/lib/ui/buttons/button_small.dart
@@ -30,10 +30,9 @@ class ButtonSmall extends StatelessWidget {
height: 26,
child: ElevatedButton(
style: Theme.of(context).elevatedButtonTheme.style?.copyWith(
- backgroundColor:
- MaterialStateProperty.all(Colors.transparent),
- foregroundColor: MaterialStateProperty.all(color),
- shape: MaterialStateProperty.all(
+ backgroundColor: WidgetStateProperty.all(Colors.transparent),
+ foregroundColor: WidgetStateProperty.all(color),
+ shape: WidgetStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppSizes.radiusLarge),
side: BorderSide(
@@ -56,9 +55,9 @@ class ButtonSmall extends StatelessWidget {
height: 26,
child: ElevatedButton(
style: Theme.of(context).elevatedButtonTheme.style?.copyWith(
- backgroundColor: MaterialStateProperty.all(color),
- foregroundColor: MaterialStateProperty.all(Colors.white),
- shape: MaterialStateProperty.all(
+ backgroundColor: WidgetStateProperty.all(color),
+ foregroundColor: WidgetStateProperty.all(Colors.white),
+ shape: WidgetStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppSizes.radiusLarge),
),
diff --git a/recipients_app/lib/ui/configs/app_theme.dart b/recipients_app/lib/ui/configs/app_theme.dart
index 07a996985..d4c3c7367 100644
--- a/recipients_app/lib/ui/configs/app_theme.dart
+++ b/recipients_app/lib/ui/configs/app_theme.dart
@@ -22,7 +22,6 @@ abstract class AppTheme {
primary: AppColors.primaryColor,
secondary: AppColors.primaryColor,
surface: AppColors.primaryLightColor,
- background: AppColors.backgroundColor,
error: AppColors.redColor,
onError: AppColors.fontColorDark,
),
diff --git a/recipients_app/pubspec.lock b/recipients_app/pubspec.lock
index 1c4cc802c..86bc6d8c5 100644
--- a/recipients_app/pubspec.lock
+++ b/recipients_app/pubspec.lock
@@ -13,10 +13,10 @@ packages:
dependency: transitive
description:
name: _flutterfire_internals
- sha256: "3dee3db3468c5f4640a4e8aa9c1e22561c298976d8c39ed2fdd456a9a3db26e1"
+ sha256: "37a42d06068e2fe3deddb2da079a8c4d105f241225ba27b7122b37e9865fd8f7"
url: "https://pub.dev"
source: hosted
- version: "1.3.32"
+ version: "1.3.35"
alchemist:
dependency: "direct dev"
description:
@@ -141,10 +141,10 @@ packages:
dependency: "direct dev"
description:
name: build_runner
- sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
+ sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7"
url: "https://pub.dev"
source: hosted
- version: "2.4.9"
+ version: "2.4.11"
build_runner_core:
dependency: transitive
description:
@@ -197,26 +197,26 @@ packages:
dependency: "direct main"
description:
name: cloud_firestore
- sha256: "58ea77912e355cfd4e49f858e01d5ab4f99c7181ebd545b3fbeae25d6677dff6"
+ sha256: a0f161b92610e078b4962d7e6ebeb66dc9cce0ada3514aeee442f68165d78185
url: "https://pub.dev"
source: hosted
- version: "4.17.2"
+ version: "4.17.5"
cloud_firestore_platform_interface:
dependency: transitive
description:
name: cloud_firestore_platform_interface
- sha256: "9cb7d350c08c3d4987d34f418037aca3882649cdad5158440b4b932232edcf82"
+ sha256: "6a55b319f8d33c307396b9104512e8130a61904528ab7bd8b5402678fca54b81"
url: "https://pub.dev"
source: hosted
- version: "6.2.2"
+ version: "6.2.5"
cloud_firestore_web:
dependency: transitive
description:
name: cloud_firestore_web
- sha256: "28db029962ebdcb8caf80f0c109f359ebcefa983b85fb62e5a220b1a577d84b5"
+ sha256: "89dfa1304d3da48b3039abbb2865e3d30896ef858e569a16804a99f4362283a9"
url: "https://pub.dev"
source: hosted
- version: "3.12.2"
+ version: "3.12.5"
code_builder:
dependency: transitive
description:
@@ -281,14 +281,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.4.1"
+ dlibphonenumber:
+ dependency: transitive
+ description:
+ name: dlibphonenumber
+ sha256: "9af890d44ad57ee84ebb7e5fb5d22ceae9bc12a89c70b5aca5076abdf76d3461"
+ url: "https://pub.dev"
+ source: hosted
+ version: "1.1.29"
equatable:
dependency: "direct main"
description:
name: equatable
- sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+ sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
url: "https://pub.dev"
source: hosted
- version: "2.0.5"
+ version: "2.0.7"
fake_async:
dependency: transitive
description:
@@ -317,58 +325,58 @@ packages:
dependency: "direct main"
description:
name: firebase_app_check
- sha256: e720b7512fc21bf5b6725a55e166298e4b081c2a0b0e8933a27b6bd03f874de9
+ sha256: aac3b42cdf804b10cb1085c9902e5d1ef2f30e7cfc0c504e6f47519713d86829
url: "https://pub.dev"
source: hosted
- version: "0.2.2+4"
+ version: "0.2.2+7"
firebase_app_check_platform_interface:
dependency: transitive
description:
name: firebase_app_check_platform_interface
- sha256: "846a82036d29225753495c189410117c940931e19ddcd062a4f46308c38d1a34"
+ sha256: d0b9e4676ee7a272160b989a9a899d6469e336fe3624b3935cdae77a476f00d1
url: "https://pub.dev"
source: hosted
- version: "0.1.0+26"
+ version: "0.1.0+29"
firebase_app_check_web:
dependency: transitive
description:
name: firebase_app_check_web
- sha256: dc2dfc85c5f78228f11f61215cde46b30ed14f847737963c38a103c394123e3f
+ sha256: f5359ba62111e4b28e5f1477b7c5c560dcfabe1ccc9e02e65ebdb428eda204ad
url: "https://pub.dev"
source: hosted
- version: "0.1.2+4"
+ version: "0.1.2+7"
firebase_auth:
dependency: "direct main"
description:
name: firebase_auth
- sha256: "63b4401c95ddb00fb272872c451147e33509e80eed43937369910ef6c34c00b7"
+ sha256: cfc2d970829202eca09e2896f0a5aa7c87302817ecc0bdfa954f026046bf10ba
url: "https://pub.dev"
source: hosted
- version: "4.19.4"
+ version: "4.20.0"
firebase_auth_platform_interface:
dependency: transitive
description:
name: firebase_auth_platform_interface
- sha256: "4e204f9ef43d83ac9e7a324a9317e4dd2a1ddda2aa72b67bc6cc364f0b8492dc"
+ sha256: a0270e1db3b2098a14cb2a2342b3cd2e7e458e0c391b1f64f6f78b14296ec093
url: "https://pub.dev"
source: hosted
- version: "7.2.5"
+ version: "7.3.0"
firebase_auth_web:
dependency: transitive
description:
name: firebase_auth_web
- sha256: "809a2eb444d1a07c0a680b205b86d713bc7171a4b2627fd6c01cf05f2b6f93cd"
+ sha256: "64e067e763c6378b7e774e872f0f59f6812885e43020e25cde08f42e9459837b"
url: "https://pub.dev"
source: hosted
- version: "5.11.4"
+ version: "5.12.0"
firebase_core:
dependency: "direct main"
description:
name: firebase_core
- sha256: "4aef2a23d0f3265545807d68fbc2f76a6b994ca3c778d88453b99325abd63284"
+ sha256: "26de145bb9688a90962faec6f838247377b0b0d32cc0abecd9a4e43525fc856c"
url: "https://pub.dev"
source: hosted
- version: "2.30.1"
+ version: "2.32.0"
firebase_core_platform_interface:
dependency: transitive
description:
@@ -381,34 +389,34 @@ packages:
dependency: transitive
description:
name: firebase_core_web
- sha256: "67f2fcc600fc78c2f731c370a3a5e6c87ee862e3a2fba6f951eca6d5dafe5c29"
+ sha256: "22fcb352744908224fc7be3caae254836099786acfe5df6e9fe901e9c2575a41"
url: "https://pub.dev"
source: hosted
- version: "2.16.0"
+ version: "2.17.1"
firebase_messaging:
dependency: "direct main"
description:
name: firebase_messaging
- sha256: "73a43445a7f8c6e6327f0ec3922b1c99a9f4a0e4896197bfe10a88259f775aad"
+ sha256: a1662cc95d9750a324ad9df349b873360af6f11414902021f130c68ec02267c4
url: "https://pub.dev"
source: hosted
- version: "14.9.1"
+ version: "14.9.4"
firebase_messaging_platform_interface:
dependency: transitive
description:
name: firebase_messaging_platform_interface
- sha256: "675527aadccb679c9dfd43a4558690427123ac1e99f03eef5bbce9dc216edc91"
+ sha256: "87c4a922cb6f811cfb7a889bdbb3622702443c52a0271636cbc90d813ceac147"
url: "https://pub.dev"
source: hosted
- version: "4.5.34"
+ version: "4.5.37"
firebase_messaging_web:
dependency: transitive
description:
name: firebase_messaging_web
- sha256: "66deff69307f54fc7a20732b4278af327ae378b86607d5ac877d8f2201fe881e"
+ sha256: "0d34dca01a7b103ed7f20138bffbb28eb0e61a677bf9e78a028a932e2c7322d5"
url: "https://pub.dev"
source: hosted
- version: "3.8.4"
+ version: "3.8.7"
fixnum:
dependency: transitive
description:
@@ -426,10 +434,10 @@ packages:
dependency: "direct main"
description:
name: flutter_bloc
- sha256: f0ecf6e6eb955193ca60af2d5ca39565a86b8a142452c5b24d96fb477428f4d2
+ sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
url: "https://pub.dev"
source: hosted
- version: "8.1.5"
+ version: "8.1.6"
flutter_localizations:
dependency: "direct main"
description: flutter
@@ -521,18 +529,19 @@ packages:
dependency: "direct main"
description:
name: intl
- sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+ sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
url: "https://pub.dev"
source: hosted
- version: "0.18.1"
+ version: "0.19.0"
intl_phone_number_input:
dependency: "direct main"
description:
- name: intl_phone_number_input
- sha256: "1c4328713a9503ab26a1fdbb6b00b4cada68c18aac922b35bedbc72eff1297c3"
- url: "https://pub.dev"
- source: hosted
- version: "0.7.4"
+ path: "."
+ ref: "v0.8.0"
+ resolved-ref: d10eb21c5010cde3cc833ef9a759b606831acf0d
+ url: "https://github.com/natintosh/intl_phone_number_input.git"
+ source: git
+ version: "0.7.5"
io:
dependency: transitive
description:
@@ -569,50 +578,26 @@ packages:
dependency: transitive
description:
name: leak_tracker
- sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+ sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev"
source: hosted
- version: "10.0.0"
+ version: "10.0.4"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
- sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+ sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev"
source: hosted
- version: "2.0.1"
+ version: "3.0.3"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
- sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
- url: "https://pub.dev"
- source: hosted
- version: "2.0.1"
- libphonenumber_platform_interface:
- dependency: transitive
- description:
- name: libphonenumber_platform_interface
- sha256: f801f6c65523f56504b83f0890e6dad584ab3a7507dca65fec0eed640afea40f
+ sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
- version: "0.4.2"
- libphonenumber_plugin:
- dependency: transitive
- description:
- name: libphonenumber_plugin
- sha256: c615021d9816fbda2b2587881019ed595ecdf54d999652d7e4cce0e1f026368c
- url: "https://pub.dev"
- source: hosted
- version: "0.3.3"
- libphonenumber_web:
- dependency: transitive
- description:
- name: libphonenumber_web
- sha256: "8186f420dbe97c3132283e52819daff1e55d60d6db46f7ea5ac42f42a28cc2ef"
- url: "https://pub.dev"
- source: hosted
- version: "0.3.2"
+ version: "3.0.1"
lint:
dependency: "direct dev"
description:
@@ -649,10 +634,10 @@ packages:
dependency: transitive
description:
name: meta
- sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+ sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
- version: "1.11.0"
+ version: "1.12.0"
mime:
dependency: transitive
description:
@@ -665,10 +650,10 @@ packages:
dependency: "direct dev"
description:
name: mocktail
- sha256: c4b5007d91ca4f67256e720cb1b6d704e79a510183a12fa551021f652577dce6
+ sha256: "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8"
url: "https://pub.dev"
source: hosted
- version: "1.0.3"
+ version: "1.0.4"
nested:
dependency: transitive
description:
@@ -697,18 +682,18 @@ packages:
dependency: "direct main"
description:
name: package_info_plus
- sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0
+ sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce
url: "https://pub.dev"
source: hosted
- version: "8.0.0"
+ version: "8.1.1"
package_info_plus_platform_interface:
dependency: transitive
description:
name: package_info_plus_platform_interface
- sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e
+ sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
url: "https://pub.dev"
source: hosted
- version: "3.0.0"
+ version: "3.0.1"
path:
dependency: transitive
description:
@@ -749,6 +734,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.5.1"
+ protobuf:
+ dependency: transitive
+ description:
+ name: protobuf
+ sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.1.0"
provider:
dependency: transitive
description:
@@ -794,18 +787,18 @@ packages:
dependency: transitive
description:
name: sentry
- sha256: fd1fbfe860c05f5c52820ec4dbf2b6473789e83ead26cfc18bca4fe80bf3f008
+ sha256: "2440763ae96fa8fd1bcdfc224f5232e1b7a09af76a72f4e626ee313a261faf6f"
url: "https://pub.dev"
source: hosted
- version: "8.2.0"
+ version: "8.10.1"
sentry_flutter:
dependency: "direct main"
description:
name: sentry_flutter
- sha256: c64f0aec5332bec87083b61514d1b6b29e435b9045d03ce1575861192b9a5680
+ sha256: "3b30038b3b9303540a8b2c8b1c8f0bb93a207f8e4b25691c59d969ddeb4734fd"
url: "https://pub.dev"
source: hosted
- version: "8.2.0"
+ version: "8.10.1"
shelf:
dependency: transitive
description:
@@ -935,26 +928,26 @@ packages:
dependency: transitive
description:
name: test
- sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f
+ sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073"
url: "https://pub.dev"
source: hosted
- version: "1.24.9"
+ version: "1.25.2"
test_api:
dependency: transitive
description:
name: test_api
- sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+ sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev"
source: hosted
- version: "0.6.1"
+ version: "0.7.0"
test_core:
dependency: transitive
description:
name: test_core
- sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a
+ sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4"
url: "https://pub.dev"
source: hosted
- version: "0.5.9"
+ version: "0.6.0"
timing:
dependency: transitive
description:
@@ -983,10 +976,10 @@ packages:
dependency: "direct main"
description:
name: url_launcher
- sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
+ sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
url: "https://pub.dev"
source: hosted
- version: "6.2.6"
+ version: "6.3.1"
url_launcher_android:
dependency: transitive
description:
@@ -1063,10 +1056,10 @@ packages:
dependency: transitive
description:
name: vm_service
- sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+ sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.dev"
source: hosted
- version: "13.0.0"
+ version: "14.2.1"
watcher:
dependency: transitive
description:
@@ -1103,10 +1096,10 @@ packages:
dependency: "direct main"
description:
name: webview_flutter
- sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932"
+ sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522"
url: "https://pub.dev"
source: hosted
- version: "4.7.0"
+ version: "4.8.0"
webview_flutter_android:
dependency: transitive
description:
@@ -1135,10 +1128,10 @@ packages:
dependency: transitive
description:
name: win32
- sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
+ sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
url: "https://pub.dev"
source: hosted
- version: "5.5.0"
+ version: "5.5.4"
xml:
dependency: transitive
description:
@@ -1156,5 +1149,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
- dart: ">=3.3.0 <4.0.0"
- flutter: ">=3.19.6"
+ dart: ">=3.4.4 <4.0.0"
+ flutter: ">=3.22.3"
diff --git a/recipients_app/pubspec.yaml b/recipients_app/pubspec.yaml
index 93d667480..b80324c0e 100644
--- a/recipients_app/pubspec.yaml
+++ b/recipients_app/pubspec.yaml
@@ -2,52 +2,55 @@ name: app
description: Social Income App
publish_to: "none"
-version: 1.1.13+30
+version: 1.1.14+31
environment:
- sdk: ">=3.2.0 <4.0.0"
- flutter: 3.19.6
+ sdk: ">=3.4.4 <4.0.0"
+ flutter: 3.22.3
dependencies:
animations: ^2.0.11
another_flushbar: ^1.12.30
- cloud_firestore: ^4.17.2
+ cloud_firestore: ^4.17.5
collection: ^1.18.0
- equatable: ^2.0.5
- firebase_app_check: ^0.2.2
- firebase_auth: ^4.19.4
- firebase_core: ^2.30.1
- firebase_messaging: ^14.9.1
+ equatable: ^2.0.7
+ firebase_app_check: ^0.2.2+7
+ firebase_auth: ^4.20.0
+ firebase_core: ^2.32.0
+ firebase_messaging: ^14.9.4
flutter:
sdk: flutter
- flutter_bloc: ^8.1.5
+ flutter_bloc: ^8.1.6
flutter_localizations:
sdk: flutter
flutter_native_splash: ^2.4.0
-
- intl: ^0.18.0
- intl_phone_number_input: ^0.7.4
+ intl: ^0.19.0
+ # v0.8.0 is not publish on pub.dev but it is released on Github. This version fixes the build error on iOS with the message "Cannot find type 'PhoneNumberKit' in scope".
+ intl_phone_number_input:
+ git:
+ url: https://github.com/natintosh/intl_phone_number_input.git
+ ref: v0.8.0
json_annotation: ^4.9.0
json_serializable: ^6.8.0
- package_info_plus: ^8.0.0
+ package_info_plus: ^8.1.1
# https://github.com/chrisedg87/flutter_rounded_loading_button/pull/74
rounded_loading_button:
git:
url: https://github.com/ShamilPP/flutter_rounded_loading_button.git
ref: master
- sentry_flutter: ^8.2.0
- url_launcher: ^6.2.6
- webview_flutter: ^4.7.0
+ sentry_flutter: ^8.10.1
+ url_launcher: ^6.3.1
+ webview_flutter: ^4.8.0
dev_dependencies:
alchemist: ^0.7.0
bloc_test: ^9.1.7
- build_runner: ^2.4.9
+ build_runner: ^2.4.11
flutter_test:
sdk: flutter
lint: ^2.3.0
- mocktail: ^1.0.3
+ mocktail: ^1.0.4
flutter:
uses-material-design: true