Skip to content

Dark theme: Base PR for implementation in each module #671

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

Open
Marc-Andrieu wants to merge 23 commits into
base: main
Choose a base branch
from
Open

Dark theme: Base PR for implementation in each module #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b2fdf46
Base branch for dark theme implementation in each module
Marc-Andrieu May 3, 2026
27fc4eb
whatever Thonyk did...
Marc-Andrieu May 3, 2026
a3b8d8c
minor palette fixes 🎨
Marc-Andrieu May 9, 2026
8b82d25
Dark theme: tools [directly into the core]
Marc-Andrieu May 10, 2026
020a505
That was a mistake
Marc-Andrieu May 10, 2026
4c9242f
I prefer this way (a vivid color on the spin loader)
Marc-Andrieu May 16, 2026
54eaf46
Fix: TextEntry defaults
Marc-Andrieu May 16, 2026
f23e7d5
functions.dart: context param already there
Marc-Andrieu May 16, 2026
dd77834
Add the default theme (unused variable, for reference within the work…
Marc-Andrieu May 16, 2026
8160dbb
Dark theme: PH (#682)
Marc-Andrieu May 24, 2026
06c051b
Dark theme: settings (#684)
Marc-Andrieu May 24, 2026
3d46fd1
Dark theme: phonebook (#683)
Marc-Andrieu May 24, 2026
53f15a5
Dark theme: cinema (#678)
Marc-Andrieu May 24, 2026
06cc15f
Dark theme: flappybird (#679)
Marc-Andrieu May 24, 2026
8f2d073
Dark theme: web (#673)
Marc-Andrieu May 26, 2026
797065e
Dark theme: booking (#676)
Marc-Andrieu May 26, 2026
644168b
Dark theme: centralisation (#672)
Marc-Andrieu May 26, 2026
69d87b2
Dark theme: AMAP (#675)
Marc-Andrieu May 26, 2026
7e0a38f
Dark theme: admin (#686)
Marc-Andrieu May 27, 2026
0099b7b
Dark theme: advert (#674)
Marc-Andrieu May 29, 2026
60855bd
Dark theme: home (#680)
Marc-Andrieu May 30, 2026
8346240
Dark theme: Centralassociation (#689)
Rausterr Jun 1, 2026
e5f3b67
Dark theme: others (#681)
Marc-Andrieu Jun 6, 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
0 assets/images/pipe.png → assets/images/pipe_day.png
View file
Open in desktop
File renamed without changes
Binary file added assets/images/pipe_night.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/admin/ui/admin.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class AdminTemplate extends HookConsumerWidget {
final meNotifier = ref.watch(asyncUserProvider.notifier);
return Scaffold(
body: Container(
decoration: const BoxDecoration(color: Colors.white),
decoration: const BoxDecoration(),
child: SafeArea(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
Expand Down
12 changes: 8 additions & 4 deletions lib/admin/ui/components/admin_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:titan/tools/constants.dart';

class AdminButton extends StatelessWidget {
final Widget child;
Expand All @@ -13,12 +12,17 @@ class AdminButton extends StatelessWidget {
padding: const EdgeInsets.symmetric(vertical: 15),
alignment: Alignment.center,
decoration: BoxDecoration(
gradient: const LinearGradient(
colors: [ColorConstants.gradient1, ColorConstants.gradient2],
gradient: LinearGradient(
colors: [
Theme.of(context).colorScheme.primaryContainer,
Theme.of(context).colorScheme.primaryFixed,
],
),
boxShadow: [
BoxShadow(
color: ColorConstants.gradient2.withValues(alpha: 0.5),
color: Theme.of(
context,
).colorScheme.primaryFixed.withValues(alpha: 0.5),
blurRadius: 5,
offset: const Offset(2, 2),
spreadRadius: 2,
Expand Down
4 changes: 2 additions & 2 deletions lib/admin/ui/components/item_card_ui.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ class ItemCardUi extends StatelessWidget {
margin: const EdgeInsets.symmetric(vertical: 10),
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
decoration: BoxDecoration(
color: Colors.white,
color: Theme.of(context).colorScheme.primary,
borderRadius: BorderRadius.circular(10),
boxShadow: [
BoxShadow(
color: Colors.grey.withValues(alpha: 0.2),
color: Theme.of(context).shadowColor,
blurRadius: 5,
spreadRadius: 2,
),
Expand Down
5 changes: 2 additions & 3 deletions lib/admin/ui/components/text_editing.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:titan/tools/constants.dart';
import 'package:titan/tools/ui/widgets/align_left_text.dart';
import 'package:titan/tools/ui/widgets/text_entry.dart';

Expand All @@ -21,12 +20,12 @@ class TextEditing extends StatelessWidget {
label,
fontSize: 14,
fontWeight: FontWeight.w400,
color: Colors.grey.shade500,
color: Theme.of(context).colorScheme.secondaryFixed,
),
TextEntry(
label: label,
controller: controller,
color: ColorConstants.gradient1,
color: Theme.of(context).colorScheme.primaryContainer,
),
],
),
Expand Down
16 changes: 10 additions & 6 deletions lib/admin/ui/components/user_ui.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:heroicons/heroicons.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:titan/tools/constants.dart';
import 'package:titan/user/class/simple_users.dart';

class UserUi extends HookConsumerWidget {
Expand Down Expand Up @@ -29,24 +28,29 @@ class UserUi extends HookConsumerWidget {
child: Container(
padding: const EdgeInsets.all(7),
decoration: BoxDecoration(
gradient: const LinearGradient(
colors: [ColorConstants.background2, Colors.black],
gradient: LinearGradient(
colors: [
Theme.of(context).colorScheme.secondaryContainer,
Theme.of(context).colorScheme.secondary,
],
begin: Alignment.topLeft,
end: Alignment.bottomRight,
),
boxShadow: [
BoxShadow(
color: ColorConstants.background2.withValues(alpha: 0.4),
color: Theme.of(
context,
).colorScheme.secondaryContainer.withValues(alpha: 0.4),
offset: const Offset(2, 3),
blurRadius: 5,
),
],
borderRadius: const BorderRadius.all(Radius.circular(10)),
),
child: const HeroIcon(
child: HeroIcon(
HeroIcons.trash,
size: 20,
color: Colors.white,
color: Theme.of(context).colorScheme.onSecondary,
),
),
),
Expand Down
4 changes: 2 additions & 2 deletions lib/admin/ui/pages/groups/add_group_page/add_group_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ class AddGroupPage extends HookConsumerWidget {
});
},
builder: (child) => AdminButton(child: child),
child: const Text(
child: Text(
AdminTextConstants.add,
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w600,
color: Colors.white,
color: Theme.of(context).colorScheme.onPrimaryContainer,
),
),
),
Expand Down
6 changes: 4 additions & 2 deletions lib/admin/ui/pages/groups/add_loaner_page/add_loaner_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,12 @@ class AddLoanerPage extends HookConsumerWidget {
fontWeight: FontWeight.w500,
),
),
const HeroIcon(
HeroIcon(
HeroIcons.plus,
size: 25,
color: Colors.black,
color: Theme.of(
context,
).colorScheme.onPrimary,
),
],
),
Expand Down
21 changes: 13 additions & 8 deletions lib/admin/ui/pages/groups/edit_group_page/edit_group_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import 'package:titan/admin/tools/constants.dart';
import 'package:titan/admin/ui/admin.dart';
import 'package:titan/admin/ui/components/admin_button.dart';
import 'package:titan/admin/ui/pages/groups/edit_group_page/search_user.dart';
import 'package:titan/tools/constants.dart';
import 'package:titan/tools/functions.dart';
import 'package:titan/tools/token_expire_wrapper.dart';
import 'package:titan/tools/ui/builders/auto_loader_child.dart';
Expand Down Expand Up @@ -60,10 +59,10 @@ class EditGroupPage extends HookConsumerWidget {
description.text = group.description;
return Column(
children: [
const AlignLeftText(
AlignLeftText(
AdminTextConstants.edit,
fontSize: 20,
color: ColorConstants.gradient1,
color: Theme.of(context).colorScheme.primaryContainer,
),
const SizedBox(height: 20),
Form(
Expand All @@ -75,7 +74,9 @@ class EditGroupPage extends HookConsumerWidget {
alignment: Alignment.centerLeft,
child: TextEntry(
controller: name,
color: ColorConstants.gradient1,
color: Theme.of(
context,
).colorScheme.primaryContainer,
label: AdminTextConstants.name,
suffixIcon: const HeroIcon(HeroIcons.pencil),
enabledColor: Colors.transparent,
Expand All @@ -86,7 +87,9 @@ class EditGroupPage extends HookConsumerWidget {
alignment: Alignment.centerLeft,
child: TextEntry(
controller: description,
color: ColorConstants.gradient1,
color: Theme.of(
context,
).colorScheme.primaryContainer,
label: AdminTextConstants.description,
suffixIcon: const HeroIcon(HeroIcons.pencil),
enabledColor: Colors.transparent,
Expand Down Expand Up @@ -122,12 +125,14 @@ class EditGroupPage extends HookConsumerWidget {
});
},
builder: (child) => AdminButton(child: child),
child: const Text(
child: Text(
AdminTextConstants.edit,
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.w600,
color: Colors.white,
color: Theme.of(
context,
).colorScheme.onPrimaryContainer,
),
),
),
Expand All @@ -139,7 +144,7 @@ class EditGroupPage extends HookConsumerWidget {
],
);
},
loaderColor: Colors.white,
loaderColor: Theme.of(context).colorScheme.primary,
),
),
),
Expand Down
7 changes: 4 additions & 3 deletions lib/admin/ui/pages/groups/edit_group_page/results.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import 'package:titan/admin/class/group.dart';
import 'package:titan/admin/providers/group_provider.dart';
import 'package:titan/admin/providers/simple_groups_groups_provider.dart';
import 'package:titan/admin/tools/constants.dart';
import 'package:titan/tools/constants.dart';
import 'package:titan/tools/functions.dart';
import 'package:titan/tools/token_expire_wrapper.dart';
import 'package:titan/tools/ui/builders/async_child.dart';
Expand Down Expand Up @@ -76,7 +75,9 @@ class MemberResults extends HookConsumerWidget {
});
}
},
waitingColor: ColorConstants.gradient1,
waitingColor: Theme.of(
context,
).colorScheme.primaryContainer,
builder: (child) => child,
child: const HeroIcon(HeroIcons.plus),
),
Expand All @@ -88,7 +89,7 @@ class MemberResults extends HookConsumerWidget {
)
.toList(),
),
loaderColor: ColorConstants.gradient1,
loaderColor: Theme.of(context).colorScheme.primaryContainer,
);
}
}
15 changes: 8 additions & 7 deletions lib/admin/ui/pages/groups/edit_group_page/search_user.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import 'package:titan/admin/providers/simple_groups_groups_provider.dart';
import 'package:titan/admin/tools/constants.dart';
import 'package:titan/admin/ui/pages/groups/edit_group_page/results.dart';
import 'package:titan/admin/ui/components/user_ui.dart';
import 'package:titan/tools/constants.dart';
import 'package:titan/tools/ui/builders/async_child.dart';
import 'package:titan/tools/ui/widgets/custom_dialog_box.dart';
import 'package:titan/tools/functions.dart';
Expand Down Expand Up @@ -48,7 +47,7 @@ class SearchUser extends HookConsumerWidget {
children: [
StyledSearchBar(
label: AdminTextConstants.members,
color: ColorConstants.gradient1,
color: Theme.of(context).colorScheme.primaryContainer,
padding: const EdgeInsets.all(0),
onChanged: (value) async {
if (value.isNotEmpty) {
Expand All @@ -75,17 +74,19 @@ class SearchUser extends HookConsumerWidget {
child: Container(
padding: const EdgeInsets.all(7),
decoration: BoxDecoration(
gradient: const LinearGradient(
gradient: LinearGradient(
colors: [
ColorConstants.gradient1,
ColorConstants.gradient2,
Theme.of(context).colorScheme.primaryContainer,
Theme.of(context).colorScheme.primaryFixed,
],
begin: Alignment.topLeft,
end: Alignment.bottomRight,
),
boxShadow: [
BoxShadow(
color: ColorConstants.gradient2.withValues(alpha: 0.4),
color: Theme.of(
context,
).colorScheme.primaryFixed.withValues(alpha: 0.4),
offset: const Offset(2, 3),
blurRadius: 5,
),
Expand All @@ -95,7 +96,7 @@ class SearchUser extends HookConsumerWidget {
child: HeroIcon(
!add.value ? HeroIcons.plus : HeroIcons.xMark,
size: 20,
color: Colors.white,
color: Theme.of(context).colorScheme.onPrimaryContainer,
),
),
),
Expand Down
19 changes: 12 additions & 7 deletions lib/admin/ui/pages/groups/group_page/group_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import 'package:titan/admin/ui/components/item_card_ui.dart';
import 'package:titan/admin/ui/pages/groups/group_page/group_ui.dart';
import 'package:titan/loan/providers/loaner_list_provider.dart';
import 'package:titan/admin/tools/constants.dart';
import 'package:titan/tools/constants.dart';
import 'package:titan/tools/ui/builders/async_child.dart';
import 'package:titan/tools/ui/widgets/custom_dialog_box.dart';
import 'package:titan/tools/functions.dart';
Expand Down Expand Up @@ -51,14 +50,14 @@ class GroupsPage extends HookConsumerWidget {
child: Column(
children: [
const SizedBox(height: 20),
const Align(
Align(
alignment: Alignment.centerLeft,
child: Text(
AdminTextConstants.groups,
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w700,
color: ColorConstants.gradient1,
color: Theme.of(context).colorScheme.primaryContainer,
),
),
),
Expand Down Expand Up @@ -87,7 +86,9 @@ class GroupsPage extends HookConsumerWidget {
const Spacer(),
HeroIcon(
HeroIcons.plus,
color: Colors.grey.shade700,
color: Theme.of(
context,
).colorScheme.secondaryContainer,
size: 40,
),
const Spacer(),
Expand All @@ -111,7 +112,9 @@ class GroupsPage extends HookConsumerWidget {
children: [
HeroIcon(
HeroIcons.buildingLibrary,
color: Colors.grey.shade700,
color: Theme.of(
context,
).colorScheme.secondaryContainer,
size: 40,
),
Positioned(
Expand All @@ -120,7 +123,9 @@ class GroupsPage extends HookConsumerWidget {
child: HeroIcon(
HeroIcons.plus,
size: 15,
color: Colors.grey.shade700,
color: Theme.of(
context,
).colorScheme.secondaryContainer,
),
),
],
Expand Down Expand Up @@ -180,7 +185,7 @@ class GroupsPage extends HookConsumerWidget {
],
);
},
loaderColor: ColorConstants.gradient1,
loaderColor: Theme.of(context).colorScheme.primaryContainer,
),
],
),
Expand Down
Loading
Loading