WIP: desktop address book displays contacts

This commit is contained in:
ryleedavis 2022-11-14 16:00:09 -07:00
parent a5af60535e
commit e0555f53a4
2 changed files with 288 additions and 296 deletions

View file

@ -13,7 +13,9 @@ import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_colors.dart'; import 'package:stackwallet/utilities/theme/stack_colors.dart';
import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/address_book_card.dart'; import 'package:stackwallet/widgets/address_book_card.dart';
import 'package:stackwallet/widgets/conditional_parent.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
import 'package:stackwallet/widgets/loading_indicator.dart'; import 'package:stackwallet/widgets/loading_indicator.dart';
@ -21,8 +23,6 @@ import 'package:stackwallet/widgets/rounded_white_container.dart';
import 'package:stackwallet/widgets/stack_text_field.dart'; import 'package:stackwallet/widgets/stack_text_field.dart';
import 'package:stackwallet/widgets/textfield_icon_button.dart'; import 'package:stackwallet/widgets/textfield_icon_button.dart';
import 'package:stackwallet/utilities/util.dart';
class AddressBookView extends ConsumerStatefulWidget { class AddressBookView extends ConsumerStatefulWidget {
const AddressBookView({Key? key, this.coin}) : super(key: key); const AddressBookView({Key? key, this.coin}) : super(key: key);
@ -103,8 +103,13 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
final addressBookEntriesFuture = ref.watch( final addressBookEntriesFuture = ref.watch(
addressBookServiceProvider.select((value) => value.addressBookEntries)); addressBookServiceProvider.select((value) => value.addressBookEntries));
final isDesktop = Util.isDesktop;
return ConditionalParent(
condition: !isDesktop,
builder: (child) {
return Scaffold( return Scaffold(
backgroundColor: Theme.of(context).extension<StackColors>()!.background, backgroundColor:
Theme.of(context).extension<StackColors>()!.background,
appBar: AppBar( appBar: AppBar(
leading: AppBarBackButton( leading: AppBarBackButton(
onPressed: () { onPressed: () {
@ -128,7 +133,8 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
key: const Key("addressBookFilterViewButton"), key: const Key("addressBookFilterViewButton"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: Theme.of(context).extension<StackColors>()!.background, color:
Theme.of(context).extension<StackColors>()!.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.filter, Assets.svg.filter,
color: Theme.of(context) color: Theme.of(context)
@ -157,7 +163,8 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
key: const Key("addressBookAddNewContactViewButton"), key: const Key("addressBookAddNewContactViewButton"),
size: 36, size: 36,
shadows: const [], shadows: const [],
color: Theme.of(context).extension<StackColors>()!.background, color:
Theme.of(context).extension<StackColors>()!.background,
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.plus, Assets.svg.plus,
color: Theme.of(context) color: Theme.of(context)
@ -192,6 +199,16 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
child: IntrinsicHeight( child: IntrinsicHeight(
child: Padding( child: Padding(
padding: const EdgeInsets.all(4), padding: const EdgeInsets.all(4),
child: child,
),
),
),
),
);
},
),
);
},
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
@ -199,7 +216,8 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
Constants.size.circularBorderRadius, Constants.size.circularBorderRadius,
), ),
child: TextField( child: !isDesktop
? TextField(
autocorrect: Util.isDesktop ? false : true, autocorrect: Util.isDesktop ? false : true,
enableSuggestions: Util.isDesktop ? false : true, enableSuggestions: Util.isDesktop ? false : true,
controller: _searchController, controller: _searchController,
@ -246,11 +264,10 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
) )
: null, : null,
), ),
)
: null,
), ),
), if (!isDesktop) const SizedBox(height: 16),
const SizedBox(
height: 16,
),
Text( Text(
"Favorites", "Favorites",
style: STextStyles.smallMed12(context), style: STextStyles.smallMed12(context),
@ -261,8 +278,7 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
FutureBuilder( FutureBuilder(
future: addressBookEntriesFuture, future: addressBookEntriesFuture,
builder: (_, AsyncSnapshot<List<Contact>> snapshot) { builder: (_, AsyncSnapshot<List<Contact>> snapshot) {
if (snapshot.connectionState == if (snapshot.connectionState == ConnectionState.done &&
ConnectionState.done &&
snapshot.hasData) { snapshot.hasData) {
_cacheFav = snapshot.data!; _cacheFav = snapshot.data!;
} }
@ -272,29 +288,24 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
} else { } else {
if (_cacheFav!.isNotEmpty) { if (_cacheFav!.isNotEmpty) {
return RoundedWhiteContainer( return RoundedWhiteContainer(
padding: const EdgeInsets.all(0), padding: EdgeInsets.all(!isDesktop ? 0 : 15),
child: Column( child: Column(
children: [ children: [
..._cacheFav! ..._cacheFav!
.where((element) => element.addresses .where((element) => element.addresses
.where((e) => ref.watch( .where((e) => ref.watch(
addressBookFilterProvider addressBookFilterProvider.select((value) =>
.select((value) => value value.coins.contains(e.coin))))
.coins
.contains(e.coin))))
.isNotEmpty) .isNotEmpty)
.where((e) => .where((e) =>
e.isFavorite && e.isFavorite &&
ref ref
.read( .read(addressBookServiceProvider)
addressBookServiceProvider)
.matches(_searchTerm, e)) .matches(_searchTerm, e))
.where( .where((element) => element.isFavorite)
(element) => element.isFavorite)
.map( .map(
(e) => AddressBookCard( (e) => AddressBookCard(
key: Key( key: Key("favContactCard_${e.id}_key"),
"favContactCard_${e.id}_key"),
contactId: e.id, contactId: e.id,
), ),
), ),
@ -327,8 +338,7 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
FutureBuilder( FutureBuilder(
future: addressBookEntriesFuture, future: addressBookEntriesFuture,
builder: (_, AsyncSnapshot<List<Contact>> snapshot) { builder: (_, AsyncSnapshot<List<Contact>> snapshot) {
if (snapshot.connectionState == if (snapshot.connectionState == ConnectionState.done &&
ConnectionState.done &&
snapshot.hasData) { snapshot.hasData) {
_cache = snapshot.data!; _cache = snapshot.data!;
} }
@ -338,26 +348,22 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
} else { } else {
if (_cache!.isNotEmpty) { if (_cache!.isNotEmpty) {
return RoundedWhiteContainer( return RoundedWhiteContainer(
padding: const EdgeInsets.all(0), padding: EdgeInsets.all(!isDesktop ? 0 : 15),
child: Column( child: Column(
children: [ children: [
..._cache! ..._cache!
.where((element) => element.addresses .where((element) => element.addresses
.where((e) => ref.watch( .where((e) => ref.watch(
addressBookFilterProvider addressBookFilterProvider.select((value) =>
.select((value) => value value.coins.contains(e.coin))))
.coins
.contains(e.coin))))
.isNotEmpty) .isNotEmpty)
.where((e) => ref .where((e) => ref
.read(addressBookServiceProvider) .read(addressBookServiceProvider)
.matches(_searchTerm, e)) .matches(_searchTerm, e))
.where( .where((element) => !element.isFavorite)
(element) => !element.isFavorite)
.map( .map(
(e) => AddressBookCard( (e) => AddressBookCard(
key: Key( key: Key("desktopContactCard_${e.id}_key"),
"contactCard_${e.id}_key"),
contactId: e.id, contactId: e.id,
), ),
), ),
@ -379,13 +385,6 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
), ),
], ],
), ),
),
),
),
),
);
},
),
); );
} }
} }

View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/models/contact.dart'; import 'package:stackwallet/models/contact.dart';
import 'package:stackwallet/pages/address_book_views/address_book_view.dart';
import 'package:stackwallet/pages/address_book_views/subviews/add_address_book_entry_view.dart'; import 'package:stackwallet/pages/address_book_views/subviews/add_address_book_entry_view.dart';
import 'package:stackwallet/pages/address_book_views/subviews/address_book_filter_view.dart'; import 'package:stackwallet/pages/address_book_views/subviews/address_book_filter_view.dart';
import 'package:stackwallet/providers/global/wallets_provider.dart'; import 'package:stackwallet/providers/global/wallets_provider.dart';
@ -9,11 +10,11 @@ import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/theme/stack_colors.dart'; import 'package:stackwallet/utilities/theme/stack_colors.dart';
import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
import 'package:stackwallet/widgets/desktop/desktop_dialog.dart'; import 'package:stackwallet/widgets/desktop/desktop_dialog.dart';
import 'package:stackwallet/widgets/icon_widgets/x_icon.dart'; import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
import 'package:stackwallet/widgets/rounded_container.dart'; import 'package:stackwallet/widgets/rounded_container.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart';
import 'package:stackwallet/widgets/stack_text_field.dart'; import 'package:stackwallet/widgets/stack_text_field.dart';
import 'package:stackwallet/widgets/textfield_icon_button.dart'; import 'package:stackwallet/widgets/textfield_icon_button.dart';
@ -36,7 +37,7 @@ class _DesktopAddressBook extends ConsumerState<DesktopAddressBook> {
late bool hasContacts = false; late bool hasContacts = false;
String filter = ""; String _searchTerm = "";
Future<void> selectCryptocurrency() async { Future<void> selectCryptocurrency() async {
await showDialog<dynamic>( await showDialog<dynamic>(
@ -123,25 +124,25 @@ class _DesktopAddressBook extends ConsumerState<DesktopAddressBook> {
Constants.size.circularBorderRadius, Constants.size.circularBorderRadius,
), ),
child: TextField( child: TextField(
autocorrect: false, autocorrect: Util.isDesktop ? false : true,
enableSuggestions: false, enableSuggestions: Util.isDesktop ? false : true,
controller: _searchController, controller: _searchController,
focusNode: _searchFocusNode, focusNode: _searchFocusNode,
onChanged: (newString) { onChanged: (value) {
setState(() => filter = newString); setState(() {
_searchTerm = value;
});
}, },
style: STextStyles.field(context), style: STextStyles.field(context),
decoration: standardInputDecoration( decoration: standardInputDecoration(
"Search...", "Search",
_searchFocusNode, _searchFocusNode,
context, context,
).copyWith( ).copyWith(
labelStyle: STextStyles.fieldLabel(context)
.copyWith(fontSize: 16),
prefixIcon: Padding( prefixIcon: Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
vertical: 16, vertical: 20,
), ),
child: SvgPicture.asset( child: SvgPicture.asset(
Assets.svg.search, Assets.svg.search,
@ -160,7 +161,6 @@ class _DesktopAddressBook extends ConsumerState<DesktopAddressBook> {
onTap: () async { onTap: () async {
setState(() { setState(() {
_searchController.text = ""; _searchController.text = "";
filter = "";
}); });
}, },
), ),
@ -243,14 +243,7 @@ class _DesktopAddressBook extends ConsumerState<DesktopAddressBook> {
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 26), padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 26),
child: SizedBox( child: SizedBox(
width: 489, width: 489,
child: RoundedWhiteContainer( child: AddressBookView(),
child: Center(
child: Text(
"Your contacts will appear here",
style: STextStyles.itemSubtitle(context),
),
),
),
), ),
), ),
], ],