Skip to content

Commit

Permalink
Merge branch 'main' into TALAO
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkbee1 committed Mar 19, 2024
2 parents af4046b + a0348a5 commit 63e6d27
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 29 deletions.
5 changes: 4 additions & 1 deletion lib/lang/cubit/lang_cubit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ class LangCubit extends Cubit<LangState> {
Future<void> checkLocale() async {
final languageType = await getRecordedLanguage();
if (languageType == LanguageType.phone) {
emit(state.copyWith(languageType: languageType));
final newLocale =
await Devicelocale.currentAsLocale ?? const Locale('en');

emit(state.copyWith(languageType: languageType, locale: newLocale));
} else {
emit(
state.copyWith(
Expand Down
64 changes: 36 additions & 28 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,10 @@ packages:
dependency: transitive
description:
name: buffer
sha256: "94f60815065a8f0fd4f05be51faf86cf86519327e039d5c2aac72e1d1cc1dad4"
sha256: "389da2ec2c16283c8787e0adaede82b1842102f8c8aae2f49003a766c5c6b3d1"
url: "https://pub.dev"
source: hosted
version: "1.2.2"
version: "1.2.3"
build:
dependency: transitive
description:
Expand Down Expand Up @@ -779,10 +779,10 @@ packages:
dependency: "direct main"
description:
name: file_saver
sha256: eb16c32d3eb5e4b6318ab9fa97138d6ea0b2d47a25c0af6540263e46979e1c57
sha256: bdebc720e17b3e01aba59da69b6d47020a7e5ba7d5c75bd9194f9618d5f16ef4
url: "https://pub.dev"
source: hosted
version: "0.2.11"
version: "0.2.12"
file_selector_linux:
dependency: transitive
description:
Expand Down Expand Up @@ -880,42 +880,50 @@ packages:
dependency: "direct main"
description:
name: flutter_image_compress
sha256: f159d2e8c4ed04b8e36994124fd4a5017a0f01e831ae3358c74095c340e9ae5e
sha256: "4edadb0ca2f957b85190e9c3aa728569b91b64b6e06e0eec5b622d47a8692ab2"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.2.0"
flutter_image_compress_common:
dependency: transitive
description:
name: flutter_image_compress_common
sha256: "0756440ddc647696ebc56f393be8c1055e81ef1c1f58986fb1f078af393637d8"
sha256: "7f79bc6c8a363063620b4e372fa86bc691e1cb28e58048cd38e030692fbd99ee"
url: "https://pub.dev"
source: hosted
version: "1.0.4"
version: "1.0.5"
flutter_image_compress_macos:
dependency: transitive
description:
name: flutter_image_compress_macos
sha256: fea1e3d71150d03373916b832c49b5c2f56c3e7e13da82a929274a2c6f88251e
sha256: "26df6385512e92b3789dc76b613b54b55c457a7f1532e59078b04bf189782d47"
url: "https://pub.dev"
source: hosted
version: "1.0.1"
version: "1.0.2"
flutter_image_compress_ohos:
dependency: transitive
description:
name: flutter_image_compress_ohos
sha256: "70360371698be994786e5dd2e364a6525b1c5a4f843bff8af9b8a2fbe808d8d8"
url: "https://pub.dev"
source: hosted
version: "0.0.2"
flutter_image_compress_platform_interface:
dependency: transitive
description:
name: flutter_image_compress_platform_interface
sha256: "87d0964ae72ccab1cdfbc32f825ce6b57bf87fd3576a2842bf38189d392163b8"
sha256: "579cb3947fd4309103afe6442a01ca01e1e6f93dc53bb4cbd090e8ce34a41889"
url: "https://pub.dev"
source: hosted
version: "1.0.4"
version: "1.0.5"
flutter_image_compress_web:
dependency: transitive
description:
name: flutter_image_compress_web
sha256: "1c8cd505be95cb2e0573cdd9d236ac0ba39c166b8df06ef1823f2a17b60e1253"
sha256: f02fe352b17f82b72f481de45add240db062a2585850bea1667e82cc4cd6c311
url: "https://pub.dev"
source: hosted
version: "0.1.4"
version: "0.1.4+1"
flutter_launcher_icons:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -1263,10 +1271,10 @@ packages:
dependency: transitive
description:
name: image_picker_ios
sha256: fadafce49e8569257a0cad56d24438a6fa1f0cbd7ee0af9b631f7492818a4ca3
sha256: "917a5cadd67d052554cfb258595e54217de53fac5b52939426e26319a02e6297"
url: "https://pub.dev"
source: hosted
version: "0.8.9+1"
version: "0.8.9+2"
image_picker_linux:
dependency: transitive
description:
Expand Down Expand Up @@ -1303,10 +1311,10 @@ packages:
dependency: transitive
description:
name: injectable
sha256: bd91492afd80d0b1143b96c80283b1180393ad3989915c0e5e6928ac1266fa75
sha256: "44b4aa254816b23bf0a3285ff27da3ff0b516a6f00e0bbbea7b194f14fbb75a7"
url: "https://pub.dev"
source: hosted
version: "2.3.3"
version: "2.3.5"
intl:
dependency: transitive
description:
Expand Down Expand Up @@ -1772,10 +1780,10 @@ packages:
dependency: transitive
description:
name: permission_handler_apple
sha256: bdafc6db74253abb63907f4e357302e6bb786ab41465e8635f362ee71fd8707b
sha256: "8c90be7f8244eeb2bbfa4248221d38a66ca3e3cc3ab967a25a2529d86eee7c45"
url: "https://pub.dev"
source: hosted
version: "9.4.0"
version: "9.4.1"
permission_handler_html:
dependency: transitive
description:
Expand Down Expand Up @@ -2020,10 +2028,10 @@ packages:
dependency: "direct main"
description:
name: screenshot
sha256: "455284ff1f5b911d94a43c25e1385485cf6b4f288293eba68f15dad711c7b81c"
sha256: "5488135006b34529bf3765a7b1900ca94ccafca300c573550a0474a7162ebf95"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.3.0"
scroll_to_index:
dependency: transitive
description:
Expand Down Expand Up @@ -2256,10 +2264,10 @@ packages:
dependency: transitive
description:
name: sqflite_common
sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5"
sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4"
url: "https://pub.dev"
source: hosted
version: "2.5.3"
version: "2.5.4"
sqlite3:
dependency: transitive
description:
Expand Down Expand Up @@ -2625,10 +2633,10 @@ packages:
dependency: "direct main"
description:
name: webview_flutter_android
sha256: "3e5f4e9d818086b0d01a66fb1ff9cc72ab0cc58c71980e3d3661c5685ea0efb0"
sha256: f038ee2fae73b509dde1bc9d2c5a50ca92054282de17631a9a3d515883740934
url: "https://pub.dev"
source: hosted
version: "3.15.0"
version: "3.16.0"
webview_flutter_platform_interface:
dependency: transitive
description:
Expand All @@ -2641,10 +2649,10 @@ packages:
dependency: "direct main"
description:
name: webview_flutter_wkwebview
sha256: "9bf168bccdf179ce90450b5f37e36fe263f591c9338828d6bf09b6f8d0f57f86"
sha256: f12f8d8a99784b863e8b85e4a9a5e3cf1839d6803d2c0c3e0533a8f3c5a992a7
url: "https://pub.dev"
source: hosted
version: "3.12.0"
version: "3.13.0"
win32:
dependency: transitive
description:
Expand Down

0 comments on commit 63e6d27

Please sign in to comment.