Skip to content

Commit c7b0e00

Browse files
JshewmakerJshewmaker
committed
fixed an issue with most played commander stat
1 parent 67e7d06 commit c7b0e00

12 files changed

Lines changed: 82 additions & 64 deletions

File tree

‎ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>12.0</string>
24+
<string>13.0</string>
2525
</dict>
2626
</plist>

‎ios/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ post_install do |installer|
5050
end
5151
end
5252
end
53-
end
53+
end

‎ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,7 +1535,7 @@ SPEC CHECKSUMS:
15351535
FirebaseFirestoreInternal: 8c5921c360a70e447bfeefb245f450e8b50e750b
15361536
FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
15371537
FirebaseSharedSwift: e17c654ef1f1a616b0b33054e663ad1035c8fd40
1538-
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
1538+
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
15391539
google_sign_in_ios: 19297361f2c51d7d8ac0201b866ef1fa5d1f94a8
15401540
GoogleAppMeasurement: fc0817122bd4d4189164f85374e06773b9561896
15411541
GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db
@@ -1555,6 +1555,6 @@ SPEC CHECKSUMS:
15551555
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
15561556
wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
15571557

1558-
PODFILE CHECKSUM: 6855ada6587ada1dd8acfc7fc1239123878aad1f
1558+
PODFILE CHECKSUM: bc7eae3e2661f1b11146bfb0087f8fdf5ee02315
15591559

15601560
COCOAPODS: 1.16.2

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@
384384
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
385385
GCC_WARN_UNUSED_FUNCTION = YES;
386386
GCC_WARN_UNUSED_VARIABLE = YES;
387-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
387+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
388388
MTL_ENABLE_DEBUG_INFO = NO;
389389
SDKROOT = iphoneos;
390390
SUPPORTED_PLATFORMS = iphoneos;
@@ -478,7 +478,7 @@
478478
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
479479
GCC_WARN_UNUSED_FUNCTION = YES;
480480
GCC_WARN_UNUSED_VARIABLE = YES;
481-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
481+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
482482
MTL_ENABLE_DEBUG_INFO = YES;
483483
ONLY_ACTIVE_ARCH = YES;
484484
SDKROOT = iphoneos;
@@ -530,7 +530,7 @@
530530
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
531531
GCC_WARN_UNUSED_FUNCTION = YES;
532532
GCC_WARN_UNUSED_VARIABLE = YES;
533-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
533+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
534534
MTL_ENABLE_DEBUG_INFO = NO;
535535
SDKROOT = iphoneos;
536536
SUPPORTED_PLATFORMS = iphoneos;
@@ -662,7 +662,7 @@
662662
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
663663
GCC_WARN_UNUSED_FUNCTION = YES;
664664
GCC_WARN_UNUSED_VARIABLE = YES;
665-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
665+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
666666
MTL_ENABLE_DEBUG_INFO = YES;
667667
ONLY_ACTIVE_ARCH = YES;
668668
SDKROOT = iphoneos;
@@ -747,7 +747,7 @@
747747
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
748748
GCC_WARN_UNUSED_FUNCTION = YES;
749749
GCC_WARN_UNUSED_VARIABLE = YES;
750-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
750+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
751751
MTL_ENABLE_DEBUG_INFO = NO;
752752
SDKROOT = iphoneos;
753753
SUPPORTED_PLATFORMS = iphoneos;
@@ -834,7 +834,7 @@
834834
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
835835
GCC_WARN_UNUSED_FUNCTION = YES;
836836
GCC_WARN_UNUSED_VARIABLE = YES;
837-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
837+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
838838
MTL_ENABLE_DEBUG_INFO = NO;
839839
SDKROOT = iphoneos;
840840
SUPPORTED_PLATFORMS = iphoneos;
@@ -925,7 +925,7 @@
925925
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
926926
GCC_WARN_UNUSED_FUNCTION = YES;
927927
GCC_WARN_UNUSED_VARIABLE = YES;
928-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
928+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
929929
MTL_ENABLE_DEBUG_INFO = YES;
930930
ONLY_ACTIVE_ARCH = YES;
931931
SDKROOT = iphoneos;
@@ -1010,7 +1010,7 @@
10101010
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
10111011
GCC_WARN_UNUSED_FUNCTION = YES;
10121012
GCC_WARN_UNUSED_VARIABLE = YES;
1013-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1013+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
10141014
MTL_ENABLE_DEBUG_INFO = NO;
10151015
SDKROOT = iphoneos;
10161016
SUPPORTED_PLATFORMS = iphoneos;
@@ -1097,7 +1097,7 @@
10971097
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
10981098
GCC_WARN_UNUSED_FUNCTION = YES;
10991099
GCC_WARN_UNUSED_VARIABLE = YES;
1100-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1100+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
11011101
MTL_ENABLE_DEBUG_INFO = NO;
11021102
SDKROOT = iphoneos;
11031103
SUPPORTED_PLATFORMS = iphoneos;
@@ -1182,7 +1182,7 @@
11821182
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
11831183
GCC_WARN_UNUSED_FUNCTION = YES;
11841184
GCC_WARN_UNUSED_VARIABLE = YES;
1185-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1185+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
11861186
MTL_ENABLE_DEBUG_INFO = NO;
11871187
SDKROOT = iphoneos;
11881188
SUPPORTED_PLATFORMS = iphoneos;

‎ios/Runner.xcodeproj/xcshareddata/xcschemes/development.xcscheme‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug-development"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -34,6 +35,7 @@
3435
buildConfiguration = "Debug-development"
3536
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3637
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
38+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
3739
launchStyle = "0"
3840
useCustomWorkingDirectory = "NO"
3941
ignoresPersistentStateOnLaunch = "NO"

‎lib/l10n/arb/app_localizations.dart‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,17 @@ import 'app_localizations_es.dart';
6262
/// be consistent with the languages listed in the AppLocalizations.supportedLocales
6363
/// property.
6464
abstract class AppLocalizations {
65-
AppLocalizations(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
65+
AppLocalizations(String locale)
66+
: localeName = intl.Intl.canonicalizedLocale(locale.toString());
6667

6768
final String localeName;
6869

6970
static AppLocalizations of(BuildContext context) {
7071
return Localizations.of<AppLocalizations>(context, AppLocalizations)!;
7172
}
7273

73-
static const LocalizationsDelegate<AppLocalizations> delegate = _AppLocalizationsDelegate();
74+
static const LocalizationsDelegate<AppLocalizations> delegate =
75+
_AppLocalizationsDelegate();
7476

7577
/// A list of this localizations delegate along with the default localizations
7678
/// delegates.
@@ -82,7 +84,8 @@ abstract class AppLocalizations {
8284
/// Additional delegates can be added by appending to this list in
8385
/// MaterialApp. This list does not have to be used at all if a custom list
8486
/// of delegates is preferred or required.
85-
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
87+
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
88+
<LocalizationsDelegate<dynamic>>[
8689
delegate,
8790
GlobalMaterialLocalizations.delegate,
8891
GlobalCupertinoLocalizations.delegate,
@@ -714,7 +717,8 @@ abstract class AppLocalizations {
714717
String get gameRestoredMessage;
715718
}
716719

717-
class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {
720+
class _AppLocalizationsDelegate
721+
extends LocalizationsDelegate<AppLocalizations> {
718722
const _AppLocalizationsDelegate();
719723

720724
@override
@@ -723,25 +727,25 @@ class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations>
723727
}
724728

725729
@override
726-
bool isSupported(Locale locale) => <String>['en', 'es'].contains(locale.languageCode);
730+
bool isSupported(Locale locale) =>
731+
<String>['en', 'es'].contains(locale.languageCode);
727732

728733
@override
729734
bool shouldReload(_AppLocalizationsDelegate old) => false;
730735
}
731736

732737
AppLocalizations lookupAppLocalizations(Locale locale) {
733-
734-
735738
// Lookup logic when only language code is specified.
736739
switch (locale.languageCode) {
737-
case 'en': return AppLocalizationsEn();
738-
case 'es': return AppLocalizationsEs();
740+
case 'en':
741+
return AppLocalizationsEn();
742+
case 'es':
743+
return AppLocalizationsEs();
739744
}
740745

741746
throw FlutterError(
742-
'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
743-
'an issue with the localizations generation tool. Please file an issue '
744-
'on GitHub with a reproducible sample app and the gen-l10n configuration '
745-
'that was used.'
746-
);
747+
'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
748+
'an issue with the localizations generation tool. Please file an issue '
749+
'on GitHub with a reproducible sample app and the gen-l10n configuration '
750+
'that was used.');
747751
}

‎lib/l10n/arb/app_localizations_en.dart‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ class AppLocalizationsEn extends AppLocalizations {
4545
String get passwordInputLabelText => 'Password';
4646

4747
@override
48-
String get resetPasswordSubmitText => 'If an account is registered with the provided email, we will send a link to reset your password';
48+
String get resetPasswordSubmitText =>
49+
'If an account is registered with the provided email, we will send a link to reset your password';
4950

5051
@override
5152
String get resetPasswordTitle => 'Reset Password';
@@ -87,7 +88,8 @@ class AppLocalizationsEn extends AppLocalizations {
8788
String get resultsTabTimeline => 'Timeline';
8889

8990
@override
90-
String get navigationDialogText => 'Are you sure you want to go to the home page? The current game progress will be lost.';
91+
String get navigationDialogText =>
92+
'Are you sure you want to go to the home page? The current game progress will be lost.';
9193

9294
@override
9395
String get exitGameDialogText => 'Exit Game?';
@@ -113,7 +115,8 @@ class AppLocalizationsEn extends AppLocalizations {
113115
String get saveButtonText => 'Save';
114116

115117
@override
116-
String get accountOwnershipLinkText => 'Link this player to your account so we know which commander you are!';
118+
String get accountOwnershipLinkText =>
119+
'Link this player to your account so we know which commander you are!';
117120

118121
@override
119122
String get accountOwnershipTitle => 'This is my commander';
@@ -233,7 +236,8 @@ class AppLocalizationsEn extends AppLocalizations {
233236
String get whoWentFirst => 'Who went first:';
234237

235238
@override
236-
String get accountOwner => 'Please select the account owner from the list to sync the game stats to their account:';
239+
String get accountOwner =>
240+
'Please select the account owner from the list to sync the game stats to their account:';
237241

238242
@override
239243
String get cancel => 'Cancel';
@@ -316,7 +320,8 @@ class AppLocalizationsEn extends AppLocalizations {
316320
String get deleteMatchDialogTitle => 'Delete Match';
317321

318322
@override
319-
String get deleteMatchDialogContent => 'Are you sure you want to delete this match?';
323+
String get deleteMatchDialogContent =>
324+
'Are you sure you want to delete this match?';
320325

321326
@override
322327
String get cancelButtonLabel => 'Cancel';

‎lib/l10n/arb/app_localizations_es.dart‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ class AppLocalizationsEs extends AppLocalizations {
4545
String get passwordInputLabelText => 'Password';
4646

4747
@override
48-
String get resetPasswordSubmitText => 'If an account is registered with the provided email, we will send a link to reset your password';
48+
String get resetPasswordSubmitText =>
49+
'If an account is registered with the provided email, we will send a link to reset your password';
4950

5051
@override
5152
String get resetPasswordTitle => 'Reset Password';
@@ -87,7 +88,8 @@ class AppLocalizationsEs extends AppLocalizations {
8788
String get resultsTabTimeline => 'Timeline';
8889

8990
@override
90-
String get navigationDialogText => 'Are you sure you want to go to the home page? The current game progress will be lost.';
91+
String get navigationDialogText =>
92+
'Are you sure you want to go to the home page? The current game progress will be lost.';
9193

9294
@override
9395
String get exitGameDialogText => 'Exit Game?';
@@ -113,7 +115,8 @@ class AppLocalizationsEs extends AppLocalizations {
113115
String get saveButtonText => 'Save';
114116

115117
@override
116-
String get accountOwnershipLinkText => '¡Vincula este jugador a tu cuenta para saber qué comandante eres!';
118+
String get accountOwnershipLinkText =>
119+
'¡Vincula este jugador a tu cuenta para saber qué comandante eres!';
117120

118121
@override
119122
String get accountOwnershipTitle => 'Este es mi comandante';
@@ -201,10 +204,12 @@ class AppLocalizationsEs extends AppLocalizations {
201204
String get statsTitle => 'Tus Estadísticas';
202205

203206
@override
204-
String get matchHistoryLoadError => 'Error al cargar el historial de partidas';
207+
String get matchHistoryLoadError =>
208+
'Error al cargar el historial de partidas';
205209

206210
@override
207-
String get noMatchHistoryAvailable => 'No hay historial de partidas disponible';
211+
String get noMatchHistoryAvailable =>
212+
'No hay historial de partidas disponible';
208213

209214
@override
210215
String get gameOverTitle => 'Game Over';
@@ -233,7 +238,8 @@ class AppLocalizationsEs extends AppLocalizations {
233238
String get whoWentFirst => 'Who went first:';
234239

235240
@override
236-
String get accountOwner => 'Please select the account owner from the list to sync the game stats to their account:';
241+
String get accountOwner =>
242+
'Please select the account owner from the list to sync the game stats to their account:';
237243

238244
@override
239245
String get cancel => 'Cancel';
@@ -316,7 +322,8 @@ class AppLocalizationsEs extends AppLocalizations {
316322
String get deleteMatchDialogTitle => 'Delete Match';
317323

318324
@override
319-
String get deleteMatchDialogContent => 'Are you sure you want to delete this match?';
325+
String get deleteMatchDialogContent =>
326+
'Are you sure you want to delete this match?';
320327

321328
@override
322329
String get cancelButtonLabel => 'Cancel';

‎lib/stats_overview/stats_overview_bloc/stats_overview_bloc.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class StatsOverviewBloc extends Bloc<StatsOverviewEvent, StatsOverviewState> {
9595
final commanders = <String>[];
9696
for (final game in games) {
9797
final player = _findPlayerInGame(game, userId);
98-
if (player.commander == null) return 'No commanders';
98+
if (player.commander == null) continue;
9999
commanders.add(player.commander?.name ?? '');
100100
}
101101
commanders

‎packages/app_ui/lib/src/theme/app_theme.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ class AppTheme {
129129
);
130130
}
131131

132-
TabBarTheme get _tabBarTheme {
133-
return TabBarTheme(
132+
TabBarThemeData get _tabBarTheme {
133+
return TabBarThemeData(
134134
dividerColor: Colors.transparent,
135135
overlayColor: WidgetStateProperty.all<Color>(AppColors.background),
136136
);

0 commit comments

Comments
 (0)