Skip to content

Commit

Permalink
[Presentation] Moved the shared image widgets to its own folder
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolfteam committed Jul 23, 2021
1 parent 2eaa240 commit 664b9fa
Show file tree
Hide file tree
Showing 35 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions lib/presentation/artifact/artifact_page.dart
Expand Up @@ -3,14 +3,14 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:genshindb/application/bloc.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/artifacts/widgets/artifact_stats.dart';
import 'package:genshindb/presentation/shared/circle_character.dart';
import 'package:genshindb/presentation/shared/circle_monster.dart';
import 'package:genshindb/presentation/shared/details/detail_appbar.dart';
import 'package:genshindb/presentation/shared/details/detail_bottom_portrait_layout.dart';
import 'package:genshindb/presentation/shared/details/detail_general_card.dart';
import 'package:genshindb/presentation/shared/details/detail_tab_landscape_layout.dart';
import 'package:genshindb/presentation/shared/details/detail_top_layout.dart';
import 'package:genshindb/presentation/shared/extensions/rarity_extensions.dart';
import 'package:genshindb/presentation/shared/images/circle_character.dart';
import 'package:genshindb/presentation/shared/images/circle_monster.dart';
import 'package:genshindb/presentation/shared/item_description_detail.dart';
import 'package:genshindb/presentation/shared/loading.dart';
import 'package:genshindb/presentation/shared/scaffold_with_fab.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/artifacts/widgets/artifact_card.dart
Expand Up @@ -5,7 +5,7 @@ import 'package:genshindb/domain/models/models.dart';
import 'package:genshindb/presentation/artifact/artifact_page.dart';
import 'package:genshindb/presentation/shared/extensions/rarity_extensions.dart';
import 'package:genshindb/presentation/shared/gradient_card.dart';
import 'package:genshindb/presentation/shared/rarity.dart';
import 'package:genshindb/presentation/shared/images/rarity.dart';
import 'package:genshindb/presentation/shared/styles.dart';
import 'package:transparent_image/transparent_image.dart';

Expand Down
Expand Up @@ -4,9 +4,9 @@ import 'package:genshindb/domain/models/models.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/common_table_cell.dart';
import 'package:genshindb/presentation/shared/extensions/element_type_extensions.dart';
import 'package:genshindb/presentation/shared/images/wrapped_ascension_material.dart';
import 'package:genshindb/presentation/shared/item_description_detail.dart';
import 'package:genshindb/presentation/shared/styles.dart';
import 'package:genshindb/presentation/shared/wrapped_ascension_material.dart';

class CharacterDetailAscensionMaterialsCard extends StatelessWidget {
final ElementType elementType;
Expand Down
Expand Up @@ -4,10 +4,10 @@ import 'package:genshindb/domain/extensions/string_extensions.dart';
import 'package:genshindb/domain/extensions/weapon_type_extensions.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/details/detail_general_card.dart';
import 'package:genshindb/presentation/shared/element_image.dart';
import 'package:genshindb/presentation/shared/extensions/element_type_extensions.dart';
import 'package:genshindb/presentation/shared/extensions/i18n_extensions.dart';
import 'package:genshindb/presentation/shared/genshin_db_icons.dart';
import 'package:genshindb/presentation/shared/images/element_image.dart';
import 'package:genshindb/presentation/shared/item_description.dart';

import 'character_detail.dart';
Expand Down
Expand Up @@ -4,9 +4,9 @@ import 'package:genshindb/domain/models/models.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/common_table_cell.dart';
import 'package:genshindb/presentation/shared/extensions/element_type_extensions.dart';
import 'package:genshindb/presentation/shared/images/wrapped_ascension_material.dart';
import 'package:genshindb/presentation/shared/item_description_detail.dart';
import 'package:genshindb/presentation/shared/styles.dart';
import 'package:genshindb/presentation/shared/wrapped_ascension_material.dart';

class CharacterDetailTalentAscensionMaterialsCard extends StatelessWidget {
final ElementType elementType;
Expand All @@ -17,14 +17,14 @@ class CharacterDetailTalentAscensionMaterialsCard extends StatelessWidget {
Key? key,
required this.elementType,
required this.talentAscensionMaterials,
}) : multiTalentAscensionMaterials = const [],
}) : multiTalentAscensionMaterials = const [],
super(key: key);

const CharacterDetailTalentAscensionMaterialsCard.withMultiTalents({
Key? key,
required this.elementType,
required this.multiTalentAscensionMaterials,
}) : talentAscensionMaterials = const [],
}) : talentAscensionMaterials = const [],
super(key: key);

@override
Expand Down
6 changes: 3 additions & 3 deletions lib/presentation/characters/widgets/character_card.dart
Expand Up @@ -5,11 +5,11 @@ import 'package:genshindb/domain/enums/enums.dart';
import 'package:genshindb/domain/models/models.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/character/character_page.dart';
import 'package:genshindb/presentation/shared/comingsoon_new_avatar.dart';
import 'package:genshindb/presentation/shared/element_image.dart';
import 'package:genshindb/presentation/shared/extensions/element_type_extensions.dart';
import 'package:genshindb/presentation/shared/extensions/i18n_extensions.dart';
import 'package:genshindb/presentation/shared/rarity.dart';
import 'package:genshindb/presentation/shared/images/comingsoon_new_avatar.dart';
import 'package:genshindb/presentation/shared/images/element_image.dart';
import 'package:genshindb/presentation/shared/images/rarity.dart';
import 'package:genshindb/presentation/shared/styles.dart';
import 'package:genshindb/presentation/shared/utils/toast_utils.dart';
import 'package:transparent_image/transparent_image.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/elements/widgets/element_debuff_card.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:genshindb/presentation/shared/element_image.dart';
import 'package:genshindb/presentation/shared/images/element_image.dart';
import 'package:genshindb/presentation/shared/styles.dart';

class ElementDebuffCard extends StatelessWidget {
Expand Down
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:genshindb/presentation/shared/element_image.dart';
import 'package:genshindb/presentation/shared/images/element_image.dart';
import 'package:genshindb/presentation/shared/styles.dart';

class ElementReactionCard extends StatelessWidget {
Expand Down
Expand Up @@ -9,10 +9,10 @@ import 'package:genshindb/domain/models/models.dart';
import 'package:genshindb/domain/utils/date_utils.dart' as utils;
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/extensions/i18n_extensions.dart';
import 'package:genshindb/presentation/shared/images/wrapped_ascension_material.dart';
import 'package:genshindb/presentation/shared/styles.dart';
import 'package:genshindb/presentation/shared/utils/size_utils.dart';
import 'package:genshindb/presentation/shared/utils/toast_utils.dart';
import 'package:genshindb/presentation/shared/wrapped_ascension_material.dart';

class GameCodeListItem extends StatelessWidget {
final String code;
Expand Down
@@ -1,7 +1,7 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:genshindb/presentation/home/widgets/ascension_material_item_card.dart';
import 'package:genshindb/presentation/shared/circle_character.dart';
import 'package:genshindb/presentation/shared/images/circle_character.dart';

class CharCardAscensionMaterial extends StatelessWidget {
final String name;
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/home/widgets/elements_card.dart
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:genshindb/domain/enums/enums.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/elements/elements_page.dart';
import 'package:genshindb/presentation/shared/element_image.dart';
import 'package:genshindb/presentation/shared/images/element_image.dart';
import 'package:genshindb/presentation/shared/styles.dart';

class ElementsCard extends StatelessWidget {
Expand Down
Expand Up @@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:genshindb/application/bloc.dart';
import 'package:genshindb/domain/assets.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/circle_character.dart';
import 'package:genshindb/presentation/shared/images/circle_character.dart';
import 'package:genshindb/presentation/shared/loading.dart';
import 'package:genshindb/presentation/shared/styles.dart';

Expand Down
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:genshindb/presentation/home/widgets/ascension_material_item_card.dart';
import 'package:genshindb/presentation/shared/circle_weapon.dart';
import 'package:genshindb/presentation/shared/images/circle_weapon.dart';

class WeaponCardAscensionMaterial extends StatelessWidget {
final String name;
Expand Down
8 changes: 4 additions & 4 deletions lib/presentation/material/widgets/material_detail_bottom.dart
Expand Up @@ -4,15 +4,15 @@ import 'package:genshindb/domain/extensions/iterable_extensions.dart';
import 'package:genshindb/domain/extensions/string_extensions.dart';
import 'package:genshindb/domain/models/models.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/circle_character.dart';
import 'package:genshindb/presentation/shared/circle_monster.dart';
import 'package:genshindb/presentation/shared/circle_weapon.dart';
import 'package:genshindb/presentation/shared/details/detail_bottom_portrait_layout.dart';
import 'package:genshindb/presentation/shared/details/detail_tab_landscape_layout.dart';
import 'package:genshindb/presentation/shared/extensions/rarity_extensions.dart';
import 'package:genshindb/presentation/shared/images/circle_character.dart';
import 'package:genshindb/presentation/shared/images/circle_monster.dart';
import 'package:genshindb/presentation/shared/images/circle_weapon.dart';
import 'package:genshindb/presentation/shared/images/wrapped_ascension_material.dart';
import 'package:genshindb/presentation/shared/item_description_detail.dart';
import 'package:genshindb/presentation/shared/material_item_button.dart';
import 'package:genshindb/presentation/shared/wrapped_ascension_material.dart';
import 'package:responsive_builder/responsive_builder.dart';

class MaterialDetailBottom extends StatelessWidget {
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/monsters/widgets/monster_card.dart
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:genshindb/domain/enums/enums.dart';
import 'package:genshindb/domain/models/models.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/comingsoon_new_avatar.dart';
import 'package:genshindb/presentation/shared/images/comingsoon_new_avatar.dart';
import 'package:genshindb/presentation/shared/styles.dart';
import 'package:genshindb/presentation/shared/utils/toast_utils.dart';
import 'package:transparent_image/transparent_image.dart';
Expand Down
Expand Up @@ -8,7 +8,7 @@ import 'package:genshindb/presentation/artifacts/artifacts_page.dart';
import 'package:genshindb/presentation/characters/characters_page.dart';
import 'package:genshindb/presentation/materials/materials_page.dart';
import 'package:genshindb/presentation/monsters/monsters_page.dart';
import 'package:genshindb/presentation/shared/circle_item.dart';
import 'package:genshindb/presentation/shared/images/circle_item.dart';
import 'package:genshindb/presentation/weapons/weapons_page.dart';

class NotificationCircleItem extends StatelessWidget {
Expand Down
Expand Up @@ -7,7 +7,7 @@ import 'package:genshindb/domain/enums/enums.dart';
import 'package:genshindb/domain/extensions/duration_extensions.dart';
import 'package:genshindb/domain/models/models.dart' as models;
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/circle_item.dart';
import 'package:genshindb/presentation/shared/images/circle_item.dart';
import 'package:genshindb/presentation/shared/number_picker_dialog.dart';
import 'package:genshindb/presentation/shared/styles.dart';
import 'package:genshindb/presentation/shared/utils/modal_bottom_sheet_utils.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/shared/details/detail_general_card.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:genshindb/presentation/shared/rarity.dart';
import 'package:genshindb/presentation/shared/images/rarity.dart';
import 'package:genshindb/presentation/shared/styles.dart';

class DetailGeneralCard extends StatelessWidget {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:genshindb/domain/assets.dart';
import 'package:genshindb/domain/enums/enums.dart';

import 'extensions/element_type_extensions.dart';
import '../extensions/element_type_extensions.dart';

class ElementImage extends StatelessWidget {
final ElementType type;
Expand Down
File renamed without changes.
File renamed without changes.
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';

import 'material_item_button.dart';
import '../material_item_button.dart';

class WrappedAscensionMaterial extends StatelessWidget {
final String image;
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/shared/item_description_detail.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';

import 'primogem_icon.dart';
import 'images/primogem_icon.dart';
import 'styles.dart';

class ItemDescriptionDetail extends StatelessWidget {
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/tierlist/widgets/tierlist_fab.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:genshindb/application/bloc.dart';
import 'package:genshindb/presentation/shared/circle_character.dart';
import 'package:genshindb/presentation/shared/images/circle_character.dart';
import 'package:genshindb/presentation/shared/styles.dart';

class TierListFab extends StatelessWidget {
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/tierlist/widgets/tierlist_row.dart
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:genshindb/application/bloc.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/circle_character.dart';
import 'package:genshindb/presentation/shared/images/circle_character.dart';
import 'package:genshindb/presentation/shared/utils/size_utils.dart';

import 'rename_tierlist_dialog.dart';
Expand Down
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:genshindb/domain/models/models.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/images/wrapped_ascension_material.dart';
import 'package:genshindb/presentation/shared/item_description_detail.dart';
import 'package:genshindb/presentation/shared/styles.dart';
import 'package:genshindb/presentation/shared/utils/size_utils.dart';
import 'package:genshindb/presentation/shared/wrapped_ascension_material.dart';

class WeaponDetailAscensionMaterialsCard extends StatelessWidget {
final Color rarityColor;
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/weapon/widgets/weapon_detail_bottom.dart
Expand Up @@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
import 'package:genshindb/domain/enums/enums.dart';
import 'package:genshindb/domain/models/models.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/circle_character.dart';
import 'package:genshindb/presentation/shared/details/detail_bottom_portrait_layout.dart';
import 'package:genshindb/presentation/shared/details/detail_tab_landscape_layout.dart';
import 'package:genshindb/presentation/shared/extensions/rarity_extensions.dart';
import 'package:genshindb/presentation/shared/images/circle_character.dart';
import 'package:genshindb/presentation/shared/item_description_detail.dart';
import 'package:genshindb/presentation/shared/styles.dart';
import 'package:genshindb/presentation/shared/utils/size_utils.dart';
Expand Down
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:genshindb/domain/models/models.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/images/wrapped_ascension_material.dart';
import 'package:genshindb/presentation/shared/item_description_detail.dart';
import 'package:genshindb/presentation/shared/utils/size_utils.dart';
import 'package:genshindb/presentation/shared/wrapped_ascension_material.dart';

class WeaponCraftingMaterials extends StatelessWidget {
final List<ItemAscensionMaterialModel> materials;
Expand Down
4 changes: 2 additions & 2 deletions lib/presentation/weapons/widgets/weapon_card.dart
Expand Up @@ -6,12 +6,12 @@ import 'package:genshindb/application/bloc.dart';
import 'package:genshindb/domain/enums/enums.dart';
import 'package:genshindb/domain/models/models.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/comingsoon_new_avatar.dart';
import 'package:genshindb/presentation/shared/extensions/i18n_extensions.dart';
import 'package:genshindb/presentation/shared/extensions/rarity_extensions.dart';
import 'package:genshindb/presentation/shared/gradient_card.dart';
import 'package:genshindb/presentation/shared/images/comingsoon_new_avatar.dart';
import 'package:genshindb/presentation/shared/images/rarity.dart';
import 'package:genshindb/presentation/shared/loading.dart';
import 'package:genshindb/presentation/shared/rarity.dart';
import 'package:genshindb/presentation/shared/styles.dart';
import 'package:genshindb/presentation/weapon/weapon_page.dart';
import 'package:transparent_image/transparent_image.dart';
Expand Down

0 comments on commit 664b9fa

Please sign in to comment.