mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2024-12-23 20:09:23 +00:00
desktop tx search filter + various bugfixes
This commit is contained in:
parent
ec7840419f
commit
cc0770b2a2
4 changed files with 772 additions and 536 deletions
|
@ -306,7 +306,7 @@ class _TransactionDetailsViewState extends ConsumerState<AllTransactionsView> {
|
||||||
"Search",
|
"Search",
|
||||||
searchFieldFocusNode,
|
searchFieldFocusNode,
|
||||||
context,
|
context,
|
||||||
desktopMed: true,
|
desktopMed: isDesktop,
|
||||||
).copyWith(
|
).copyWith(
|
||||||
prefixIcon: Padding(
|
prefixIcon: Padding(
|
||||||
padding: EdgeInsets.symmetric(
|
padding: EdgeInsets.symmetric(
|
||||||
|
@ -330,6 +330,7 @@ class _TransactionDetailsViewState extends ConsumerState<AllTransactionsView> {
|
||||||
onTap: () async {
|
onTap: () async {
|
||||||
setState(() {
|
setState(() {
|
||||||
_searchController.text = "";
|
_searchController.text = "";
|
||||||
|
_searchString = "";
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
@ -342,31 +343,45 @@ class _TransactionDetailsViewState extends ConsumerState<AllTransactionsView> {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(
|
if (isDesktop)
|
||||||
width: 20,
|
const SizedBox(
|
||||||
),
|
|
||||||
SecondaryButton(
|
|
||||||
desktopMed: true,
|
|
||||||
width: 200,
|
|
||||||
label: "Filter",
|
|
||||||
icon: SvgPicture.asset(
|
|
||||||
Assets.svg.filter,
|
|
||||||
color: Theme.of(context)
|
|
||||||
.extension<StackColors>()!
|
|
||||||
.accentColorDark,
|
|
||||||
width: 20,
|
width: 20,
|
||||||
height: 20,
|
|
||||||
),
|
),
|
||||||
onPressed: () {
|
if (isDesktop)
|
||||||
Navigator.of(context).pushNamed(
|
SecondaryButton(
|
||||||
TransactionSearchFilterView.routeName,
|
desktopMed: isDesktop,
|
||||||
arguments: ref
|
width: 200,
|
||||||
|
label: "Filter",
|
||||||
|
icon: SvgPicture.asset(
|
||||||
|
Assets.svg.filter,
|
||||||
|
color: Theme.of(context)
|
||||||
|
.extension<StackColors>()!
|
||||||
|
.accentColorDark,
|
||||||
|
width: 20,
|
||||||
|
height: 20,
|
||||||
|
),
|
||||||
|
onPressed: () {
|
||||||
|
final coin = ref
|
||||||
.read(walletsChangeNotifierProvider)
|
.read(walletsChangeNotifierProvider)
|
||||||
.getManager(walletId)
|
.getManager(walletId)
|
||||||
.coin,
|
.coin;
|
||||||
);
|
if (isDesktop) {
|
||||||
},
|
showDialog<void>(
|
||||||
),
|
context: context,
|
||||||
|
builder: (context) {
|
||||||
|
return TransactionSearchFilterView(
|
||||||
|
coin: coin,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
Navigator.of(context).pushNamed(
|
||||||
|
TransactionSearchFilterView.routeName,
|
||||||
|
arguments: coin,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
@ -402,6 +417,7 @@ class _TransactionDetailsViewState extends ConsumerState<AllTransactionsView> {
|
||||||
|
|
||||||
final monthlyList = groupTransactionsByMonth(searched);
|
final monthlyList = groupTransactionsByMonth(searched);
|
||||||
return ListView.builder(
|
return ListView.builder(
|
||||||
|
primary: isDesktop ? false : null,
|
||||||
itemCount: monthlyList.length,
|
itemCount: monthlyList.length,
|
||||||
itemBuilder: (_, index) {
|
itemBuilder: (_, index) {
|
||||||
final month = monthlyList[index];
|
final month = monthlyList[index];
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -359,6 +359,7 @@ class _MyWalletState extends State<MyWallet> {
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return ListView(
|
return ListView(
|
||||||
|
primary: false,
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
"My wallet",
|
"My wallet",
|
||||||
|
|
|
@ -228,6 +228,25 @@ class STextStyles {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static TextStyle labelExtraExtraSmall(BuildContext context) {
|
||||||
|
switch (_theme(context).themeType) {
|
||||||
|
case ThemeType.light:
|
||||||
|
return GoogleFonts.inter(
|
||||||
|
color: _theme(context).textFieldActiveSearchIconRight,
|
||||||
|
fontWeight: FontWeight.w500,
|
||||||
|
fontSize: 14,
|
||||||
|
height: 14 / 14,
|
||||||
|
);
|
||||||
|
case ThemeType.dark:
|
||||||
|
return GoogleFonts.inter(
|
||||||
|
color: _theme(context).textFieldActiveSearchIconRight,
|
||||||
|
fontWeight: FontWeight.w500,
|
||||||
|
fontSize: 14,
|
||||||
|
height: 14 / 14,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static TextStyle label700(BuildContext context) {
|
static TextStyle label700(BuildContext context) {
|
||||||
switch (_theme(context).themeType) {
|
switch (_theme(context).themeType) {
|
||||||
case ThemeType.light:
|
case ThemeType.light:
|
||||||
|
|
Loading…
Reference in a new issue