Skip to content
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

Desktop updates: websocket service and pro account management #1026

Merged
merged 53 commits into from
Mar 26, 2024
Merged
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
6b001ea
do not pass initialize flag when running Lantern
atavism Mar 18, 2024
39a1e39
do not pass initialize flag when running Lantern
atavism Mar 18, 2024
99ee35a
remove tray manager references in vpn switch widget
atavism Mar 18, 2024
1d0b91b
remove tray manager references in vpn switch widget
atavism Mar 18, 2024
e07e011
use windows webview
atavism Mar 18, 2024
c775cc9
update windows webview
atavism Mar 18, 2024
d808196
update windows webview
atavism Mar 18, 2024
289604c
windows webview updates
atavism Mar 18, 2024
368cc36
windows webview updates
atavism Mar 18, 2024
312c0cf
windows webview updates
atavism Mar 18, 2024
ca8e7b7
updates to use flutter_windows_webview
atavism Mar 18, 2024
1ba4262
update CI branch
atavism Mar 18, 2024
fbb4d98
merge latest
atavism Mar 19, 2024
a2335d1
use wgh136/flutter_windows_webview
atavism Mar 19, 2024
482b153
use subosito/flutter-action v2.12.0
atavism Mar 19, 2024
d6943f4
use subosito/flutter-action v2.12.0
atavism Mar 19, 2024
219991a
use subosito/flutter-action v2.12.0
atavism Mar 19, 2024
79a6b19
merge latest
atavism Mar 19, 2024
50f269d
Add expectedMonthlyPrice to plan json
atavism Mar 19, 2024
4d10af0
update branch name
atavism Mar 19, 2024
a56f3ed
update planfromJson
atavism Mar 19, 2024
7c6f2da
use cannot_sign_in instead of cannot_login
atavism Mar 19, 2024
6123581
fix issue with blank pro account screen
atavism Mar 19, 2024
084871d
Add devices and expiryDate
atavism Mar 19, 2024
117001e
update branch name
atavism Mar 19, 2024
8558285
Add report_description
atavism Mar 19, 2024
a1dba70
Add report_description
atavism Mar 19, 2024
2620791
save email address and pass currency to paymentRedirect
atavism Mar 20, 2024
322da45
dart format
atavism Mar 20, 2024
7babd06
merge latest
atavism Mar 20, 2024
ef82f53
use switch statement for desktop os opening webview
atavism Mar 20, 2024
82909d8
update user is pro check
atavism Mar 21, 2024
961b1ed
add websocket service
atavism Mar 21, 2024
d5d72fc
add websocket service
atavism Mar 21, 2024
c00ced4
clean-ups, add comments
atavism Mar 21, 2024
7d43b8f
apply formatting
atavism Mar 21, 2024
c901d47
Added socket to account menu and
jigar-f Mar 22, 2024
5f34ebc
updates to use didChangeAppLifecycleState
atavism Mar 24, 2024
81b5066
updates to init websocket when app starts
atavism Mar 24, 2024
39d67a9
clean-ups, add comments
atavism Mar 24, 2024
8fcdc92
updates to websocket service
atavism Mar 24, 2024
908f9d6
merge latest
atavism Mar 24, 2024
f0d03de
remove websocket changes to account menu
atavism Mar 24, 2024
a8d3a1a
apply formatting
atavism Mar 24, 2024
3cd60c5
refresh user data when home page is loaded
atavism Mar 24, 2024
3f10436
remove redundant methods
atavism Mar 25, 2024
3f012fa
update onTrayMenuItemClick
atavism Mar 25, 2024
b9b7b67
clean-ups, do not fetch user data when checking email address
atavism Mar 25, 2024
65a62fb
set Localization.locale in setLanguage
atavism Mar 25, 2024
e9af14d
use Localization.locale when parsing plan json
atavism Mar 25, 2024
ea7e495
fix system menu show button
atavism Mar 25, 2024
5a59708
support redeeming reseller codes on desktop
atavism Mar 25, 2024
05cece0
Desktop Error handling and other hot fix (#1027)
jigar-f Mar 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
apply formatting
atavism committed Mar 24, 2024
commit a8d3a1a5c902a608b91f688a1ce2028872597e9e
20 changes: 10 additions & 10 deletions lib/account/account.dart
Original file line number Diff line number Diff line change
@@ -59,14 +59,14 @@ class _AccountMenuState extends State<AccountMenu> {
)
: const SizedBox(),
),
ListItemFactory.settingsItem(
key: AppKeys.upgrade_lantern_pro,
icon: ImagePaths.pro_icon_black,
content: 'Upgrade to Lantern Pro'.i18n,
onTap: () {
upgradeToLanternPro(context);
},
),
ListItemFactory.settingsItem(
key: AppKeys.upgrade_lantern_pro,
icon: ImagePaths.pro_icon_black,
content: 'Upgrade to Lantern Pro'.i18n,
onTap: () {
upgradeToLanternPro(context);
},
),
ListItemFactory.settingsItem(
icon: ImagePaths.star,
content: 'Invite Friends'.i18n,
@@ -155,8 +155,8 @@ class _AccountMenuState extends State<AccountMenu> {
return BaseScreen(
title: 'Account'.i18n,
automaticallyImplyLeading: false,
body: sessionModel.proUser(
(BuildContext sessionContext, bool proUser, Widget? child) {
body: sessionModel
.proUser((BuildContext sessionContext, bool proUser, Widget? child) {
return ListView(
children: proUser
? proItems(sessionContext)