Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ux fixes #2033

Merged
merged 3 commits into from
Feb 17, 2025
Merged

Ux fixes #2033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afc026f
Fix SizedBox location
tuxpizza Feb 16, 2025
a8243ef
Disable more shadows and fix colors
tuxpizza Feb 17, 2025
0dc1ded
Add buffer to bottom of transactions page
tuxpizza Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions lib/src/screens/dashboard/pages/balance/balance_row_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,18 +329,18 @@ class BalanceRowWidget extends StatelessWidget {
borderRadius: BorderRadius.circular(30.0),
border: Border.all(
color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
width: 1.5,
width: 1,
),
color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
boxShadow: [
BoxShadow(
color: Theme.of(context)
.extension<BalancePageTheme>()!
.cardBorderColor
.withAlpha(50),
spreadRadius: dashboardViewModel.getShadowSpread(),
blurRadius: dashboardViewModel.getShadowBlur())
],
// boxShadow: [
// BoxShadow(
// color: Theme.of(context)
// .extension<BalancePageTheme>()!
// .cardBorderColor
// .withAlpha(50),
// spreadRadius: dashboardViewModel.getShadowSpread(),
// blurRadius: dashboardViewModel.getShadowBlur())
// ],
),
child: TextButton(
onPressed: () => Fluttertoast.showToast(
Expand Down
2 changes: 1 addition & 1 deletion lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,11 +354,11 @@ class CryptoBalanceWidget extends StatelessWidget {
),
),
),
SizedBox(height: 150),
],
],
);
}),
SizedBox(height: 130),
],
),
);
Expand Down
36 changes: 22 additions & 14 deletions lib/src/screens/dashboard/pages/navigation_dock.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class NavigationDock extends StatelessWidget {
builder: (_) {
return Container(
alignment: Alignment.bottomCenter,
height: 130,
height: 150,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
Expand Down Expand Up @@ -126,9 +126,9 @@ class NavigationDock extends StatelessWidget {
: Positioned(
child: Observer(
builder: (_) {
return Container(
return Container(
alignment: Alignment.bottomCenter,
height: 130,
height: 150,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
Expand All @@ -137,15 +137,23 @@ class NavigationDock extends StatelessWidget {
Theme.of(context)
.extension<DashboardPageTheme>()!
.thirdGradientBackgroundColor
.withAlpha(10),
.withAlpha(5),
Theme.of(context)
.extension<DashboardPageTheme>()!
.thirdGradientBackgroundColor
.withAlpha(75),
.withAlpha(50),
Theme.of(context)
.extension<DashboardPageTheme>()!
.thirdGradientBackgroundColor
.withAlpha(125),
Theme.of(context)
.extension<DashboardPageTheme>()!
.thirdGradientBackgroundColor
.withAlpha(150),
Theme.of(context)
.extension<DashboardPageTheme>()!
.thirdGradientBackgroundColor
.withAlpha(200),
Theme.of(context)
.extension<DashboardPageTheme>()!
.thirdGradientBackgroundColor,
Expand All @@ -168,15 +176,15 @@ class NavigationDock extends StatelessWidget {
color: Theme.of(context)
.extension<SyncIndicatorTheme>()!
.syncedBackgroundColor,
boxShadow: [
BoxShadow(
color: Theme.of(context)
.extension<BalancePageTheme>()!
.cardBorderColor
.withAlpha(50),
spreadRadius: dashboardViewModel.getShadowSpread(),
blurRadius: dashboardViewModel.getShadowBlur())
],
// boxShadow: [
// BoxShadow(
// color: Theme.of(context)
// .extension<BalancePageTheme>()!
// .cardBorderColor
// .withAlpha(50),
// spreadRadius: dashboardViewModel.getShadowSpread(),
// blurRadius: dashboardViewModel.getShadowBlur())
// ],
),
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10),
Expand Down
12 changes: 6 additions & 6 deletions lib/src/screens/dashboard/pages/transactions_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ class TransactionsPage extends StatelessWidget {
color: responsiveLayoutUtil.shouldRenderMobileUI
? null
: Theme.of(context).colorScheme.background,
padding: EdgeInsets.only(top: 24, bottom: 24),
child: Column(
children: <Widget>[
Observer(builder: (_) {
Expand Down Expand Up @@ -73,12 +72,15 @@ class TransactionsPage extends StatelessWidget {
child: Observer(
builder: (_) {
final items = dashboardViewModel.items;

final amount = items.length + 1;
return items.isNotEmpty
? ListView.builder(
key: ValueKey('transactions_page_list_view_builder_key'),
itemCount: items.length,
itemCount: items.length + 1,
itemBuilder: (context, index) {

if(index == items.length) return SizedBox(height: 150);

final item = items[index];

if (item is DateSectionItem) {
Expand Down Expand Up @@ -164,7 +166,6 @@ class TransactionsPage extends StatelessWidget {
),
);
}

if (item is OrderListItem) {
final order = item.order;

Expand All @@ -182,7 +183,6 @@ class TransactionsPage extends StatelessWidget {
),
);
}

return Container(color: Colors.transparent, height: 1);
})
: Center(
Expand All @@ -197,7 +197,7 @@ class TransactionsPage extends StatelessWidget {
);
},
),
)
),
],
),
),
Expand Down
Loading