From 35e957a049041bd621d6d46f7a18b958380359a4 Mon Sep 17 00:00:00 2001 From: Varakh Date: Fri, 21 May 2021 01:33:16 +0200 Subject: [PATCH] Use 4 spaces as tab --- .editorconfig | 6 + .travis.yml | 36 +- android/app/src/debug/AndroidManifest.xml | 4 +- android/app/src/main/AndroidManifest.xml | 9 +- .../java/de/varakh/fbmobile/MainActivity.java | 9 +- .../main/res/drawable/launch_background.xml | 3 +- android/app/src/main/res/values/styles.xml | 1 + android/app/src/profile/AndroidManifest.xml | 4 +- assets/i18n/en.json | 284 ++++---- assets/logo_caption.svg | 687 ++++++++++++------ .../AppIcon.appiconset/Contents.json | 205 +++++- .../LaunchImage.imageset/Contents.json | 40 +- lib/core/viewmodels/base_model.dart | 1 + pubspec.yaml | 124 ++-- 14 files changed, 931 insertions(+), 482 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..a8addd6 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,6 @@ +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 +indent_style = space +indent_size = 4 diff --git a/.travis.yml b/.travis.yml index b6a551a..64e0c4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,24 +2,24 @@ language: generic dist: bionic addons: - apt: - packages: - - lib32stdc++6 + apt: + packages: + - lib32stdc++6 env: - global: - - FLUTTER_CHANNEL=stable + global: + - FLUTTER_CHANNEL=stable install: - - git clone https://github.com/flutter/flutter.git -b $FLUTTER_CHANNEL - - export PATH=$(pwd)/flutter/bin:$PATH - - export PATH=$(pwd)/flutter/bin/cache/dart-sdk/bin:$PATH - - flutter doctor -v - - flutter pub get - - flutter pub upgrade - - flutter packages pub run build_runner build --delete-conflicting-outputs + - git clone https://github.com/flutter/flutter.git -b $FLUTTER_CHANNEL + - export PATH=$(pwd)/flutter/bin:$PATH + - export PATH=$(pwd)/flutter/bin/cache/dart-sdk/bin:$PATH + - flutter doctor -v + - flutter pub get + - flutter pub upgrade + - flutter packages pub run build_runner build --delete-conflicting-outputs static_analysis: &static_analysis - name: "Static analysis" - script: flutter analyze --no-current-package $TRAVIS_BUILD_DIR/lib + name: "Static analysis" + script: flutter analyze --no-current-package $TRAVIS_BUILD_DIR/lib #build: &build # name: "Build APK" @@ -39,10 +39,10 @@ static_analysis: &static_analysis # - if [[ $TRAVIS_TAG == "" ]]; then flutter build apk; else flutter build apk --build-name $BUILD_NAME --build-number $BUILD_NUMBER; fi jobs: - include: - - <<: *static_analysis + include: + - <<: *static_analysis # - stage: build # <<: *build cache: - directories: - - $HOME/.pub-cache \ No newline at end of file + directories: + - $HOME/.pub-cache diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index c09ab85..277b95d 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -3,6 +3,6 @@ - - + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 5292f69..9ac1ba0 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -17,8 +17,8 @@ android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> - - + + @@ -67,6 +67,7 @@ android:name="flutterEmbedding" android:value="2" /> - - + + + diff --git a/android/app/src/main/java/de/varakh/fbmobile/MainActivity.java b/android/app/src/main/java/de/varakh/fbmobile/MainActivity.java index fb98e6e..e2003c3 100644 --- a/android/app/src/main/java/de/varakh/fbmobile/MainActivity.java +++ b/android/app/src/main/java/de/varakh/fbmobile/MainActivity.java @@ -1,13 +1,14 @@ package de.varakh.fbmobile; import androidx.annotation.NonNull; + import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { - @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); - } + @Override + public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { + GeneratedPluginRegistrant.registerWith(flutterEngine); + } } diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml index 304732f..0db4a83 100644 --- a/android/app/src/main/res/drawable/launch_background.xml +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -1,5 +1,4 @@ - - + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 00fa441..26e896f 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,5 +1,6 @@ +