Comunic/comunicmobile
1
0
Fork 0
mirror of https://gitlab.com/comunic/comunicmobile synced 2024-11-22 21:09:21 +00:00
Code Issues Projects Releases Wiki Activity

Move "About Comunic" dialog

Browse Source
This commit is contained in:
Pierre HUBERT 2020-05-03 17:00:38 +02:00
parent 11c25ea271
commit e00f452b98
3 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ui/routes/app_settings_route.dart
View File

@ -1,5 +1,6 @@
import 'package:comunic/helpers/preferences_helper.dart'; import 'package:comunic/helpers/preferences_helper.dart';
import 'package:comunic/utils/intl_utils.dart'; import 'package:comunic/utils/intl_utils.dart';
import 'package:comunic/utils/ui_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
/// Application settings route /// Application settings route
@ -61,6 +62,10 @@ class __AppSettingsBodyState extends State<_AppSettingsBody> {
description: description:
tr("You will need to restart the application to apply changes"), tr("You will need to restart the application to apply changes"),
), ),
ListTile(
title: Text(tr("About Comunic")),
onTap: () => showAboutAppDialog(context),
),
], ],
), ),
); );

5
lib/ui/routes/main_route.dart
View File

@ -126,11 +126,6 @@ class _MainRouteState extends MainController {
_openAccountsSettings(); _openAccountsSettings();
break; break;
/// Show about dialog
case BarCallbackActions.OPEN_ABOUT_DIALOG:
showAboutAppDialog(context);
break;
/// Logout user /// Logout user
case BarCallbackActions.ACTION_LOGOUT: case BarCallbackActions.ACTION_LOGOUT:
_logoutRequested(); _logoutRequested();

42
lib/ui/widgets/navbar_widget.dart
View File

@ -28,7 +28,6 @@ enum BarCallbackActions {
OPEN_ACCOUNT_SETTINGS, OPEN_ACCOUNT_SETTINGS,
OPEN_APP_SETTINGS, OPEN_APP_SETTINGS,
OPEN_USER_FRIENDS_LIST, OPEN_USER_FRIENDS_LIST,
OPEN_ABOUT_DIALOG,
OPEN_CONVERSATION, OPEN_CONVERSATION,
NONE, NONE,
ACTION_LOGOUT ACTION_LOGOUT
@ -103,8 +102,6 @@ final _menuActionsItem = <_ActionMenuItem>[
action: BarCallbackActions.OPEN_ACCOUNT_SETTINGS), action: BarCallbackActions.OPEN_ACCOUNT_SETTINGS),
_ActionMenuItem( _ActionMenuItem(
label: tr("App settings"), action: BarCallbackActions.OPEN_APP_SETTINGS), label: tr("App settings"), action: BarCallbackActions.OPEN_APP_SETTINGS),
_ActionMenuItem(
label: tr("About Comunic"), action: BarCallbackActions.OPEN_ABOUT_DIALOG),
_ActionMenuItem( _ActionMenuItem(
label: tr("Sign out"), action: BarCallbackActions.ACTION_LOGOUT), label: tr("Sign out"), action: BarCallbackActions.ACTION_LOGOUT),
]; ];
@ -128,7 +125,7 @@ class ComunicAppBar extends StatefulWidget implements PreferredSizeWidget {
class _ComunicAppBarState extends SafeState<ComunicAppBar> { class _ComunicAppBarState extends SafeState<ComunicAppBar> {
var _unreadNotifications = var _unreadNotifications =
CountUnreadNotifications(notifications: 0, conversations: 0); CountUnreadNotifications(notifications: 0, conversations: 0);
@override @override
void initState() { void initState() {
@ -137,9 +134,9 @@ class _ComunicAppBarState extends SafeState<ComunicAppBar> {
// Listen to notifications number update // Listen to notifications number update
this.listenChangeState<NewNumberNotifsEvent>( this.listenChangeState<NewNumberNotifsEvent>(
(d) => _unreadNotifications.notifications = d.newNum); (d) => _unreadNotifications.notifications = d.newNum);
this.listenChangeState<NewNumberUnreadConversations>( this.listenChangeState<NewNumberUnreadConversations>(
(d) => _unreadNotifications.conversations = d.newNum); (d) => _unreadNotifications.conversations = d.newNum);
} }
void _refreshCountUnread() async { void _refreshCountUnread() async {
@ -179,8 +176,7 @@ class _ComunicAppBarState extends SafeState<ComunicAppBar> {
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: List.generate( children: List.generate(
_menuItems.length, _menuItems.length,
(i) => (i) => _MenuItemWidget(
_MenuItemWidget(
item: _menuItems[i], item: _menuItems[i],
onTap: widget.onTap, onTap: widget.onTap,
isSelected: _menuItems[i].action == widget.selectedAction, isSelected: _menuItems[i].action == widget.selectedAction,
@ -221,9 +217,9 @@ class _MenuItemWidget extends StatelessWidget {
color: isSelected ? _secondaryColor() : _primaryColor(), color: isSelected ? _secondaryColor() : _primaryColor(),
child: !item.isMenu child: !item.isMenu
? InkWell( ? InkWell(
child: _buildIconContainer(), child: _buildIconContainer(),
onTap: () => onTap(item.action), onTap: () => onTap(item.action),
) )
: _buildContextMenuPopupButton(), : _buildContextMenuPopupButton(),
), ),
); );
@ -244,15 +240,15 @@ class _MenuItemWidget extends StatelessWidget {
newNotice == 0 newNotice == 0
? Container() ? Container()
: Material( : Material(
color: Colors.red, color: Colors.red,
child: Padding( child: Padding(
padding: const EdgeInsets.all(2.0), padding: const EdgeInsets.all(2.0),
child: Text(" $newNotice ", child: Text(" $newNotice ",
style: TextStyle(color: Colors.white)), style: TextStyle(color: Colors.white)),
), ),
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(50.0), Radius.circular(50.0),
)), )),
Spacer(flex: 2), Spacer(flex: 2),
], ],
); );
@ -264,9 +260,9 @@ class _MenuItemWidget extends StatelessWidget {
child: _buildIconContainer(), child: _buildIconContainer(),
itemBuilder: (i) => _menuActionsItem itemBuilder: (i) => _menuActionsItem
.map((f) => PopupMenuItem( .map((f) => PopupMenuItem(
child: Text(f.label), child: Text(f.label),
value: f.action, value: f.action,
)) ))
.toList(), .toList(),
onSelected: onTap, onSelected: onTap,
); );