diff --git a/.fvmrc b/.fvmrc index b6a9abf..eb1057a 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,4 +1,4 @@ { - "flutter": "3.29.3", + "flutter": "3.32.0", "flavors": {} } \ No newline at end of file diff --git a/.github/workflows/android_firebase_app_distribution_production.yml b/.github/workflows/android_firebase_app_distribution_production.yml index 17bef3d..7442b30 100644 --- a/.github/workflows/android_firebase_app_distribution_production.yml +++ b/.github/workflows/android_firebase_app_distribution_production.yml @@ -51,7 +51,7 @@ jobs: - name: "[Flutter - Upload to Firebase App Distribution]" run: cd android; ./gradlew appDistributionUploadProductionRelease; cd .. - # TODO: Add correct AppId from the Firebase Project + # TODO(HELU): Add correct AppId from the Firebase Project - name: "[Flutter - Upload Crashlytics Mapping Files]" run: firebase crashlytics:symbols:upload --app=XXX build/app/outputs/symbols diff --git a/.github/workflows/android_firebase_app_distribution_staging.yml b/.github/workflows/android_firebase_app_distribution_staging.yml index 72bd1de..bf9fd77 100644 --- a/.github/workflows/android_firebase_app_distribution_staging.yml +++ b/.github/workflows/android_firebase_app_distribution_staging.yml @@ -51,7 +51,7 @@ jobs: - name: "[Flutter - Upload to Firebase App Distribution]" run: cd android; ./gradlew appDistributionUplodaStagingRelease; cd .. - # TODO: Add correct AppId from the Firebase Project + # TODO(HELU): Add correct AppId from the Firebase Project - name: "[Flutter - Upload Crashlytics Mapping Files]" run: firebase crashlytics:symbols:upload --app=XXX build/app/outputs/symbols diff --git a/.github/workflows/android_play_store_distribution.yml b/.github/workflows/android_play_store_distribution.yml index 2c0bef3..9545afc 100644 --- a/.github/workflows/android_play_store_distribution.yml +++ b/.github/workflows/android_play_store_distribution.yml @@ -52,7 +52,7 @@ jobs: uses: r0adkll/upload-google-play@v1.1.1 with: serviceAccountJsonPlainText: ${{ secrets.GOOGLE_PLAY_DISTRIBUTION_SERVICE_ACCOUNT_JSON }} - packageName: com.strv.flutter.template + packageName: cz.helu.flutter.template releaseFiles: build/app/outputs/bundle/productionRelease/app-production-release.aab mappingFile: build/app/outputs/mapping/productionRelease/mapping.txt whatsNewDirectory: whatsnew @@ -61,7 +61,7 @@ jobs: #status: draft # Upload it as draft release if you want to manually publish the release from GooglePlay console #userFraction: 0.1 # Rollout of the release <0;1> - # TODO: Add correct AppId from the Firebase Project + # TODO(HELU): Add correct AppId from the Firebase Project - name: "[Flutter - Upload Crashlytics Mapping Files]" run: firebase crashlytics:symbols:upload --app=XXX build/app/outputs/symbols diff --git a/.vscode/settings.json b/.vscode/settings.json index e560150..30ecbd7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "dart.flutterSdkPath": ".fvm/versions/3.29.3" + "dart.flutterSdkPath": ".fvm/flutter_sdk" } \ No newline at end of file diff --git a/README.md b/README.md index 5587d9a..2fdbb52 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,21 @@ +![Flutter Template Logo](docs/flutter_template.jpg) + +
+ +[![Flutter](https://img.shields.io/badge/Flutter-3.32-blue)](https://docs.flutter.dev/release/whats-new#flutter-332) +[![Dart](https://img.shields.io/badge/Dart-3.8.0-blue)](https://dart.dev/guides/whats-new#dart-380) +[![License](https://img.shields.io/github/license/HE-LU/flutter-template)](LICENSE) + +
+ +
+ +[![CodeCheck](https://github.com/HE-LU/flutter-template/actions/workflows/flutter_project_codecheck_android.yml/badge.svg)](https://github.com/HE-LU/flutter-template/actions/workflows/flutter_project_codecheck_android.yml) +[![CodeRabbit Pull Request Reviews](https://img.shields.io/coderabbit/prs/github/HE-LU/flutter-template?utm_source=oss&utm_medium=github&utm_campaign=HE-LU%2Fflutter-template&labelColor=171717&color=FF570A)](#) + +
+ + # Flutter Template - [Project notes](#project-notes) @@ -58,7 +76,7 @@ # Project notes -- Notes that could be benefitial to know during the development. +- Notes that could be beneficial to know during the development. - For example list of test accounts, required credentials, steps required to get testing account, etc. @@ -175,7 +193,7 @@ You can read about flavors setup in the following tutorials: - 🖥️ [Linux](https://docs.flutter.dev/deployment/linux) - Flavors are not supported yet. In case of using firebase with multiple flavors, you have to: -- for iOS add custom build run script phase and copy appropriate `GoogleService-Info.plist` file. It's already prepared, you just need to uncomment it and add appropriate plists to destinations according to the script. +- For iOS, add the custom Build Run Script phase and copy the appropriate `GoogleService-Info.plist` file. The script is already prepared; simply uncomment it and add the necessary `plist` files to their destinations. For Google sign in: - for iOS, you have to copy value from `REVERSED_CLIENT_ID` from `GoogleService-Info.plist` into `GOOGLE_REVERSED_CLIENT_ID` in build settings. @@ -189,7 +207,7 @@ For Google sign in: - As we are using flavors, we have to specify which flavor to build using `--flavor` argument, and also select a correct main file using `-t` argument. - One of the arguments you should use is `--obfuscate`. This makes reverse engineering harder. This has to be used also with `--split-debug-info` which should make the app smaller, and also specify the directory where the mapping file to read obfuscated stack trace is stored. - Optional step is to include precompiled Shaders. To do that you have to first [Precompile Shaders](#precompiling-shaders) and add `--bundle-sksl-path` argument. -- In case we would like to build a Debugable version of the app, we have to add `--debug` argument. +- To build a debug version of the app, include the `--debug` flag. Here is an example of assembling an Android app bundle using all the commands: ``` @@ -339,7 +357,7 @@ This way we are ensuring that at least the Android version is buildable. We are ## Theming Theming is done inside `lib/core/themes/app_theme.dart`. Currently, we suggest using Material 3. The main setup is done in file `app_theme.dart`. -The main idea right now is to overwrite the whole `colorScheme` with an "undefined" pinkish color and to not use the default theme colorScheme anywhere in the app. Every widget like AppBar, EleveatedButton, TextField, etc. should have a custom implementation starting with the word `Custom` so it is easily recognizable. This Widget then should wrap the appropriate widget, and should utilize colors from `context.colorScheme`, which has an extension method, as is returning our own implementation of `CustomColorScheme`. All colors should be declared there. +The current approach is to completely override the default `colorScheme` with a custom "undefined" pinkish palette and avoid using the default theme anywhere in the app. Every widget—such as AppBar, ElevatedButton, and TextField—should have a custom implementation prefixed with `Custom` for easy identification. Each `Custom` widget should wrap the corresponding standard widget and use colors from `context.colorScheme` and text styles from `context.textTheme`. These context extensions return our custom implementations: `CustomColorScheme` and `CustomTextTheme`, where all colors and text styles are defined. The most tricky part of theming is to make sure that the app supports Edge-to-Edge, and that it has correct navigation and StatusBar colors set. To make this possible, we had to implement our own `CustomSystemBarsTheme` class. To use it properly, make sure you are calling `setupSystemBarsTheme` during the App startup. In case of the need of overriding the Brightness for a specific screen, there are two approaches. First, the simple one is to just use `CustomAppBar`, and set brightness to it. Second, wrap the whole Scaffold inside `CustomSystemBarsThemeWidget` and set Brightness to it. @@ -357,7 +375,7 @@ To be able to use the firebase provider for Apple login, we need to do some conf - Create a Service ID - this is the service that would provide sign in with apple. `Developer -> Certificates, Identifiers & Profiles -> Identifiers -> Create new -> Services IDs` (note: to get into services there is a filter on Identifiers screen on right top where you can switch from identifiers to services.) - Description will be visible to our users - e.g. Template - - Identifier - can be app/bundle ID `com.strv.flutter.template.develop` or simply `flutter-template-develop` + - Identifier - can be app/bundle ID `cz.helu.flutter.template.develop` or simply `flutter-template-develop` - Enable Sign in with Apple for the service - Domains is url of your page e.g. `template.com` - Return URL is crucial part - this will be taken from Firebase: Authentication -> Sign-in method -> Apple -> callback URL diff --git a/analysis_options.yaml b/analysis_options.yaml index 607827c..e657abc 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -7,13 +7,21 @@ # The following line activates a set of recommended lints for Flutter apps, # packages, and plugins designed to encourage good coding practices. -include: package:flutter_lints/flutter.yaml +include: package:netglade_analysis/lints.yaml analyzer: - exclude: + exclude: - 'project_setup/**' - '**.g.dart' - '**.gen.dart' + - '**.config.dart' + - '**.graphql.dart' + errors: + todo: info + +formatter: + page_width: 140 + trailing_commas: preserve linter: # The lint rules applied to this project can be customized in the @@ -28,36 +36,10 @@ linter: # `// ignore_for_file: name_of_lint` syntax on the line or in the file # producing the lint. rules: - # avoid_redundant_argument_values: true - always_declare_return_types: true - always_use_package_imports: true - avoid_catches_without_on_clauses: true - avoid_catching_errors: true - avoid_empty_else: true - avoid_field_initializers_in_const_classes: true - avoid_final_parameters: true - avoid_multiple_declarations_per_line: true - avoid_types_as_parameter_names: true - avoid_types_on_closure_parameters: true - avoid_unnecessary_containers: true - avoid_void_async: true - await_only_futures: true - camel_case_extensions: true - camel_case_types: true - curly_braces_in_flow_control_structures: true - empty_statements: true - eol_at_end_of_file: true - file_names: true - leading_newlines_in_multiline_strings: true - library_names: true - no_duplicate_case_values: true - no_logic_in_create_state: true - no_self_assignments: true - no_wildcard_variable_uses: true - prefer_single_quotes: true - prefer_void_to_null: true - slash_for_doc_comments: true - unnecessary_brace_in_string_interps: true + sort_pub_dependencies: false + require_trailing_commas: false + avoid_positional_boolean_parameters: false + no_default_cases: false # Additional information about this file can be found at # https://dart.dev/guides/language/analysis-options diff --git a/android/app/build.gradle b/android/app/build.gradle index a5d67c5..287c744 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -41,7 +41,7 @@ android { compileSdkVersion compileAndroidSdkVersion ndkVersion flutter.ndkVersion flavorDimensions "env" - namespace "com.strv.flutter.template" + namespace "cz.helu.flutter.template" compileOptions { coreLibraryDesugaringEnabled true @@ -73,7 +73,6 @@ android { } defaultConfig { - applicationId "com.strv.flutter.template" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion minAndroidSdkVersion @@ -117,9 +116,6 @@ android { shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - // Comment this when testing dynamic links. - applicationIdSuffix = ".debug" } release { signingConfig signingConfigs.release @@ -129,7 +125,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - // TODO: Remove or change to true, once Firebase is set-up correctly + // TODO(HELU): Remove or change to true, once Firebase is set-up correctly firebaseCrashlytics { mappingFileUploadEnabled = false unstrippedNativeLibsDir file("build/app/intermediates/merged_native_libs/productionRelease/out/lib") diff --git a/android/app/google-services.json b/android/app/google-services.json index 47872d5..d634e0e 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -1,15 +1,15 @@ { "project_info": { "project_number": "907121519909", - "project_id": "strv-flutter-template", - "storage_bucket": "strv-flutter-template.appspot.com" + "project_id": "helu-flutter-template", + "storage_bucket": "helu-flutter-template.appspot.com" }, "client": [ { "client_info": { "mobilesdk_app_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "android_client_info": { - "package_name": "com.strv.flutter.template" + "package_name": "cz.helu.flutter.template" } }, "oauth_client": [ @@ -17,7 +17,7 @@ "client_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "client_type": 1, "android_info": { - "package_name": "com.strv.flutter.template", + "package_name": "cz.helu.flutter.template", "certificate_hash": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" } }, @@ -42,7 +42,7 @@ "client_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "client_type": 2, "ios_info": { - "bundle_id": "com.strv.flutter.template.staging" + "bundle_id": "cz.helu.flutter.template.staging" } } ] @@ -53,7 +53,7 @@ "client_info": { "mobilesdk_app_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "android_client_info": { - "package_name": "com.strv.flutter.template.debug" + "package_name": "cz.helu.flutter.template.debug" } }, "oauth_client": [ @@ -61,7 +61,7 @@ "client_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "client_type": 1, "android_info": { - "package_name": "com.strv.flutter.template.debug", + "package_name": "cz.helu.flutter.template.debug", "certificate_hash": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" } }, @@ -86,7 +86,7 @@ "client_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "client_type": 2, "ios_info": { - "bundle_id": "com.strv.flutter.template.staging" + "bundle_id": "cz.helu.flutter.template.staging" } } ] @@ -97,7 +97,7 @@ "client_info": { "mobilesdk_app_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "android_client_info": { - "package_name": "com.strv.flutter.template.develop" + "package_name": "cz.helu.flutter.template.develop" } }, "oauth_client": [ @@ -105,7 +105,7 @@ "client_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "client_type": 1, "android_info": { - "package_name": "com.strv.flutter.template.develop", + "package_name": "cz.helu.flutter.template.develop", "certificate_hash": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" } }, @@ -130,7 +130,7 @@ "client_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "client_type": 2, "ios_info": { - "bundle_id": "com.strv.flutter.template.staging" + "bundle_id": "cz.helu.flutter.template.staging" } } ] @@ -141,7 +141,7 @@ "client_info": { "mobilesdk_app_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "android_client_info": { - "package_name": "com.strv.flutter.template.develop.debug" + "package_name": "cz.helu.flutter.template.develop.debug" } }, "oauth_client": [ @@ -149,7 +149,7 @@ "client_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "client_type": 1, "android_info": { - "package_name": "com.strv.flutter.template.develop.debug", + "package_name": "cz.helu.flutter.template.develop.debug", "certificate_hash": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" } }, @@ -174,7 +174,7 @@ "client_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "client_type": 2, "ios_info": { - "bundle_id": "com.strv.flutter.template.staging" + "bundle_id": "cz.helu.flutter.template.staging" } } ] @@ -185,7 +185,7 @@ "client_info": { "mobilesdk_app_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "android_client_info": { - "package_name": "com.strv.flutter.template.staging" + "package_name": "cz.helu.flutter.template.staging" } }, "oauth_client": [ @@ -193,7 +193,7 @@ "client_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "client_type": 1, "android_info": { - "package_name": "com.strv.flutter.template.staging", + "package_name": "cz.helu.flutter.template.staging", "certificate_hash": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" } }, @@ -218,7 +218,7 @@ "client_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "client_type": 2, "ios_info": { - "bundle_id": "com.strv.flutter.template.staging" + "bundle_id": "cz.helu.flutter.template.staging" } } ] @@ -229,7 +229,7 @@ "client_info": { "mobilesdk_app_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "android_client_info": { - "package_name": "com.strv.flutter.template.staging.debug" + "package_name": "cz.helu.flutter.template.staging.debug" } }, "oauth_client": [ @@ -237,7 +237,7 @@ "client_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "client_type": 1, "android_info": { - "package_name": "com.strv.flutter.template.staging.debug", + "package_name": "cz.helu.flutter.template.staging.debug", "certificate_hash": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" } }, @@ -262,7 +262,7 @@ "client_id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "client_type": 2, "ios_info": { - "bundle_id": "com.strv.flutter.template.staging" + "bundle_id": "cz.helu.flutter.template.staging" } } ] diff --git a/android/app/src/androidTest/java/com/strv/flutter/template/MainActivityTest.java b/android/app/src/androidTest/java/cz/helu/flutter/template/MainActivityTest.java similarity index 96% rename from android/app/src/androidTest/java/com/strv/flutter/template/MainActivityTest.java rename to android/app/src/androidTest/java/cz/helu/flutter/template/MainActivityTest.java index db321bf..2eb6d7d 100644 --- a/android/app/src/androidTest/java/com/strv/flutter/template/MainActivityTest.java +++ b/android/app/src/androidTest/java/cz/helu/flutter/template/MainActivityTest.java @@ -1,4 +1,4 @@ -package com.strv.flutter.template; +package cz.helu.flutter.template; import androidx.test.platform.app.InstrumentationRegistry; import org.junit.Test; diff --git a/android/app/src/developDebug/ic_launcher-playstore.png b/android/app/src/developDebug/ic_launcher-playstore.png index 3f1a310..b75ab47 100644 Binary files a/android/app/src/developDebug/ic_launcher-playstore.png and b/android/app/src/developDebug/ic_launcher-playstore.png differ diff --git a/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher.png b/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher.png index 7c477c2..3408fae 100644 Binary files a/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher_foreground.png index 8fc642f..87394b0 100644 Binary files a/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/developDebug/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher.png b/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher.png index 04a5a92..cc6a1c8 100644 Binary files a/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher_foreground.png index fb1309c..a5f0d86 100644 Binary files a/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/developDebug/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher.png index f162d23..7bc89b2 100644 Binary files a/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher_foreground.png index 361bbe3..1c1d3ea 100644 Binary files a/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/developDebug/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher.png index 59ab2bf..b8e668c 100644 Binary files a/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png index 7645a03..ed2f9c7 100644 Binary files a/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/developDebug/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher.png index 8d614d1..431500c 100644 Binary files a/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 866d4e7..00f20d6 100644 Binary files a/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/developDebug/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/developDebug/res/values/colors.xml b/android/app/src/developDebug/res/values/colors.xml index d81c478..696fb27 100644 --- a/android/app/src/developDebug/res/values/colors.xml +++ b/android/app/src/developDebug/res/values/colors.xml @@ -1,4 +1,4 @@ - #FF121618 + #FFF2F2F2 \ No newline at end of file diff --git a/android/app/src/developRelease/ic_launcher-playstore.png b/android/app/src/developRelease/ic_launcher-playstore.png index a85f2d8..9b0118b 100644 Binary files a/android/app/src/developRelease/ic_launcher-playstore.png and b/android/app/src/developRelease/ic_launcher-playstore.png differ diff --git a/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher.png b/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher.png index 8b57140..5461a69 100644 Binary files a/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher_foreground.png index b1bf7a8..6f5df14 100644 Binary files a/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/developRelease/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher.png b/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher.png index 6450e3b..b079614 100644 Binary files a/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher_foreground.png index e7d7b4d..c7ffa6c 100644 Binary files a/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/developRelease/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher.png index dda8a8e..a7cfee5 100644 Binary files a/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher_foreground.png index b515b10..aeb6374 100644 Binary files a/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/developRelease/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher.png index 42ad601..7dfeec6 100644 Binary files a/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png index 1f47145..a3b6eef 100644 Binary files a/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/developRelease/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher.png index 141d582..4291e39 100644 Binary files a/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 86656b4..23719e5 100644 Binary files a/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/developRelease/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/developRelease/res/values/colors.xml b/android/app/src/developRelease/res/values/colors.xml index d81c478..696fb27 100644 --- a/android/app/src/developRelease/res/values/colors.xml +++ b/android/app/src/developRelease/res/values/colors.xml @@ -1,4 +1,4 @@ - #FF121618 + #FFF2F2F2 \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f242817..99691e1 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="cz.helu.flutter.template"> diff --git a/android/app/src/main/kotlin/com/strv/flutter/template/MainActivity.kt b/android/app/src/main/kotlin/cz/helu/flutter/template/MainActivity.kt similarity index 76% rename from android/app/src/main/kotlin/com/strv/flutter/template/MainActivity.kt rename to android/app/src/main/kotlin/cz/helu/flutter/template/MainActivity.kt index 1d10aa4..5c93400 100644 --- a/android/app/src/main/kotlin/com/strv/flutter/template/MainActivity.kt +++ b/android/app/src/main/kotlin/cz/helu/flutter/template/MainActivity.kt @@ -1,4 +1,4 @@ -package com.strv.flutter.template +package cz.helu.flutter.template import io.flutter.embedding.android.FlutterFragmentActivity diff --git a/android/app/src/main/res/drawable-hdpi/android12splash.png b/android/app/src/main/res/drawable-hdpi/android12splash.png index e910ca3..e340151 100644 Binary files a/android/app/src/main/res/drawable-hdpi/android12splash.png and b/android/app/src/main/res/drawable-hdpi/android12splash.png differ diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png index e910ca3..e340151 100644 Binary files a/android/app/src/main/res/drawable-hdpi/splash.png and b/android/app/src/main/res/drawable-hdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-mdpi/android12splash.png b/android/app/src/main/res/drawable-mdpi/android12splash.png index e44e119..791e426 100644 Binary files a/android/app/src/main/res/drawable-mdpi/android12splash.png and b/android/app/src/main/res/drawable-mdpi/android12splash.png differ diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png index e44e119..791e426 100644 Binary files a/android/app/src/main/res/drawable-mdpi/splash.png and b/android/app/src/main/res/drawable-mdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/android/app/src/main/res/drawable-night-hdpi/android12splash.png index e910ca3..e340151 100644 Binary files a/android/app/src/main/res/drawable-night-hdpi/android12splash.png and b/android/app/src/main/res/drawable-night-hdpi/android12splash.png differ diff --git a/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/android/app/src/main/res/drawable-night-mdpi/android12splash.png index e44e119..791e426 100644 Binary files a/android/app/src/main/res/drawable-night-mdpi/android12splash.png and b/android/app/src/main/res/drawable-night-mdpi/android12splash.png differ diff --git a/android/app/src/main/res/drawable-night-v21/background.png b/android/app/src/main/res/drawable-night-v21/background.png index 4bb5d7a..00a4175 100644 Binary files a/android/app/src/main/res/drawable-night-v21/background.png and b/android/app/src/main/res/drawable-night-v21/background.png differ diff --git a/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png index 1a318c4..bc1eb02 100644 Binary files a/android/app/src/main/res/drawable-night-xhdpi/android12splash.png and b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png differ diff --git a/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png index 757ba67..fdecce3 100644 Binary files a/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png and b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png differ diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png index 2b2fbca..5194e23 100644 Binary files a/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png and b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png differ diff --git a/android/app/src/main/res/drawable-night/background.png b/android/app/src/main/res/drawable-night/background.png index 4bb5d7a..00a4175 100644 Binary files a/android/app/src/main/res/drawable-night/background.png and b/android/app/src/main/res/drawable-night/background.png differ diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png index 3107d37..8278aeb 100644 Binary files a/android/app/src/main/res/drawable-v21/background.png and b/android/app/src/main/res/drawable-v21/background.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/android12splash.png b/android/app/src/main/res/drawable-xhdpi/android12splash.png index 1a318c4..bc1eb02 100644 Binary files a/android/app/src/main/res/drawable-xhdpi/android12splash.png and b/android/app/src/main/res/drawable-xhdpi/android12splash.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png index 1a318c4..bc1eb02 100644 Binary files a/android/app/src/main/res/drawable-xhdpi/splash.png and b/android/app/src/main/res/drawable-xhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxhdpi/android12splash.png index 757ba67..fdecce3 100644 Binary files a/android/app/src/main/res/drawable-xxhdpi/android12splash.png and b/android/app/src/main/res/drawable-xxhdpi/android12splash.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png index 757ba67..fdecce3 100644 Binary files a/android/app/src/main/res/drawable-xxhdpi/splash.png and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png index 2b2fbca..5194e23 100644 Binary files a/android/app/src/main/res/drawable-xxxhdpi/android12splash.png and b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png index 2b2fbca..5194e23 100644 Binary files a/android/app/src/main/res/drawable-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png index 3107d37..8278aeb 100644 Binary files a/android/app/src/main/res/drawable/background.png and b/android/app/src/main/res/drawable/background.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index db77bb4..0000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 17987b7..0000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 09d4391..0000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index d5f1c8d..0000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 4d6372e..0000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml index d2dfe4f..c9f50a5 100644 --- a/android/app/src/main/res/values-v31/styles.xml +++ b/android/app/src/main/res/values-v31/styles.xml @@ -6,7 +6,7 @@ true true shortEdges - #FFFFFF + #F2F2F2 @drawable/android12splash + + + + + + + + + Flutter Template + + + + + - - - - - - - - - + .bottomLeft { + position: absolute; + bottom: 0; + left: 0; + } - - + .bottomRight { + position: absolute; + bottom: 0; + right: 0; + } - \ No newline at end of file + @media (prefers-color-scheme: dark) { + body { + background-color: #121618; + } + } + + + + + + + + + + + + + + diff --git a/web/splash/img/dark-1x.png b/web/splash/img/dark-1x.png index e44e119..791e426 100644 Binary files a/web/splash/img/dark-1x.png and b/web/splash/img/dark-1x.png differ diff --git a/web/splash/img/dark-2x.png b/web/splash/img/dark-2x.png index 1a318c4..bc1eb02 100644 Binary files a/web/splash/img/dark-2x.png and b/web/splash/img/dark-2x.png differ diff --git a/web/splash/img/dark-3x.png b/web/splash/img/dark-3x.png index 757ba67..fdecce3 100644 Binary files a/web/splash/img/dark-3x.png and b/web/splash/img/dark-3x.png differ diff --git a/web/splash/img/dark-4x.png b/web/splash/img/dark-4x.png index 2b2fbca..5194e23 100644 Binary files a/web/splash/img/dark-4x.png and b/web/splash/img/dark-4x.png differ diff --git a/web/splash/img/light-1x.png b/web/splash/img/light-1x.png index e44e119..791e426 100644 Binary files a/web/splash/img/light-1x.png and b/web/splash/img/light-1x.png differ diff --git a/web/splash/img/light-2x.png b/web/splash/img/light-2x.png index 1a318c4..bc1eb02 100644 Binary files a/web/splash/img/light-2x.png and b/web/splash/img/light-2x.png differ diff --git a/web/splash/img/light-3x.png b/web/splash/img/light-3x.png index 757ba67..fdecce3 100644 Binary files a/web/splash/img/light-3x.png and b/web/splash/img/light-3x.png differ diff --git a/web/splash/img/light-4x.png b/web/splash/img/light-4x.png index 2b2fbca..5194e23 100644 Binary files a/web/splash/img/light-4x.png and b/web/splash/img/light-4x.png differ diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt index 930d207..06dc589 100644 --- a/windows/flutter/CMakeLists.txt +++ b/windows/flutter/CMakeLists.txt @@ -6,7 +6,7 @@ set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") # Configuration provided via flutter tool. include(${EPHEMERAL_DIR}/generated_config.cmake) -# TODO: Move the rest of this into files in ephemeral. See +# TODO(HELU): Move the rest of this into files in ephemeral. See # https://github.com/flutter/flutter/issues/57146. set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index 8819026..43583a4 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -89,11 +89,11 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "com.strv" "\0" + VALUE "CompanyName", "cz.helu" "\0" VALUE "FileDescription", "Flutter Template" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "Flutter Template" "\0" - VALUE "LegalCopyright", "Copyright (C) 2024 com.strv. All rights reserved." "\0" + VALUE "LegalCopyright", "Copyright (C) 2024 cz.helu. All rights reserved." "\0" VALUE "OriginalFilename", "template.exe" "\0" VALUE "ProductName", "Flutter Template" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico index 5ac4c69..2a33f37 100644 Binary files a/windows/runner/resources/app_icon.ico and b/windows/runner/resources/app_icon.ico differ