mirror of
https://github.com/hanskokx/arcane_framework.git
synced 2026-05-14 10:29:06 +02:00
Refactor theme management to use ListenableBuilder for improved reactivity
Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com>
This commit is contained in:
+152
-160
@@ -210,9 +210,9 @@ class ArcaneAuthExample extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return ValueListenableBuilder(
|
return ListenableBuilder(
|
||||||
valueListenable: Arcane.features.notifier,
|
listenable: Arcane.features.notifier,
|
||||||
builder: (context, enabledFeatures, _) {
|
builder: (context, _) {
|
||||||
return Card(
|
return Card(
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.all(8.0),
|
padding: const EdgeInsets.all(8.0),
|
||||||
@@ -271,170 +271,162 @@ class ArcaneThemeExample extends StatelessWidget {
|
|||||||
});
|
});
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return ListenableBuilder(
|
return ArcaneThemeSwitcher(
|
||||||
listenable: Arcane.theme.themeChanges,
|
child: Card(
|
||||||
builder: (context, _) {
|
child: Padding(
|
||||||
final ThemeData effectiveTheme = Arcane.theme.currentTheme;
|
padding: const EdgeInsets.all(8.0),
|
||||||
final bool isFollowingSystem = Arcane.theme.isFollowingSystemTheme;
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
return Card(
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
child: Padding(
|
children: [
|
||||||
padding: const EdgeInsets.all(8.0),
|
Text(
|
||||||
child: Column(
|
"Theme",
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
style: Theme.of(context).textTheme.headlineSmall,
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
),
|
||||||
children: [
|
Column(
|
||||||
Text(
|
children: [
|
||||||
"Theme",
|
Switch(
|
||||||
style: Theme.of(context).textTheme.headlineSmall,
|
value: Arcane.theme.currentThemeMode == ThemeMode.dark,
|
||||||
),
|
thumbIcon: WidgetStateProperty.resolveWith((states) {
|
||||||
Column(
|
if (states.contains(WidgetState.selected)) {
|
||||||
|
return const Icon(Icons.dark_mode);
|
||||||
|
}
|
||||||
|
return const Icon(Icons.light_mode);
|
||||||
|
}),
|
||||||
|
onChanged: (_) {
|
||||||
|
final ThemeMode oldTheme = Arcane.theme.currentThemeMode;
|
||||||
|
Arcane.theme.switchTheme();
|
||||||
|
Arcane.log(
|
||||||
|
"Switching theme",
|
||||||
|
metadata: {
|
||||||
|
"followingSystemTheme":
|
||||||
|
"${Arcane.theme.isFollowingSystemTheme}",
|
||||||
|
"newMode": Arcane.theme.currentThemeMode.name,
|
||||||
|
"oldMode": oldTheme.name,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Checkbox(
|
||||||
|
value: Arcane.theme.followingSystemThemeChanges.value,
|
||||||
|
onChanged: (value) {
|
||||||
|
final ThemeMode oldTheme =
|
||||||
|
Arcane.theme.currentThemeMode;
|
||||||
|
if (value == true) {
|
||||||
|
Arcane.theme.followSystemTheme(context);
|
||||||
|
Arcane.log(
|
||||||
|
"Switching theme",
|
||||||
|
metadata: {
|
||||||
|
"followingSystemTheme":
|
||||||
|
"${Arcane.theme.isFollowingSystemTheme}",
|
||||||
|
"newMode": Arcane.theme.currentThemeMode.name,
|
||||||
|
"oldMode": oldTheme.name,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
Arcane.theme.switchTheme(
|
||||||
|
themeMode: Arcane.theme.systemThemeMode,
|
||||||
|
);
|
||||||
|
Arcane.log(
|
||||||
|
"Switching theme",
|
||||||
|
metadata: {
|
||||||
|
"followingSystemTheme":
|
||||||
|
"${Arcane.theme.isFollowingSystemTheme}",
|
||||||
|
"newMode": Arcane.theme.currentThemeMode.name,
|
||||||
|
"oldMode": oldTheme.name,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
const Text("Follow system"),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 20,
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
spacing: 8,
|
||||||
children: [
|
children: [
|
||||||
Switch(
|
const Text("Color"),
|
||||||
value: Arcane.theme.currentThemeMode == ThemeMode.dark,
|
Expanded(
|
||||||
thumbIcon: WidgetStateProperty.resolveWith((states) {
|
child: ListView.separated(
|
||||||
if (states.contains(WidgetState.selected)) {
|
itemCount: colors.length,
|
||||||
return const Icon(Icons.dark_mode);
|
scrollDirection: Axis.horizontal,
|
||||||
}
|
separatorBuilder: (_, __) => const SizedBox(width: 4),
|
||||||
return const Icon(Icons.light_mode);
|
itemBuilder: (context, index) {
|
||||||
}),
|
return InkWell(
|
||||||
onChanged: (_) {
|
onTap: () {
|
||||||
final ThemeMode oldTheme =
|
if (context.themeMode == ThemeMode.dark) {
|
||||||
Arcane.theme.currentThemeMode;
|
Arcane.theme.setDarkTheme(
|
||||||
Arcane.theme.switchTheme();
|
ThemeData(
|
||||||
Arcane.log(
|
brightness: Brightness.dark,
|
||||||
"Switching theme",
|
colorSchemeSeed: colors[index],
|
||||||
metadata: {
|
),
|
||||||
"followingSystemTheme":
|
);
|
||||||
"${Arcane.theme.isFollowingSystemTheme}",
|
} else if (context.themeMode == ThemeMode.light) {
|
||||||
"newMode": Arcane.theme.currentThemeMode.name,
|
Arcane.theme.setLightTheme(
|
||||||
"oldMode": oldTheme.name,
|
ThemeData(
|
||||||
},
|
brightness: Brightness.light,
|
||||||
);
|
colorSchemeSeed: colors[index],
|
||||||
},
|
),
|
||||||
),
|
);
|
||||||
Row(
|
}
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
Checkbox(
|
|
||||||
value: isFollowingSystem,
|
|
||||||
onChanged: (value) {
|
|
||||||
final ThemeMode oldTheme =
|
|
||||||
Arcane.theme.currentThemeMode;
|
|
||||||
if (value == true) {
|
|
||||||
Arcane.theme.followSystemTheme(context);
|
|
||||||
Arcane.log(
|
Arcane.log(
|
||||||
"Switching theme",
|
"Setting ${Arcane.theme.currentThemeMode.name} theme color to ${colors[index].name}",
|
||||||
metadata: {
|
|
||||||
"followingSystemTheme":
|
|
||||||
"${Arcane.theme.isFollowingSystemTheme}",
|
|
||||||
"newMode": Arcane.theme.currentThemeMode.name,
|
|
||||||
"oldMode": oldTheme.name,
|
|
||||||
},
|
|
||||||
);
|
);
|
||||||
} else {
|
},
|
||||||
Arcane.theme.switchTheme(
|
child: Container(
|
||||||
themeMode: Arcane.theme.systemThemeMode,
|
key: Key(
|
||||||
);
|
"${colors[index]}-${Arcane.theme.currentThemeMode}"),
|
||||||
Arcane.log(
|
decoration: BoxDecoration(
|
||||||
"Switching theme",
|
color: colors[index],
|
||||||
metadata: {
|
border: Arcane.theme.currentTheme.colorScheme
|
||||||
"followingSystemTheme":
|
.primary.name ==
|
||||||
"${Arcane.theme.isFollowingSystemTheme}",
|
colors[index].name
|
||||||
"newMode": Arcane.theme.currentThemeMode.name,
|
? Border.all(
|
||||||
"oldMode": oldTheme.name,
|
width: 2,
|
||||||
},
|
color: Colors.white,
|
||||||
);
|
)
|
||||||
}
|
: null,
|
||||||
},
|
boxShadow: Arcane.theme.currentTheme.colorScheme
|
||||||
),
|
.primary.name ==
|
||||||
const Text("Follow system"),
|
colors[index].name
|
||||||
],
|
? [
|
||||||
|
const BoxShadow(
|
||||||
|
color: Colors.black,
|
||||||
|
spreadRadius: 1,
|
||||||
|
blurRadius: 1,
|
||||||
|
offset: Offset(0, 0),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
: null,
|
||||||
|
),
|
||||||
|
width: 20,
|
||||||
|
height: 20,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
SizedBox(
|
),
|
||||||
height: 20,
|
Text(
|
||||||
child: Row(
|
"The current theme mode is ${Arcane.theme.currentModeOf(context).name} and "
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
"is ${Arcane.theme.isFollowingSystemTheme ? "" : "not "}"
|
||||||
spacing: 8,
|
"following the system theme.",
|
||||||
children: [
|
),
|
||||||
const Text("Color"),
|
],
|
||||||
Expanded(
|
|
||||||
child: ListView.separated(
|
|
||||||
itemCount: colors.length,
|
|
||||||
scrollDirection: Axis.horizontal,
|
|
||||||
separatorBuilder: (_, __) => const SizedBox(width: 4),
|
|
||||||
itemBuilder: (context, index) {
|
|
||||||
return InkWell(
|
|
||||||
onTap: () {
|
|
||||||
if (context.themeMode == ThemeMode.dark) {
|
|
||||||
Arcane.theme.setDarkTheme(
|
|
||||||
ThemeData(
|
|
||||||
brightness: Brightness.dark,
|
|
||||||
colorSchemeSeed: colors[index],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
} else if (context.themeMode ==
|
|
||||||
ThemeMode.light) {
|
|
||||||
Arcane.theme.setLightTheme(
|
|
||||||
ThemeData(
|
|
||||||
brightness: Brightness.light,
|
|
||||||
colorSchemeSeed: colors[index],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Arcane.log(
|
|
||||||
"Setting ${Arcane.theme.currentThemeMode.name} theme color to ${colors[index].name}",
|
|
||||||
);
|
|
||||||
},
|
|
||||||
child: Container(
|
|
||||||
key: Key(
|
|
||||||
"${colors[index]}-${Arcane.theme.currentThemeMode}"),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: colors[index],
|
|
||||||
border:
|
|
||||||
effectiveTheme.colorScheme.primary.name ==
|
|
||||||
colors[index].name
|
|
||||||
? Border.all(
|
|
||||||
width: 2,
|
|
||||||
color: Colors.white,
|
|
||||||
)
|
|
||||||
: null,
|
|
||||||
boxShadow:
|
|
||||||
effectiveTheme.colorScheme.primary.name ==
|
|
||||||
colors[index].name
|
|
||||||
? [
|
|
||||||
const BoxShadow(
|
|
||||||
color: Colors.black,
|
|
||||||
spreadRadius: 1,
|
|
||||||
blurRadius: 1,
|
|
||||||
offset: Offset(0, 0),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
: null,
|
|
||||||
),
|
|
||||||
width: 20,
|
|
||||||
height: 20,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Text(
|
|
||||||
"The current theme mode is ${Arcane.theme.currentModeOf(context).name} and "
|
|
||||||
"is ${Arcane.theme.isFollowingSystemTheme ? "" : "not "}"
|
|
||||||
"following the system theme.",
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
);
|
),
|
||||||
},
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,14 +31,14 @@ class _ArcaneThemeSwitcherState extends State<ArcaneThemeSwitcher>
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return ValueListenableBuilder<ThemeMode>(
|
return ListenableBuilder(
|
||||||
valueListenable: ArcaneReactiveTheme.I.themeModeChanges,
|
listenable: ArcaneReactiveTheme.I.themeChanges,
|
||||||
builder: (BuildContext context, ThemeMode themeMode, Widget? child) {
|
builder: (BuildContext context, Widget? child) {
|
||||||
return ValueListenableBuilder<ThemeData>(
|
return ValueListenableBuilder<ThemeData>(
|
||||||
valueListenable: ArcaneReactiveTheme.I.themeDataChanges,
|
valueListenable: ArcaneReactiveTheme.I.themeDataChanges,
|
||||||
builder: (BuildContext context, ThemeData themeData, Widget? child) {
|
builder: (BuildContext context, ThemeData themeData, Widget? child) {
|
||||||
return _ArcaneTheme(
|
return _ArcaneTheme(
|
||||||
themeMode: themeMode,
|
themeMode: ArcaneReactiveTheme.I.currentThemeMode,
|
||||||
followSystem: ArcaneReactiveTheme.I.isFollowingSystemTheme,
|
followSystem: ArcaneReactiveTheme.I.isFollowingSystemTheme,
|
||||||
theme: themeData,
|
theme: themeData,
|
||||||
child: widget.child,
|
child: widget.child,
|
||||||
|
|||||||
Reference in New Issue
Block a user