From b2a35813f6b4f77278a6ee18f334930153289b46 Mon Sep 17 00:00:00 2001 From: Aunali321 Date: Tue, 11 Oct 2022 02:32:23 +0530 Subject: [PATCH] fix: disable update functionality for now. --- assets/i18n/en_US.json | 3 +- lib/ui/widgets/appInfoView/app_info_view.dart | 5 +- .../appInfoView/app_info_viewmodel.dart | 6 + .../homeView/available_updates_card.dart | 20 ++- lib/ui/widgets/shared/application_item.dart | 158 +++++++++--------- 5 files changed, 101 insertions(+), 91 deletions(-) diff --git a/assets/i18n/en_US.json b/assets/i18n/en_US.json index 2c80a1c8..997302a0 100644 --- a/assets/i18n/en_US.json +++ b/assets/i18n/en_US.json @@ -149,7 +149,8 @@ "patchedDateLabel": "Patched Date", "patchedDateHint": "{date} at {time}", "appliedPatchesLabel": "Applied Patches", - "appliedPatchesHint": "{quantity} applied patches" + "appliedPatchesHint": "{quantity} applied patches", + "updateNotImplemented": "Update functionality not implemented yet" }, "contributorsView": { "widgetTitle": "Contributors", diff --git a/lib/ui/widgets/appInfoView/app_info_view.dart b/lib/ui/widgets/appInfoView/app_info_view.dart index 721a3908..2c442bac 100644 --- a/lib/ui/widgets/appInfoView/app_info_view.dart +++ b/lib/ui/widgets/appInfoView/app_info_view.dart @@ -160,8 +160,9 @@ class AppInfoView extends StatelessWidget { child: InkWell( borderRadius: BorderRadius.circular(16.0), onTap: () { - model.navigateToPatcher(app); - Navigator.of(context).pop(); + model.updateNotImplemented(context); + // model.navigateToPatcher(app); + // Navigator.of(context).pop(); }, child: Column( mainAxisAlignment: diff --git a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart index 880acfe7..ab95a049 100644 --- a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart +++ b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart @@ -8,6 +8,7 @@ import 'package:revanced_manager/models/patched_application.dart'; import 'package:revanced_manager/services/manager_api.dart'; import 'package:revanced_manager/services/patcher_api.dart'; import 'package:revanced_manager/services/root_api.dart'; +import 'package:revanced_manager/services/toast.dart'; import 'package:revanced_manager/ui/views/home/home_viewmodel.dart'; import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart'; import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; @@ -19,6 +20,7 @@ class AppInfoViewModel extends BaseViewModel { final ManagerAPI _managerAPI = locator(); final PatcherAPI _patcherAPI = locator(); final RootAPI _rootAPI = RootAPI(); + final Toast _toast = locator(); Future uninstallApp( BuildContext context, @@ -51,6 +53,10 @@ class AppInfoViewModel extends BaseViewModel { locator().setIndex(1); } + void updateNotImplemented(BuildContext context) { + _toast.show('appInfoView.updateNotImplemented'); + } + Future showUninstallDialog( BuildContext context, PatchedApplication app, diff --git a/lib/ui/widgets/homeView/available_updates_card.dart b/lib/ui/widgets/homeView/available_updates_card.dart index 0ade6486..3756a4ed 100644 --- a/lib/ui/widgets/homeView/available_updates_card.dart +++ b/lib/ui/widgets/homeView/available_updates_card.dart @@ -45,15 +45,17 @@ class AvailableUpdatesCard extends StatelessWidget { physics: const NeverScrollableScrollPhysics(), children: apps .map((app) => ApplicationItem( - icon: app.icon, - name: app.name, - patchDate: app.patchDate, - changelog: app.changelog, - isUpdatableApp: true, - onPressed: () => - locator().navigateToPatcher( - app, - ), + icon: app.icon, + name: app.name, + patchDate: app.patchDate, + changelog: app.changelog, + isUpdatableApp: true, + //TODO: Find a better way to do update functionality + onPressed: () {} + // () => + // locator().navigateToPatcher( + // app, + // ), )) .toList(), ); diff --git a/lib/ui/widgets/shared/application_item.dart b/lib/ui/widgets/shared/application_item.dart index ab955c8c..7e9f4838 100644 --- a/lib/ui/widgets/shared/application_item.dart +++ b/lib/ui/widgets/shared/application_item.dart @@ -51,93 +51,93 @@ class _ApplicationItemState extends State Widget build(BuildContext context) { ExpandableController expController = ExpandableController(); return Container( - margin: const EdgeInsets.only(bottom: 16.0), - child: CustomCard( - onTap: () { - expController.toggle(); - _animationController.isCompleted - ? _animationController.reverse() - : _animationController.forward(); - }, - child: ExpandablePanel( - controller: expController, - theme: const ExpandableThemeData( - inkWellBorderRadius: BorderRadius.all(Radius.circular(16)), - tapBodyToCollapse: false, - tapBodyToExpand: false, - tapHeaderToExpand: false, - hasIcon: false, - animationDuration: Duration(milliseconds: 450), - ), - header: Row( - children: [ - SizedBox( - width: 40, - child: Image.memory(widget.icon, height: 40, width: 40), - ), - const SizedBox(width: 4), - Padding( - padding: const EdgeInsets.only(left: 15.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - widget.name.length > 12 - ? '${widget.name.substring(0, 12)}...' - : widget.name, - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - ), - ), - Text(format(widget.patchDate)), - ], - ), - ), - const Spacer(), - RotationTransition( - turns: Tween(begin: 0.0, end: 0.50) - .animate(_animationController), - child: const Padding( - padding: EdgeInsets.all(8.0), - child: Icon(Icons.arrow_drop_down), - ), - ), - const SizedBox(width: 8), - Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.end, + margin: const EdgeInsets.only(bottom: 16.0), + child: CustomCard( + onTap: () { + expController.toggle(); + _animationController.isCompleted + ? _animationController.reverse() + : _animationController.forward(); + }, + child: ExpandablePanel( + controller: expController, + theme: const ExpandableThemeData( + inkWellBorderRadius: BorderRadius.all(Radius.circular(16)), + tapBodyToCollapse: false, + tapBodyToExpand: false, + tapHeaderToExpand: false, + hasIcon: false, + animationDuration: Duration(milliseconds: 450), + ), + header: Row( + children: [ + SizedBox( + width: 40, + child: Image.memory(widget.icon, height: 40, width: 40), + ), + const SizedBox(width: 4), + Padding( + padding: const EdgeInsets.only(left: 15.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - CustomMaterialButton( - label: widget.isUpdatableApp - ? I18nText('applicationItem.patchButton') - : I18nText('applicationItem.infoButton'), - onPressed: widget.onPressed, + Text( + widget.name.length > 12 + ? '${widget.name.substring(0, 12)}...' + : widget.name, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.w500, + ), ), + Text(format(widget.patchDate)), ], ), - ], - ), - collapsed: const SizedBox(), - expanded: Padding( - padding: const EdgeInsets.only(top: 16.0, left: 4.0, right: 4.0, bottom: 4.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - I18nText( - 'applicationItem.changelogLabel', - child: const Text( - '', - style: TextStyle(fontWeight: FontWeight.w700), + ), + const Spacer(), + RotationTransition( + turns: Tween(begin: 0.0, end: 0.50) + .animate(_animationController), + child: const Padding( + padding: EdgeInsets.all(8.0), + child: Icon(Icons.arrow_drop_down), ), ), - const SizedBox(height: 4), - Text('\u2022 ${widget.changelog.join('\n\u2022 ')}'), + const SizedBox(width: 8), + Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + CustomMaterialButton( + label: widget.isUpdatableApp + ? I18nText('applicationItem.infoButton') + : I18nText('applicationItem.infoButton'), + onPressed: widget.onPressed, + ), + ], + ), ], ), + collapsed: const SizedBox(), + expanded: Padding( + padding: const EdgeInsets.only( + top: 16.0, left: 4.0, right: 4.0, bottom: 4.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + I18nText( + 'applicationItem.changelogLabel', + child: const Text( + '', + style: TextStyle(fontWeight: FontWeight.w700), + ), + ), + const SizedBox(height: 4), + Text('\u2022 ${widget.changelog.join('\n\u2022 ')}'), + ], + ), + ), ), - ), - ) - ); + )); } }