Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 70 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,70 @@
os:
- linux
sudo: false
addons:
apt:
# Flutter depends on /usr/lib/x86_64-linux-gnu/libstdc++.so.6 version GLIBCXX_3.4.18
sources:
- ubuntu-toolchain-r-test # if we don't specify this, the libstdc++6 we get is the wrong version
packages:
- libstdc++6
- fonts-droid
before_script:
- git clone https://github.com/flutter/flutter.git -b master --depth 1
- ./flutter/bin/flutter doctor
script:
- ./flutter/bin/flutter test --coverage
after_success:
- bash <(curl -s https://codecov.io/bash) -t $CODE_COV_TOKEN
cache:
directories:
- $HOME/.pub-cache
matrix:
include:
- os: linux
language: android
licenses:
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
- 'google-gdk-license-.+'
android:
components:
- tools
- platform-tools
- build-tools-25.0.3
- android-25
- sys-img-armeabi-v7a-google_apis-25
- extra-android-m2repository
- extra-google-m2repository
- extra-google-android-support
jdk: oraclejdk8
sudo: false
addons:
apt:
# Flutter depends on /usr/lib/x86_64-linux-gnu/libstdc++.so.6 version GLIBCXX_3.4.18
sources:
- ubuntu-toolchain-r-test # if we don't specify this, the libstdc++6 we get is the wrong version
packages:
- libstdc++6
- fonts-droid
install:
- wget http://services.gradle.org/distributions/gradle-3.5-bin.zip
- unzip -qq gradle-3.5-bin.zip
- export GRADLE_HOME=$PWD/gradle-3.5
- export PATH=$GRADLE_HOME/bin:$PATH
- git clone https://github.com/flutter/flutter.git -b alpha --depth 1
- echo yes | sdkmanager "tools"
- echo yes | sdkmanager "platforms;android-25"
- echo yes | sdkmanager "extras;android;m2repository"
- echo yes | sdkmanager "extras;google;m2repository"
- echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
- echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
# Check components status
- sdkmanager --list || true
- ./flutter/bin/flutter doctor
before_script:
- ./flutter/bin/flutter packages get
script:
- ./flutter/bin/flutter packages pub run build_runner build apk
- ./flutter/bin/flutter packages pub run build_runner test
- os: osx
language: generic
osx_image: xcode8.3
install:
- brew update
- brew install libimobiledevice
- brew install ideviceinstaller
- brew install ios-deploy
- git clone https://github.com/flutter/flutter.git -b alpha --depth 1
before_script:
- ./flutter/bin/flutter packages get
script:
- ./flutter/bin/flutter packages pub run build_runner build ios
cache:
directories:
- $HOME/.pub-cache
notifications:
email:
recipients:
- mathieuauclair@twentythreesolutions.com
on_success: always
on_failure: never
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ Note: If you're not part of the Comiko project on Firebase, you can either ask t

- Place it under `comiko-app/android/app`

## Dart 2

Take note that this repository is now set to use dart2 tools with flutter. Commands like pub build, pub test are no longer supported. Please use build runner now!

```
❯ flutter packages pub run build_runner test

```


### Debug firebase auth
Get your debug keystore fingerprint.
There's no password for debug keystore, just hit enter when asked.
Expand Down
3 changes: 3 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
analyzer:
language:
enableSuperMixins: true
linter:
rules:
- always_declare_return_types
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ android {
compileSdkVersion 26
buildToolsVersion '26.0.3'


sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
Expand All @@ -30,6 +29,7 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
multiDexEnabled true
applicationId "ca.comiko.comiko"
minSdkVersion 16
targetSdkVersion 25
Expand Down
4 changes: 3 additions & 1 deletion lib/pages/artists_page.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'dart:async';

import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:comiko/pages/is_page.dart';
import 'package:comiko/widgets/artist_card.dart';
Expand All @@ -13,7 +15,7 @@ class ArtistsPage extends StatelessWidget implements IsPage {
.collection('artists')
.where("deleted", isEqualTo: false)
.orderBy('name', descending: false)
.snapshots,
.snapshots(),
builder: (context, snapshot) {
if (!snapshot.hasData) {
return Center(
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/image_caching_loader.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ImagesCachingLoader extends StatelessWidget {
.collection('artists')
.where("deleted", isEqualTo: false)
.orderBy('name', descending: false)
.snapshots
.snapshots()
.first;

final cachedImages = <Future>[];
Expand Down
Loading