diff --git a/.config/dictionaries/project.dic b/.config/dictionaries/project.dic index a8925d9cff..9992a41dfc 100644 --- a/.config/dictionaries/project.dic +++ b/.config/dictionaries/project.dic @@ -26,6 +26,7 @@ dotglob drep dreps encryptor +gapless gcloud genhtml gmtime @@ -50,6 +51,7 @@ netkey oneshot openapi opentelemetry +pbxproj Pdart permissionless pg_isready @@ -75,12 +77,14 @@ thiserror timelike Traceback TXNZD +unmanaged vitss voteplan voteplans xcconfig xcfilelist xcodebuild +xcodeproj xctest xctestrun xcworkspace diff --git a/catalyst_voices/lib/dummy/home_screen.dart b/catalyst_voices/lib/dummy/home_screen.dart index 2d27352a90..4bbc73ef5c 100644 --- a/catalyst_voices/lib/dummy/home_screen.dart +++ b/catalyst_voices/lib/dummy/home_screen.dart @@ -1,4 +1,5 @@ import 'package:catalyst_voices/dummy/dummy.dart'; +import 'package:catalyst_voices_assets/catalyst_voices_assets.dart'; import 'package:flutter/material.dart'; final class HomeScreen extends StatelessWidget { @@ -6,10 +7,30 @@ final class HomeScreen extends StatelessWidget { @override Widget build(BuildContext context) { - return const Scaffold( + return Scaffold( key: WidgetKeys.homeScreen, body: Center( - child: Text('Catalyst Voices'), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + 'Catalyst Voices', + style: TextStyle( + color: VoicesColors.purpleGradientStart, + fontFamily: VoicesFonts.sFPro, + fontSize: 32, + ), + ), + const SizedBox(height: 20), + SizedBox( + height: 200, + width: 200, + child: CatalystImage.asset( + VoicesAssets.images.dummyCatalystVoices.path, + ), + ), + ], + ), ), ); } diff --git a/catalyst_voices/lib/dummy/login_page.dart b/catalyst_voices/lib/dummy/login_page.dart index cc37b8691e..5387bb7e77 100644 --- a/catalyst_voices/lib/dummy/login_page.dart +++ b/catalyst_voices/lib/dummy/login_page.dart @@ -61,7 +61,7 @@ final class _LoginPageState extends State { padding: const EdgeInsets.all(16), child: ElevatedButton( key: WidgetKeys.loginButton, - onPressed: () => _loginButtonPressed(context), + onPressed: () async => _loginButtonPressed(context), child: const Text(_Constants.loginButtonText), ), ), @@ -87,16 +87,16 @@ final class _LoginPageState extends State { passwordTextController = TextEditingController(); } - void _loginButtonPressed(BuildContext context) { + Future _loginButtonPressed(BuildContext context) async { if (_validateCredentials()) { - _navigateToHomeScreen(context); + await _navigateToHomeScreen(context); } else { _showError(context); } } - void _navigateToHomeScreen(BuildContext context) { - Navigator.push( + Future _navigateToHomeScreen(BuildContext context) async { + await Navigator.push( context, MaterialPageRoute( builder: (context) => const HomeScreen(), diff --git a/catalyst_voices/lib/main_development.dart b/catalyst_voices/lib/main_development.dart index 6305764e73..0e6549a784 100644 --- a/catalyst_voices/lib/main_development.dart +++ b/catalyst_voices/lib/main_development.dart @@ -1,6 +1,6 @@ import 'package:catalyst_voices/app/app.dart'; import 'package:catalyst_voices/bootstrap.dart'; -void main() { - bootstrap(() => const App()); +void main() async { + await bootstrap(() => const App()); } diff --git a/catalyst_voices/lib/main_production.dart b/catalyst_voices/lib/main_production.dart index 6305764e73..0e6549a784 100644 --- a/catalyst_voices/lib/main_production.dart +++ b/catalyst_voices/lib/main_production.dart @@ -1,6 +1,6 @@ import 'package:catalyst_voices/app/app.dart'; import 'package:catalyst_voices/bootstrap.dart'; -void main() { - bootstrap(() => const App()); +void main() async { + await bootstrap(() => const App()); } diff --git a/catalyst_voices/lib/main_staging.dart b/catalyst_voices/lib/main_staging.dart index 6305764e73..0e6549a784 100644 --- a/catalyst_voices/lib/main_staging.dart +++ b/catalyst_voices/lib/main_staging.dart @@ -1,6 +1,6 @@ import 'package:catalyst_voices/app/app.dart'; import 'package:catalyst_voices/bootstrap.dart'; -void main() { - bootstrap(() => const App()); +void main() async { + await bootstrap(() => const App()); } diff --git a/catalyst_voices/packages/.gitkeep b/catalyst_voices/packages/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/catalyst_voices/packages/catalyst_voices_assets/.gitignore b/catalyst_voices/packages/catalyst_voices_assets/.gitignore new file mode 100644 index 0000000000..8e19df2d9d --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/.gitignore @@ -0,0 +1,43 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# VSCode related +.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ +pubspec.lock + +# Web related +lib/generated_plugin_registrant.dart + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Test related +coverage \ No newline at end of file diff --git a/catalyst_voices/packages/catalyst_voices_assets/README.md b/catalyst_voices/packages/catalyst_voices_assets/README.md new file mode 100644 index 0000000000..ae5cb2540d --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/README.md @@ -0,0 +1,5 @@ +# Catalyst Voices Assets + +```sh +dart run build_runner build +``` diff --git a/catalyst_voices/packages/catalyst_voices_assets/assets/colors/colors.xml b/catalyst_voices/packages/catalyst_voices_assets/assets/colors/colors.xml new file mode 100644 index 0000000000..cb790c64dc --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/assets/colors/colors.xml @@ -0,0 +1,12 @@ + + + #FFFFFF + #000000 + #512DA8 + #673AB7 + #512DA8 + #222126 + #7CAE7A + #B02E0C + #565656 + diff --git a/catalyst_voices/packages/catalyst_voices_assets/assets/fonts/SF-Pro-Rounded-Regular.ttf b/catalyst_voices/packages/catalyst_voices_assets/assets/fonts/SF-Pro-Rounded-Regular.ttf new file mode 100644 index 0000000000..8514dfc7a0 Binary files /dev/null and b/catalyst_voices/packages/catalyst_voices_assets/assets/fonts/SF-Pro-Rounded-Regular.ttf differ diff --git a/catalyst_voices/packages/catalyst_voices_assets/assets/images/dummy_catalyst_voices.webp b/catalyst_voices/packages/catalyst_voices_assets/assets/images/dummy_catalyst_voices.webp new file mode 100644 index 0000000000..d4eaf4a5bf Binary files /dev/null and b/catalyst_voices/packages/catalyst_voices_assets/assets/images/dummy_catalyst_voices.webp differ diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/.gitignore b/catalyst_voices/packages/catalyst_voices_assets/example/.gitignore new file mode 100644 index 0000000000..29a3a5017f --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/example/.gitignore @@ -0,0 +1,43 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/.metadata b/catalyst_voices/packages/catalyst_voices_assets/example/.metadata new file mode 100644 index 0000000000..cdf0334255 --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/example/.metadata @@ -0,0 +1,30 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "db7ef5bf9f59442b0e200a90587e8fa5e0c6336a" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a + base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a + - platform: web + create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a + base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/README.md b/catalyst_voices/packages/catalyst_voices_assets/example/README.md new file mode 100644 index 0000000000..ae56c4dd9f --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/example/README.md @@ -0,0 +1,47 @@ +# Catalyst Voices Assets Example + +This is an example of how to use the Catalyst Voices Assets package. + +## Usage + +```dart +import 'package:catalyst_voices_assets/catalyst_voices_assets.dart'; +import 'package:flutter/material.dart'; + +void main() => runApp(Example()); + +final class Example extends StatelessWidget { + const Example({super.key}); + + @override + Widget build(BuildContext context) { + return MaterialApp( + home: Scaffold( + body: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + 'Catalyst Assets', + style: TextStyle( + color: VoicesColors.purpleGradientStart, + fontFamily: VoicesFonts.sFPro, + fontSize: 32, + ), + ), + const SizedBox(height: 20), + SizedBox( + height: 200, + width: 200, + child: CatalystImage.asset( + VoicesAssets.images.dummyCatalystVoices.path, + ), + ), + ], + ), + ), + ), + ); + } +} +``` diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/lib/src/main.dart b/catalyst_voices/packages/catalyst_voices_assets/example/lib/src/main.dart new file mode 100644 index 0000000000..d2f8dccbbf --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/example/lib/src/main.dart @@ -0,0 +1,39 @@ +import 'package:catalyst_voices_assets/catalyst_voices_assets.dart'; +import 'package:flutter/material.dart'; + +void main() => runApp(Example()); + +final class Example extends StatelessWidget { + const Example({super.key}); + + @override + Widget build(BuildContext context) { + return MaterialApp( + home: Scaffold( + body: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + 'Catalyst Assets', + style: TextStyle( + color: VoicesColors.purpleGradientStart, + fontFamily: VoicesFonts.sFPro, + fontSize: 32, + ), + ), + const SizedBox(height: 20), + SizedBox( + height: 200, + width: 200, + child: CatalystImage.asset( + VoicesAssets.images.dummyCatalystVoices.path, + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_assets/example/pubspec.yaml new file mode 100644 index 0000000000..00ad10d3dd --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/example/pubspec.yaml @@ -0,0 +1,17 @@ +name: catalyst_voices_assets_example +description: A Catalyst Voices Assets Example. +version: 0.1.0+1 +publish_to: none + +environment: + sdk: ">=3.2.0 <4.0.0" + flutter: 3.16.0 + +dependencies: + catalyst_voices_assets: + path: ../ + flutter: + sdk: flutter + +flutter: + uses-material-design: true \ No newline at end of file diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/web/favicon.png b/catalyst_voices/packages/catalyst_voices_assets/example/web/favicon.png new file mode 100644 index 0000000000..8aaa46ac1a Binary files /dev/null and b/catalyst_voices/packages/catalyst_voices_assets/example/web/favicon.png differ diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/web/icons/Icon-192.png b/catalyst_voices/packages/catalyst_voices_assets/example/web/icons/Icon-192.png new file mode 100644 index 0000000000..b749bfef07 Binary files /dev/null and b/catalyst_voices/packages/catalyst_voices_assets/example/web/icons/Icon-192.png differ diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/web/icons/Icon-512.png b/catalyst_voices/packages/catalyst_voices_assets/example/web/icons/Icon-512.png new file mode 100644 index 0000000000..88cfd48dff Binary files /dev/null and b/catalyst_voices/packages/catalyst_voices_assets/example/web/icons/Icon-512.png differ diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/web/icons/Icon-maskable-192.png b/catalyst_voices/packages/catalyst_voices_assets/example/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000..eb9b4d76e5 Binary files /dev/null and b/catalyst_voices/packages/catalyst_voices_assets/example/web/icons/Icon-maskable-192.png differ diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/web/icons/Icon-maskable-512.png b/catalyst_voices/packages/catalyst_voices_assets/example/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000..d69c56691f Binary files /dev/null and b/catalyst_voices/packages/catalyst_voices_assets/example/web/icons/Icon-maskable-512.png differ diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/web/index.html b/catalyst_voices/packages/catalyst_voices_assets/example/web/index.html new file mode 100644 index 0000000000..45cf2ca304 --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/example/web/index.html @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + example + + + + + + + + + + diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/web/manifest.json b/catalyst_voices/packages/catalyst_voices_assets/example/web/manifest.json new file mode 100644 index 0000000000..096edf8fe4 --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/example/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "example", + "short_name": "example", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/catalyst_voices/packages/catalyst_voices_assets/lib/catalyst_voices_assets.dart b/catalyst_voices/packages/catalyst_voices_assets/lib/catalyst_voices_assets.dart new file mode 100644 index 0000000000..32a9b6694e --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/lib/catalyst_voices_assets.dart @@ -0,0 +1,3 @@ +library catalyst_voices_assets; + +export 'src/catalyst_voices_assets.dart'; diff --git a/catalyst_voices/packages/catalyst_voices_assets/lib/generated/assets.gen.dart b/catalyst_voices/packages/catalyst_voices_assets/lib/generated/assets.gen.dart new file mode 100644 index 0000000000..52ced289c9 --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/lib/generated/assets.gen.dart @@ -0,0 +1,101 @@ +/// GENERATED CODE - DO NOT MODIFY BY HAND +/// ***************************************************** +/// FlutterGen +/// ***************************************************** + +// coverage:ignore-file +// ignore_for_file: type=lint +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use + +import 'package:flutter/widgets.dart'; + +class $AssetsImagesGen { + const $AssetsImagesGen(); + + /// File path: assets/images/dummy_catalyst_voices.webp + AssetGenImage get dummyCatalystVoices => + const AssetGenImage('assets/images/dummy_catalyst_voices.webp'); + + /// List of all assets + List get values => [dummyCatalystVoices]; +} + +class VoicesAssets { + VoicesAssets._(); + + static const $AssetsImagesGen images = $AssetsImagesGen(); +} + +class AssetGenImage { + const AssetGenImage(this._assetName); + + final String _assetName; + + Image image({ + Key? key, + AssetBundle? bundle, + ImageFrameBuilder? frameBuilder, + ImageErrorWidgetBuilder? errorBuilder, + String? semanticLabel, + bool excludeFromSemantics = false, + double? scale, + double? width, + double? height, + Color? color, + Animation? opacity, + BlendMode? colorBlendMode, + BoxFit? fit, + AlignmentGeometry alignment = Alignment.center, + ImageRepeat repeat = ImageRepeat.noRepeat, + Rect? centerSlice, + bool matchTextDirection = false, + bool gaplessPlayback = false, + bool isAntiAlias = false, + String? package, + FilterQuality filterQuality = FilterQuality.low, + int? cacheWidth, + int? cacheHeight, + }) { + return Image.asset( + _assetName, + key: key, + bundle: bundle, + frameBuilder: frameBuilder, + errorBuilder: errorBuilder, + semanticLabel: semanticLabel, + excludeFromSemantics: excludeFromSemantics, + scale: scale, + width: width, + height: height, + color: color, + opacity: opacity, + colorBlendMode: colorBlendMode, + fit: fit, + alignment: alignment, + repeat: repeat, + centerSlice: centerSlice, + matchTextDirection: matchTextDirection, + gaplessPlayback: gaplessPlayback, + isAntiAlias: isAntiAlias, + package: package, + filterQuality: filterQuality, + cacheWidth: cacheWidth, + cacheHeight: cacheHeight, + ); + } + + ImageProvider provider({ + AssetBundle? bundle, + String? package, + }) { + return AssetImage( + _assetName, + bundle: bundle, + package: package, + ); + } + + String get path => _assetName; + + String get keyName => _assetName; +} diff --git a/catalyst_voices/packages/catalyst_voices_assets/lib/generated/colors.gen.dart b/catalyst_voices/packages/catalyst_voices_assets/lib/generated/colors.gen.dart new file mode 100644 index 0000000000..d011568143 --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/lib/generated/colors.gen.dart @@ -0,0 +1,42 @@ +/// GENERATED CODE - DO NOT MODIFY BY HAND +/// ***************************************************** +/// FlutterGen +/// ***************************************************** + +// coverage:ignore-file +// ignore_for_file: type=lint +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use + +import 'package:flutter/painting.dart'; +import 'package:flutter/material.dart'; + +class VoicesColors { + VoicesColors._(); + + /// Color: #000000 + static const Color darkBackground = Color(0xFF000000); + + /// Color: #222126 + static const Color darkCard = Color(0xFF222126); + + /// Color: #7CAE7A + static const Color green = Color(0xFF7CAE7A); + + /// Color: #512DA8 + static const Color purple = Color(0xFF512DA8); + + /// Color: #673AB7 + static const Color purpleGradientStart = Color(0xFF673AB7); + + /// Color: #512DA8 + static const Color purpleGradientStop = Color(0xFF512DA8); + + /// Color: #B02E0C + static const Color red = Color(0xFFB02E0C); + + /// Color: #565656 + static const Color today = Color(0xFF565656); + + /// Color: #FFFFFF + static const Color white = Color(0xFFFFFFFF); +} diff --git a/catalyst_voices/packages/catalyst_voices_assets/lib/generated/fonts.gen.dart b/catalyst_voices/packages/catalyst_voices_assets/lib/generated/fonts.gen.dart new file mode 100644 index 0000000000..a8241327cf --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/lib/generated/fonts.gen.dart @@ -0,0 +1,15 @@ +/// GENERATED CODE - DO NOT MODIFY BY HAND +/// ***************************************************** +/// FlutterGen +/// ***************************************************** + +// coverage:ignore-file +// ignore_for_file: type=lint +// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use + +class VoicesFonts { + VoicesFonts._(); + + /// Font family: SF-Pro + static const String sFPro = 'SF-Pro'; +} diff --git a/catalyst_voices/packages/catalyst_voices_assets/lib/src/catalyst_image.dart b/catalyst_voices/packages/catalyst_voices_assets/lib/src/catalyst_image.dart new file mode 100644 index 0000000000..cd96c3bf60 --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/lib/src/catalyst_image.dart @@ -0,0 +1,60 @@ +import 'package:flutter/widgets.dart'; + +/// [CatalystImage] is a wrapper around [Image.asset] that sets the package +/// property to `catalyst_voices_assets` by default. +/// This allows the package to be used without having to specify +/// the package name every time. +/// For more information, see [Image.asset]. +final class CatalystImage { + static Image asset( + String name, { + AssetBundle? bundle, + ImageFrameBuilder? frameBuilder, + ImageErrorWidgetBuilder? errorBuilder, + String? semanticLabel, + bool excludeFromSemantics = false, + double? scale, + double? width, + double? height, + Color? color, + Animation? opacity, + BlendMode? colorBlendMode, + BoxFit? fit, + Alignment alignment = Alignment.center, + ImageRepeat repeat = ImageRepeat.noRepeat, + Rect? centerSlice, + bool matchTextDirection = false, + bool gaplessPlayback = false, + bool isAntiAlias = false, + String package = 'catalyst_voices_assets', + FilterQuality filterQuality = FilterQuality.low, + int? cacheWidth, + int? cacheHeight, + }) { + return Image.asset( + name, + bundle: bundle, + frameBuilder: frameBuilder, + errorBuilder: errorBuilder, + semanticLabel: semanticLabel, + excludeFromSemantics: excludeFromSemantics, + scale: scale, + width: width, + height: height, + color: color, + opacity: opacity, + colorBlendMode: colorBlendMode, + fit: fit, + alignment: alignment, + repeat: repeat, + centerSlice: centerSlice, + matchTextDirection: matchTextDirection, + gaplessPlayback: gaplessPlayback, + isAntiAlias: isAntiAlias, + filterQuality: filterQuality, + cacheWidth: cacheWidth, + cacheHeight: cacheHeight, + package: package, + ); + } +} diff --git a/catalyst_voices/packages/catalyst_voices_assets/lib/src/catalyst_voices_assets.dart b/catalyst_voices/packages/catalyst_voices_assets/lib/src/catalyst_voices_assets.dart new file mode 100644 index 0000000000..8da60065f7 --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/lib/src/catalyst_voices_assets.dart @@ -0,0 +1,4 @@ +export 'package:catalyst_voices_assets/generated/assets.gen.dart'; +export 'package:catalyst_voices_assets/generated/colors.gen.dart'; +export 'package:catalyst_voices_assets/generated/fonts.gen.dart'; +export 'package:catalyst_voices_assets/src/catalyst_image.dart'; diff --git a/catalyst_voices/packages/catalyst_voices_assets/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_assets/pubspec.yaml new file mode 100644 index 0000000000..b8850105e1 --- /dev/null +++ b/catalyst_voices/packages/catalyst_voices_assets/pubspec.yaml @@ -0,0 +1,46 @@ +name: catalyst_voices_assets +description: A Catalyst Voices Assets. +version: 0.1.0+1 +publish_to: none + +environment: + sdk: ">=3.2.0 <4.0.0" + flutter: 3.16.0 + +dependencies: + flutter: + sdk: flutter + +dev_dependencies: + build_runner: ^2.1.11 + flutter_gen_runner: ^5.3.2 + +flutter: + uses-material-design: true + generate: true + assets: + - assets/images/ + fonts: + - family: SF-Pro + fonts: + - asset: assets/fonts/SF-Pro-Rounded-Regular.ttf + weight: 600 + +flutter_gen: + output: lib/generated/ + assets: + enabled: true + outputs: + class_name: VoicesAssets + package_parameter_enabled: false + style: dot-delimiter + fonts: + enabled: true + outputs: + class_name: VoicesFonts + colors: + enabled: true + outputs: + class_name: VoicesColors + inputs: + - assets/colors/colors.xml \ No newline at end of file diff --git a/catalyst_voices/pubspec.yaml b/catalyst_voices/pubspec.yaml index 016c0bc880..12dee6bdd3 100644 --- a/catalyst_voices/pubspec.yaml +++ b/catalyst_voices/pubspec.yaml @@ -4,11 +4,13 @@ version: 0.1.0+1 publish_to: none environment: - sdk: '>=3.1.5 <4.0.0' - flutter: 3.13.9 + sdk: '>=3.2.0 <4.0.0' + flutter: 3.16.0 dependencies: bloc: ^8.1.2 + catalyst_voices_assets: + path: ./packages/catalyst_voices_assets flutter: sdk: flutter flutter_bloc: ^8.1.3 @@ -19,7 +21,7 @@ dependencies: dev_dependencies: bloc_test: ^9.1.4 catalyst_analysis: - path: ../catalyst_voices_packages/packages/catalyst_analysis + path: ../catalyst_voices_packages/catalyst_analysis flutter_test: sdk: flutter integration_test: diff --git a/catalyst_voices_packages/packages/catalyst_analysis/.gitignore b/catalyst_voices_packages/catalyst_analysis/.gitignore similarity index 100% rename from catalyst_voices_packages/packages/catalyst_analysis/.gitignore rename to catalyst_voices_packages/catalyst_analysis/.gitignore diff --git a/catalyst_voices_packages/packages/catalyst_analysis/CHANGELOG.md b/catalyst_voices_packages/catalyst_analysis/CHANGELOG.md similarity index 100% rename from catalyst_voices_packages/packages/catalyst_analysis/CHANGELOG.md rename to catalyst_voices_packages/catalyst_analysis/CHANGELOG.md diff --git a/catalyst_voices_packages/packages/catalyst_analysis/README.md b/catalyst_voices_packages/catalyst_analysis/README.md similarity index 100% rename from catalyst_voices_packages/packages/catalyst_analysis/README.md rename to catalyst_voices_packages/catalyst_analysis/README.md diff --git a/catalyst_voices_packages/packages/catalyst_analysis/analysis_options.yaml b/catalyst_voices_packages/catalyst_analysis/analysis_options.yaml similarity index 100% rename from catalyst_voices_packages/packages/catalyst_analysis/analysis_options.yaml rename to catalyst_voices_packages/catalyst_analysis/analysis_options.yaml diff --git a/catalyst_voices_packages/packages/catalyst_analysis/example/README.md b/catalyst_voices_packages/catalyst_analysis/example/README.md similarity index 100% rename from catalyst_voices_packages/packages/catalyst_analysis/example/README.md rename to catalyst_voices_packages/catalyst_analysis/example/README.md diff --git a/catalyst_voices_packages/packages/catalyst_analysis/example/lib/example.dart b/catalyst_voices_packages/catalyst_analysis/example/lib/example.dart similarity index 100% rename from catalyst_voices_packages/packages/catalyst_analysis/example/lib/example.dart rename to catalyst_voices_packages/catalyst_analysis/example/lib/example.dart diff --git a/catalyst_voices_packages/packages/catalyst_analysis/example/melos_example.iml b/catalyst_voices_packages/catalyst_analysis/example/melos_example.iml similarity index 100% rename from catalyst_voices_packages/packages/catalyst_analysis/example/melos_example.iml rename to catalyst_voices_packages/catalyst_analysis/example/melos_example.iml diff --git a/catalyst_voices_packages/packages/catalyst_analysis/example/pubspec.yaml b/catalyst_voices_packages/catalyst_analysis/example/pubspec.yaml similarity index 90% rename from catalyst_voices_packages/packages/catalyst_analysis/example/pubspec.yaml rename to catalyst_voices_packages/catalyst_analysis/example/pubspec.yaml index e8116eb962..43ba4ff782 100644 --- a/catalyst_voices_packages/packages/catalyst_analysis/example/pubspec.yaml +++ b/catalyst_voices_packages/catalyst_analysis/example/pubspec.yaml @@ -4,7 +4,7 @@ description: A project that showcases how to enable the recommended lints for Ca publish_to: none environment: - sdk: '>=3.1.2 <4.0.0' + sdk: '>=3.2.0 <4.0.0' dev_dependencies: catalyst_analysis: diff --git a/catalyst_voices_packages/packages/catalyst_analysis/example/pubspec_overrides.yaml b/catalyst_voices_packages/catalyst_analysis/example/pubspec_overrides.yaml similarity index 100% rename from catalyst_voices_packages/packages/catalyst_analysis/example/pubspec_overrides.yaml rename to catalyst_voices_packages/catalyst_analysis/example/pubspec_overrides.yaml diff --git a/catalyst_voices_packages/packages/catalyst_analysis/lib/analysis_options.1.0.0.yaml b/catalyst_voices_packages/catalyst_analysis/lib/analysis_options.1.0.0.yaml similarity index 98% rename from catalyst_voices_packages/packages/catalyst_analysis/lib/analysis_options.1.0.0.yaml rename to catalyst_voices_packages/catalyst_analysis/lib/analysis_options.1.0.0.yaml index 2ba95d1142..9cc2c40f1f 100644 --- a/catalyst_voices_packages/packages/catalyst_analysis/lib/analysis_options.1.0.0.yaml +++ b/catalyst_voices_packages/catalyst_analysis/lib/analysis_options.1.0.0.yaml @@ -14,7 +14,7 @@ linter: - always_declare_return_types - always_use_package_imports - annotate_overrides - # - annotate_redeclares # Enabled as Dart 3.2.0 will be released + - annotate_redeclares - avoid_bool_literals_in_conditional_expressions - avoid_catching_errors - avoid_double_and_int_checks diff --git a/catalyst_voices_packages/packages/catalyst_analysis/lib/analysis_options.yaml b/catalyst_voices_packages/catalyst_analysis/lib/analysis_options.yaml similarity index 100% rename from catalyst_voices_packages/packages/catalyst_analysis/lib/analysis_options.yaml rename to catalyst_voices_packages/catalyst_analysis/lib/analysis_options.yaml diff --git a/catalyst_voices_packages/packages/catalyst_analysis/lib/catalyst_analysis.dart b/catalyst_voices_packages/catalyst_analysis/lib/catalyst_analysis.dart similarity index 100% rename from catalyst_voices_packages/packages/catalyst_analysis/lib/catalyst_analysis.dart rename to catalyst_voices_packages/catalyst_analysis/lib/catalyst_analysis.dart diff --git a/catalyst_voices_packages/packages/catalyst_analysis/melos_catalyst_analysis.iml b/catalyst_voices_packages/catalyst_analysis/melos_catalyst_analysis.iml similarity index 100% rename from catalyst_voices_packages/packages/catalyst_analysis/melos_catalyst_analysis.iml rename to catalyst_voices_packages/catalyst_analysis/melos_catalyst_analysis.iml diff --git a/catalyst_voices_packages/packages/catalyst_analysis/pubspec.yaml b/catalyst_voices_packages/catalyst_analysis/pubspec.yaml similarity index 84% rename from catalyst_voices_packages/packages/catalyst_analysis/pubspec.yaml rename to catalyst_voices_packages/catalyst_analysis/pubspec.yaml index cec09dc51d..4ed04afe16 100644 --- a/catalyst_voices_packages/packages/catalyst_analysis/pubspec.yaml +++ b/catalyst_voices_packages/catalyst_analysis/pubspec.yaml @@ -3,4 +3,4 @@ version: 1.0.0 description: Lint rules for Dart and Flutter used internally at Catalyst. environment: - sdk: '>=3.1.5 <4.0.0' \ No newline at end of file + sdk: '>=3.2.0 <4.0.0' diff --git a/melos.yaml b/melos.yaml index fb25d866d4..5d2c471930 100644 --- a/melos.yaml +++ b/melos.yaml @@ -3,9 +3,8 @@ repository: https://github.com/input-output-hk/catalyst-voices packages: - catalyst_voices/* - - catalyst_voices_packages/packages/* - - catalyst_voices_packages/packages/*/* - - catalyst_voices_packages/packages/*/*/* + - catalyst_voices/packages/** + - catalyst_voices_packages/** command: version: diff --git a/pubspec.yaml b/pubspec.yaml index 3b3107207c..6a70e3d73e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: catalyst_voices_workspace environment: - sdk: '>=3.1.5 <4.0.0' + sdk: '>=3.2.0 <4.0.0' dev_dependencies: melos: ^3.2.0