Hydrogen/Solian
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Bug fixes

Browse Source
This commit is contained in:
LittleSheep 2024-10-05 03:38:30 +08:00
parent 8d79274b0c
commit ac60043ca7
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/screens/channel/channel_chat.dart
View File

@ -202,7 +202,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen>
String? placeholder; String? placeholder;
final otherside = final otherside =
_channel!.members!.where((e) => e.account.id != _accountId).firstOrNull; _channel?.members!.where((e) => e.account.id != _accountId).firstOrNull;
if (_channel?.type == 1 && otherside != null) { if (_channel?.type == 1 && otherside != null) {
title = otherside.account.nick; title = otherside.account.nick;

2
lib/screens/chat.dart
View File

@ -131,7 +131,7 @@ class _ChatScreenState extends State<ChatScreen> {
..._channels.directChannels ..._channels.directChannels
]), ]),
selfId: selfId, selfId: selfId,
useReplace: true, useReplace: false,
), ),
), ),
), ),

10
lib/shells/root_shell.dart
View File

@ -2,6 +2,7 @@ import 'package:firebase_analytics/firebase_analytics.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:solian/theme.dart'; import 'package:solian/theme.dart';
import 'package:solian/widgets/navigation/app_navigation.dart';
import 'package:solian/widgets/navigation/app_navigation_bottom.dart'; import 'package:solian/widgets/navigation/app_navigation_bottom.dart';
final GlobalKey<ScaffoldState> rootScaffoldKey = GlobalKey<ScaffoldState>(); final GlobalKey<ScaffoldState> rootScaffoldKey = GlobalKey<ScaffoldState>();
@ -39,9 +40,16 @@ class RootShell extends StatelessWidget {
); );
} }
final destNames = AppNavigation.destinations.map((x) => x.page).toList();
final showBottomNavigation = destNames.contains(routeName);
return Scaffold( return Scaffold(
key: rootScaffoldKey, key: rootScaffoldKey,
bottomNavigationBar: const AppNavigationBottom(), bottomNavigationBar: showBottomNavigation
? AppNavigationBottom(
initialIndex: destNames.indexOf(routeName ?? 'page'),
)
: null,
body: AppTheme.isLargeScreen(context) body: AppTheme.isLargeScreen(context)
? Row( ? Row(
children: [ children: [

12
lib/widgets/navigation/app_navigation_bottom.dart
View File

@ -3,7 +3,9 @@ import 'package:solian/router.dart';
import 'package:solian/widgets/navigation/app_navigation.dart'; import 'package:solian/widgets/navigation/app_navigation.dart';
class AppNavigationBottom extends StatefulWidget { class AppNavigationBottom extends StatefulWidget {
const AppNavigationBottom({super.key}); final int initialIndex;
const AppNavigationBottom({super.key, this.initialIndex = 0});
@override @override
State<AppNavigationBottom> createState() => _AppNavigationBottomState(); State<AppNavigationBottom> createState() => _AppNavigationBottomState();
@ -12,6 +14,14 @@ class AppNavigationBottom extends StatefulWidget {
class _AppNavigationBottomState extends State<AppNavigationBottom> { class _AppNavigationBottomState extends State<AppNavigationBottom> {
int _currentIndex = 0; int _currentIndex = 0;
@override
void initState() {
super.initState();
if (widget.initialIndex >= 0) {
_currentIndex = widget.initialIndex;
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BottomNavigationBar( return BottomNavigationBar(