Compare commits

..

No commits in common. "ec2eadad6de559bf8292d18bd43c5205d453c8c4" and "a4f68dd1752930e4c1edbaf6888a175b9f0fcf9f" have entirely different histories.

3 changed files with 22 additions and 49 deletions

View File

@ -112,15 +112,14 @@ class _BootstrapperShellState extends State<BootstrapperShell> {
label: 'bsPreparingData', label: 'bsPreparingData',
action: () async { action: () async {
final AuthProvider auth = Get.find(); final AuthProvider auth = Get.find();
await Future.wait([ if (auth.isAuthorized.isTrue) {
Get.find<StickerProvider>().refreshAvailableStickers(), await Future.wait([
if (auth.isAuthorized.isTrue)
Get.find<ChannelProvider>().refreshAvailableChannel(),
if (auth.isAuthorized.isTrue)
Get.find<RelationshipProvider>().refreshRelativeList(),
if (auth.isAuthorized.isTrue)
Get.find<RealmProvider>().refreshAvailableRealms(), Get.find<RealmProvider>().refreshAvailableRealms(),
]); Get.find<ChannelProvider>().refreshAvailableChannel(),
Get.find<RelationshipProvider>().refreshRelativeList(),
Get.find<StickerProvider>().refreshAvailableStickers(),
]);
}
}, },
), ),
( (
@ -184,7 +183,7 @@ class _BootstrapperShellState extends State<BootstrapperShell> {
children: [ children: [
if (_isErrored && !_isDismissable && !_isBusy) if (_isErrored && !_isDismissable && !_isBusy)
const Icon(Icons.cancel, size: 24), const Icon(Icons.cancel, size: 24),
if (_isErrored && _isDismissable && !_isBusy) if (_isErrored && _isDismissable)
const Icon(Icons.warning, size: 24), const Icon(Icons.warning, size: 24),
if ((_isErrored && _isDismissable && _isBusy) || _isBusy) if ((_isErrored && _isDismissable && _isBusy) || _isBusy)
const SizedBox( const SizedBox(

View File

@ -128,15 +128,7 @@ class _PostPublishScreenState extends State<PostPublishScreen> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
if (widget.edit == null && widget.reply == null && widget.repost == null) { if (widget.edit == null) _editorController.localRead();
_editorController.localRead();
}
if (widget.reply != null) {
_editorController.replyTo.value = widget.reply;
}
if (widget.repost != null) {
_editorController.repostTo.value = widget.repost;
}
_editorController.contentController.addListener(() => setState(() {})); _editorController.contentController.addListener(() => setState(() {}));
_syncWidget(); _syncWidget();
} }
@ -227,15 +219,10 @@ class _PostPublishScreenState extends State<PostPublishScreen> {
collapsedBackgroundColor: collapsedBackgroundColor:
Theme.of(context).colorScheme.surfaceContainer, Theme.of(context).colorScheme.surfaceContainer,
children: [ children: [
Container( PostItem(
constraints: const BoxConstraints(maxHeight: 280), item: _replyTo!,
child: SingleChildScrollView( isReactable: false,
child: PostItem( ).paddingOnly(bottom: 8),
item: _replyTo!,
isReactable: false,
).paddingOnly(bottom: 8),
),
),
], ],
), ),
if (_repostTo != null) if (_repostTo != null)
@ -250,15 +237,10 @@ class _PostPublishScreenState extends State<PostPublishScreen> {
collapsedBackgroundColor: collapsedBackgroundColor:
Theme.of(context).colorScheme.surfaceContainer, Theme.of(context).colorScheme.surfaceContainer,
children: [ children: [
Container( PostItem(
constraints: const BoxConstraints(maxHeight: 280), item: _repostTo!,
child: SingleChildScrollView( isReactable: false,
child: PostItem( ).paddingOnly(bottom: 8),
item: _repostTo!,
isReactable: false,
).paddingOnly(bottom: 8),
),
),
], ],
), ),
Expanded( Expanded(

View File

@ -385,9 +385,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
icon: const Icon(Icons.warning), icon: const Icon(Icons.warning),
onPressed: () {}, onPressed: () {},
), ),
if (!element.isCompleted && if (!element.isCompleted && element.error == null && canBeCrop)
element.error == null &&
canBeCrop)
Obx( Obx(
() => IconButton( () => IconButton(
color: Colors.teal, color: Colors.teal,
@ -400,9 +398,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
}, },
), ),
), ),
if (!element.isCompleted && if (!element.isCompleted && !element.isUploading && element.error == null)
!element.isUploading &&
element.error == null)
Obx( Obx(
() => IconButton( () => IconButton(
color: Colors.green, color: Colors.green,
@ -596,13 +592,9 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Expanded( Text(
child: Text( 'attachmentAdd'.tr,
'attachmentAdd'.tr, style: Theme.of(context).textTheme.headlineSmall,
style: Theme.of(context).textTheme.headlineSmall,
maxLines: 2,
overflow: TextOverflow.fade,
),
), ),
const SizedBox(width: 10), const SizedBox(width: 10),
Obx(() { Obx(() {