Skip to content

Commit

Permalink
Merge pull request #1103 from ImranR98/dev
Browse files Browse the repository at this point in the history
Increment versionCode (#1098) + ran 'dart fix'
  • Loading branch information
ImranR98 authored Nov 19, 2023
2 parents 5b5a51b + 367e740 commit c8d82f2
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 52 deletions.
2 changes: 1 addition & 1 deletion lib/app_sources/gitlab.dart
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class GitLab extends AppSource {
...getLinksFromParsedHTML(entryContent,
RegExp('/[^/]+\\.apk\$', caseSensitive: false), '')
.where((element) => Uri.parse(element).host != '')
.toList()

];
var entryId = entry.querySelector('id')?.innerHtml;
var version =
Expand Down
66 changes: 24 additions & 42 deletions lib/components/generated_form.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,16 @@ class GeneratedFormTextField extends GeneratedFormItem {
late bool password;
late TextInputType? textInputType;

GeneratedFormTextField(String key,
{String label = 'Input',
List<Widget> belowWidgets = const [],
String defaultValue = '',
List<String? Function(String? value)> additionalValidators = const [],
GeneratedFormTextField(super.key,
{super.label,
super.belowWidgets,
String super.defaultValue = '',
List<String? Function(String? value)> super.additionalValidators = const [],
this.required = true,
this.max = 1,
this.hint,
this.password = false,
this.textInputType})
: super(key,
label: label,
belowWidgets: belowWidgets,
defaultValue: defaultValue,
additionalValidators: additionalValidators);
this.textInputType});

@override
String ensureType(val) {
Expand All @@ -54,18 +49,14 @@ class GeneratedFormDropdown extends GeneratedFormItem {
List<String>? disabledOptKeys;

GeneratedFormDropdown(
String key,
super.key,
this.opts, {
String label = 'Input',
List<Widget> belowWidgets = const [],
String defaultValue = '',
super.label,
super.belowWidgets,
String super.defaultValue = '',
this.disabledOptKeys,
List<String? Function(String? value)> additionalValidators = const [],
}) : super(key,
label: label,
belowWidgets: belowWidgets,
defaultValue: defaultValue,
additionalValidators: additionalValidators);
List<String? Function(String? value)> super.additionalValidators = const [],
});

@override
String ensureType(val) {
Expand All @@ -75,16 +66,12 @@ class GeneratedFormDropdown extends GeneratedFormItem {

class GeneratedFormSwitch extends GeneratedFormItem {
GeneratedFormSwitch(
String key, {
String label = 'Input',
List<Widget> belowWidgets = const [],
bool defaultValue = false,
List<String? Function(bool value)> additionalValidators = const [],
}) : super(key,
label: label,
belowWidgets: belowWidgets,
defaultValue: defaultValue,
additionalValidators: additionalValidators);
super.key, {
super.label,
super.belowWidgets,
bool super.defaultValue = false,
List<String? Function(bool value)> super.additionalValidators = const [],
});

@override
bool ensureType(val) {
Expand All @@ -98,22 +85,17 @@ class GeneratedFormTagInput extends GeneratedFormItem {
late WrapAlignment alignment;
late String emptyMessage;
late bool showLabelWhenNotEmpty;
GeneratedFormTagInput(String key,
{String label = 'Input',
List<Widget> belowWidgets = const [],
Map<String, MapEntry<int, bool>> defaultValue = const {},
GeneratedFormTagInput(super.key,
{super.label,
super.belowWidgets,
Map<String, MapEntry<int, bool>> super.defaultValue = const {},
List<String? Function(Map<String, MapEntry<int, bool>> value)>
additionalValidators = const [],
super.additionalValidators = const [],
this.deleteConfirmationMessage,
this.singleSelect = false,
this.alignment = WrapAlignment.start,
this.emptyMessage = 'Input',
this.showLabelWhenNotEmpty = true})
: super(key,
label: label,
belowWidgets: belowWidgets,
defaultValue: defaultValue,
additionalValidators: additionalValidators);
this.showLabelWhenNotEmpty = true});

@override
Map<String, MapEntry<int, bool>> ensureType(val) {
Expand Down
2 changes: 1 addition & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
// ignore: implementation_imports
import 'package:easy_localization/src/localization.dart';

const String currentVersion = '0.14.33';
const String currentVersion = '0.14.34';
const String currentReleaseTag =
'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES

Expand Down
2 changes: 1 addition & 1 deletion lib/pages/add_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ class _AddAppPageState extends State<AddAppPage> {
: TextDecoration.none,
fontStyle: FontStyle.italic),
)))
.toList()

]);

return Scaffold(
Expand Down
6 changes: 3 additions & 3 deletions lib/pages/apps.dart
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ class AppsPageState extends State<AppsPage> {
.entries
.map((e) =>
((e.key / (listedApps[index].app.categories.length - 1))))
.toList(),
,
1
];
if (stops.length == 2) {
Expand All @@ -522,7 +522,7 @@ class AppsPageState extends State<AppsPage> {
.map((e) =>
Color(settingsProvider.categories[e] ?? transparent)
.withAlpha(255))
.toList(),
,
Color(transparent)
])),
child: ListTile(
Expand Down Expand Up @@ -984,7 +984,7 @@ class AppsPageState extends State<AppsPage> {
...sourceProvider.sources
.map((e) =>
MapEntry(e.runtimeType.toString(), e.name))
.toList()

])
]
],
Expand Down
6 changes: 3 additions & 3 deletions lib/pages/import_export.dart
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
child: Text(
tr('searchX', args: [source.name])))
]))
.toList(),
,
...sourceProvider.massUrlSources
.map((source) => Column(
crossAxisAlignment:
Expand All @@ -456,7 +456,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
child: Text(
tr('importX', args: [source.name])))
]))
.toList(),
,
const Spacer(),
const Divider(
height: 32,
Expand Down Expand Up @@ -518,7 +518,7 @@ class _ImportErrorDialogState extends State<ImportErrorDialog> {
style: const TextStyle(fontStyle: FontStyle.italic),
)
]);
}).toList()
})
]),
actions: [
TextButton(
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 0.14.33+226 # When changing this, update the tag in main() accordingly
version: 0.14.34+228 # When changing this, update the tag in main() accordingly

environment:
sdk: '>=3.0.0 <4.0.0'
Expand Down

0 comments on commit c8d82f2

Please sign in to comment.