Skip to content

Commit

Permalink
Warning fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolfteam committed Jan 23, 2022
1 parent 262013d commit 843bd5f
Show file tree
Hide file tree
Showing 46 changed files with 55 additions and 100 deletions.
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:meta/meta.dart';
import 'package:shiori/application/bloc.dart';
import 'package:shiori/domain/extensions/iterable_extensions.dart';
import 'package:shiori/domain/models/models.dart';
Expand Down
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:meta/meta.dart';
import 'package:shiori/domain/extensions/string_extensions.dart';

part 'calculator_asc_materials_session_form_bloc.freezed.dart';
Expand Down
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:meta/meta.dart';
import 'package:shiori/domain/models/models.dart';
import 'package:shiori/domain/services/data_service.dart';
import 'package:shiori/domain/services/telemetry_service.dart';
Expand Down
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:meta/meta.dart';
import 'package:shiori/application/bloc.dart';
import 'package:shiori/domain/models/models.dart';
import 'package:shiori/domain/services/data_service.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/application/game_codes/game_codes_bloc.dart
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:meta/meta.dart';
import 'package:shiori/domain/models/models.dart';
import 'package:shiori/domain/services/data_service.dart';
import 'package:shiori/domain/services/game_code_service.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/application/inventory/inventory_bloc.dart
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:meta/meta.dart';
import 'package:shiori/domain/enums/enums.dart';
import 'package:shiori/domain/models/models.dart';
import 'package:shiori/domain/services/data_service.dart';
Expand Down
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:meta/meta.dart';

part 'item_quantity_form_bloc.freezed.dart';
part 'item_quantity_form_event.dart';
Expand Down
2 changes: 0 additions & 2 deletions lib/application/material/material_bloc.dart
@@ -1,10 +1,8 @@
import 'dart:async';

import 'package:darq/darq.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:meta/meta.dart';
import 'package:shiori/domain/enums/enums.dart';
import 'package:shiori/domain/models/models.dart';
import 'package:shiori/domain/services/genshin_service.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/application/materials/materials_bloc.dart
Expand Up @@ -5,7 +5,6 @@ import 'package:darq/darq.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:shiori/domain/app_constants.dart';
import 'package:shiori/domain/enums/enums.dart';
import 'package:shiori/domain/enums/material_type.dart';
import 'package:shiori/domain/models/models.dart';
import 'package:shiori/domain/services/genshin_service.dart';

Expand Down
1 change: 0 additions & 1 deletion lib/application/monsters/monsters_bloc.dart
Expand Up @@ -3,7 +3,6 @@ import 'dart:async';
import 'package:bloc/bloc.dart';
import 'package:darq/darq.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:meta/meta.dart';
import 'package:shiori/domain/enums/enums.dart';
import 'package:shiori/domain/models/models.dart';
import 'package:shiori/domain/services/genshin_service.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/application/notifications/notifications_bloc.dart
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:meta/meta.dart';
import 'package:shiori/domain/enums/enums.dart';
import 'package:shiori/domain/models/models.dart';
import 'package:shiori/domain/services/data_service.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/application/tier_list/tier_list_bloc.dart
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:meta/meta.dart';
import 'package:shiori/domain/models/models.dart';
import 'package:shiori/domain/services/data_service.dart';
import 'package:shiori/domain/services/genshin_service.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/application/tier_list_form/tier_list_form_bloc.dart
Expand Up @@ -2,7 +2,6 @@ import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:meta/meta.dart';
import 'package:shiori/domain/extensions/string_extensions.dart';

part 'tier_list_form_bloc.freezed.dart';
Expand Down
5 changes: 0 additions & 5 deletions lib/domain/models/db/characters/character_file_model.dart
Expand Up @@ -3,11 +3,6 @@ import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:shiori/domain/enums/enums.dart';

import '../../../assets.dart';
import '../../../enums/character_role_type.dart';
import '../../../enums/character_skill_type.dart';
import '../../../enums/element_type.dart';
import '../../../enums/region_type.dart';
import '../../../enums/weapon_type.dart';
import '../../models.dart';

part 'character_file_model.freezed.dart';
Expand Down
3 changes: 0 additions & 3 deletions lib/domain/models/db/weapons/weapon_file_model.dart
Expand Up @@ -2,9 +2,6 @@ import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:shiori/domain/enums/enums.dart';

import '../../../assets.dart';
import '../../../enums/item_location_type.dart';
import '../../../enums/stat_type.dart';
import '../../../enums/weapon_type.dart';
import '../../models.dart';

part 'weapon_file_model.freezed.dart';
Expand Down
@@ -1,5 +1,4 @@
import 'package:hive/hive.dart';
import 'package:shiori/domain/enums/enums.dart';

part 'custom_build_artifact.g.dart';

Expand Down
@@ -1,5 +1,4 @@
import 'package:hive/hive.dart';
import 'package:shiori/domain/enums/enums.dart';

part 'custom_build_team_character.g.dart';

Expand Down
1 change: 0 additions & 1 deletion lib/domain/models/settings/app_settings.dart
@@ -1,5 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
import 'package:freezed_annotation/freezed_annotation.dart';

import '../../enums/enums.dart';
Expand Down
1 change: 1 addition & 0 deletions lib/l10n/intl_en.arb
Expand Up @@ -378,6 +378,7 @@
"shield": "Shield",
"unofficial": "Unofficial",
"customBuilds": "Custom Builds",
"createCustomBuilds": "Don't like the current builds ? Create your custom ones!",
"talentPriority": "Talent Priority",
"add": "Add",
"update": "Update",
Expand Down
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:shiori/application/bloc.dart';
Expand Down
Expand Up @@ -227,24 +227,24 @@ class AddEditItemBottomSheet extends StatelessWidget {

Future<void> _showLevelPickerDialog(BuildContext context, int value, bool forCurrentLevel) async {
final s = S.of(context);
final newValue = await showDialog<int>(
await showDialog<int>(
context: context,
builder: (_) => NumberPickerDialog(
minItemLevel: minItemLevel,
maxItemLevel: maxItemLevel,
value: value,
title: s.chooseALevel,
),
);

if (newValue == null) {
return;
}
).then((newValue) {
if (newValue == null) {
return;
}

final event = forCurrentLevel
? CalculatorAscMaterialsItemEvent.currentLevelChanged(newValue: newValue)
: CalculatorAscMaterialsItemEvent.desiredLevelChanged(newValue: newValue);
context.read<CalculatorAscMaterialsItemBloc>().add(event);
final event = forCurrentLevel
? CalculatorAscMaterialsItemEvent.currentLevelChanged(newValue: newValue)
: CalculatorAscMaterialsItemEvent.desiredLevelChanged(newValue: newValue);
context.read<CalculatorAscMaterialsItemBloc>().add(event);
});
}
}

Expand Down
@@ -1,6 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:shiori/application/bloc.dart';
import 'package:shiori/domain/enums/enums.dart' as app;
Expand Down
1 change: 0 additions & 1 deletion lib/presentation/character/character_page.dart
Expand Up @@ -5,7 +5,6 @@ import 'package:shiori/injection.dart';
import 'package:shiori/presentation/shared/scaffold_with_fab.dart';

import 'widgets/character_detail.dart';
import 'widgets/character_detail_top.dart';

class CharacterPage extends StatelessWidget {
final String itemKey;
Expand Down
Expand Up @@ -3,7 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:shiori/application/bloc.dart';
import 'package:shiori/generated/l10n.dart';
import 'package:shiori/presentation/character/widgets/character_detail.dart';
import 'package:shiori/presentation/character/widgets/character_detail_skills_card.dart';
import 'package:shiori/presentation/shared/details/detail_bottom_portrait_layout.dart';
import 'package:shiori/presentation/shared/details/detail_tab_landscape_layout.dart';
import 'package:shiori/presentation/shared/extensions/element_type_extensions.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/presentation/custom_build/widgets/weapon_section.dart
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:shiori/application/bloc.dart';
Expand Down
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
Expand Down
4 changes: 2 additions & 2 deletions lib/presentation/home/widgets/custom_builds_card.dart
Expand Up @@ -18,12 +18,12 @@ class CustomBuildsCard extends StatelessWidget {
final theme = Theme.of(context);
final s = S.of(context);
return CardItem(
title: 'Custom Builds',
title: s.customBuilds,
iconToTheLeft: iconToTheLeft,
onClick: _gotoMaterialsPage,
icon: Icon(Icons.dashboard_customize, size: 60, color: theme.colorScheme.secondary),
children: [
CardDescription(text: "Don't like the provided builds ? Create your custom ones!"),
CardDescription(text: s.createCustomBuilds),
],
);
}
Expand Down
1 change: 0 additions & 1 deletion lib/presentation/home/widgets/main_title.dart
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:shiori/presentation/shared/styles.dart';

Expand Down
22 changes: 11 additions & 11 deletions lib/presentation/home/widgets/sliver_today_main_title.dart
Expand Up @@ -43,19 +43,19 @@ class SliverTodayMainTitle extends StatelessWidget {
}

Future<void> _openDayWeekDialog(int currentSelectedDay, BuildContext context) async {
final selectedDay = await showDialog<int>(
await showDialog<int>(
context: context,
builder: (_) => ChangeCurrentDayDialog(currentSelectedDay: currentSelectedDay),
);

if (selectedDay == null) {
return;
}
).then((selectedDay) {
if (selectedDay == null) {
return;
}

if (selectedDay < 0) {
context.read<HomeBloc>().add(const HomeEvent.init());
} else {
context.read<HomeBloc>().add(HomeEvent.dayChanged(newDay: selectedDay));
}
if (selectedDay < 0) {
context.read<HomeBloc>().add(const HomeEvent.init());
} else {
context.read<HomeBloc>().add(HomeEvent.dayChanged(newDay: selectedDay));
}
});
}
}
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:responsive_builder/responsive_builder.dart';
import 'package:shiori/domain/extensions/iterable_extensions.dart';
Expand Down
16 changes: 8 additions & 8 deletions lib/presentation/materials/widgets/material_card.dart
Expand Up @@ -155,7 +155,7 @@ class MaterialCard extends StatelessWidget {
if (!withoutDetails && !isInQuantityMode)
Center(
child: Tooltip(
message: name!,
message: name,
child: Text(
name!,
textAlign: TextAlign.center,
Expand Down Expand Up @@ -186,16 +186,16 @@ class MaterialCard extends StatelessWidget {
}

Future<void> _showQuantityPickerDialog(BuildContext context) async {
final newValue = await showDialog<int>(
await showDialog<int>(
context: context,
builder: (_) => ItemQuantityDialog(quantity: quantity),
);

if (newValue == null) {
return;
}
).then((newValue) {
if (newValue == null) {
return;
}

context.read<InventoryBloc>().add(InventoryEvent.updateMaterial(key: keyName, quantity: newValue));
context.read<InventoryBloc>().add(InventoryEvent.updateMaterial(key: keyName, quantity: newValue));
});
}

Future<void> _showUsedItemsDialog(BuildContext context) async {
Expand Down
Expand Up @@ -132,28 +132,23 @@ class NotificationCircleItem extends StatelessWidget {
}

Future<void> _openCharactersPage(BuildContext context) async {
final keyName = await CharactersPage.forSelection(context, excludeKeys: [selected.itemKey]);
_onItemSelected(keyName, context);
await CharactersPage.forSelection(context, excludeKeys: [selected.itemKey]).then((keyName) => _onItemSelected(keyName, context));
}

Future<void> _openWeaponsPage(BuildContext context) async {
final keyName = await WeaponsPage.forSelection(context, excludeKeys: [selected.itemKey]);
_onItemSelected(keyName, context);
await WeaponsPage.forSelection(context, excludeKeys: [selected.itemKey]).then((keyName) => _onItemSelected(keyName, context));
}

Future<void> _openMonstersPage(BuildContext context) async {
final keyName = await MonstersPage.forSelection(context, excludeKeys: [selected.itemKey]);
_onItemSelected(keyName, context);
await MonstersPage.forSelection(context, excludeKeys: [selected.itemKey]).then((keyName) => _onItemSelected(keyName, context));
}

Future<void> _openArtifactsPage(BuildContext context) async {
final keyName = await ArtifactsPage.forSelection(context, excludeKeys: [selected.itemKey]);
_onItemSelected(keyName, context);
await ArtifactsPage.forSelection(context, excludeKeys: [selected.itemKey]).then((keyName) => _onItemSelected(keyName, context));
}

Future<void> _openMaterialsPage(BuildContext context) async {
final keyName = await MaterialsPage.forSelection(context, excludeKeys: [selected.itemKey]);
_onItemSelected(keyName, context);
await MaterialsPage.forSelection(context, excludeKeys: [selected.itemKey]).then((keyName) => _onItemSelected(keyName, context));
}

void _onItemSelected(String? keyName, BuildContext context) {
Expand Down
Expand Up @@ -107,20 +107,20 @@ class NotificationRealmCurrency extends StatelessWidget {
Future<void> _showRealmRankLevelPickerDialog(BuildContext context) async {
final s = S.of(context);
final max = getRealmMaxCurrency(currentTrustRank);
final newValue = await showDialog<int>(
await showDialog<int>(
context: context,
builder: (_) => NumberPickerDialog(
maxItemLevel: max - 1,
minItemLevel: 0,
value: currentRealmCurrency,
title: s.realmCurrency,
),
);

if (newValue == null) {
return;
}
).then((newValue) {
if (newValue == null) {
return;
}

context.read<NotificationBloc>().add(NotificationEvent.realmCurrencyChanged(newValue: newValue));
context.read<NotificationBloc>().add(NotificationEvent.realmCurrencyChanged(newValue: newValue));
});
}
}
Expand Up @@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:shiori/application/bloc.dart';
import 'package:shiori/application/notifications/notifications_bloc.dart';
import 'package:shiori/domain/enums/enums.dart';
import 'package:shiori/domain/extensions/duration_extensions.dart';
import 'package:shiori/domain/models/models.dart' as models;
Expand Down
@@ -1,7 +1,6 @@
import 'dart:ui';

import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';

const Duration _bottomSheetEnterDuration = Duration(milliseconds: 250);
Expand Down

0 comments on commit 843bd5f

Please sign in to comment.