diff --git a/android/gradle.properties b/android/gradle.properties index dfa1e9f24dd1c64da4088c407c3fe93277061b61..285f43a0d11b4b548459981eec29cd0e63ba1d20 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -app.versionName=1.2.13 -app.versionCode=24 +app.versionName=1.2.14 +app.versionCode=25 diff --git a/lib/main.dart b/lib/main.dart index 99fcffa4754263d3fc9fc19dfec853002fc4f404..a96452ba967bda7e898b0a3db2cc239d166e977b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'provider/data.dart'; -import 'screens/home.dart'; -import 'screens/game.dart'; -import 'screens/scores.dart'; -import 'utils/constants.dart'; +import 'package:hangman/provider/data.dart'; +import 'package:hangman/screens/game.dart'; +import 'package:hangman/screens/home.dart'; +import 'package:hangman/screens/scores.dart'; +import 'package:hangman/utils/constants.dart'; void main() => runApp(const Hangman()); diff --git a/lib/provider/data.dart b/lib/provider/data.dart index 6da76105ba16877fc77943ee75305e7a6af63b77..1bbdf069f604961f1cdf861ee15f980afd372866 100644 --- a/lib/provider/data.dart +++ b/lib/provider/data.dart @@ -1,7 +1,7 @@ import 'package:flutter/foundation.dart'; -import '../utils/shared_prefs.dart'; -import '../utils/constants.dart'; +import 'package:hangman/utils/constants.dart'; +import 'package:hangman/utils/shared_prefs.dart'; class Data extends ChangeNotifier { // settings diff --git a/lib/screens/game.dart b/lib/screens/game.dart index 1305fc1d42ab83ea7f5eebc8ffe1126371338600..65f2f42877086a726a9e663261cda9d88f2a2404 100644 --- a/lib/screens/game.dart +++ b/lib/screens/game.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../provider/data.dart'; -import '../utils/constants.dart'; -import '../utils/random_pick.dart'; -import '../widgets/letters.dart'; +import 'package:hangman/provider/data.dart'; +import 'package:hangman/utils/constants.dart'; +import 'package:hangman/utils/random_pick.dart'; +import 'package:hangman/widgets/letters.dart'; class Game extends StatelessWidget { const Game({super.key}); diff --git a/lib/screens/home.dart b/lib/screens/home.dart index b17a520cd12f88f71a05e1a062efb5abdb7fec20..4a797a7d67334e4081ff967dfcedcf83013b6c59 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../provider/data.dart'; -import 'game.dart'; -import '../widgets/my_app_bar.dart'; -import '../widgets/dialog_fetch_error.dart'; -import '../utils/constants.dart'; +import 'package:hangman/provider/data.dart'; +import 'package:hangman/screens/game.dart'; +import 'package:hangman/utils/constants.dart'; +import 'package:hangman/widgets/dialog_fetch_error.dart'; +import 'package:hangman/widgets/my_app_bar.dart'; class Home extends StatelessWidget { const Home({super.key}); diff --git a/lib/screens/scores.dart b/lib/screens/scores.dart index f1e62fe255d8ee98319b11ab9cfa2bd23abc6d9a..2a26025537843ac522bb08fbc6a176ab2e029737 100644 --- a/lib/screens/scores.dart +++ b/lib/screens/scores.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../provider/data.dart'; -import '../utils/constants.dart'; +import 'package:hangman/provider/data.dart'; +import 'package:hangman/utils/constants.dart'; class Scores extends StatelessWidget { const Scores({super.key}); diff --git a/lib/utils/random_pick.dart b/lib/utils/random_pick.dart index 08d44467afeba688f4893db31c0d732c1e19ecd6..668d5be94e8b4816f634c0ba91be6836736496ef 100644 --- a/lib/utils/random_pick.dart +++ b/lib/utils/random_pick.dart @@ -1,13 +1,14 @@ import 'dart:async'; -import 'package:html/parser.dart'; -import 'package:html/dom.dart'; -import 'package:http/http.dart' as http; import 'dart:convert'; -import 'package:flutter/services.dart'; import 'dart:math' show Random; + import 'package:diacritic/diacritic.dart'; +import 'package:flutter/services.dart'; +import 'package:html/parser.dart'; +import 'package:html/dom.dart'; +import 'package:http/http.dart' as http; -import '../words/list_french_words.dart'; +import 'package:hangman/words/list_french_words.dart'; class RandomPick { final String level; diff --git a/lib/utils/tools.dart b/lib/utils/tools.dart new file mode 100644 index 0000000000000000000000000000000000000000..fd48b2b009b80b22248d6e7f08a63e96c4065bd7 --- /dev/null +++ b/lib/utils/tools.dart @@ -0,0 +1,7 @@ +import 'package:flutter/foundation.dart'; + +void printlog(String message) { + if (!kReleaseMode) { + debugPrint(message); + } +} diff --git a/lib/widgets/dialog_gameover.dart b/lib/widgets/dialog_gameover.dart index af0a6ccd217eca4c2e4e6d6c1c4a7cd6471a2867..512c0944666a4963e76e52a1b3dc7bf90ae60ba6 100644 --- a/lib/widgets/dialog_gameover.dart +++ b/lib/widgets/dialog_gameover.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../screens/home.dart'; -import '../screens/game.dart'; -import '../provider/data.dart'; -import '../utils/constants.dart'; +import 'package:hangman/provider/data.dart'; +import 'package:hangman/screens/game.dart'; +import 'package:hangman/screens/home.dart'; +import 'package:hangman/utils/constants.dart'; class DialogGameOver extends StatelessWidget { final GameOver gameOver; diff --git a/lib/widgets/letters.dart b/lib/widgets/letters.dart index 69938500563a791b509acf21a62ff733a306c343..2c13855ee682eab886110bf338bfeb4191e8a028 100644 --- a/lib/widgets/letters.dart +++ b/lib/widgets/letters.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../provider/data.dart'; -import '../utils/constants.dart'; -import '../widgets/dialog_gameover.dart'; +import 'package:hangman/provider/data.dart'; +import 'package:hangman/utils/constants.dart'; +import 'package:hangman/widgets/dialog_gameover.dart'; class LetterButtons extends StatelessWidget { const LetterButtons({super.key}); diff --git a/lib/widgets/my_app_bar.dart b/lib/widgets/my_app_bar.dart index 230a4920c0cf55ca0ce00dfea3020fac40434f90..d25c46f6a6f566551680441f58c8b801cd524c0d 100644 --- a/lib/widgets/my_app_bar.dart +++ b/lib/widgets/my_app_bar.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart' show SystemNavigator; -import '../screens/scores.dart'; +import 'package:hangman/screens/scores.dart'; class MyAppBar extends StatelessWidget implements PreferredSizeWidget { const MyAppBar({super.key, this.appBar}); diff --git a/pubspec.lock b/pubspec.lock index e2b0f4c5b1edd0b4cb6a0da78a520387e41db303..2599bd07dcef5abeda4ed10e2309ee446443f091 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -183,10 +183,10 @@ packages: dependency: "direct main" description: name: provider - sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.1.2" shared_preferences: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 00a9529af8cfa51874cb8a1da260d1c723e61516..15041ac710e50752d05ed6bc3e3f9245be5af2b0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: hangman description: Hangman game, have fun with words and letters! publish_to: 'none' -version: 1.2.13+24 +version: 1.2.14+25 environment: sdk: '^3.0.0'