GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-05 03:29:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'improve-story' into 'main'

Browse Source 
fix: Improve story page appearance

See merge request famedly/fluffychat!1051
This commit is contained in:
Krille 2022-12-23 14:08:59 +00:00
commit 12cc876b83
1 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
lib/pages/story/story_view.dart
View File

@ -1,3 +1,4 @@
import 'package:fluffychat/config/app_config.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -105,6 +106,10 @@ class StoryView extends StatelessWidget {
M2PopupMenuButton<PopupStoryAction>(
color: Colors.white,
onSelected: controller.onPopupStoryAction,
icon: Icon(
Icons.adaptive.more_outlined,
color: Colors.white,
),
itemBuilder: (context) => [
if (controller.currentEvent?.canRedact ?? false)
PopupMenuItem(
@ -303,7 +308,8 @@ class StoryView extends StatelessWidget {
? LinearProgressIndicator(
color: Colors.white,
minHeight: 2,
backgroundColor: Colors.grey.shade600,
backgroundColor:
Colors.white.withOpacity(0.25),
value: controller.loadingMode
? null
: controller.progress.inMilliseconds /
@ -315,7 +321,7 @@ class StoryView extends StatelessWidget {
height: 2,
color: i < controller.index
? Colors.white
: Colors.grey.shade600,
: Colors.white.withOpacity(0.25),
),
),
],
@ -324,36 +330,47 @@ class StoryView extends StatelessWidget {
),
if (!controller.isOwnStory && currentEvent != null)
Positioned(
bottom: 16,
left: 16,
right: 16,
bottom: 8,
left: 8,
right: 8,
child: SafeArea(
child: TextField(
focusNode: controller.replyFocus,
controller: controller.replyController,
onSubmitted: controller.replyAction,
textInputAction: TextInputAction.send,
readOnly: controller.replyLoading,
decoration: InputDecoration(
hintText: L10n.of(context)!.reply,
prefixIcon: IconButton(
onPressed: controller.replyEmojiAction,
icon: const Icon(Icons.emoji_emotions_outlined),
),
suffixIcon: controller.replyLoading
? const SizedBox(
width: 16,
height: 16,
child: Center(
child: CircularProgressIndicator.adaptive(
strokeWidth: 2),
child: Material(
borderRadius: const BorderRadius.only(
bottomLeft: Radius.circular(AppConfig.borderRadius),
bottomRight: Radius.circular(AppConfig.borderRadius),
),
shadowColor: Colors.black.withAlpha(64),
clipBehavior: Clip.hardEdge,
elevation: 4,
child: TextField(
focusNode: controller.replyFocus,
controller: controller.replyController,
onSubmitted: controller.replyAction,
textInputAction: TextInputAction.send,
readOnly: controller.replyLoading,
decoration: InputDecoration(
contentPadding:
const EdgeInsets.fromLTRB(0, 16, 0, 16),
hintText: L10n.of(context)!.reply,
prefixIcon: IconButton(
onPressed: controller.replyEmojiAction,
icon: const Icon(Icons.emoji_emotions_outlined),
),
suffixIcon: controller.replyLoading
? const SizedBox(
width: 16,
height: 16,
child: Center(
child: CircularProgressIndicator.adaptive(
strokeWidth: 2),
),
)
: IconButton(
onPressed: controller.replyAction,
icon: const Icon(Icons.send_outlined),
),
)
: IconButton(
onPressed: controller.replyAction,
icon: const Icon(Icons.send_outlined),
),
fillColor: Theme.of(context).colorScheme.background,
fillColor: Theme.of(context).colorScheme.background,
),
),
),
),