2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "feat: Implement experimental new design"

Browse source 
This reverts commit 10cf8daf25c0ff50974c0439cf89fa6528510012
This commit is contained in:
Krille Fear 2021-02-01 20:00:35 +00:00
commit dfe9741c39
18 changed files with 698 additions and 1232 deletions
Download patch file Download diff file Expand all files Collapse all files

41
lib/config/routes.dart
View file

@ -5,8 +5,9 @@ import 'package:fluffychat/views/archive.dart';
import 'package:fluffychat/views/chat.dart';
import 'package:fluffychat/views/chat_details.dart';
import 'package:fluffychat/views/chat_encryption_settings.dart';
import 'package:fluffychat/views/home_view.dart';
import 'package:fluffychat/views/chat_list.dart';
import 'package:fluffychat/views/chat_permissions_settings.dart';
import 'package:fluffychat/views/discover_view.dart';
import 'package:fluffychat/views/empty_page.dart';
import 'package:fluffychat/views/homeserver_picker.dart';
import 'package:fluffychat/views/invitation_selection.dart';
@ -15,7 +16,6 @@ import 'package:fluffychat/views/log_view.dart';
import 'package:fluffychat/views/login.dart';
import 'package:fluffychat/views/new_group.dart';
import 'package:fluffychat/views/new_private_chat.dart';
import 'package:fluffychat/views/set_status_view.dart';
import 'package:fluffychat/views/settings.dart';
import 'package:fluffychat/views/settings_3pid.dart';
import 'package:fluffychat/views/settings_devices.dart';
@ -64,14 +64,14 @@ class FluffyRoutes {
switch (parts[1]) {
case '':
return ViewData(
mainView: (_) => HomeView(),
mainView: (_) => ChatList(),
emptyView: (_) => EmptyPage(),
);
case 'rooms':
final roomId = parts[2];
if (parts.length == 3) {
return ViewData(
leftView: (_) => HomeView(),
leftView: (_) => ChatList(activeChat: roomId),
mainView: (_) => Chat(roomId),
);
} else if (parts.length == 4) {
@ -79,44 +79,44 @@ class FluffyRoutes {
switch (action) {
case 'details':
return ViewData(
leftView: (_) => HomeView(),
leftView: (_) => ChatList(activeChat: roomId),
mainView: (_) => Chat(roomId),
rightView: (_) => ChatDetails(roomId),
);
case 'encryption':
return ViewData(
leftView: (_) => HomeView(),
leftView: (_) => ChatList(activeChat: roomId),
mainView: (_) => Chat(roomId),
rightView: (_) => ChatEncryptionSettings(roomId),
);
case 'permissions':
return ViewData(
leftView: (_) => HomeView(),
leftView: (_) => ChatList(activeChat: roomId),
mainView: (_) => Chat(roomId),
rightView: (_) => ChatPermissionsSettings(roomId),
);
case 'invite':
return ViewData(
leftView: (_) => HomeView(),
leftView: (_) => ChatList(activeChat: roomId),
mainView: (_) => Chat(roomId),
rightView: (_) => InvitationSelection(roomId),
);
case 'emotes':
return ViewData(
leftView: (_) => HomeView(),
leftView: (_) => ChatList(activeChat: roomId),
mainView: (_) => Chat(roomId),
rightView: (_) => MultipleEmotesSettings(roomId),
);
default:
return ViewData(
leftView: (_) => HomeView(),
leftView: (_) => ChatList(activeChat: roomId),
mainView: (_) => Chat(roomId,
scrollToEventId: action.sigil == '\$' ? action : null),
);
}
}
return ViewData(
mainView: (_) => HomeView(),
mainView: (_) => ChatList(),
emptyView: (_) => EmptyPage(),
);
case 'archive':
@ -124,25 +124,26 @@ class FluffyRoutes {
mainView: (_) => Archive(),
emptyView: (_) => EmptyPage(),
);
case 'discover':
return ViewData(
mainView: (_) =>
DiscoverPage(alias: parts.length == 3 ? parts[2] : null),
emptyView: (_) => EmptyPage(),
);
case 'logs':
return ViewData(
mainView: (_) => LogViewer(),
);
case 'newgroup':
return ViewData(
leftView: (_) => HomeView(),
leftView: (_) => ChatList(),
mainView: (_) => NewGroup(),
);
case 'newprivatechat':
return ViewData(
leftView: (_) => HomeView(),
leftView: (_) => ChatList(),
mainView: (_) => NewPrivateChat(),
);
case 'newstatus':
return ViewData(
leftView: (_) => HomeView(),
mainView: (_) => SetStatusView(initialText: settings.arguments),
);
case 'settings':
if (parts.length == 3) {
final action = parts[2];
@ -168,9 +169,7 @@ class FluffyRoutes {
case 'ignore':
return ViewData(
leftView: (_) => Settings(),
mainView: (_) => SettingsIgnoreList(
initialUserId: settings.arguments,
),
mainView: (_) => SettingsIgnoreList(),
);
case 'notifications':
return ViewData(