Skip to content

enh: More dark theme improvements #170

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
nfebe merged 27 commits into from
Feb 10, 2026
Merged

enh: More dark theme improvements #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0859fc5
enh(Theme): Added theme cubit and darktheme
Wuyika Feb 2, 2026
36affe9
enh(Theme): Setup mechanism for theme updates
Wuyika Feb 2, 2026
c3e6b38
enh(Theme): Make theme a lazysingleton
Wuyika Feb 2, 2026
4e7f664
enh(UI): Djusting custom drawer colors
Wuyika Feb 2, 2026
4d94ba3
enh(UI): Djust empty home widget colors
Wuyika Feb 2, 2026
4646e95
enh(UI): Body small style
Wuyika Feb 2, 2026
474b248
enh(UI): Fixed color scheme for bottom nav
Wuyika Feb 2, 2026
1248454
enh(UI): Back button dark theme color
Wuyika Feb 2, 2026
5003dd4
enh(UI): Group tile and group screen colors
Wuyika Feb 2, 2026
6a7b76e
enh(UI): Educational banner and party colors
Wuyika Feb 2, 2026
8fc086f
enh(UI): Transaction form dark colors
Wuyika Feb 2, 2026
578e2ad
enh(UI): Pop over dark colors
Wuyika Feb 2, 2026
b42499d
enh(Build): Revert gradle to match with dev branch
Wuyika Feb 2, 2026
e2c68f1
enh(UI): Darktheme for image, icon and image sheet
Wuyika Feb 6, 2026
7c07f82
enh(UI): Darktheme ui for all bottomsheets
Wuyika Feb 9, 2026
fb217de
enh(UI): About app sheet
Wuyika Feb 9, 2026
d098c65
enh(UI): Graph ui dark theme
Wuyika Feb 10, 2026
7a4e851
enh(UI): Tabbar darktheme ui
Wuyika Feb 10, 2026
33254bd
enh(UI): Wallet tile mini dark theme
Wuyika Feb 10, 2026
2f40893
enh(UI): Income and expense tabbar
Wuyika Feb 10, 2026
af3e164
fix(Imports): Removed unused imports
Wuyika Feb 10, 2026
b6a5324
enh(UI): Remove extra text from wallet tile
Wuyika Feb 10, 2026
bb3d1a6
enh(Code): Fix initalvalue parameter not found
Wuyika Feb 10, 2026
0ade4d2
fix(Build): Revert min sdk version
Wuyika Feb 10, 2026
7b92194
enh(UI): Transaction details sheet
Wuyika Feb 10, 2026
1fd08db
enh(UI): Unselected color
Wuyika Feb 10, 2026
a914ca6
enh(Code): Minor code fixes
Wuyika Feb 10, 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
84 changes: 42 additions & 42 deletions lib/di/injection.config.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions lib/presentation/add_transaction_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,13 @@ class _AddTransactionScreenState extends State<AddTransactionScreen>
)),
unselectedLabelStyle: TextStyle(
fontSize: 16.sp,
color: const Color(0xFF1D3229),
),
labelStyle: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.bold,
color: const Color(0xFF1D3229),
color: (tabController.index == 1)
? Theme.of(context).primaryColor
: const Color(0xFFEB5757),
),
tabs: [
if (widget.transaction == null ||
Expand All @@ -110,14 +111,13 @@ class _AddTransactionScreenState extends State<AddTransactionScreen>
Assets.images.arrowSwapUp,
colorFilter: ColorFilter.mode(
(tabController.index != 0)
? Colors.black
? Theme.of(context).colorScheme.onSurface
: const Color(0xFFEB5757),
BlendMode.srcIn,
),
),
Text(
LocaleKeys.transactionExpense.tr(),
style: Theme.of(context).textTheme.bodyMedium,
)
],
),
Expand All @@ -135,7 +135,7 @@ class _AddTransactionScreenState extends State<AddTransactionScreen>
colorFilter: ColorFilter.mode(
(tabController.index == 1)
? Theme.of(context).primaryColor
: Colors.black,
: Theme.of(context).colorScheme.onSurface,
BlendMode.srcIn,
),
),
Expand Down
13 changes: 7 additions & 6 deletions lib/presentation/category/category_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,46 +115,47 @@ class _CategoryScreenState extends State<CategoryScreen>
)),
unselectedLabelStyle: TextStyle(
fontSize: 16.sp,
color: const Color(0xFF1D3229),
),
labelStyle: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.bold,
color: const Color(0xFF1D3229),
color: (tabController.index == 0)
? Theme.of(context).primaryColor
: const Color(0xFFEB5757),
),
tabs: [
Tab(
child: Row(
spacing: 4.w,
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
Assets.images.arrowSwapDown,
colorFilter: ColorFilter.mode(
(tabController.index == 0)
? Theme.of(context).primaryColor
: Colors.black,
: Theme.of(context).colorScheme.onSurface,
BlendMode.srcIn,
),
),
SizedBox(width: 4.w),
Text(LocaleKeys.transactionIncome.tr())
],
),
),
Tab(
child: Row(
spacing: 4.w,
mainAxisAlignment: MainAxisAlignment.center,
children: [
SvgPicture.asset(
Assets.images.arrowSwapUp,
colorFilter: ColorFilter.mode(
(tabController.index == 0)
? Colors.black
? Theme.of(context).colorScheme.onSurface
: const Color(0xFFEB5757),
BlendMode.srcIn,
),
),
SizedBox(width: 4.w),
Text(LocaleKeys.transactionExpense.tr())
],
),
Expand Down
9 changes: 7 additions & 2 deletions lib/presentation/defaults_settings_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,18 @@ class DefaultsSettingsScreen extends StatelessWidget {
context: context,
theme: CurrencyPickerThemeData(
bottomSheetHeight: 0.7.sh,
backgroundColor: Colors.white,
backgroundColor:
Theme.of(context).scaffoldBackgroundColor,
flagSize: 24.sp,
subtitleTextStyle: TextStyle(
fontSize: 12.sp,
color: Theme.of(context).primaryColor,
),
),
onSelect: (Currency currencyValue) {
context.read<CurrencyCubit>().setCurrency(currencyValue);
context
.read<CurrencyCubit>()
.setCurrency(currencyValue);
},
);
},
Expand Down Expand Up @@ -137,6 +140,7 @@ class DefaultsSettingsScreen extends StatelessWidget {
final pickedGroup =
await showCustomBottomSheet<GroupEntity>(
context,
color: Theme.of(context).scaffoldBackgroundColor,
widget: PickGroupBottomSheet(
group: group,
),
Expand Down Expand Up @@ -186,6 +190,7 @@ class DefaultsSettingsScreen extends StatelessWidget {
? () async {
await showCustomBottomSheet(
context,
color: Theme.of(context).scaffoldBackgroundColor,
widget: SelectWalletBottomSheet(
wallets: wallets,
onSelect: (selectedWallet) {
Expand Down
2 changes: 1 addition & 1 deletion lib/presentation/display_settings_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ class _DisplaySettingsScreenState extends State<DisplaySettingsScreen> {
style: TextStyle(
color: supportedFormDisplays.elementAt(index) == formDisplay
? Theme.of(context).primaryColor
: Colors.black,
: Theme.of(context).colorScheme.onSurface,
fontSize: 16.sp,
),
),
Expand Down
7 changes: 4 additions & 3 deletions lib/presentation/home_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ import 'package:trakli/presentation/config/cubit/config_cubit.dart';
import 'package:trakli/presentation/groups/cubit/group_cubit.dart';
import 'package:trakli/presentation/history_screen.dart';
import 'package:trakli/presentation/info_interfaces/empty_home_widget.dart';
import 'package:trakli/presentation/notifications/notifications_screen.dart';
import 'package:trakli/presentation/transactions/cubit/transaction_cubit.dart';
import 'package:trakli/presentation/utils/all_wallets_tile.dart';
import 'package:trakli/presentation/utils/app_navigator.dart';
import 'package:trakli/presentation/utils/bottom_sheets/pick_group_bottom_sheet.dart';
import 'package:trakli/presentation/utils/colors.dart';
import 'package:trakli/presentation/utils/custom_appbar.dart';
import 'package:trakli/presentation/utils/enums.dart';
import 'package:trakli/presentation/utils/helpers.dart';
import 'package:trakli/presentation/utils/transaction_tile.dart';
import 'package:trakli/presentation/utils/all_wallets_tile.dart';
import 'package:trakli/presentation/widgets/image_widget.dart';
import 'package:trakli/presentation/utils/wallet_tile.dart';
import 'package:trakli/presentation/wallets/cubit/wallet_cubit.dart';
import 'package:trakli/presentation/notifications/notifications_screen.dart';
import 'package:trakli/presentation/widgets/image_widget.dart';

class HomeScreen extends StatefulWidget {
const HomeScreen({super.key});
Expand Down Expand Up @@ -378,6 +378,7 @@ class _HomeScreenState extends State<HomeScreen> {
final groupEntity =
await showCustomBottomSheet<GroupEntity>(
context,
color: Theme.of(context).scaffoldBackgroundColor,
widget: PickGroupBottomSheet(
group: selectedGroup,
),
Expand Down
7 changes: 5 additions & 2 deletions lib/presentation/notification_settings/notification_settings_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,12 @@ class _NotificationSettingsBody extends StatelessWidget {
title: LocaleKeys.insightsFrequency.tr(),
subtitle: LocaleKeys.insightsFrequencyDesc.tr(),
value: NotificationSettingsHelpers.getFrequencyLabel(
insightsFrequency),
insightsFrequency,
),
onTap: () => InsightsFrequencySelectorBottomSheet.show(
context, insightsFrequency),
context,
insightsFrequency,
),
),
],
SizedBox(height: 8.h),
Expand Down
Loading