Skip to content

enh: Adjust colors, cards, and decoration in theme #200

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

Merged
austin047 merged 7 commits into from
Jun 8, 2026
Merged

enh: Adjust colors, cards, and decoration in theme #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
15364b0
enh(UI): Align home and stat page with design
Wuyika May 29, 2026
c6ed5e6
enh(UI): Align setting page with design
Wuyika May 29, 2026
87443e7
enh(UI): App tones in app themes
Wuyika Jun 8, 2026
d9a0b19
enh(UI): Adjust card theme
Wuyika Jun 8, 2026
9dc4eac
enh(UI): Notification bar
Wuyika Jun 8, 2026
b55f313
enh(UI): Range picker theme
Wuyika Jun 8, 2026
8f08ec7
enh(Code): Unused import
Wuyika Jun 8, 2026
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
4 changes: 2 additions & 2 deletions lib/presentation/app_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,8 @@ class _AppViewState extends State<AppView> {
locale: context.locale,
supportedLocales: context.supportedLocales,
localizationsDelegates: context.localizationDelegates,
theme: lightTheme,
darkTheme: darkTheme,
theme: AppTheme.lightTheme,
darkTheme: AppTheme.darkTheme,
themeMode: themeMode,
builder: (context, child) {
return GestureDetector(
Expand Down
10 changes: 6 additions & 4 deletions lib/presentation/history_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import 'package:trakli/presentation/transactions/cubit/transaction_cubit.dart';
import 'package:trakli/presentation/utils/app_navigator.dart';
import 'package:trakli/presentation/utils/colors.dart';
import 'package:trakli/presentation/utils/design_tokens.dart';
import 'package:trakli/presentation/utils/page_app_bar.dart';
import 'package:trakli/presentation/utils/enums.dart';
import 'package:trakli/presentation/utils/helpers.dart';
import 'package:trakli/presentation/utils/page_app_bar.dart';
import 'package:trakli/presentation/utils/popovers/category_list_popover.dart';
import 'package:trakli/presentation/utils/popovers/date_list_popover.dart';
import 'package:trakli/presentation/utils/popovers/wallet_list_popover.dart';
Expand Down Expand Up @@ -89,6 +89,7 @@ class _HistoryScreenState extends State<HistoryScreen> {

@override
Widget build(BuildContext context) {
final tones = context.tones;
return BlocBuilder<TransactionCubit, TransactionState>(
builder: (context, state) {
final exchangeRateEntity =
Expand All @@ -107,6 +108,7 @@ class _HistoryScreenState extends State<HistoryScreen> {
final totalBalance = totalIncome - totalExpense;

return Scaffold(
backgroundColor: tones.bgPage,
appBar: PageAppBar(
title: LocaleKeys.transactionHistory.tr(),
actions: [
Expand Down Expand Up @@ -478,9 +480,9 @@ class _HistoryScreenState extends State<HistoryScreen> {
label: filterType.filterName.tr(),
onSelect: (category) {
setState(() {
if (!selectedItems.any((item) =>
(item is CategoryEntity &&
item.clientId == category.clientId))) {
if (!selectedItems.any((item) => (item
is CategoryEntity &&
item.clientId == category.clientId))) {
selectedItems.add(category);
}
});
Expand Down
370 changes: 189 additions & 181 deletions lib/presentation/home_screen.dart
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 0 additions & 17 deletions lib/presentation/notification_screen.dart
View file
Open in desktop

This file was deleted.

12 changes: 4 additions & 8 deletions lib/presentation/notifications/notifications_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:trakli/di/injection.dart';
import 'package:trakli/gen/assets.gen.dart';
import 'package:trakli/gen/translations/codegen_loader.g.dart';
import 'package:trakli/presentation/notifications/cubit/notification_cubit.dart';
import 'package:trakli/presentation/utils/back_button.dart';
import 'package:trakli/presentation/utils/colors.dart';
import 'package:trakli/presentation/utils/custom_appbar.dart';
import 'package:trakli/presentation/utils/notification_tile.dart';
import 'package:trakli/di/injection.dart';
import 'package:trakli/presentation/utils/page_app_bar.dart';

class NotificationsScreen extends StatelessWidget {
const NotificationsScreen({super.key});
Expand All @@ -20,11 +19,8 @@ class NotificationsScreen extends StatelessWidget {
return BlocProvider(
create: (context) => getIt<NotificationCubit>()..loadNotifications(),
child: Scaffold(
appBar: CustomAppBar(
backgroundColor: Theme.of(context).primaryColor,
leading: const CustomBackButton(),
titleText: LocaleKeys.notifications.tr(),
headerTextColor: const Color(0xFFEBEDEC),
appBar: PageAppBar(
title: LocaleKeys.notifications.tr(),
),
body: BlocBuilder<NotificationCubit, NotificationState>(
builder: (context, state) {
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/onboarding/widgets/wallet_setup_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ class _WalletSetupWidgetState extends State<WalletSetupWidget> {
context: context,
theme: CurrencyPickerThemeData(
bottomSheetHeight: 0.7.sh,
backgroundColor: Colors.white,
backgroundColor: Theme.of(context).colorScheme.surface,
Comment thread
Wuyika marked this conversation as resolved.
flagSize: 24.sp,
subtitleTextStyle: TextStyle(
fontSize: 12.sp,
Expand Down
Loading
Loading