Compare commits

...

8 Commits

Author SHA1 Message Date
Ushie
a346f8857f build: Bump version to v0.0.26 2022-09-26 16:52:04 +03:00
oSumAtrIX
e12532ea4c chore: bump patcher dependency version to v5.1.0 2022-09-26 04:34:23 +02:00
afn
7ecf951bfb fix: tweak card appearances (#296)
* fix: tweak card appearances

* Update patch_selector_card.dart
2022-09-25 18:13:37 +05:30
Aunali321
db18874ea1 fix: now using country code for languages. 2022-09-25 14:38:25 +05:30
oSumAtrIX
18a69776cd feat: en_US.json language asset file 2022-09-25 08:26:08 +02:00
oSumAtrIX
21cadf6450 feat: remove en.json language asset 2022-09-25 08:22:21 +02:00
oSumAtrIX
5ddbe6e252 Update Crowdin configuration file 2022-09-25 08:19:47 +02:00
afn
6d1427e01e fix: move changelog into app item custom card (#294) 2022-09-25 00:19:02 +05:30
11 changed files with 115 additions and 118 deletions

View File

@@ -71,7 +71,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
// ReVanced // ReVanced
implementation "app.revanced:revanced-patcher:5.0.1" implementation "app.revanced:revanced-patcher:5.1.0"
// Signing & aligning // Signing & aligning
implementation("org.bouncycastle:bcpkix-jdk15on:1.70") implementation("org.bouncycastle:bcpkix-jdk15on:1.70")

View File

@@ -1,3 +1,3 @@
files: files:
- source: /assets/i18n/en.json - source: /assets/i18n/en.json
translation: /assets/i18n/%two_letters_code%.json translation: /assets/i18n/%locale_with_underscore%.json

View File

@@ -35,7 +35,7 @@ class MyApp extends StatelessWidget {
localizationsDelegates: [ localizationsDelegates: [
FlutterI18nDelegate( FlutterI18nDelegate(
translationLoader: FileTranslationLoader( translationLoader: FileTranslationLoader(
fallbackFile: 'en', fallbackFile: 'en_US',
basePath: 'assets/i18n', basePath: 'assets/i18n',
), ),
), ),

View File

@@ -33,7 +33,7 @@ class _ContributorsCardState extends State<ContributorsCard> {
'', '',
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w500,
), ),
), ),
), ),

View File

@@ -49,7 +49,7 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
), ),
], ],
), ),
const SizedBox(height: 8), const SizedBox(height: 4),
Row( Row(
children: <Widget>[ children: <Widget>[
I18nText('latestCommitCard.managerLabel'), I18nText('latestCommitCard.managerLabel'),

View File

@@ -32,7 +32,7 @@ class AppSelectorCard extends StatelessWidget {
), ),
), ),
), ),
const SizedBox(height: 10), const SizedBox(height: 8),
locator<PatcherViewModel>().selectedApp == null locator<PatcherViewModel>().selectedApp == null
? I18nText('appSelectorCard.widgetSubtitle') ? I18nText('appSelectorCard.widgetSubtitle')
: Row( : Row(
@@ -49,21 +49,21 @@ class AppSelectorCard extends StatelessWidget {
), ),
), ),
const SizedBox(width: 6), const SizedBox(width: 6),
Text(locator<PatcherViewModel>().getAppSelectionString()), Text(
locator<PatcherViewModel>()
.getAppSelectionString(),
style: const TextStyle(fontWeight: FontWeight.w600),
),
], ],
), ),
locator<PatcherViewModel>().selectedApp == null locator<PatcherViewModel>().selectedApp == null
? Container() ? Container()
: Column( : Column(
children: [ children: [
const SizedBox(height: 10), const SizedBox(height: 4),
Padding( Text(
padding: const EdgeInsets.only(left: 20),
child: Text(
locator<PatcherViewModel>() locator<PatcherViewModel>()
.getRecommendedVersionString(context), .getRecommendedVersionString(context),
style: const TextStyle(fontStyle: FontStyle.italic),
),
), ),
], ],
), ),

View File

@@ -32,7 +32,7 @@ class PatchSelectorCard extends StatelessWidget {
), ),
), ),
), ),
const SizedBox(height: 10), const SizedBox(height: 4),
locator<PatcherViewModel>().selectedApp == null locator<PatcherViewModel>().selectedApp == null
? I18nText('patchSelectorCard.widgetSubtitle') ? I18nText('patchSelectorCard.widgetSubtitle')
: locator<PatcherViewModel>().selectedPatches.isEmpty : locator<PatcherViewModel>().selectedPatches.isEmpty
@@ -46,7 +46,7 @@ class PatchSelectorCard extends StatelessWidget {
String _getPatchesSelection() { String _getPatchesSelection() {
String text = ''; String text = '';
for (Patch p in locator<PatcherViewModel>().selectedPatches) { for (Patch p in locator<PatcherViewModel>().selectedPatches) {
text += '${p.getSimpleName()} (v${p.version})\n'; text += '\u2022 ${p.getSimpleName()} (v${p.version})\n';
} }
return text.substring(0, text.length - 1); return text.substring(0, text.length - 1);
} }

View File

@@ -65,21 +65,14 @@ class _PatchItemState extends State<PatchItem> {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
const SizedBox(width: 4), const SizedBox(width: 6),
Container( Text(
padding: const EdgeInsets.symmetric( widget.version,
horizontal: 4, style: TextStyle(
vertical: 2, fontSize: 16,
color: Theme.of(context).colorScheme.secondary,
), ),
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),
@@ -88,7 +81,10 @@ class _PatchItemState extends State<PatchItem> {
softWrap: true, softWrap: true,
maxLines: 3, maxLines: 3,
overflow: TextOverflow.visible, overflow: TextOverflow.visible,
style: const TextStyle(fontSize: 14), style: TextStyle(
fontSize: 14,
color: Theme.of(context).colorScheme.onSecondaryContainer,
),
), ),
], ],
), ),
@@ -119,12 +115,12 @@ class _PatchItemState extends State<PatchItem> {
padding: const EdgeInsets.only(top: 8), padding: const EdgeInsets.only(top: 8),
child: TextButton.icon( child: TextButton.icon(
label: I18nText('patchItem.unsupportedWarningButton'), label: I18nText('patchItem.unsupportedWarningButton'),
icon: const Icon(Icons.warning), icon: const Icon(Icons.warning, size: 20.0),
onPressed: () => _showUnsupportedWarningDialog(), onPressed: () => _showUnsupportedWarningDialog(),
style: ButtonStyle( style: ButtonStyle(
shape: MaterialStateProperty.all( shape: MaterialStateProperty.all(
RoundedRectangleBorder( RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(8),
side: BorderSide( side: BorderSide(
width: 1, width: 1,
color: color:

View File

@@ -50,7 +50,16 @@ class _ApplicationItemState extends State<ApplicationItem>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ExpandableController expController = ExpandableController(); ExpandableController expController = ExpandableController();
return ExpandablePanel( return Container(
margin: const EdgeInsets.only(bottom: 16.0),
child: CustomCard(
onTap: () {
expController.toggle();
_animationController.isCompleted
? _animationController.reverse()
: _animationController.forward();
},
child: ExpandablePanel(
controller: expController, controller: expController,
theme: const ExpandableThemeData( theme: const ExpandableThemeData(
inkWellBorderRadius: BorderRadius.all(Radius.circular(16)), inkWellBorderRadius: BorderRadius.all(Radius.circular(16)),
@@ -60,16 +69,7 @@ class _ApplicationItemState extends State<ApplicationItem>
hasIcon: false, hasIcon: false,
animationDuration: Duration(milliseconds: 450), animationDuration: Duration(milliseconds: 450),
), ),
header: Padding( header: Row(
padding: const EdgeInsets.only(bottom: 16.0),
child: CustomCard(
onTap: () {
expController.toggle();
_animationController.isCompleted
? _animationController.reverse()
: _animationController.forward();
},
child: Row(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
width: 40, width: 40,
@@ -82,8 +82,8 @@ class _ApplicationItemState extends State<ApplicationItem>
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
widget.name.length > 9 widget.name.length > 12
? '${widget.name.substring(0, 9)}...' ? '${widget.name.substring(0, 12)}...'
: widget.name, : widget.name,
style: const TextStyle( style: const TextStyle(
fontSize: 16, fontSize: 16,
@@ -96,13 +96,14 @@ class _ApplicationItemState extends State<ApplicationItem>
), ),
const Spacer(), const Spacer(),
RotationTransition( RotationTransition(
turns: turns: Tween(begin: 0.0, end: 0.50)
Tween(begin: 0.0, end: 0.50).animate(_animationController), .animate(_animationController),
child: const Padding( child: const Padding(
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: Icon(Icons.arrow_drop_down), child: Icon(Icons.arrow_drop_down),
), ),
), ),
const SizedBox(width: 8),
Column( Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
@@ -117,11 +118,9 @@ class _ApplicationItemState extends State<ApplicationItem>
), ),
], ],
), ),
),
),
collapsed: const SizedBox(), collapsed: const SizedBox(),
expanded: Padding( expanded: Padding(
padding: const EdgeInsets.all(16.0).copyWith(top: 0.0), padding: const EdgeInsets.only(top: 16.0, left: 4.0, right: 4.0, bottom: 4.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
@@ -137,6 +136,8 @@ class _ApplicationItemState extends State<ApplicationItem>
], ],
), ),
), ),
),
)
); );
} }
} }

View File

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
publish_to: 'none' publish_to: 'none'
version: 0.0.24+24 version: 0.0.26+26
environment: environment:
sdk: ">=2.17.5 <3.0.0" sdk: ">=2.17.5 <3.0.0"