-
Notifications
You must be signed in to change notification settings - Fork 19
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
UI/connectivity warning #1412
Open
jcovaa
wants to merge
11
commits into
develop
Choose a base branch
from
ui/connectivity-warning
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
UI/connectivity warning #1412
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
412f242
first desgin - working with the themes
jcovaa 445cadf
TODO
jcovaa e2403f1
Added language theme
jcovaa 06449ff
Added widget to other pages
jcovaa 2bfa9fa
check connectivity
R0drig0-P eaf6435
check connectivity
R0drig0-P 20cc628
widget checks for connectivity instead of each page
R0drig0-P 568c52c
made requested changes
R0drig0-P 2149b81
Message with red color
jcovaa 2cb973d
merged with internet connection warning
jcovaa 930470e
changed icon to the one in the icons package
jcovaa File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
packages/uni_app/lib/view/common_widgets/connectivity_warning_card.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| import 'dart:async'; | ||
|
|
||
| import 'package:connectivity_plus/connectivity_plus.dart'; | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter_svg/flutter_svg.dart'; | ||
|
|
||
| import '../../generated/l10n.dart'; | ||
|
|
||
| class ConnectivityWarning extends StatefulWidget { | ||
| const ConnectivityWarning({super.key}); | ||
|
|
||
| @override | ||
| State<ConnectivityWarning> createState() => _ConnectivityWarningState(); | ||
| } | ||
|
|
||
| class _ConnectivityWarningState extends State<ConnectivityWarning> { | ||
| bool isOffline = false; | ||
|
|
||
| StreamSubscription<ConnectivityResult>? connectivitySubscription; | ||
|
|
||
| @override | ||
| void initState() { | ||
| super.initState(); | ||
| checkInitialConnection(); | ||
|
|
||
| connectivitySubscription = Connectivity() | ||
| .onConnectivityChanged | ||
| .listen((result) { | ||
| setState(() { | ||
| isOffline = result == ConnectivityResult.none; | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| Future<void> checkInitialConnection() async { | ||
| final result = await Connectivity().checkConnectivity(); | ||
| setState(() { | ||
| isOffline = result == ConnectivityResult.none; | ||
| }); | ||
| } | ||
|
|
||
| @override | ||
| void dispose() { | ||
| connectivitySubscription?.cancel(); | ||
| super.dispose(); | ||
| } | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| return Visibility( | ||
| visible: isOffline, | ||
| child: Container( | ||
| padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 20), | ||
| child: Row( | ||
| children: [ | ||
| SvgPicture.asset('assets/images/circle-alert.svg', | ||
| colorFilter: ColorFilter.mode( | ||
| Theme.of(context).primaryColor, | ||
| BlendMode.srcIn, | ||
| ), | ||
| width: 21, | ||
| height: 21, | ||
| ), | ||
| const SizedBox(width: 8), | ||
| Text( | ||
| S.of(context).internet_status_exception, | ||
| style: Theme.of(context).textTheme.bodyMedium, | ||
| ), | ||
| ], | ||
| ), | ||
| ), | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To make the position of the ConnectivityWarning
fixed, move it to thegetTopNavBarmethod inGeneralPageViewState(however, note that the layout of the pages may change during the redesign).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Following the conversation we had, I tried to change the
_createTopWodgetsmethod in thetop_navigation_bar.dartclass but there are 2 problems. The first is that the home page uses a getHeader method that creates the tittle differently from the other pages (the warning appears above instead of below the tittle). The second problem is that the size of the AppBar isnt dynamically changed when the warning is displayed, so it seems cut out. Do I have to increase its size or its my implementation that isnt correct?