Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remix - Foundational components #317

Merged
merged 39 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
0731c8e
Added remix
leoafarias Jun 20, 2024
a0e3238
Worked on button example
leoafarias Jun 20, 2024
ebc4ec1
Spinner component
leoafarias Jun 21, 2024
51faba1
Merge branch 'main' into feature/remix
leoafarias Jun 22, 2024
46cff81
Merge branch 'main' into feature/remix
leoafarias Jun 22, 2024
8e5a936
Merge branch 'main' into feature/remix
leoafarias Jun 24, 2024
d62c3af
Merge branch 'main' into feature/remix
leoafarias Jun 26, 2024
a1e6236
Merge branch 'main' into feature/remixf
leoafarias Jun 27, 2024
3d3b8da
Implemented tokens and loading behavior
leoafarias Jun 28, 2024
a2da4ed
Finished button
leoafarias Jul 2, 2024
3b65cf1
Merge branch 'main' into feature/remix
leoafarias Jul 2, 2024
1b4336b
Linting fixes
leoafarias Jul 2, 2024
ca9effd
Merge branch 'feature/remix' of https://github.com/conceptadev/mix in…
leoafarias Jul 2, 2024
21a2a54
Lint fix
leoafarias Jul 2, 2024
307bf9f
Clean up
leoafarias Jul 2, 2024
2da0cb7
Checkbox
leoafarias Jul 3, 2024
70e90dd
Merge branch 'main' into feature/remix
leoafarias Jul 6, 2024
2f523b4
Linting fixes
leoafarias Jul 7, 2024
6dc9980
Merge branch 'main' into feature/remix
leoafarias Jul 7, 2024
15da0fa
linting
leoafarias Jul 7, 2024
8c10b1c
Merge branch 'feature/remix' of https://github.com/conceptadev/mix in…
leoafarias Jul 7, 2024
58f2e84
wip
leoafarias Jul 9, 2024
4df5560
Merge branch 'main' into feature/remix
leoafarias Jul 9, 2024
dec693a
wip
leoafarias Jul 9, 2024
1f7f5b2
Merge branch 'feature/remix' of https://github.com/conceptadev/mix in…
leoafarias Jul 9, 2024
fc973f4
card component
leoafarias Jul 10, 2024
c400db6
Color token improvements
leoafarias Jul 11, 2024
8745c96
Added color swatch token
leoafarias Jul 11, 2024
3f2de89
Token clean up
leoafarias Jul 12, 2024
8e5f163
Color swatch
leoafarias Jul 12, 2024
342b0f8
Merge branch 'main' into feature/remix
leoafarias Jul 13, 2024
a5e3f7d
Implemented ColorSwatchToken
leoafarias Jul 13, 2024
e144836
ColorSwatch Token
leoafarias Jul 13, 2024
36e4729
Merge branch 'main' into feature/remix
leoafarias Jul 13, 2024
2daf51b
Typography token removal
leoafarias Jul 13, 2024
8f01f96
Remix update
leoafarias Jul 17, 2024
23887c3
Merge branch 'main' into feature/remix
leoafarias Jul 18, 2024
1cdc19b
Merged conflicts
leoafarias Jul 18, 2024
6884bbc
macos change
leoafarias Jul 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 0 additions & 92 deletions .all-contributorsrc

This file was deleted.

5 changes: 4 additions & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
"flavors": {
"prod": "stable",
"mincompat": "3.19.0"
}
},
"runPubGetOnSdkChanges": true,
"updateVscodeSettings": true,
"updateGitIgnore": false
}
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ node_modules

# FVM

# FVM Version Cache
.fvm/

.packages
.pub/
.dart_tool/
pubspec_overrides.yaml
pubspec.lock

# FVM Version Cache
.fvm/
8 changes: 4 additions & 4 deletions mix.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"name": "mix",
"path": "packages/mix"
},
{
"name": "root",
"path": "."
},
{
"name": "mix_generator",
"path": "packages/mix_generator"
Expand All @@ -17,8 +21,4 @@
"path": "packages/remix"
}
],
"settings": {},
"extensions": {
"recommendations": []
}
}
2 changes: 1 addition & 1 deletion packages/mix/lib/src/core/deprecation_notices.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// ignore_for_file: camel_case_types

import '../attributes/enum/enum_util.dart';
import '../core/internal/widget_state/widget_state.dart';
import '../specs/image/image_spec.dart';
import '../variants/widget_state_variant.dart';
import 'attribute.dart';
import 'internal/widget_state/widget_state.dart';

class InternalMixDeprecatedAnnotation extends Deprecated {
final String version;
Expand Down
4 changes: 4 additions & 0 deletions packages/mix/lib/src/theme/tokens/color_token.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ class ColorToken extends MixToken<Color> {
@override
Color resolve(BuildContext context) {
final themeValue = MixTheme.of(context).colors[this];

if (themeValue == null) {
// Look for maybe been a swatch token
}
assert(
themeValue != null,
'ColorToken $name is not defined in the theme',
Expand Down
30 changes: 30 additions & 0 deletions packages/remix/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [

{
"name": "Remix (debug mode)",
"cwd": "demo",
"request": "launch",
"type": "dart",
"deviceId": "macos"
},
{
"name": "Remix (profile mode)",
"cwd": "demo",
"request": "launch",
"type": "dart",
"flutterMode": "profile"
},
{
"name": "Remix (release mode)",
"cwd": "demo",
"request": "launch",
"type": "dart",
"flutterMode": "release"
}
]
}
29 changes: 29 additions & 0 deletions packages/remix/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BSD 3-Clause License

Copyright (c) 2022, Concepta
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
16 changes: 16 additions & 0 deletions packages/remix/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# remix_ui

A new Flutter project.

## Getting Started

This project is a starting point for a Flutter application.

A few resources to get you started if this is your first Flutter project:

- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)

For help getting started with Flutter development, view the
[online documentation](https://docs.flutter.dev/), which offers tutorials,
samples, guidance on mobile development, and a full API reference.
6 changes: 6 additions & 0 deletions packages/remix/analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
include: package:flutter_lints/flutter.yaml

linter:
rules:
library_private_types_in_public_api: false
non_constant_identifier_names: false
9 changes: 9 additions & 0 deletions packages/remix/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
targets:
$default:
builders:
mix_generator|spec:
generate_for:
- lib/**/*_spec.dart
mix_generator|dto:
generate_for:
- lib/**/*_dto.dart
43 changes: 43 additions & 0 deletions packages/remix/demo/.gitignore
Original file line number Diff line number Diff line change
@@ -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
45 changes: 45 additions & 0 deletions packages/remix/demo/.metadata
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# 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.

version:
revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
channel: stable

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
- platform: android
create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
- platform: ios
create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
- platform: linux
create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
- platform: macos
create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
- platform: web
create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
- platform: windows
create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8

# 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'
16 changes: 16 additions & 0 deletions packages/remix/demo/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# demo

A new Flutter project.

## Getting Started

This project is a starting point for a Flutter application.

A few resources to get you started if this is your first Flutter project:

- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)

For help getting started with Flutter development, view the
[online documentation](https://docs.flutter.dev/), which offers tutorials,
samples, guidance on mobile development, and a full API reference.
28 changes: 28 additions & 0 deletions packages/remix/demo/analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This file configures the analyzer, which statically analyzes Dart code to
# check for errors, warnings, and lints.
#
# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
# invoked from the command line by running `flutter analyze`.

# 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

linter:
# The lint rules applied to this project can be customized in the
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
# included above or to enable additional rules. A list of all available lints
# and their documentation is published at https://dart.dev/lints.
#
# Instead of disabling a lint rule for the entire project in the
# section below, it can also be suppressed for a single line of code
# or a specific dart file by using the `// ignore: name_of_lint` and
# `// ignore_for_file: name_of_lint` syntax on the line or in the file
# producing the lint.
rules:
# avoid_print: false # Uncomment to disable the `avoid_print` rule
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule

# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options
Loading
Loading