diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..29478df Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..36b8697 Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..5da639b Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2973c44 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..d752da2 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..b26e945 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index db77bb4..c234862 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png 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 index 17987b7..8969d24 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png 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 index 09d4391..af4ecf2 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png 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 index d5f1c8d..d3da757 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png 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 index 4d6372e..c46a254 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3fe7f68 --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #2ce086 + \ No newline at end of file diff --git a/assets/icon/dynamic_foreground.png b/assets/icon/dynamic_foreground.png new file mode 100644 index 0000000..14abe1d Binary files /dev/null and b/assets/icon/dynamic_foreground.png differ diff --git a/assets/icon/full_ico.png b/assets/icon/full_ico.png new file mode 100644 index 0000000..f1b22aa Binary files /dev/null and b/assets/icon/full_ico.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index dc9ada4..1706697 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 7353c41..8a645c8 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 797d452..5fb9d34 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 6ed2d93..11d5ff8 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 4cd7b00..ae630b2 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index fe73094..e75ed37 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 321773c..5fe0ba6 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 797d452..5fb9d34 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 502f463..c8c82d2 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 0ec3034..eb20df9 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png new file mode 100644 index 0000000..85e54ff Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png new file mode 100644 index 0000000..17109b9 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png new file mode 100644 index 0000000..ec29f33 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png new file mode 100644 index 0000000..d268c07 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 0ec3034..eb20df9 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index e9f5fea..b3c1e1a 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png new file mode 100644 index 0000000..7658a33 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png new file mode 100644 index 0000000..3228072 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 84ac32a..b8eee15 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 8953cba..8bdfb17 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 0467bf1..bc08e55 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/lib/main.dart b/lib/main.dart index 7dc79b3..ebfcfda 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -33,7 +33,12 @@ class MyApp extends StatelessWidget { ), ) : Theme( - data: ThemeData(useMaterial3: true, colorScheme: lightColorScheme), + data: ThemeData( + useMaterial3: true, + colorScheme: (MediaQuery.of(context).platformBrightness == + Brightness.dark) + ? darkColorScheme + : lightColorScheme), child: const CupertinoApp( title: 'PraĊĦule', home: HomeView(), diff --git a/lib/util/color_schemes.g.dart b/lib/util/color_schemes.g.dart index bbe245f..e53598f 100644 --- a/lib/util/color_schemes.g.dart +++ b/lib/util/color_schemes.g.dart @@ -2,68 +2,68 @@ import 'package:flutter/material.dart'; const lightColorScheme = ColorScheme( brightness: Brightness.light, - primary: Color(0xFF006D34), + primary: Color(0xFF006D3C), onPrimary: Color(0xFFFFFFFF), - primaryContainer: Color(0xFF89FAA5), - onPrimaryContainer: Color(0xFF00210B), - secondary: Color(0xFF506352), + primaryContainer: Color(0xFF5AFFA2), + onPrimaryContainer: Color(0xFF00210E), + secondary: Color(0xFF4F6353), onSecondary: Color(0xFFFFFFFF), - secondaryContainer: Color(0xFFD3E8D2), - onSecondaryContainer: Color(0xFF0E1F12), - tertiary: Color(0xFF286C2A), + secondaryContainer: Color(0xFFD2E8D4), + onSecondaryContainer: Color(0xFF0D1F13), + tertiary: Color(0xFF006B55), onTertiary: Color(0xFFFFFFFF), - tertiaryContainer: Color(0xFFABF4A2), - onTertiaryContainer: Color(0xFF002203), + tertiaryContainer: Color(0xFF7FF8D3), + onTertiaryContainer: Color(0xFF002118), error: Color(0xFFBA1A1A), errorContainer: Color(0xFFFFDAD6), onError: Color(0xFFFFFFFF), onErrorContainer: Color(0xFF410002), - background: Color(0xFFFCFDF7), + background: Color(0xFFFBFDF8), onBackground: Color(0xFF191C19), - surface: Color(0xFFFCFDF7), + surface: Color(0xFFFBFDF8), onSurface: Color(0xFF191C19), - surfaceVariant: Color(0xFFDDE5DA), - onSurfaceVariant: Color(0xFF414941), - outline: Color(0xFF717970), + surfaceVariant: Color(0xFFDCE5DB), + onSurfaceVariant: Color(0xFF414942), + outline: Color(0xFF717971), onInverseSurface: Color(0xFFF0F1EC), inverseSurface: Color(0xFF2E312E), - inversePrimary: Color(0xFF6DDD8B), + inversePrimary: Color(0xFF2FE288), shadow: Color(0xFF000000), - surfaceTint: Color(0xFF006D34), - outlineVariant: Color(0xFFC1C9BE), + surfaceTint: Color(0xFF006D3C), + outlineVariant: Color(0xFFC0C9BF), scrim: Color(0xFF000000), ); const darkColorScheme = ColorScheme( brightness: Brightness.dark, - primary: Color(0xFF6DDD8B), - onPrimary: Color(0xFF003918), - primaryContainer: Color(0xFF005225), - onPrimaryContainer: Color(0xFF89FAA5), - secondary: Color(0xFFB7CCB7), - onSecondary: Color(0xFF233426), - secondaryContainer: Color(0xFF394B3B), - onSecondaryContainer: Color(0xFFD3E8D2), - tertiary: Color(0xFF90D889), - onTertiary: Color(0xFF003908), - tertiaryContainer: Color(0xFF095314), - onTertiaryContainer: Color(0xFFABF4A2), + primary: Color(0xFF2FE288), + onPrimary: Color(0xFF00391D), + primaryContainer: Color(0xFF00522C), + onPrimaryContainer: Color(0xFF5AFFA2), + secondary: Color(0xFFB6CCB9), + onSecondary: Color(0xFF223527), + secondaryContainer: Color(0xFF384B3D), + onSecondaryContainer: Color(0xFFD2E8D4), + tertiary: Color(0xFF61DBB7), + onTertiary: Color(0xFF00382B), + tertiaryContainer: Color(0xFF00513F), + onTertiaryContainer: Color(0xFF7FF8D3), error: Color(0xFFFFB4AB), errorContainer: Color(0xFF93000A), onError: Color(0xFF690005), onErrorContainer: Color(0xFFFFDAD6), background: Color(0xFF191C19), - onBackground: Color(0xFFE2E3DE), + onBackground: Color(0xFFE1E3DE), surface: Color(0xFF191C19), - onSurface: Color(0xFFE2E3DE), - surfaceVariant: Color(0xFF414941), - onSurfaceVariant: Color(0xFFC1C9BE), - outline: Color(0xFF8B9389), + onSurface: Color(0xFFE1E3DE), + surfaceVariant: Color(0xFF414942), + onSurfaceVariant: Color(0xFFC0C9BF), + outline: Color(0xFF8B938A), onInverseSurface: Color(0xFF191C19), - inverseSurface: Color(0xFFE2E3DE), - inversePrimary: Color(0xFF006D34), + inverseSurface: Color(0xFFE1E3DE), + inversePrimary: Color(0xFF006D3C), shadow: Color(0xFF000000), - surfaceTint: Color(0xFF6DDD8B), - outlineVariant: Color(0xFF414941), + surfaceTint: Color(0xFF2FE288), + outlineVariant: Color(0xFF414942), scrim: Color(0xFF000000), ); diff --git a/pubspec.lock b/pubspec.lock index 82e3dc0..2941a42 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -17,6 +17,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.0" + archive: + dependency: transitive + description: + name: archive + sha256: e0902a06f0e00414e4e3438a084580161279f137aeb862274710f29ec10cf01e + url: "https://pub.dev" + source: hosted + version: "3.3.9" args: dependency: transitive description: @@ -121,6 +129,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 + url: "https://pub.dev" + source: hosted + version: "0.4.0" clock: dependency: transitive description: @@ -363,6 +379,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + flutter_launcher_icons: + dependency: "direct dev" + description: + name: flutter_launcher_icons + sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + url: "https://pub.dev" + source: hosted + version: "0.13.1" flutter_lints: dependency: "direct dev" description: @@ -474,6 +498,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf + url: "https://pub.dev" + source: hosted + version: "4.0.17" image_picker: dependency: "direct main" description: @@ -727,6 +759,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.7" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6 + url: "https://pub.dev" + source: hosted + version: "6.0.1" platform: dependency: transitive description: @@ -743,6 +783,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.5" + pointycastle: + dependency: transitive + description: + name: pointycastle + sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + url: "https://pub.dev" + source: hosted + version: "3.7.3" pool: dependency: transitive description: @@ -1028,6 +1076,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" + xml: + dependency: transitive + description: + name: xml + sha256: af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556 + url: "https://pub.dev" + source: hosted + version: "6.4.2" yaml: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index c096ddf..d0968a8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -65,6 +65,25 @@ dev_dependencies: test: ^1.24.6 integration_test: sdk: flutter + flutter_launcher_icons: ^0.13.1 + +flutter_launcher_icons: + android: true + ios: true + image_path: "assets/icon/full_ico.png" + min_sdk_android: 21 # android min sdk min:16, default 21 + adaptive_icon_background: "#2ce086" + adaptive_icon_foreground: "assets/icon/dynamic_foreground.png" + remove_alpha_ios: true + # web: + # generate: true + # background_color: "#2fe288" + # theme_color: "#2fe288" + # windows: + # generate: true + # icon_size: 48 # min:48, max:256, default: 48 + # macos: + # generate: true # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec