updates
This commit is contained in:
parent
fc22d11df1
commit
27a8a62475
32 changed files with 354 additions and 335 deletions
|
|
@ -141,16 +141,16 @@ class _TabBar extends StatelessWidget {
|
|||
onTap: () => onSelect(i),
|
||||
child: Container(
|
||||
constraints:
|
||||
const BoxConstraints(minHeight: RatuneSpacing.minTouchTarget),
|
||||
const BoxConstraints(minHeight: TimbreSpacing.minTouchTarget),
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: RatuneSpacing.md,
|
||||
vertical: RatuneSpacing.md,
|
||||
horizontal: TimbreSpacing.md,
|
||||
vertical: TimbreSpacing.md,
|
||||
),
|
||||
child: Center(
|
||||
child: Text(
|
||||
tabs[i],
|
||||
style: TextStyle(
|
||||
color: active ? RatuneColors.foreground : RatuneColors.dimmed,
|
||||
color: active ? TimbreColors.foreground : TimbreColors.dimmed,
|
||||
fontWeight: active ? FontWeight.w700 : FontWeight.w400,
|
||||
decoration:
|
||||
active ? TextDecoration.underline : TextDecoration.none,
|
||||
|
|
@ -164,13 +164,13 @@ class _TabBar extends StatelessWidget {
|
|||
);
|
||||
if (i < tabs.length - 1) {
|
||||
children.add(
|
||||
const Text('|', style: TextStyle(color: RatuneColors.border)),
|
||||
const Text('|', style: TextStyle(color: TimbreColors.border)),
|
||||
);
|
||||
}
|
||||
}
|
||||
return Container(
|
||||
decoration: const BoxDecoration(
|
||||
border: Border(top: BorderSide(color: RatuneColors.border)),
|
||||
border: Border(top: BorderSide(color: TimbreColors.border)),
|
||||
),
|
||||
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: children),
|
||||
);
|
||||
|
|
@ -191,14 +191,14 @@ class _StatusBar extends ConsumerWidget {
|
|||
conn.credentials?.display ?? 'online',
|
||||
accent,
|
||||
),
|
||||
ConnStatus.connecting => ('◐', 'connecting…', RatuneColors.dimmed),
|
||||
ConnStatus.connecting => ('◐', 'connecting…', TimbreColors.dimmed),
|
||||
ConnStatus.error => ('○', 'offline', const Color(0xFFE06C75)),
|
||||
ConnStatus.disconnected => ('○', 'tap to connect', RatuneColors.dimmed),
|
||||
ConnStatus.disconnected => ('○', 'tap to connect', TimbreColors.dimmed),
|
||||
};
|
||||
|
||||
return Container(
|
||||
height: 22,
|
||||
color: RatuneColors.surface,
|
||||
color: TimbreColors.surface,
|
||||
child: Row(
|
||||
children: [
|
||||
// Left: connection status — tap to open the connect sheet.
|
||||
|
|
@ -207,7 +207,7 @@ class _StatusBar extends ConsumerWidget {
|
|||
onTap: () => showConnectSheet(context),
|
||||
child: Padding(
|
||||
padding:
|
||||
const EdgeInsets.symmetric(horizontal: RatuneSpacing.lg),
|
||||
const EdgeInsets.symmetric(horizontal: TimbreSpacing.lg),
|
||||
child: Row(
|
||||
children: [
|
||||
Text('$glyph ', style: TextStyle(color: color)),
|
||||
|
|
@ -230,14 +230,14 @@ class _StatusBar extends ConsumerWidget {
|
|||
MaterialPageRoute(builder: (_) => const SettingsScreen()),
|
||||
),
|
||||
child: const Padding(
|
||||
padding: EdgeInsets.symmetric(horizontal: RatuneSpacing.lg),
|
||||
padding: EdgeInsets.symmetric(horizontal: TimbreSpacing.lg),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(Icons.settings, size: 12, color: RatuneColors.dimmed),
|
||||
SizedBox(width: RatuneSpacing.xs),
|
||||
Icon(Icons.settings, size: 12, color: TimbreColors.dimmed),
|
||||
SizedBox(width: TimbreSpacing.xs),
|
||||
Text('settings',
|
||||
style: TextStyle(color: RatuneColors.dimmed)),
|
||||
style: TextStyle(color: TimbreColors.dimmed)),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue