Fix with utf8

This commit is contained in:
Морозов Андрей 2022-09-24 10:13:10 +04:00
parent bffa95969e
commit 4a5e2d7c84
3 changed files with 35 additions and 29 deletions

View File

@ -1,3 +1,4 @@
import 'dart:convert';
import 'dart:math'; import 'dart:math';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -56,11 +57,14 @@ class DataSingleton {
} }
if (currentWordIndex < 5) { if (currentWordIndex < 5) {
if (gridData[currentWordIndex].length == 5) { if (gridData[currentWordIndex].length == 5) {
if (gridData[currentWordIndex] == secretWord) { var input = utf8
.decode(utf8.encode("${gridData[currentWordIndex]}\r").toList())
.toString();
if (input == secretWord) {
nextWord(); nextWord();
return WinGameState(); return WinGameState();
} }
if (allWords.contains(gridData[currentWordIndex])) { if (allWords.contains(secretWord)) {
nextWord(); nextWord();
return GridUpdateState(); return GridUpdateState();
} else { } else {

View File

@ -7,14 +7,14 @@ packages:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.8.2" version: "2.9.0"
bloc: bloc:
dependency: transitive dependency: "direct main"
description: description:
name: bloc name: bloc
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "8.0.3" version: "8.1.0"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
@ -28,7 +28,7 @@ packages:
name: characters name: characters
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.2.1"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
@ -42,14 +42,14 @@ packages:
name: clock name: clock
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.1"
collection: collection:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.15.0" version: "1.16.0"
crypto: crypto:
dependency: transitive dependency: transitive
description: description:
@ -84,7 +84,7 @@ packages:
name: fake_async name: fake_async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.3.1"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
@ -93,12 +93,12 @@ packages:
source: hosted source: hosted
version: "1.1.2" version: "1.1.2"
file: file:
dependency: transitive dependency: "direct main"
description: description:
name: file name: file
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.1.2" version: "6.1.4"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -124,7 +124,7 @@ packages:
name: flutter_lints name: flutter_lints
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.4" version: "2.0.1"
flutter_svg: flutter_svg:
dependency: transitive dependency: transitive
description: description:
@ -155,7 +155,7 @@ packages:
name: google_fonts name: google_fonts
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.3.1" version: "3.0.1"
http: http:
dependency: transitive dependency: transitive
description: description:
@ -190,28 +190,28 @@ packages:
name: lints name: lints
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.1" version: "2.0.0"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.11" version: "0.12.12"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.4" version: "0.2.0"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.7.0" version: "1.8.0"
nested: nested:
dependency: transitive dependency: transitive
description: description:
@ -225,7 +225,7 @@ packages:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.1" version: "1.8.2"
path_drawing: path_drawing:
dependency: transitive dependency: transitive
description: description:
@ -391,7 +391,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.2" version: "1.9.1"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
@ -412,28 +412,28 @@ packages:
name: string_scanner name: string_scanner
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.1"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
name: term_glyph name: term_glyph
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.2.1"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.9" version: "0.4.13"
top_snackbar_flutter: top_snackbar_flutter:
dependency: "direct main" dependency: "direct main"
description: description:
name: top_snackbar_flutter name: top_snackbar_flutter
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.2" version: "2.1.1"
twemoji: twemoji:
dependency: "direct main" dependency: "direct main"
description: description:
@ -454,7 +454,7 @@ packages:
name: vector_math name: vector_math
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.2" version: "2.1.3"
win32: win32:
dependency: transitive dependency: transitive
description: description:
@ -484,5 +484,5 @@ packages:
source: hosted source: hosted
version: "3.1.0" version: "3.1.0"
sdks: sdks:
dart: ">=2.16.0-100.0.dev <3.0.0" dart: ">=2.18.0-146.0.dev <3.0.0"
flutter: ">=2.10.0-0" flutter: ">=2.10.0-0"

View File

@ -4,29 +4,31 @@ description: A new Flutter project.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.15.1 <3.0.0" sdk: ">=2.15.1 <3.5.0"
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
flutter_bloc: ^8.0.1 flutter_bloc: ^8.0.1
top_snackbar_flutter: ^1.0.2 top_snackbar_flutter: ^2.1.1
flutter_countdown_timer: ^4.1.0 flutter_countdown_timer: ^4.1.0
shared_preferences: ^2.0.12 shared_preferences: ^2.0.12
equatable: ^2.0.3 equatable: ^2.0.3
twemoji: ^0.4.2 twemoji: ^0.4.2
cupertino_icons: ^1.0.2 cupertino_icons: ^1.0.2
google_fonts: ^2.2.0 google_fonts: ^3.0.1
shared_preferences_web: ^2.0.3 shared_preferences_web: ^2.0.3
desktop_window: ^0.4.0 desktop_window: ^0.4.0
fullscreen: ^1.0.3 fullscreen: ^1.0.3
file: ^6.1.4
bloc: ^8.1.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter
flutter_lints: ^1.0.0 flutter_lints: ^2.0.1
flutter: flutter:
uses-material-design: true uses-material-design: true