Commit graph

174 commits

Author SHA1 Message Date
Neeraj Gupta 173a3bcd07
Replace happy case toasts with shortToast 2022-12-26 10:44:36 +05:30
ashilkn c783677c00 Changed toggle's active track color on subscription screen on android 2022-12-19 19:34:25 +05:30
vishnukvmd 3b28725458 Remove duplicate code 2022-12-06 22:28:17 +05:30
Neeraj Gupta 4a060c4edd
Fix unawaited future warnings 2022-11-06 16:06:33 +05:30
Neeraj Gupta 19cc54f422
Fix lint issues 2022-11-06 13:52:54 +05:30
Neeraj Gupta 14a95bfebc
Fix UI bug for free trial 2022-10-26 13:28:51 +05:30
Ashil a7e598b451
Merge pull request #554 from ente-io/redesign-settings-new
Settings redesign + use components
2022-10-11 10:26:23 +05:30
vishnukvmd bcaa86c413 Fix font style 2022-10-10 22:55:24 +05:30
vishnukvmd d9a9f6fec8 Fix case 2022-10-10 22:53:59 +05:30
vishnukvmd 1159b8e6f3 Upgrade in_app_purchase 2022-10-10 22:40:57 +05:30
ashilkn 91fa181647 fixed setstate() called after dispose error 2022-10-10 11:53:12 +05:30
Neeraj Gupta 240c978299
Fix merge conflict 2022-09-21 19:41:33 +05:30
Neeraj Gupta 99a5bd8ff0
Merge branch 'rewrite_device_sync' of github.com:ente-io/frame into rewrite_device_sync 2022-09-21 17:57:39 +05:30
Neeraj Gupta 0a6d6f0f62
Merge branch 'master' into rewrite_device_sync 2022-09-21 17:57:09 +05:30
Neeraj Gupta 97e754739f
Fix handling of crypto subscription on UI 2022-09-21 17:09:03 +05:30
ashilkn fe291e963f migrated data_util.dart to null safety 2022-09-20 18:33:00 +05:30
ashilkn ccb0afe8e2 remove prefix letters from indentifier names 2022-09-19 10:41:02 +05:30
ashilkn eb7c1ec837 started incremental migration to null safety 2022-09-07 14:00:09 +05:30
Neeraj Gupta b9f14ed260
copy change 2022-09-06 17:21:34 +05:30
Neeraj Gupta 1612b4f8f6
Show error if user tries to link existing subscription to another account 2022-09-06 17:02:22 +05:30
vishnukvmd 06ec7cb658 final all the vars! 2022-08-29 20:13:31 +05:30
vishnukvmd 7ec6a908e8 Caps on pls 2022-08-14 23:11:08 +05:30
vishnukvmd c1b07a7dae Update family-plan dialog title 2022-08-14 23:10:26 +05:30
Neeraj Gupta 5bcb53bee4
Lint fixes 2022-07-12 12:00:02 +05:30
Neeraj Gupta 40d3ba5488
Lint: replace launch with launchUrlString for web urls 2022-07-11 09:21:08 +05:30
Neeraj Gupta 460dd1203e
Prefer const 2022-07-04 11:33:10 +05:30
Neeraj Gupta fdadf36baa
Lint fixes 2022-07-03 15:39:01 +05:30
Neeraj Gupta 1911f8fa83
dart format 2022-07-03 15:19:33 +05:30
Neeraj Gupta 590715c9d8
Fix few flutter_lint hints 2022-07-03 15:15:00 +05:30
Neeraj Gupta d71c5237ec
Link fixes 2022-07-03 12:19:00 +05:30
Neeraj Gupta a25cdbf570
replace loading widget var with EnteLoadingWidget 2022-07-03 11:34:42 +05:30
Neeraj Gupta a382a02196
Organize ui widgets in separate folders 2022-07-01 19:48:05 +05:30
ashilkn 0bfde606f9 fixed the transition to grandpermission screen 2022-06-28 13:17:36 +05:30
Neeraj Gupta 34681b5a34
update assets 2022-06-24 20:59:24 +05:30
vishnukvmd 08df53cee4 Don't show title on the action bar of the subscription page during onbaording 2022-06-19 15:48:35 +05:30
vishnukvmd cc2817d738 Fix style of underlined links 2022-06-19 15:39:37 +05:30
vishnukvmd 6ee64dbac9 Fix text style of Questions link 2022-06-19 15:35:14 +05:30
vishnukvmd cea9e025a3 Fix cases 2022-06-18 17:53:51 +05:30
vishnukvmd b55d969065 Fix text color 2022-06-13 20:57:06 +05:30
vishnukvmd 910c63303e Fix button style 2022-06-13 20:21:03 +05:30
vishnukvmd 13eef6d518 Fix styles of the ChildSubscriptionWidget 2022-06-13 20:12:08 +05:30
vishnukvmd 9937bee6ef Remove redundant text style 2022-06-13 20:02:51 +05:30
Neeraj Gupta 063c9ba5f4
Fix color for leave family dialog in light theme 2022-06-12 21:39:24 +05:30
vishnukvmd 47505ae102 Execute dart format lib 2022-06-11 13:53:52 +05:30
vishnukvmd 3e306facf5 Apply dart fix for require_trailing_commas 2022-06-11 13:53:18 +05:30
vishnukvmd 2ecd872f3d Pass context to toast_util 2022-06-10 19:59:56 +05:30
vishnukvmd d0af78ce6c Remove unused fonts 2022-06-10 19:25:35 +05:30
vishnukvmd dc5dffd601 Fix cases 2022-06-10 12:39:15 +05:30
vishnukvmd ebdf7442e1 Fix more cases 2022-06-09 13:59:30 +05:30
vishnukvmd 1bf689e837 Fix text case 2022-06-09 13:50:50 +05:30
Neeraj Gupta 842e34f61b
Capitalize words 2022-06-09 10:29:23 +05:30
Neeraj Gupta ceac5c0b40
Capitalize words 2022-06-09 10:21:59 +05:30
ashilkn 3322dcf1c3 code refactoring 2022-06-07 10:10:29 +05:30
Neeraj Gupta 7c34e7a989
Fix leave family widget visibility on light mode 2022-06-06 20:57:45 +05:30
ashilkn 0bd781100e minor changes to 'start backup' screen 2022-06-03 17:40:14 +05:30
ashilkn 575964499a removed 'thank you for signing up' toast and moved toasts to bottom 2022-06-03 16:56:47 +05:30
ashilkn 6ac87e4613 added fade out effect on bottom and top of subscription screen and other minor changes 2022-06-03 12:51:53 +05:30
ashilkn 7289d9763b fixed 'are you sure you want to exit?' dialog box's visibility issue on light theme 2022-06-03 11:40:00 +05:30
ashilkn 8f54ba548e fixed 'Questions?' bottom sheet issue in light theme 2022-06-02 20:03:28 +05:30
ashilkn eb17356ca5 added progress bar for subscription(on boarding) screen 2022-06-02 16:36:24 +05:30
Neeraj Gupta 0e44e7fc25
Merge pull request #254 from ente-io/on-bording-screen-fixes
On boarding screen fixes
2022-05-31 17:39:08 +05:30
ashilkn ca8c2ef9af text capitalization 2022-05-30 19:43:19 +05:30
Neeraj Gupta 5879b5d8bb
Capitalize words 2022-05-30 16:38:15 +05:30
Neeraj Gupta 8873b9c827
Fix subsciption fetch 2022-05-30 14:53:55 +05:30
Neeraj Gupta c0ca216622
Redesign: UI changes 2022-05-30 08:00:51 +05:30
Neeraj Gupta de7e9d97fc
Capitalize words 2022-05-17 17:08:21 +05:30
Neeraj Gupta 3ee7467469
Fix subscription UI during onboarding 2022-05-17 02:22:10 +05:30
Neeraj Gupta 783655d497
Fix background padding color for plan widget 2022-05-17 01:44:15 +05:30
Neeraj Gupta 855e0423b3
Capitalize word 2022-05-17 01:34:13 +05:30
Neeraj Gupta c70b08c990
Merge remote-tracking branch 'origin/master' into redesign 2022-05-13 22:52:34 +05:30
Neeraj Gupta 6c6c6427a4
show manage family option for free plans 2022-05-12 09:59:04 +05:30
Neeraj Gupta 65904d673f
UI fixes: subscription page 2022-05-03 17:23:40 +05:30
Neeraj Gupta b7d66d2a93
Fix subscription widget ui 2022-05-03 14:35:53 +05:30
Neeraj Gupta 4cd4d396aa
redesign subscription page 2022-04-28 10:54:26 +05:30
Neeraj Gupta 8979def82b
Fix loading for subscription page 2022-04-26 17:22:09 +05:30
Neeraj Gupta edb8aecae2
Merge branch 'master' into redesign 2022-04-26 15:05:00 +05:30
Neeraj Gupta b416bfc619
update query param key for familyPortal url 2022-04-26 14:11:44 +05:30
Neeraj Gupta 8c8238f915
take user back to settings page after leaving family 2022-04-26 14:10:37 +05:30
Neeraj Gupta cb342cbb2d
improve UI for leave family 2022-04-25 09:51:43 +05:30
ashilkn 534a5b493a fixed padding and textstyle of memories and other minor fixes 2022-04-23 18:48:06 +05:30
Neeraj Gupta d2d99758be
Show family usage as current usage on subscription page 2022-04-21 08:51:58 +05:30
Neeraj Gupta f4e4829669
Show manage family option for app store & play store 2022-04-21 08:48:44 +05:30
Neeraj Gupta 830d7bed7a
support family plan for non-stripe customers 2022-04-21 02:42:34 +05:30
Neeraj Gupta 151456953d
use totalUsage while checking for downgrade 2022-04-21 02:06:35 +05:30
Neeraj Gupta 4bcde8d308
msupport for managing family 2022-04-21 01:44:44 +05:30
Neeraj Gupta b2df82bb2e
Add ChildSubscription Widget with support to leave family 2022-04-21 01:06:33 +05:30
Neeraj Gupta 54fa6aacc1
Add option to manage family on sub page 2022-04-16 22:10:18 +05:30
Neeraj Gupta 6dcb4ba0b4
switch to usageDetailsV2 for fetching subscription 2022-04-14 19:47:41 +05:30
Neeraj Gupta 3239ba3644
Resolve existing package import issues 2021-10-30 11:21:23 +05:30
Neeraj Gupta aa8f4b9bde
lint: enable directives_ordering for imports 2021-10-30 11:13:56 +05:30
Neeraj Gupta da793a3466
do not add expired plan in currentPlans 2021-10-17 19:19:53 +05:30
vishnukvmd bf9425671a Ignore current plan if it is inactive 2021-09-30 21:06:46 +05:30
Neeraj Gupta a4814690b2
Stripe: Hide renew button if the subscription has expired 2021-09-27 11:17:40 +05:30
Neeraj Gupta 0c2bc37d6a
[Stripe] Show payment details even after stripe subscription has expired 2021-09-27 11:00:51 +05:30
Neeraj Gupta 7b1a2252bf
Fix: Do not show incorrect cancellation diaglog when current stripe subscribption expires 2021-09-27 10:49:04 +05:30
Neeraj Gupta 908a049594
Stripe: always show renew/cancel, even if current plan has expired 2021-09-27 10:38:49 +05:30
Neeraj Gupta ddfc9b32d8
[onboarding] verify subscription before moving away from plan selection page 2021-09-27 10:12:38 +05:30
Neeraj Gupta 586bb42458 Linter: Fixed unused imports 2021-09-05 11:52:12 +05:30
Neeraj Gupta 8921466258 Android: enable stripe for new users 2021-08-28 11:29:56 +05:30
Neeraj Gupta 1447df8434 Fix color schemes for dialogs 2021-08-27 19:10:43 +05:30