ua1zbe/meshcore-sar_android
1
0
Fork 0
mirror of https://github.com/dz0ny/meshcore-sar.git synced 2026-08-11 16:30:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: Simplify device settings styling #123

Browse Source
This commit is contained in:
Janez T
2026-03-19 14:18:29 +01:00
parent 8da69705ee
commit d8cb35c595
6 changed files with 272 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/widgets/contacts/contact_tile.dart
View File

@@ -185,14 +185,7 @@ class ContactTile extends StatelessWidget {
margin: const EdgeInsets.only(bottom: 8),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(18),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
colorScheme.surfaceContainerLow,
colorScheme.surfaceContainerHighest.withValues(alpha: 0.9),
],
),
color: colorScheme.surfaceContainerLow,
border: Border.all(
color: colorScheme.outlineVariant.withValues(alpha: 0.35),
),

26
lib/widgets/device/spectrum_scan_panel.dart
View File

@@ -106,7 +106,10 @@ class SpectrumScanPanel extends StatelessWidget {
color: theme.colorScheme.primary,
label: AppLocalizations.of(context)!.quiet,
),
_LegendChip(color: Colors.orange, label: AppLocalizations.of(context)!.moderate),
_LegendChip(
color: Colors.orange,
label: AppLocalizations.of(context)!.moderate,
),
_LegendChip(
color: theme.colorScheme.error,
label: AppLocalizations.of(context)!.busy,
@@ -147,7 +150,7 @@ class SpectrumScanPanel extends StatelessWidget {
width: double.infinity,
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
decoration: BoxDecoration(
color: theme.colorScheme.surface.withValues(alpha: 0.7),
color: theme.colorScheme.surfaceContainerLow,
borderRadius: BorderRadius.circular(12),
border: Border.all(color: theme.colorScheme.outlineVariant),
),
@@ -303,12 +306,7 @@ class _FrequencyRangePreview extends StatelessWidget {
height: 108,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16),
gradient: LinearGradient(
colors: [
scheme.surface,
scheme.surfaceContainerHighest.withValues(alpha: 0.9),
],
),
color: scheme.surfaceContainerLow,
border: Border.all(color: scheme.outlineVariant),
),
child: Stack(
@@ -322,13 +320,7 @@ class _FrequencyRangePreview extends StatelessWidget {
child: DecoratedBox(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
gradient: LinearGradient(
colors: [
scheme.primary.withValues(alpha: 0.12),
scheme.tertiary.withValues(alpha: 0.08),
scheme.primary.withValues(alpha: 0.12),
],
),
color: scheme.surfaceContainerHigh,
),
),
),
@@ -341,7 +333,7 @@ class _FrequencyRangePreview extends StatelessWidget {
child: DecoratedBox(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: scheme.primary.withValues(alpha: 0.20),
color: scheme.primaryContainer,
border: Border.all(color: scheme.primary),
),
),
@@ -355,7 +347,7 @@ class _FrequencyRangePreview extends StatelessWidget {
child: DecoratedBox(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(999),
color: scheme.tertiary.withValues(alpha: 0.32),
color: scheme.tertiaryContainer,
border: Border.all(color: scheme.tertiary),
),
),

376
lib/widgets/messages/recipient_selector_sheet.dart
View File

@@ -4,7 +4,7 @@ import '../../l10n/app_localizations.dart';
import '../../models/contact.dart';
import '../common/contact_avatar.dart';
enum _RecipientSortMode { activity, alphabetical }
enum _RecipientSortMode { activity, favorites, alphabetical }
/// Bottom sheet for selecting message recipient (channel, contact, or room)
class RecipientSelectorSheet extends StatefulWidget {
@@ -74,11 +74,27 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
return a.isPublicChannel ? -1 : 1;
}
if (_sortMode == _RecipientSortMode.activity) {
if (_sortMode == _RecipientSortMode.favorites) {
if (a.isFavourite != b.isFavourite) {
return a.isFavourite ? -1 : 1;
}
final unreadCompare = _unreadFor(b).compareTo(_unreadFor(a));
if (unreadCompare != 0) {
return unreadCompare;
}
final lastSeenCompare = b.lastSeenTime.compareTo(a.lastSeenTime);
if (lastSeenCompare != 0) {
return lastSeenCompare;
}
} else if (_sortMode == _RecipientSortMode.activity) {
final unreadCompare = _unreadFor(b).compareTo(_unreadFor(a));
if (unreadCompare != 0) {
return unreadCompare;
}
final lastSeenCompare = b.lastSeenTime.compareTo(a.lastSeenTime);
if (lastSeenCompare != 0) {
return lastSeenCompare;
}
}
return a.displayName.toLowerCase().compareTo(b.displayName.toLowerCase());
@@ -165,7 +181,7 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
mainAxisSize: MainAxisSize.min,
children: [
Padding(
padding: const EdgeInsets.fromLTRB(20, 12, 20, 16),
padding: const EdgeInsets.fromLTRB(16, 12, 16, 10),
child: Column(
children: [
Container(
@@ -176,64 +192,16 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
borderRadius: BorderRadius.circular(999),
),
),
const SizedBox(height: 16),
const SizedBox(height: 12),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
l10n.selectRecipient,
style: Theme.of(context).textTheme.titleLarge
?.copyWith(
fontWeight: FontWeight.w900,
letterSpacing: -0.5,
),
),
const SizedBox(height: 10),
Wrap(
spacing: 8,
runSpacing: 8,
children: [
if (widget.showAllOption)
_SummaryChip(
icon: Icons.all_inbox_rounded,
label: l10n.showAll,
count: widget.unreadCount,
accentColor: colorScheme.primary,
),
if (hasChannels)
_SummaryChip(
icon: Icons.broadcast_on_personal_rounded,
label: l10n.channels,
count: filteredChannels.length,
accentColor: _sectionColor(
context,
'channel',
),
),
if (hasContacts)
_SummaryChip(
icon: Icons.person_rounded,
label: l10n.contacts,
count: filteredContacts.length,
accentColor: _sectionColor(
context,
'contact',
),
),
if (hasRooms)
_SummaryChip(
icon: Icons.meeting_room_outlined,
label: l10n.rooms,
count: filteredRooms.length,
accentColor: _sectionColor(context, 'room'),
),
],
),
],
child: Text(
l10n.selectRecipient,
style: Theme.of(context).textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.w900,
letterSpacing: -0.5,
),
),
),
const SizedBox(width: 12),
@@ -244,69 +212,47 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
),
],
),
const SizedBox(height: 16),
TextField(
controller: _searchController,
decoration: InputDecoration(
hintText: l10n.searchRecipients,
prefixIcon: const Icon(Icons.search_rounded),
suffixIcon: _searchQuery.isNotEmpty
? IconButton(
icon: const Icon(Icons.close_rounded),
onPressed: () {
_searchController.clear();
setState(() {
_searchQuery = '';
});
},
)
: null,
filled: true,
fillColor: colorScheme.surfaceContainerHigh,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(18),
borderSide: BorderSide.none,
),
contentPadding: const EdgeInsets.symmetric(
horizontal: 18,
vertical: 16,
),
),
onChanged: (value) {
setState(() {
_searchQuery = value;
});
},
),
const SizedBox(height: 12),
Align(
alignment: Alignment.centerLeft,
child: Wrap(
spacing: 8,
runSpacing: 8,
children: [
_SortChip(
icon: Icons.flash_on_rounded,
label: l10n.active,
selected: _sortMode == _RecipientSortMode.activity,
onTap: () {
Row(
children: [
Expanded(
child: TextField(
controller: _searchController,
decoration: InputDecoration(
hintText: l10n.searchRecipients,
prefixIcon: const Icon(Icons.search_rounded),
suffixIcon: _searchQuery.isNotEmpty
? IconButton(
icon: const Icon(Icons.close_rounded),
onPressed: () {
_searchController.clear();
setState(() {
_searchQuery = '';
});
},
)
: null,
filled: true,
fillColor: colorScheme.surfaceContainerHigh,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(16),
borderSide: BorderSide.none,
),
contentPadding: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 14,
),
),
onChanged: (value) {
setState(() {
_sortMode = _RecipientSortMode.activity;
_searchQuery = value;
});
},
),
_SortChip(
icon: Icons.sort_by_alpha_rounded,
label: 'A-Z',
selected: _sortMode == _RecipientSortMode.alphabetical,
onTap: () {
setState(() {
_sortMode = _RecipientSortMode.alphabetical;
});
},
),
],
),
),
const SizedBox(width: 10),
_buildSortMenuButton(context),
],
),
],
),
@@ -422,6 +368,82 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
);
}
Widget _buildSortMenuButton(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final colorScheme = Theme.of(context).colorScheme;
return PopupMenuButton<_RecipientSortMode>(
tooltip: 'Sort',
initialValue: _sortMode,
onSelected: (sortMode) {
setState(() {
_sortMode = sortMode;
});
},
itemBuilder: (context) => [
PopupMenuItem<_RecipientSortMode>(
value: _RecipientSortMode.activity,
child: Row(
children: [
Icon(
Icons.flash_on_rounded,
size: 18,
color: _sortMode == _RecipientSortMode.activity
? colorScheme.primary
: null,
),
const SizedBox(width: 8),
Text(l10n.active),
],
),
),
PopupMenuItem<_RecipientSortMode>(
value: _RecipientSortMode.favorites,
child: Row(
children: [
Icon(
Icons.star_rounded,
size: 18,
color: _sortMode == _RecipientSortMode.favorites
? colorScheme.primary
: null,
),
const SizedBox(width: 8),
Text(l10n.favourites),
],
),
),
const PopupMenuItem<_RecipientSortMode>(
value: _RecipientSortMode.alphabetical,
child: Row(
children: [
Icon(Icons.sort_by_alpha_rounded, size: 18),
SizedBox(width: 8),
Text('A-Z'),
],
),
),
],
child: Container(
width: 46,
height: 46,
decoration: BoxDecoration(
color: colorScheme.surfaceContainerHigh,
borderRadius: BorderRadius.circular(16),
),
alignment: Alignment.center,
child: Icon(
_sortMode == _RecipientSortMode.activity
? Icons.flash_on_rounded
: _sortMode == _RecipientSortMode.favorites
? Icons.star_rounded
: Icons.sort_by_alpha_rounded,
color: colorScheme.primary,
),
),
);
}
Widget _buildSectionCard(
BuildContext context, {
required String type,
@@ -438,15 +460,7 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
margin: const EdgeInsets.only(bottom: 12),
padding: const EdgeInsets.all(14),
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
colorScheme.surface,
accentColor.withValues(alpha: 0.05),
colorScheme.surfaceContainerLow,
],
),
color: colorScheme.surfaceContainerLow,
borderRadius: BorderRadius.circular(24),
border: Border.all(color: accentColor.withValues(alpha: 0.14)),
),
@@ -530,14 +544,9 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
return Container(
margin: const EdgeInsets.only(bottom: 12),
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
colorScheme.primaryContainer.withValues(alpha: 0.4),
colorScheme.surfaceContainerHigh,
],
),
color: isSelected
? colorScheme.primaryContainer.withValues(alpha: 0.42)
: colorScheme.surfaceContainerHigh,
borderRadius: BorderRadius.circular(24),
border: Border.all(
color: isSelected
@@ -750,104 +759,3 @@ class _RecipientSelectorSheetState extends State<RecipientSelectorSheet> {
);
}
}
class _SummaryChip extends StatelessWidget {
final IconData icon;
final String label;
final int count;
final Color accentColor;
const _SummaryChip({
required this.icon,
required this.label,
required this.count,
required this.accentColor,
});
@override
Widget build(BuildContext context) {
final colorScheme = Theme.of(context).colorScheme;
return Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
decoration: BoxDecoration(
color: colorScheme.surfaceContainerHigh,
borderRadius: BorderRadius.circular(999),
border: Border.all(color: accentColor.withValues(alpha: 0.14)),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(icon, size: 14, color: accentColor),
const SizedBox(width: 8),
Text(
'$count',
style: Theme.of(
context,
).textTheme.labelLarge?.copyWith(fontWeight: FontWeight.w800),
),
const SizedBox(width: 6),
Text(
label,
style: Theme.of(context).textTheme.labelLarge?.copyWith(
color: colorScheme.onSurfaceVariant,
fontWeight: FontWeight.w600,
),
),
],
),
);
}
}
class _SortChip extends StatelessWidget {
final IconData icon;
final String label;
final bool selected;
final VoidCallback onTap;
const _SortChip({
required this.icon,
required this.label,
required this.selected,
required this.onTap,
});
@override
Widget build(BuildContext context) {
final colorScheme = Theme.of(context).colorScheme;
return FilterChip(
selected: selected,
onSelected: (_) => onTap(),
avatar: Icon(
icon,
size: 16,
color: selected
? colorScheme.onSecondaryContainer
: colorScheme.primary,
),
label: Text(
label,
style: Theme.of(
context,
).textTheme.labelLarge?.copyWith(fontWeight: FontWeight.w700),
),
side: BorderSide(
color: selected
? colorScheme.secondaryContainer
: colorScheme.outlineVariant.withValues(alpha: 0.35),
),
selectedColor: colorScheme.secondaryContainer,
checkmarkColor: colorScheme.onSecondaryContainer,
backgroundColor: colorScheme.surfaceContainerLow,
labelStyle: TextStyle(
color: selected
? colorScheme.onSecondaryContainer
: colorScheme.onSurface,
),
showCheckmark: false,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(999)),
);
}
}