BlockStorage/repertory
1
0
Fork 0
Code Issues 4 Pull Requests Releases 8 Wiki Activity

[ui] UI theme should match repertory blue #61
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Scott E. Graves
2025-09-04 20:01:55 -05:00
parent 71ddf7ecf7
commit da0e2ddb46
4 changed files with 33 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/repertory/lib/main.dart
View File

@@ -104,7 +104,7 @@ class _MyAppState extends State<MyApp> {
child: EditMountScreen( child: EditMountScreen(
mount: mount, mount: mount,
title: title:
'${mount.provider} [${formatMountName(mount.type, mount.name)}] Settings', '${mount.provider} Settings • ${formatMountName(mount.type, mount.name)}',
), ),
); );
}, },

38
web/repertory/lib/screens/add_mount_screen.dart
View File

@@ -168,39 +168,17 @@ class _AddMountScreenState extends State<AddMountScreen> {
if (_mount != null) ...[ if (_mount != null) ...[
const SizedBox(height: constants.padding), const SizedBox(height: constants.padding),
Expanded( Expanded(
child: Container( child: Padding(
decoration: BoxDecoration( padding: const EdgeInsets.symmetric(
color: scheme.primary.withValues( horizontal: constants.padding,
alpha: constants.primaryAlpha,
),
borderRadius: BorderRadius.circular(constants.borderRadius),
border: Border.all(
color: scheme.outlineVariant.withValues(alpha: 0.06),
width: 1,
),
gradient: const LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: constants.gradientColors2,
),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.22),
blurRadius: constants.borderRadius,
offset: Offset(0, constants.borderRadius),
),
],
), ),
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(constants.borderRadius), borderRadius: BorderRadius.circular(constants.borderRadius),
child: Padding( child: MountSettingsWidget(
padding: const EdgeInsets.all(constants.padding), isAdd: true,
child: MountSettingsWidget( mount: _mount!,
isAdd: true, settings: _settings[_mountType]!,
mount: _mount!, showAdvanced: false,
settings: _settings[_mountType]!,
showAdvanced: false,
),
), ),
), ),
), ),

45
web/repertory/lib/screens/edit_mount_screen.dart
View File

@@ -169,49 +169,18 @@ class _EditMountScreenState extends State<EditMountScreen> {
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: constants.padding, horizontal: constants.padding,
), ),
child: Material( child: ClipRRect(
color: Colors.transparent, borderRadius: BorderRadius.circular(constants.borderRadius),
child: Container( child: MountSettingsWidget(
decoration: BoxDecoration( mount: widget.mount,
color: scheme.primary.withValues( settings: jsonDecode(
alpha: constants.primaryAlpha, jsonEncode(widget.mount.mountConfig.settings),
),
borderRadius: BorderRadius.circular(constants.borderRadius),
border: Border.all(
color: scheme.outlineVariant.withValues(alpha: 0.06),
width: 1,
),
gradient: const LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: constants.gradientColors2,
),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.22),
blurRadius: constants.borderRadius,
offset: Offset(0, constants.borderRadius),
),
],
),
child: ClipRRect(
borderRadius: BorderRadius.circular(constants.borderRadius),
child: Padding(
padding: const EdgeInsets.all(constants.padding),
child: MountSettingsWidget(
mount: widget.mount,
settings: jsonDecode(
jsonEncode(widget.mount.mountConfig.settings),
),
showAdvanced: _showAdvanced,
),
),
), ),
showAdvanced: _showAdvanced,
), ),
), ),
), ),
), ),
const SizedBox(height: constants.padding), const SizedBox(height: constants.padding),
], ],
), ),

61
web/repertory/lib/screens/edit_settings_screen.dart
View File

@@ -122,51 +122,24 @@ class _EditSettingsScreenState extends State<EditSettingsScreen> {
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: constants.padding, horizontal: constants.padding,
), ),
child: Material( child: ClipRRect(
color: Colors.transparent, borderRadius: BorderRadius.circular(constants.borderRadius),
child: Container( child: FutureBuilder<Map<String, dynamic>>(
decoration: BoxDecoration( future: _grabSettings(),
color: scheme.surface.withValues(alpha: 0.40), initialData: const <String, dynamic>{},
borderRadius: BorderRadius.circular(constants.borderRadius), builder: (context, snapshot) {
border: Border.all( if (!snapshot.hasData) {
color: scheme.outlineVariant.withValues(alpha: 0.06), return const Center(child: CircularProgressIndicator());
width: 1, }
),
gradient: const LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: constants.gradientColors2,
),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.22),
blurRadius: constants.borderRadius,
offset: Offset(0, constants.borderRadius),
),
],
),
child: ClipRRect(
borderRadius: BorderRadius.circular(constants.borderRadius),
child: FutureBuilder<Map<String, dynamic>>(
future: _grabSettings(),
initialData: const <String, dynamic>{},
builder: (context, snapshot) {
if (!snapshot.hasData) {
return const Center(
child: CircularProgressIndicator(),
);
}
return UISettingsWidget( return UISettingsWidget(
origSettings: jsonDecode( origSettings: jsonDecode(
jsonEncode(snapshot.requireData), jsonEncode(snapshot.requireData),
), ),
settings: snapshot.requireData, settings: snapshot.requireData,
showAdvanced: false, showAdvanced: false,
); );
}, },
),
),
), ),
), ),
), ),