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

Merge branch 'krille/better-fabs' into 'main'

Browse Source 
chore: Improve FABs

See merge request famedly/fluffychat!655
This commit is contained in:
Krille Fear 2021-12-31 08:40:09 +00:00
commit 690cc7bf29
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/l10n/intl_en.arb
View File

@ -2685,5 +2685,7 @@
"body": {} "body": {}
} }
}, },
"whoCanSeeMyStoriesDesc": "Please note that people can see and contact each other in your story." "whoCanSeeMyStoriesDesc": "Please note that people can see and contact each other in your story.",
"whatIsGoingOn": "What is going on?",
"addDescription": "Add description"
} }

8
lib/pages/add_story/add_story_view.dart
View File

@ -101,8 +101,9 @@ class AddStoryView extends StatelessWidget {
onChanged: controller.updateColors, onChanged: controller.updateColors,
decoration: InputDecoration( decoration: InputDecoration(
border: InputBorder.none, border: InputBorder.none,
hintText: hintText: controller.hasMedia
controller.hasMedia ? 'Add description' : 'How are you?', ? L10n.of(context)!.addDescription
: L10n.of(context)!.whatIsGoingOn,
filled: false, filled: false,
hintStyle: TextStyle( hintStyle: TextStyle(
color: Colors.white.withOpacity(0.5), color: Colors.white.withOpacity(0.5),
@ -116,7 +117,6 @@ class AddStoryView extends StatelessWidget {
), ),
], ],
), ),
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: floatingActionButton:
controller.controller.text.isEmpty && !controller.hasMedia controller.controller.text.isEmpty && !controller.hasMedia
? null ? null
@ -125,7 +125,7 @@ class AddStoryView extends StatelessWidget {
label: Text(L10n.of(context)!.publish), label: Text(L10n.of(context)!.publish),
backgroundColor: Theme.of(context).colorScheme.surface, backgroundColor: Theme.of(context).colorScheme.surface,
foregroundColor: Theme.of(context).colorScheme.onSurface, foregroundColor: Theme.of(context).colorScheme.onSurface,
icon: const Icon(Icons.check_circle), icon: const Icon(Icons.send_rounded),
), ),
); );
} }

3
lib/pages/add_story/invite_story_page.dart
View File

@ -113,13 +113,12 @@ class _InviteStoryPageState extends State<InviteStoryPage> {
), ),
); );
}), }),
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: FloatingActionButton.extended( floatingActionButton: FloatingActionButton.extended(
onPressed: _inviteAction, onPressed: _inviteAction,
label: Text(L10n.of(context)!.publish), label: Text(L10n.of(context)!.publish),
backgroundColor: Theme.of(context).colorScheme.surface, backgroundColor: Theme.of(context).colorScheme.surface,
foregroundColor: Theme.of(context).colorScheme.onSurface, foregroundColor: Theme.of(context).colorScheme.onSurface,
icon: const Icon(Icons.upload_outlined), icon: const Icon(Icons.send_rounded),
), ),
); );
} }

19
lib/pages/chat_list/chat_list_view.dart
View File

@ -206,18 +206,13 @@ class ChatListView extends StatelessWidget {
Expanded(child: _ChatListViewBody(controller)), Expanded(child: _ChatListViewBody(controller)),
]), ]),
floatingActionButton: selectMode == SelectMode.normal floatingActionButton: selectMode == SelectMode.normal
? controller.scrolledToTop ? FloatingActionButton.extended(
? FloatingActionButton.extended( isExtended: controller.scrolledToTop,
onPressed: () => onPressed: () =>
VRouter.of(context).to('/newprivatechat'), VRouter.of(context).to('/newprivatechat'),
icon: const Icon(CupertinoIcons.chat_bubble), icon: const Icon(CupertinoIcons.chat_bubble),
label: Text(L10n.of(context).newChat), label: Text(L10n.of(context).newChat),
) )
: FloatingActionButton(
onPressed: () =>
VRouter.of(context).to('/newprivatechat'),
child: const Icon(CupertinoIcons.chat_bubble),
)
: null, : null,
bottomNavigationBar: Column( bottomNavigationBar: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,