Skip to content

Commit

Permalink
feat: Update assets, bump version, update changelogs, minor visual im…
Browse files Browse the repository at this point in the history
…provements
  • Loading branch information
astubenbord committed Dec 19, 2023
1 parent 9680054 commit 9451907
Show file tree
Hide file tree
Showing 24 changed files with 98 additions and 64 deletions.
2 changes: 2 additions & 0 deletions android/fastlane/metadata/android/de-DE/changelogs/4023.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Kleinere visuelle Änderungen
- Aktualisieren der Store-Präsenz
2 changes: 2 additions & 0 deletions android/fastlane/metadata/android/en-US/changelogs/4023.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Minor visual updates
- Update store assets
6 changes: 2 additions & 4 deletions android/fastlane/metadata/android/en-US/full_description.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
An (almost) fully fledged mobile Paperless client compatible with Paperless.

Using this app requires access to running a Paperless-ng*x instance.

* View and search documents
* Add, delete or edit documents
* Share, download, print or preview your documents
* Share, download, print and preview your documents
* Manage correspondents, document types, tags and storage paths
* Scan and upload documents with preset correspondent, document type, tags and creation date
* Review and quickly process newly added documents in the inbox
Expand All @@ -14,4 +12,4 @@ Using this app requires access to running a Paperless-ng*x instance.
* Modern, intuitive UI built according to the Material Design 3 specification
* Light and dark theme
* Support for dynamic color (Android 12+ only)
* Available in English, German, French, Catalan, Polish, Czech and Turkish language
* Available in English, German, French, Spanish, Catalan, Polish, Czech, Russian and Turkish language with more to come
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
An (almost) fully fledged mobile Paperless client.
An (almost) fully fledged mobile paperless-ng*x client.
4 changes: 2 additions & 2 deletions lib/core/service/file_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ class FileService {
formatBytes(await getDirSizeInBytes(consumptionDir));

logger.ft(
"Removing scans...",
"Clearing scans directory...",
className: runtimeType.toString(),
methodName: "clearUserData",
);
await _temporaryScansDirectory.delete(recursive: true);
await _temporaryScansDirectory.clear();
logger.ft(
"Removed $scanDirSize...",
className: runtimeType.toString(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_form_builder/flutter_form_builder.dart';
import 'package:intl/intl.dart';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/extensions/flutter_extensions.dart';
import 'package:paperless_mobile/core/widgets/form_builder_fields/extended_date_range_form_field/extended_date_range_dialog.dart';
import 'package:paperless_mobile/core/widgets/form_builder_fields/extended_date_range_form_field/relative_date_range_picker_helper.dart';
import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
Expand All @@ -11,13 +12,15 @@ class FormBuilderExtendedDateRangePicker extends StatefulWidget {
final String labelText;
final DateRangeQuery initialValue;
final void Function(DateRangeQuery? query)? onChanged;
final EdgeInsets padding;

const FormBuilderExtendedDateRangePicker({
super.key,
required this.name,
required this.labelText,
required this.initialValue,
this.onChanged,
required this.padding,
});

@override
Expand Down Expand Up @@ -49,29 +52,36 @@ class _FormBuilderExtendedDateRangePickerState
builder: (field) {
return Column(
children: [
TextFormField(
controller: _textEditingController,
readOnly: true,
onTap: () => _showExtendedDateRangePicker(field),
decoration: InputDecoration(
prefixIcon: const Icon(Icons.date_range),
labelText: widget.labelText,
suffixIcon: _textEditingController.text.isNotEmpty
? IconButton(
icon: const Icon(Icons.clear),
onPressed: () {
field.didChange(const UnsetDateRangeQuery());
},
)
: null,
Padding(
padding: widget.padding.copyWith(bottom: 0),
child: TextFormField(
controller: _textEditingController,
readOnly: true,
onTap: () => _showExtendedDateRangePicker(field),
decoration: InputDecoration(
prefixIcon: const Icon(Icons.date_range),
labelText: widget.labelText,
suffixIcon: _textEditingController.text.isNotEmpty
? IconButton(
icon: const Icon(Icons.clear),
onPressed: () {
field.didChange(const UnsetDateRangeQuery());
},
)
: null,
),
),
),
MediaQuery.removePadding(
context: context,
removeLeft: true,
removeRight: true,
child: RelativeDateRangePickerHelper(field: field),
),
RelativeDateRangePickerHelper(
field: field,
padding: widget.padding,
)
// MediaQuery.removePadding(
//context: context,
//removeLeft: true,
//removeRight: true,
//child: ,
//),
],
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
class RelativeDateRangePickerHelper extends StatefulWidget {
final FormFieldState<DateRangeQuery> field;
final void Function(DateRangeQuery value)? onChanged;
final EdgeInsets padding;

const RelativeDateRangePickerHelper({
super.key,
required this.field,
this.onChanged,
required this.padding,
});

@override
Expand All @@ -24,25 +26,32 @@ class _RelativeDateRangePickerHelperState
Widget build(BuildContext context) {
return SizedBox(
height: 64,
child: ListView.separated(
itemCount: _options.length,
separatorBuilder: (context, index) => const SizedBox(width: 8.0),
itemBuilder: (context, index) {
final option = _options[index];
return ColoredChipWrapper(
child: FilterChip(
label: Text(option.title),
onSelected: (isSelected) {
final value =
isSelected ? option.value : const RelativeDateRangeQuery();
widget.field.didChange(value);
widget.onChanged?.call(value);
},
selected: widget.field.value == option.value,
),
);
},
child: CustomScrollView(
scrollDirection: Axis.horizontal,
slivers: [
SliverToBoxAdapter(child: SizedBox(width: widget.padding.left)),
SliverList.separated(
itemCount: _options.length,
separatorBuilder: (context, index) => const SizedBox(width: 8.0),
itemBuilder: (context, index) {
final option = _options[index];
return ColoredChipWrapper(
child: FilterChip(
label: Text(option.title),
onSelected: (isSelected) {
final value = isSelected
? option.value
: const RelativeDateRangeQuery();
widget.field.didChange(value);
widget.onChanged?.call(value);
},
selected: widget.field.value == option.value,
),
);
},
),
SliverToBoxAdapter(child: SizedBox(width: widget.padding.right))
],
),
);
}
Expand Down
1 change: 1 addition & 0 deletions lib/features/changelogs/view/changelog_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class ChangelogDialog extends StatelessWidget {
}

const _versionNumbers = {
"4023": "3.1.7",
"4013": "3.1.6",
"4003": "3.1.5",
"58": "3.1.4",
Expand Down
2 changes: 1 addition & 1 deletion lib/features/document_search/view/document_search_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class _DocumentSearchBarState extends State<DocumentSearchBar> {
constraints: const BoxConstraints(
maxWidth: 720,
minWidth: 360,
maxHeight: 56,
maxHeight: 48,
minHeight: 48,
),
child: Row(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_form_builder/flutter_form_builder.dart';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/database/tables/local_user_account.dart';
import 'package:paperless_mobile/core/extensions/flutter_extensions.dart';
import 'package:paperless_mobile/core/repository/label_repository.dart';
import 'package:paperless_mobile/core/widgets/form_builder_fields/extended_date_range_form_field/form_builder_extended_date_range_picker.dart';
import 'package:paperless_mobile/features/labels/tags/view/widgets/tags_form_field.dart';
Expand Down Expand Up @@ -93,21 +94,22 @@ class _DocumentFilterFormState extends State<DocumentFilterForm> {

List<Widget> _buildFormFieldList(LabelRepository labelRepository) {
return [
_buildQueryFormField(),
_buildQueryFormField().paddedSymmetrically(horizontal: 12),
Align(
alignment: Alignment.centerLeft,
child: Text(
S.of(context)!.advanced,
style: Theme.of(context).textTheme.bodySmall,
),
),
).paddedLTRB(12, 16, 12, 0),
FormBuilderExtendedDateRangePicker(
name: DocumentFilterForm.fkCreatedAt,
initialValue: widget.initialFilter.created,
labelText: S.of(context)!.createdAt,
onChanged: (_) {
_checkQueryConstraints();
},
padding: EdgeInsets.symmetric(vertical: 8, horizontal: 12),
),
FormBuilderExtendedDateRangePicker(
name: DocumentFilterForm.fkAddedAt,
Expand All @@ -116,17 +118,28 @@ class _DocumentFilterFormState extends State<DocumentFilterForm> {
onChanged: (_) {
_checkQueryConstraints();
},
padding: EdgeInsets.symmetric(vertical: 8, horizontal: 12),
),
_buildCorrespondentFormField(labelRepository.correspondents)
.paddedSymmetrically(
horizontal: 16,
vertical: 4,
),
_buildDocumentTypeFormField(labelRepository.documentTypes)
.paddedSymmetrically(
horizontal: 16,
vertical: 4,
),
_buildStoragePathFormField(labelRepository.storagePaths)
.paddedSymmetrically(
horizontal: 16,
vertical: 4,
),
_buildTagsFormField(labelRepository.tags).paddedSymmetrically(
horizontal: 16,
vertical: 4,
),
_buildCorrespondentFormField(labelRepository.correspondents),
_buildDocumentTypeFormField(labelRepository.documentTypes),
_buildStoragePathFormField(labelRepository.storagePaths),
_buildTagsFormField(labelRepository.tags),
]
.map((w) => SliverPadding(
padding: widget.padding,
sliver: SliverToBoxAdapter(child: w),
))
.toList();
].map((e) => SliverToBoxAdapter(child: e)).toList();
}

void _checkQueryConstraints() {
Expand Down
4 changes: 2 additions & 2 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ class _GoRouterShellState extends State<GoRouterShell> {
);
},
routerConfig: _router,
debugShowCheckedModeBanner: true,
debugShowCheckedModeBanner: false,
title: "Paperless Mobile",
theme: buildTheme(
brightness: Brightness.light,
Expand All @@ -396,7 +396,7 @@ class _GoRouterShellState extends State<GoRouterShell> {
dynamicScheme: darkDynamic,
preferredColorScheme: settings.preferredColorSchemeOption,
),
themeMode: settings.preferredThemeMode,
themeMode: ThemeMode.light,
supportedLocales: const [
Locale('en'),
Locale('de'),
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 3.1.6+401
version: 3.1.7+402

environment:
sdk: ">=3.1.0 <4.0.0"
Expand Down
1 change: 0 additions & 1 deletion resources/get_it_on_google_play_en.svg

This file was deleted.

Binary file modified resources/publishing/feature_graphic.xcf
Binary file not shown.
2 changes: 1 addition & 1 deletion scripts/update_changelogs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function mergeChangelogs () {
__target_file=$__target_dir/changelogs_$1.md
rm -f $__target_file
touch $__target_file
ls $__script_dir/../android/fastlane/metadata/android/$1/changelogs/[0-9]*.txt | tac | while read f; do
ls -1v $__script_dir/../android/fastlane/metadata/android/$1/changelogs/[0-9]*.txt | tac | while read f; do
__build_number="${f%.*}"
echo "# $(basename -- $__build_number)" >> $__target_file
cat $f >> $__target_file
Expand Down

0 comments on commit 9451907

Please sign in to comment.