Fixes input bar spacing issues

pull/1384/head
Kelrap 1 year ago
parent e59678648d
commit 8294e1959c

@ -14,7 +14,6 @@ import 'package:fluffychat/pangea/choreographer/widgets/start_igc_button.dart';
import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart';
import 'package:fluffychat/pangea/widgets/chat/chat_floating_action_button.dart';
import 'package:fluffychat/utils/account_config.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/chat_settings_popup_menu.dart';
import 'package:fluffychat/widgets/connection_status_header.dart';
import 'package:fluffychat/widgets/matrix.dart';
@ -299,7 +298,12 @@ class ChatView extends StatelessWidget {
),
),
SafeArea(
child: Column(
child:
// #Pangea
Stack(
children: [
// Pangea#
Column(
children: <Widget>[
Expanded(
child: GestureDetector(
@ -308,7 +312,8 @@ class ChatView extends StatelessWidget {
builder: (context) {
if (controller.timeline == null) {
return const Center(
child: CircularProgressIndicator.adaptive(
child:
CircularProgressIndicator.adaptive(
strokeWidth: 2,
),
);
@ -341,7 +346,8 @@ class ChatView extends StatelessWidget {
borderRadius: const BorderRadius.all(
Radius.circular(24),
),
child: controller.room.isAbandonedDMRoom == true
child: controller.room.isAbandonedDMRoom ==
true
? Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
@ -353,14 +359,16 @@ class ChatView extends StatelessWidget {
padding: const EdgeInsets.all(
16,
),
foregroundColor: Theme.of(context)
foregroundColor:
Theme.of(context)
.colorScheme
.error,
),
icon: const Icon(
Icons.archive_outlined,
),
onPressed: controller.archiveChat,
onPressed:
controller.archiveChat,
label: Text(
L10n.of(context)!.archive,
),
@ -371,7 +379,8 @@ class ChatView extends StatelessWidget {
padding: const EdgeInsets.all(
16,
),
foregroundColor: Theme.of(context)
foregroundColor:
Theme.of(context)
.colorScheme
.error,
),
@ -395,7 +404,8 @@ class ChatView extends StatelessWidget {
icon: const Icon(
Icons.forum_outlined,
),
onPressed: controller.recreateChat,
onPressed:
controller.recreateChat,
label: Text(
L10n.of(context)!.reopenChat,
),
@ -424,25 +434,13 @@ class ChatView extends StatelessWidget {
),
// #Pangea
// Keep messages above minimum input bar height
SizedBox(
height: (PlatformInfos.isMobile ? 30 : 60),
const SizedBox(
height: 60,
),
// Pangea#
],
),
),
// #Pangea
// if (controller.dragging)
// Container(
// color: Theme.of(context)
// .scaffoldBackgroundColor
// .withOpacity(0.9),
// alignment: Alignment.center,
// child: const Icon(
// Icons.upload_outlined,
// size: 100,
// ),
// ),
Positioned(
left: 0,
right: 0,
@ -462,7 +460,8 @@ class ChatView extends StatelessWidget {
maxWidth: FluffyThemes.columnWidth * 2.4,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
StartIGCButton(
controller: controller,
@ -511,6 +510,22 @@ class ChatView extends StatelessWidget {
// Pangea#
],
),
// #Pangea
// if (controller.dragging)
// Container(
// color: Theme.of(context)
// .scaffoldBackgroundColor
// .withOpacity(0.9),
// alignment: Alignment.center,
// child: const Icon(
// Icons.upload_outlined,
// size: 100,
// ),
// ),
// Pangea#
),
],
),
);
},
),

Loading…
Cancel
Save