Skip to content

Commit a6b4c07

Browse files
khlebobulkhlebobul
authored
Merge pull request #14 from khlebobul/level_star_fix
Level star fix
2 parents 169b63e + 7dc21f6 commit a6b4c07

21 files changed

+453
-190
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## [1.3.1]
2+
3+
#### Bug Fixes
4+
5+
- Fixed the completed level indicator error
6+
7+
#### Improvements
8+
9+
- Updated package dependencies
10+
111
## [1.3.0]
212

313
#### New Features

‎ios/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ SPEC CHECKSUMS:
5454
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
5555
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
5656
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
57-
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
57+
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
5858

5959
PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e
6060

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@
495495
buildSettings = {
496496
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
497497
CLANG_ENABLE_MODULES = YES;
498-
CURRENT_PROJECT_VERSION = 15;
498+
CURRENT_PROJECT_VERSION = 16;
499499
DEVELOPMENT_TEAM = G4KB5U6326;
500500
ENABLE_BITCODE = NO;
501501
INFOPLIST_FILE = Runner/Info.plist;
@@ -505,7 +505,7 @@
505505
"$(inherited)",
506506
"@executable_path/Frameworks",
507507
);
508-
MARKETING_VERSION = 1.3.0;
508+
MARKETING_VERSION = 1.3.1;
509509
PRODUCT_BUNDLE_IDENTIFIER = com.khlebobul.pegma;
510510
PRODUCT_NAME = "$(TARGET_NAME)";
511511
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -683,7 +683,7 @@
683683
buildSettings = {
684684
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
685685
CLANG_ENABLE_MODULES = YES;
686-
CURRENT_PROJECT_VERSION = 15;
686+
CURRENT_PROJECT_VERSION = 16;
687687
DEVELOPMENT_TEAM = G4KB5U6326;
688688
ENABLE_BITCODE = NO;
689689
INFOPLIST_FILE = Runner/Info.plist;
@@ -693,7 +693,7 @@
693693
"$(inherited)",
694694
"@executable_path/Frameworks",
695695
);
696-
MARKETING_VERSION = 1.3.0;
696+
MARKETING_VERSION = 1.3.1;
697697
PRODUCT_BUNDLE_IDENTIFIER = com.khlebobul.pegma;
698698
PRODUCT_NAME = "$(TARGET_NAME)";
699699
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -709,7 +709,7 @@
709709
buildSettings = {
710710
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
711711
CLANG_ENABLE_MODULES = YES;
712-
CURRENT_PROJECT_VERSION = 15;
712+
CURRENT_PROJECT_VERSION = 16;
713713
DEVELOPMENT_TEAM = G4KB5U6326;
714714
ENABLE_BITCODE = NO;
715715
INFOPLIST_FILE = Runner/Info.plist;
@@ -719,7 +719,7 @@
719719
"$(inherited)",
720720
"@executable_path/Frameworks",
721721
);
722-
MARKETING_VERSION = 1.3.0;
722+
MARKETING_VERSION = 1.3.1;
723723
PRODUCT_BUNDLE_IDENTIFIER = com.khlebobul.pegma;
724724
PRODUCT_NAME = "$(TARGET_NAME)";
725725
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

‎lib/generated/intl/messages_de.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
2020
class MessageLookup extends MessageLookupByLibrary {
2121
String get localeName => 'de';
2222

23-
static String m0(appName) =>
24-
"der name ${appName} ist ein wortspiel, das kombiniert: „peg“ (stift, spielstein) ist das hauptelement des spiels und „theorema“, das mit mathematischer strenge und logik verbunden ist.";
23+
static String m0(String appName) =>
24+
"der name ${appName} ist ein wortspiel, das kombiniert: \"peg\" (stift, spielstein) ist das hauptelement des spiels und \"theorema\", das mit mathematischer strenge und logik verbunden ist.";
2525

2626
final messages = _notInlinedMessages(_notInlinedMessages);
2727
static Map<String, Function> _notInlinedMessages(_) => <String, Function>{

‎lib/generated/intl/messages_en.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
2020
class MessageLookup extends MessageLookupByLibrary {
2121
String get localeName => 'en';
2222

23-
static String m0(appName) =>
23+
static String m0(String appName) =>
2424
"the name ${appName} is a play on words that combines: \"peg\" (peg, token) is the main element of the game and \"theorema\", which is associated with mathematical rigor and logic.";
2525

2626
final messages = _notInlinedMessages(_notInlinedMessages);

‎lib/generated/intl/messages_es.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
2020
class MessageLookup extends MessageLookupByLibrary {
2121
String get localeName => 'es';
2222

23-
static String m0(appName) =>
23+
static String m0(String appName) =>
2424
"el nombre ${appName} es un juego de palabras que combina: \"peg\" (clavija, ficha) que es el elemento principal del juego y \"theorema\", que se asocia con el rigor y la lógica matemática.";
2525

2626
final messages = _notInlinedMessages(_notInlinedMessages);

‎lib/generated/intl/messages_fr.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
2020
class MessageLookup extends MessageLookupByLibrary {
2121
String get localeName => 'fr';
2222

23-
static String m0(appName) =>
23+
static String m0(String appName) =>
2424
"le nom ${appName} est un jeu de mots qui combine : \"peg\" (cheville, jeton) est l\'élément principal du jeu et \"theorema\", qui est associé à la rigueur mathématique et à la logique.";
2525

2626
final messages = _notInlinedMessages(_notInlinedMessages);

‎lib/generated/intl/messages_it.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
2020
class MessageLookup extends MessageLookupByLibrary {
2121
String get localeName => 'it';
2222

23-
static String m0(appName) =>
24-
"il nome ${appName} è un gioco di parole che combina: \"peg\" (piolo, pedina) - l’elemento principale del gioco - e \"theorema\", associato al rigore e alla logica matematica.";
23+
static String m0(String appName) =>
24+
"il nome ${appName} è un gioco di parole che combina: \"peg\" (piolo, pedina) - l'elemento principale del gioco - e \"theorema\", associato al rigore e alla logica matematica.";
2525

2626
final messages = _notInlinedMessages(_notInlinedMessages);
2727
static Map<String, Function> _notInlinedMessages(_) => <String, Function>{

‎lib/generated/intl/messages_ru.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
2020
class MessageLookup extends MessageLookupByLibrary {
2121
String get localeName => 'ru';
2222

23-
static String m0(appName) =>
23+
static String m0(String appName) =>
2424
"название ${appName} - это игра слов, которая объединяет: \"peg\" (колышек, фишка) - основной элемент игры и \"theorema\", что связано с математической строгостью и логикой.";
2525

2626
final messages = _notInlinedMessages(_notInlinedMessages);

‎lib/main.dart‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ class MainApp extends ConsumerWidget {
4040

4141
@override
4242
Widget build(BuildContext context, WidgetRef ref) {
43-
final themeMode = ref.watch(themeNotifierProvider);
44-
final locale = ref.watch(languageNotifierProvider);
43+
final themeModeAsync = ref.watch(themeProvider);
44+
final localeAsync = ref.watch(languageProvider);
45+
46+
final themeMode = themeModeAsync.value ?? ThemeMode.system;
47+
final locale = localeAsync.value ?? const Locale('en', 'US');
4548

4649
talker.info('App build with theme: $themeMode, locale: $locale');
4750

0 commit comments

Comments
 (0)