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

Match sensors bg and hide counts

Browse Source
This commit is contained in:
Janez T
2026-03-08 21:03:44 +01:00
parent 2ab8681ac4
commit d113f7a881
6 changed files with 128 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/screens/contacts_tab.dart
View File

@@ -7,7 +7,6 @@ import '../models/contact.dart';
import '../providers/contacts_provider.dart';
import '../providers/app_provider.dart';
import '../providers/connection_provider.dart';
import '../providers/messages_provider.dart';
import '../widgets/contacts/contact_tile.dart';
import '../widgets/contacts/add_channel_dialog.dart';
@@ -207,8 +206,8 @@ class _ContactsTabState extends State<ContactsTab> {
final l10n = AppLocalizations.of(context)!;
return Scaffold(
body: Consumer2<ContactsProvider, MessagesProvider>(
builder: (context, contactsProvider, messagesProvider, child) {
body: Consumer<ContactsProvider>(
builder: (context, contactsProvider, child) {
final chatContacts = _sortContactsByDistance(
contactsProvider.chatContacts,
);
@@ -292,10 +291,6 @@ class _ContactsTabState extends State<ContactsTab> {
formatDistance: _formatDistance,
onNavigateToMap: widget.onNavigateToMap,
onNavigateToMessages: widget.onNavigateToMessages,
messageCount: messagesProvider
.getMessageCountForDestination(contact),
unreadMessageCount: messagesProvider
.getUnreadCountForDestination(contact),
),
),
const Divider(height: 32),
@@ -316,10 +311,6 @@ class _ContactsTabState extends State<ContactsTab> {
formatDistance: _formatDistance,
onNavigateToMap: widget.onNavigateToMap,
onNavigateToMessages: widget.onNavigateToMessages,
messageCount: messagesProvider
.getMessageCountForDestination(contact),
unreadMessageCount: messagesProvider
.getUnreadCountForDestination(contact),
),
),
const Divider(height: 32),
@@ -340,10 +331,6 @@ class _ContactsTabState extends State<ContactsTab> {
formatDistance: _formatDistance,
onNavigateToMap: widget.onNavigateToMap,
onNavigateToMessages: widget.onNavigateToMessages,
messageCount: messagesProvider
.getMessageCountForDestination(contact),
unreadMessageCount: messagesProvider
.getUnreadCountForDestination(contact),
),
),
const Divider(height: 32),
@@ -364,10 +351,6 @@ class _ContactsTabState extends State<ContactsTab> {
formatDistance: _formatDistance,
onNavigateToMap: widget.onNavigateToMap,
onNavigateToMessages: widget.onNavigateToMessages,
messageCount: messagesProvider
.getMessageCountForDestination(contact),
unreadMessageCount: messagesProvider
.getUnreadCountForDestination(contact),
),
),
],

18
lib/screens/sensors_tab.dart
View File

@@ -371,6 +371,7 @@ class _SensorCard extends StatelessWidget {
final l10n = AppLocalizations.of(context)!;
final telemetry = contact?.telemetry;
final theme = Theme.of(context);
final colorScheme = theme.colorScheme;
final metrics = contact == null || telemetry == null
? const <_MetricCardData>[]
: _buildMetricCards(l10n, telemetry, contact!);
@@ -378,16 +379,23 @@ class _SensorCard extends StatelessWidget {
return Container(
margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(
color: theme.colorScheme.surface,
borderRadius: BorderRadius.circular(28),
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
colorScheme.surfaceContainerLow,
colorScheme.surfaceContainerHighest.withValues(alpha: 0.9),
],
),
border: Border.all(
color: theme.colorScheme.outline.withValues(alpha: 0.14),
color: colorScheme.outlineVariant.withValues(alpha: 0.35),
),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.04),
blurRadius: 18,
offset: const Offset(0, 8),
color: Colors.black.withValues(alpha: 0.045),
blurRadius: 12,
offset: const Offset(0, 4),
),
],
),