Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Thibault Deckers committed Aug 8, 2020
2 parents 0f0f46d + f5da9e3 commit 9936a6c
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 4 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Quality check

on:
push:
branches:
- develop

jobs:
build:
name: Check code quality.
runs-on: ubuntu-latest
steps:
- uses: subosito/flutter-action@v1
with:
channel: 'stable'

- name: Clone the repository.
uses: actions/checkout@v2

- name: Get packages for the Flutter project.
run: flutter pub get

- name: Update the flutter version file.
working-directory: ${{ github.workspace }}/scripts
run: ./update_flutter_version.sh

- name: Static analysis.
run: flutter analyze

- name: Unit tests.
run: flutter test
File renamed without changes.
1 change: 1 addition & 0 deletions lib/services/metadata_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class MetadataService {
}
return null;
}

return background
? servicePolicy.call(
call,
Expand Down
3 changes: 1 addition & 2 deletions lib/widgets/album/grid/header_generic.dart
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ class SectionHeader extends StatelessWidget {
// force a higher first line to match leading icon/selector dimension
style: TextStyle(height: 2.3 * textScaleFactor),
), // 23 hair spaces match a width of 40.0
if (hasTrailing)
TextSpan(text: '\u200A' * 17),
if (hasTrailing) TextSpan(text: '\u200A' * 17),
TextSpan(
text: text,
style: Constants.titleTextStyle,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import 'package:aves/model/source/collection_lens.dart';
import 'package:aves/model/source/collection_source.dart';
import 'package:aves/services/android_app_service.dart';
import 'package:aves/services/image_file_service.dart';
import 'package:aves/utils/constants.dart';
import 'package:aves/utils/durations.dart';
import 'package:aves/widgets/album/app_bar.dart';
import 'package:aves/widgets/album/empty.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class MediaStoreSource extends CollectionSource {
addAll(pendingNewEntries);
pendingNewEntries.clear();
}

ImageFileService.getImageEntries(knownEntryMap).listen(
(entry) {
pendingNewEntries.add(entry);
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ description: A new Flutter application.
# 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: 1.1.3+15
version: 1.1.4+16

# video_player (as of v0.10.8+2, backed by ExoPlayer):
# - does not support content URIs (by default, but trivial by fork)
Expand Down

0 comments on commit 9936a6c

Please sign in to comment.