ReVanced/revanced-manager
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager.git synced 2025-05-02 23:04:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'flutter' of github.com:revanced/revanced-manager into flutter

Browse Source
This commit is contained in:
Alberto Ponces 2022-09-24 12:12:24 +01:00
commit f398b6863a
2 changed files with 122 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
lib/ui/views/installer/installer_view.dart
View File

@ -18,27 +18,38 @@ class InstallerView extends StatelessWidget {
onModelReady: (model) => model.initialize(context), onModelReady: (model) => model.initialize(context),
viewModelBuilder: () => InstallerViewModel(), viewModelBuilder: () => InstallerViewModel(),
builder: (context, model, child) => WillPopScope( builder: (context, model, child) => WillPopScope(
child: Scaffold( child: SafeArea(
body: CustomScrollView( top: false,
controller: model.scrollController, child: Scaffold(
slivers: <Widget>[ body: CustomScrollView(
CustomSliverAppBar( controller: model.scrollController,
title: Text( slivers: <Widget>[
model.headerLogs, CustomSliverAppBar(
style: GoogleFonts.inter( title: Text(
color: Theme.of(context).textTheme.headline6!.color, model.headerLogs,
style: GoogleFonts.inter(
color: Theme.of(context).textTheme.headline6!.color,
),
), ),
), onBackButtonPressed: () => model.onWillPop(context),
onBackButtonPressed: () => model.onWillPop(context), actions: <Widget>[
actions: <Widget>[ Visibility(
Visibility( visible: !model.isPatching,
visible: !model.isPatching, child: CustomPopupMenu(
child: CustomPopupMenu( onSelected: (value) => model.onMenuSelection(value),
onSelected: (value) => model.onMenuSelection(value), children: {
children: { if (!model.hasErrors)
if (!model.hasErrors) 0: I18nText(
0: I18nText( 'installerView.shareApkMenuOption',
'installerView.shareApkMenuOption', child: const Text(
'',
style: TextStyle(
fontWeight: FontWeight.bold,
),
),
),
1: I18nText(
'installerView.shareLogMenuOption',
child: const Text( child: const Text(
'', '',
style: TextStyle( style: TextStyle(
@ -46,103 +57,95 @@ class InstallerView extends StatelessWidget {
), ),
), ),
), ),
1: I18nText( },
'installerView.shareLogMenuOption', ),
child: const Text( ),
'', ],
style: TextStyle( bottom: PreferredSize(
fontWeight: FontWeight.bold, preferredSize: const Size(double.infinity, 1.0),
child:
GradientProgressIndicator(progress: model.progress!)),
),
SliverPadding(
padding: const EdgeInsets.all(20.0),
sliver: SliverList(
delegate: SliverChildListDelegate.fixed(
<Widget>[
CustomCard(
child: Text(
model.logs,
style: GoogleFonts.jetBrainsMono(
fontSize: 13,
height: 1.5,
), ),
), ),
), ),
}, ],
), ),
), ),
],
bottom: PreferredSize(
preferredSize: const Size(double.infinity, 1.0),
child:
GradientProgressIndicator(progress: model.progress!)),
),
SliverPadding(
padding: const EdgeInsets.all(20.0),
sliver: SliverList(
delegate: SliverChildListDelegate.fixed(
<Widget>[
CustomCard(
child: Text(
model.logs,
style: GoogleFonts.jetBrainsMono(
fontSize: 13,
height: 1.5,
),
),
),
],
),
), ),
), SliverFillRemaining(
SliverFillRemaining( hasScrollBody: false,
hasScrollBody: false, child: Align(
child: Align( alignment: Alignment.bottomCenter,
alignment: Alignment.bottomCenter, child: Visibility(
child: Visibility( visible: !model.isPatching && !model.hasErrors,
visible: !model.isPatching && !model.hasErrors, child: Padding(
child: Padding( padding: const EdgeInsets.all(20.0).copyWith(top: 0.0),
padding: const EdgeInsets.all(20.0).copyWith(top: 0.0), child: Row(
child: Row( mainAxisAlignment: MainAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
children: <Widget>[ Visibility(
Visibility( visible: model.isInstalled,
visible: model.isInstalled, child: CustomMaterialButton(
child: CustomMaterialButton( label: I18nText('installerView.openButton'),
label: I18nText('installerView.openButton'), isExpanded: true,
isExpanded: true, onPressed: () {
onPressed: () { model.openApp();
model.openApp(); model.cleanPatcher();
model.cleanPatcher(); Navigator.of(context).pop();
Navigator.of(context).pop(); },
},
),
),
Visibility(
visible: !model.isInstalled && model.isRooted,
child: CustomMaterialButton(
isFilled: false,
label:
I18nText('installerView.installRootButton'),
isExpanded: true,
onPressed: () => model.installResult(
context,
true,
), ),
), ),
), Visibility(
Visibility( visible: !model.isInstalled && model.isRooted,
visible: !model.isInstalled, child: CustomMaterialButton(
child: const SizedBox( isFilled: false,
width: 16, label:
), I18nText('installerView.installRootButton'),
), isExpanded: true,
Visibility( onPressed: () => model.installResult(
visible: !model.isInstalled, context,
child: CustomMaterialButton( true,
label: I18nText('installerView.installButton'), ),
isExpanded: true,
onPressed: () => model.installResult(
context,
false,
), ),
), ),
), Visibility(
], visible: !model.isInstalled,
child: const SizedBox(
width: 16,
),
),
Visibility(
visible: !model.isInstalled,
child: CustomMaterialButton(
label: I18nText('installerView.installButton'),
isExpanded: true,
onPressed: () => model.installResult(
context,
false,
),
),
),
],
),
), ),
), ),
), ),
), ),
), ],
], ),
), ),
), ),
onWillPop: () => model.onWillPop(context), onWillPop: () => model.onWillPop(context),

17
lib/ui/widgets/patchesSelectorView/patch_item.dart
View File

@ -58,13 +58,28 @@ class _PatchItemState extends State<PatchItem> {
children: <Widget>[ children: <Widget>[
Text( Text(
widget.simpleName, widget.simpleName,
maxLines: 2,
overflow: TextOverflow.visible,
style: const TextStyle( style: const TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
const SizedBox(width: 4), const SizedBox(width: 4),
Text(widget.version) Container(
padding: const EdgeInsets.symmetric(
horizontal: 4,
vertical: 2,
),
decoration: BoxDecoration(
color: Theme.of(context)
.colorScheme
.background
.withOpacity(0.5),
borderRadius: BorderRadius.circular(6),
),
child: Text(widget.version),
)
], ],
), ),
const SizedBox(height: 4), const SizedBox(height: 4),