bachelor/wonders
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Polish and refactor collections views

Browse Source
This commit is contained in:
Shawn 2022-11-08 11:15:39 -07:00
parent c3034a5f97
commit 05ad64c2f6
8 changed files with 93 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ui/screens/collectible_found/collectible_found_screen.dart
View File

@ -62,6 +62,7 @@ class CollectibleFoundScreen extends StatelessWidget {
height: context.heightPx * .35,
child: Center(child: Hero(tag: 'collectible_image_${collectible.id}', child: _buildImage(context))),
),
Gap($styles.insets.lg),
_buildRibbon(context),
Gap($styles.insets.sm),
_buildTitle(context, collectible.title, $styles.text.h2, $styles.colors.offWhite, t * 1.5),

31
lib/ui/screens/collection/collection_screen.dart
View File

@ -9,9 +9,10 @@ import 'package:wonders/ui/common/controls/simple_header.dart';
import 'package:wonders/ui/common/gradient_container.dart';
import 'package:wonders/ui/common/modals/app_modals.dart';
part 'widgets/_collection_tile.dart';
part 'widgets/_newly_discovered_row.dart';
part 'widgets/_collectible_image.dart';
part 'widgets/_newly_discovered_items_btn.dart';
part 'widgets/_collection_list.dart';
part 'widgets/_collection_list_card.dart';
part 'widgets/_collection_footer.dart';
class CollectionScreen extends StatefulWidget with GetItStatefulWidgetMixin {
@ -25,15 +26,7 @@ class CollectionScreen extends StatefulWidget with GetItStatefulWidgetMixin {
class _CollectionScreenState extends State<CollectionScreen> with GetItStateMixin {
Map<String, int> _states = collectiblesLogic.statesById.value;
GlobalKey? _scrollKey;
WonderType? get scrollTargetWonder {
String? id = widget.fromId;
if (_states[id] != CollectibleState.discovered) {
id = _states.keys.firstWhereOrNull((id) => _states[id] == CollectibleState.discovered);
}
return collectiblesLogic.fromId(id)?.wonder;
}
final GlobalKey _scrollKey = GlobalKey();
@override
void initState() {
@ -44,16 +37,11 @@ class _CollectionScreenState extends State<CollectionScreen> with GetItStateMixi
}
void _scrollToTarget([bool animate = true]) {
if (_scrollKey != null) {
Scrollable.ensureVisible(_scrollKey!.currentContext!, alignment: 0.15, duration: animate ? 300.ms : 0.ms);
if (_scrollKey.currentContext != null) {
Scrollable.ensureVisible(_scrollKey.currentContext!, alignment: 0.15, duration: animate ? 300.ms : 0.ms);
}
}
void _showDetails(BuildContext context, CollectibleData collectible) {
context.push(ScreenPaths.artifact(collectible.artifactId));
Future.delayed(300.ms).then((_) => collectiblesLogic.updateState(collectible.id, CollectibleState.explored));
}
void _handleReset() async {
String msg = $strings.collectionPopupResetConfirm;
final result = await showModal(context, child: OkCancelModal(msg: msg));
@ -71,9 +59,6 @@ class _CollectionScreenState extends State<CollectionScreen> with GetItStateMixi
if (state == CollectibleState.explored) explored++;
});
WonderType? scrollWonder = scrollTargetWonder;
if (scrollWonder != null) _scrollKey = GlobalKey();
return ColoredBox(
color: $styles.colors.greyStrong,
child: Column(
@ -81,14 +66,12 @@ class _CollectionScreenState extends State<CollectionScreen> with GetItStateMixi
Expanded(
child: Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
SimpleHeader($strings.collectionTitleCollection),
_NewlyDiscoveredRow(count: discovered, onPressed: _scrollToTarget),
_NewlyDiscoveredItemsBtn(count: discovered, onPressed: _scrollToTarget),
Flexible(
child: _CollectionList(
states: _states,
fromId: widget.fromId,
scrollKey: _scrollKey,
scrollWonder: scrollWonder,
onPressed: (o) => _showDetails(context, o),
onReset: discovered + explored > 0 ? _handleReset : null,
),
),

4
lib/ui/screens/collection/widgets/_collection_tile.dart → lib/ui/screens/collection/widgets/_collectible_image.dart
View File

@ -1,7 +1,7 @@
part of '../collection_screen.dart';
class _CollectionTile extends StatelessWidget {
const _CollectionTile({
class _CollectibleImage extends StatelessWidget {
const _CollectibleImage({
Key? key,
required this.collectible,
required this.state,

63
lib/ui/screens/collection/widgets/_collection_list.dart
View File

@ -5,31 +5,38 @@ class _CollectionList extends StatelessWidget {
const _CollectionList({
Key? key,
required this.states,
required this.onPressed,
this.onReset,
this.fromId,
this.scrollWonder,
this.scrollKey,
}) : super(key: key);
final Map<String, int> states;
final ValueSetter<CollectibleData> onPressed;
final VoidCallback? onReset;
final Key? scrollKey;
final WonderType? scrollWonder;
final String? fromId;
WonderType? get scrollTargetWonder {
String? id = fromId;
if (states[id] != CollectibleState.discovered) {
id = states.keys.firstWhereOrNull((id) => states[id] == CollectibleState.discovered);
}
return collectiblesLogic.fromId(id)?.wonder;
}
@override
Widget build(BuildContext context) {
List<WonderData> wonders = wondersLogic.all;
bool vtMode = context.isLandscape == false;
final scrollWonder = scrollTargetWonder;
// Create list of collections that is shared by both hz and vt layouts
List<Widget> collections = [
...wonders.map((d) {
return _buildSingleCollection(
context,
return _CollectionListCard(
key: d.type == scrollWonder ? scrollKey : null,
height: vtMode ? 300 : 400,
width: vtMode ? null : 600,
fromId: fromId,
states: states,
data: d,
);
}).toList()
@ -54,50 +61,6 @@ class _CollectionList extends StatelessWidget {
);
}
Widget _buildSingleCollection(BuildContext context, {double? width, double? height, required WonderData data}) {
List<CollectibleData> collectibles = collectiblesLogic.forWonder(data.type);
return Center(
child: SizedBox(
width: width ?? double.infinity,
height: height ?? double.infinity,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
/// Title
Text(
data.title.toUpperCase(),
key: data.type == scrollWonder ? scrollKey : null,
textAlign: TextAlign.left,
style: $styles.text.title1.copyWith(color: $styles.colors.offWhite),
),
Gap($styles.insets.md),
/// Images
Expanded(
child: SeparatedRow(
separatorBuilder: () => Gap($styles.insets.sm),
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
...collectibles.map((e) {
int state = states[e.id] ?? CollectibleState.lost;
return Flexible(
child: _CollectionTile(
collectible: e,
state: state,
onPressed: onPressed,
heroTag: e.id == fromId ? 'collectible_image_$fromId' : null,
),
);
}).toList()
]),
)
],
),
),
);
}
// TODO: Restore reset functionality somehow
// Widget _buildResetBtn(BuildContext context) {
// Widget btn = AppBtn.from(

61
lib/ui/screens/collection/widgets/_collection_list_card.dart Normal file
View File

@ -0,0 +1,61 @@
part of '../collection_screen.dart';
class _CollectionListCard extends StatelessWidget {
const _CollectionListCard(
{Key? key, this.width, this.height, required this.data, required this.fromId, required this.states})
: super(key: key);
final double? width;
final double? height;
final WonderData data;
final String? fromId;
final Map<String, int> states;
void _showDetails(BuildContext context, CollectibleData collectible) {
context.push(ScreenPaths.artifact(collectible.artifactId));
Future.delayed(300.ms).then((_) => collectiblesLogic.updateState(collectible.id, CollectibleState.explored));
}
@override
Widget build(BuildContext context) {
List<CollectibleData> collectibles = collectiblesLogic.forWonder(data.type);
return Center(
child: SizedBox(
width: width ?? double.infinity,
height: height ?? double.infinity,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
/// Title
Text(
data.title.toUpperCase(),
textAlign: TextAlign.left,
style: $styles.text.title1.copyWith(color: $styles.colors.offWhite),
),
Gap($styles.insets.md),
/// Images
Expanded(
child: SeparatedRow(
separatorBuilder: () => Gap($styles.insets.sm),
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
...collectibles.map((e) {
int state = states[e.id] ?? CollectibleState.lost;
return Flexible(
child: _CollectibleImage(
collectible: e,
state: state,
onPressed: (c) => _showDetails(context, c),
heroTag: e.id == fromId ? 'collectible_image_$fromId' : null,
),
);
}).toList()
]),
)
],
),
),
);
}
}

4
lib/ui/screens/collection/widgets/_newly_discovered_row.dart → lib/ui/screens/collection/widgets/_newly_discovered_items_btn.dart
View File

@ -1,8 +1,8 @@
part of '../collection_screen.dart';
@immutable
class _NewlyDiscoveredRow extends StatelessWidget {
const _NewlyDiscoveredRow({Key? key, this.count = 0, required this.onPressed}) : super(key: key);
class _NewlyDiscoveredItemsBtn extends StatelessWidget {
const _NewlyDiscoveredItemsBtn({Key? key, this.count = 0, required this.onPressed}) : super(key: key);
final int count;
final VoidCallback onPressed;

12
pubspec.lock
View File

@ -245,7 +245,7 @@ packages:
name: file
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.4"
version: "6.1.2"
fixnum:
dependency: transitive
description:
@ -259,7 +259,7 @@ packages:
name: flextras
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.2"
version: "1.0.0"
flutter:
dependency: "direct main"
description: flutter
@ -1034,7 +1034,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.14"
version: "0.4.12"
timing:
dependency: transitive
description:
@ -1132,14 +1132,14 @@ packages:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
version: "2.1.2"
vm_service:
dependency: transitive
description:
name: vm_service
url: "https://pub.dartlang.org"
source: hosted
version: "9.4.0"
version: "9.3.0"
watcher:
dependency: transitive
description:
@ -1197,5 +1197,5 @@ packages:
source: hosted
version: "2.3.0"
sdks:
dart: ">=2.18.0 <3.0.0"
dart: ">=2.17.1 <3.0.0"
flutter: ">=3.0.0"

2
pubspec.yaml
View File

@ -19,7 +19,7 @@ dependencies:
drop_cap_text: ^1.1.3
equatable: ^2.0.5
extra_alignments: ^1.0.0+1
flextras: ^0.0.2
flextras: ^1.0.0
flutter_animate: ^1.0.0
flutter_circular_text: ^0.3.1
flutter_displaymode: ^0.4.0