diff --git a/android/gradle.properties b/android/gradle.properties index 408253ceb04c0c7c49b3b9daf597f35b66ce16c1..e6443382b31fab5fc027b99dc079154f78f27d0b 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=0.0.27 -app.versionCode=27 +app.versionName=0.0.28 +app.versionCode=28 diff --git a/fastlane/metadata/android/en-US/changelogs/28.txt b/fastlane/metadata/android/en-US/changelogs/28.txt new file mode 100644 index 0000000000000000000000000000000000000000..52f2179d505f14dcc88966038849680298d1df24 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/28.txt @@ -0,0 +1 @@ +Avoid print calls in production code. diff --git a/fastlane/metadata/android/fr-FR/changelogs/28.txt b/fastlane/metadata/android/fr-FR/changelogs/28.txt new file mode 100644 index 0000000000000000000000000000000000000000..8537dac9f8ac580dac7eee02b1a1c99a901fe7d2 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/28.txt @@ -0,0 +1 @@ +Supprime les appels à print dans le code de production. diff --git a/lib/layout/board.dart b/lib/layout/board.dart index bbec9314ddda93544bb0b932ce1938f49bf4b14f..6406c46e919e34e5a2758e1fb13135d6969a3414 100644 --- a/lib/layout/board.dart +++ b/lib/layout/board.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import '../provider/data.dart'; -import '../utils/game_utils.dart'; +import 'package:momomotus/provider/data.dart'; +import 'package:momomotus/utils/game_utils.dart'; class Board { static Container buildGameBoard(Data myProvider) { diff --git a/lib/layout/game.dart b/lib/layout/game.dart index 4110e266f73602b903678e84a9c0196e5c68e73a..a1b1136e09e6d085d68f53f609c15c918dab1688 100644 --- a/lib/layout/game.dart +++ b/lib/layout/game.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import '../layout/board.dart'; -import '../layout/keyboard.dart'; -import '../provider/data.dart'; -import '../utils/game_utils.dart'; +import 'package:momomotus/layout/board.dart'; +import 'package:momomotus/layout/keyboard.dart'; +import 'package:momomotus/provider/data.dart'; +import 'package:momomotus/utils/game_utils.dart'; class Game { static Widget buildGameWidget(Data myProvider) { diff --git a/lib/layout/keyboard.dart b/lib/layout/keyboard.dart index c68931d68d19c873747e9d1f4268c8fd9c403a6e..6476e514618d9cb425a3af943b9738b8a32b7ca6 100644 --- a/lib/layout/keyboard.dart +++ b/lib/layout/keyboard.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import '../provider/data.dart'; -import '../utils/game_utils.dart'; +import 'package:momomotus/provider/data.dart'; +import 'package:momomotus/utils/game_utils.dart'; class Keyboard { static Container buildWidget(Data myProvider) { diff --git a/lib/layout/parameters.dart b/lib/layout/parameters.dart index cfee15552da24652725f4c2004dc34d60cf8cbe6..d8fb008481a523cbecfc601dc14d8b033d191300 100644 --- a/lib/layout/parameters.dart +++ b/lib/layout/parameters.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import '../provider/data.dart'; -import '../utils/game_utils.dart'; +import 'package:momomotus/provider/data.dart'; +import 'package:momomotus/utils/game_utils.dart'; class Parameters { static Container buildParametersSelector(Data myProvider) { diff --git a/lib/main.dart b/lib/main.dart index f6256a8081c24288ae5c9ac252286f37919b685a..fa8a410336510db361c5da9e84e34366a51bc671 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,8 +3,8 @@ import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:overlay_support/overlay_support.dart'; -import 'provider/data.dart'; -import 'screens/home.dart'; +import 'package:momomotus/provider/data.dart'; +import 'package:momomotus/screens/home.dart'; void main() { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/provider/data.dart b/lib/provider/data.dart index 689e514e468d6d789943463776044d460bd11106..3ae4a94a3007847201ee28d5a4b7da8a9b7df5f5 100644 --- a/lib/provider/data.dart +++ b/lib/provider/data.dart @@ -1,6 +1,8 @@ import 'package:flutter/foundation.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:momomotus/utils/tools.dart'; + class Data extends ChangeNotifier { // Configuration available values final List _availableLangValues = ['fr']; @@ -78,7 +80,7 @@ class Data extends ChangeNotifier { void currentGuessSubmitWord() { if (_currentGuess.length == int.parse(_length)) { if (_currentGuess == _word) { - print('Word found!'); + printlog('Word found!'); _foundWord = true; } addGuess(_currentGuess); diff --git a/lib/screens/home.dart b/lib/screens/home.dart index a01f5592d3ea88c9d10a45c9b355965532aa7556..ffaac00d1fbcce5fa741ec51668b27d805394673 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:overlay_support/overlay_support.dart'; -import '../layout/game.dart'; -import '../layout/parameters.dart'; -import '../provider/data.dart'; -import '../utils/game_utils.dart'; +import 'package:momomotus/layout/game.dart'; +import 'package:momomotus/layout/parameters.dart'; +import 'package:momomotus/provider/data.dart'; +import 'package:momomotus/utils/game_utils.dart'; class Home extends StatefulWidget { static const String id = 'home'; diff --git a/lib/utils/game_utils.dart b/lib/utils/game_utils.dart index 9bc8b9f693e6ecd2d8c18e7b89a63633677db46b..62c5790d13f6e9de2ca64e6886c936121e38cea8 100644 --- a/lib/utils/game_utils.dart +++ b/lib/utils/game_utils.dart @@ -1,5 +1,6 @@ -import '../provider/data.dart'; -import '../utils/random_pick_word.dart'; +import 'package:momomotus/provider/data.dart'; +import 'package:momomotus/utils/random_pick_word.dart'; +import 'package:momomotus/utils/tools.dart'; class GameUtils { static Future<void> quitGame(Data myProvider) async { @@ -7,7 +8,8 @@ class GameUtils { } static Future<void> startGame(Data myProvider) async { - print('Starting game (${myProvider.lang} / ${myProvider.length} / ${myProvider.level} )'); + printlog( + 'Starting game (${myProvider.lang} / ${myProvider.length} / ${myProvider.level} )'); myProvider.resetGame(); @@ -36,7 +38,7 @@ class GameUtils { } } while (myProvider.word != word && attempts < 10); - print('Picked word: $word'); + printlog('Picked word: $word'); } static void addLetter(Data myProvider, String letter) { @@ -89,10 +91,10 @@ class GameUtils { static void submitWord(Data myProvider) { if (GameUtils.checkCurrentlyGuessedWordExists(myProvider)) { - print('Ok word allowed: "${myProvider.currentGuess}".'); + printlog('Ok word allowed: "${myProvider.currentGuess}".'); myProvider.currentGuessSubmitWord(); } else { - print('Unknown word: "${myProvider.currentGuess}".'); + printlog('Unknown word: "${myProvider.currentGuess}".'); myProvider.currentGuessSubmitWrongWord(); } } diff --git a/lib/utils/random_pick_word.dart b/lib/utils/random_pick_word.dart index 2e031531c60145b1a1ff5d7c6b05f7b7fad69e1b..b73d54c92703668fae7ccf7141853fd153ddb2c1 100644 --- a/lib/utils/random_pick_word.dart +++ b/lib/utils/random_pick_word.dart @@ -4,6 +4,8 @@ import "dart:math"; import 'package:flutter/services.dart'; +import 'package:momomotus/utils/tools.dart'; + class RandomPickWord { static Set<String> wordList = <String>{}; static Set<String> dictionary = <String>{}; @@ -33,7 +35,7 @@ class RandomPickWord { String wordBaseFilename = 'words-$length-$lang'; // Get full dictionary (eligible words) - print('Reload dictionary ($lang / $length)'); + printlog('Reload dictionary ($lang / $length)'); try { String wordsFile = '$wordBaseFilename-dictionary'; var data = await rootBundle.loadString('assets/files/$wordsFile.txt'); @@ -47,7 +49,7 @@ class RandomPickWord { } // Get guessable words list (will pick random word from) - print('Reload words list ($lang / $length / $level)'); + printlog('Reload words list ($lang / $length / $level)'); try { String wordsFile = '$wordBaseFilename-$level'; var data = await rootBundle.loadString('assets/files/$wordsFile.txt'); @@ -61,8 +63,8 @@ class RandomPickWord { } } - print('Words in dictionary: ${dictionary.length}'); - print('Words in words list: ${wordList.length}'); + printlog('Words in dictionary: ${dictionary.length}'); + printlog('Words in words list: ${wordList.length}'); _word = ''; await wordFromLocalFile(); @@ -71,7 +73,7 @@ class RandomPickWord { Future<void> wordFromLocalFile() async { // Check we have enough words if (wordList.isEmpty) { - print('Not enough words in list.'); + printlog('Not enough words in list.'); _word = ''; } else { final random = Random(); 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/pubspec.lock b/pubspec.lock index 394474ffa93627c54bc013d08e68346854cf7420..6b1fdfef808496ebd4ff8ce5bb9e51bfbc6469e8 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -151,10 +151,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 8cb7a442de9aaa5f556fa7df790f746a7f64eaae..97f54c89352c21a4ab454d79f2e55514b896106f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: momomotus description: A motus-like game application. publish_to: 'none' -version: 0.0.27+27 +version: 0.0.28+28 environment: sdk: '^3.0.0'