Skip to content

Commit

Permalink
Merge branch 'release/1.5.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
deandreamatias committed Sep 17, 2021
2 parents 44df3bf + 469a8eb commit 7b90f33
Show file tree
Hide file tree
Showing 13 changed files with 66 additions and 230 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [1.5.0](https://github.com/deandreamatias/portfolio/compare/v1.4.0...v1.5.0) (2021-09-17)

### Feature

* Update linter ([a4b3ed6](https://github.com/deandreamatias/portfolio/commit/a4b3ed63bbb4973eddd2e5a9964604c6b8741193))

## [1.4.0](https://github.com/deandreamatias/portfolio/compare/v1.3.0...v1.4.0) (2021-05-21)

## [1.3.0](https://github.com/deandreamatias/portfolio/compare/v1.1.0...v1.3.0) (2021-03-18)
Expand Down
180 changes: 1 addition & 179 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,8 @@
#
# This file contains the analysis options used by Flutter tools, such as IntelliJ,
# Android Studio, and the `flutter analyze` command.

include: package:flutter_lints/flutter.yaml
analyzer:
strong-mode:
implicit-dynamic: false
errors:
# treat missing required parameters as a warning (not a hint)
missing_required_param: warning
# treat missing returns as a warning (not a hint)
missing_return: warning
# allow having TODOs in the code
todo: info
# Ignore analyzer hints for updating pubspecs when using Future or
# Stream and not importing dart:async
# Please see https://github.com/flutter/flutter/pull/24528 for details.
sdk_version_async_exported_from_core: ignore
exclude:
- "bin/cache/**"
- ".dart_tool/**"
Expand All @@ -40,168 +27,3 @@ analyzer:
- "images/**"
- "assets/**"
- "github/**"

linter:
rules:
# these rules are documented on and in the same order as
# the Dart Lint rules page to make maintenance easier
# https://github.com/dart-lang/linter/blob/master/example/all.yaml
- always_declare_return_types
- always_put_control_body_on_new_line
# - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219
- always_require_non_null_named_parameters
- always_specify_types
- annotate_overrides
# - avoid_annotating_with_dynamic # conflicts with always_specify_types
# - avoid_as # required for implicit-casts: true
- avoid_bool_literals_in_conditional_expressions
# - avoid_catches_without_on_clauses # we do this commonly
# - avoid_catching_errors # we do this commonly
- avoid_classes_with_only_static_members
# - avoid_double_and_int_checks # only useful when targeting JS runtime
- avoid_empty_else
# - avoid_equals_and_hash_code_on_mutable_classes # not yet tested
- avoid_field_initializers_in_const_classes
- avoid_function_literals_in_foreach_calls
# - avoid_implementing_value_types # not yet tested
- avoid_init_to_null
# - avoid_js_rounded_ints # only useful when targeting JS runtime
- avoid_null_checks_in_equality_operators
# - avoid_positional_boolean_parameters # not yet tested
# - avoid_print # not yet tested
# - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
# - avoid_redundant_argument_values # not yet tested
- avoid_relative_lib_imports
- avoid_renaming_method_parameters
- avoid_return_types_on_setters
# - avoid_returning_null # there are plenty of valid reasons to return null
# - avoid_returning_null_for_future # not yet tested
- avoid_returning_null_for_void
# - avoid_returning_this # there are plenty of valid reasons to return this
# - avoid_setters_without_getters # not yet tested
# - avoid_shadowing_type_parameters # not yet tested
- avoid_single_cascade_in_expression_statements
- avoid_slow_async_io
- avoid_types_as_parameter_names
# - avoid_types_on_closure_parameters # conflicts with always_specify_types
# - avoid_unnecessary_containers # not yet tested
- avoid_unused_constructor_parameters
- avoid_void_async
# - avoid_web_libraries_in_flutter # not yet tested
- await_only_futures
- camel_case_extensions
- camel_case_types
- cancel_subscriptions
# - cascade_invocations # not yet tested
# - close_sinks # not reliable enough
# - comment_references # blocked on https://github.com/flutter/flutter/issues/20765
# - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204
- control_flow_in_finally
# - curly_braces_in_flow_control_structures # not yet tested
# - diagnostic_describe_all_properties # not yet tested
- directives_ordering
- empty_catches
- empty_constructor_bodies
- empty_statements
# - file_names # not yet tested
# - flutter_style_todos
- hash_and_equals
- implementation_imports
# - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811
- iterable_contains_unrelated_type
# - join_return_with_assignment # not yet tested
- library_names
- library_prefixes
# - lines_longer_than_80_chars # not yet tested
- list_remove_unrelated_type
# - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/sdk/issues/34181
# - missing_whitespace_between_adjacent_strings # not yet tested
- no_adjacent_strings_in_list
- no_duplicate_case_values
# - no_logic_in_create_state # not yet tested
# - no_runtimeType_toString # not yet tested
- non_constant_identifier_names
# - null_closures # not yet tested
# - omit_local_variable_types # opposite of always_specify_types
# - one_member_abstracts # too many false positives
# - only_throw_errors # https://github.com/flutter/flutter/issues/5792
- overridden_fields
- package_api_docs
- package_names
- package_prefixed_library_names
# - parameter_assignments # we do this commonly
- prefer_adjacent_string_concatenation
- prefer_asserts_in_initializer_lists
# - prefer_asserts_with_message # not yet tested
- prefer_collection_literals
- prefer_conditional_assignment
- prefer_const_constructors
- prefer_const_constructors_in_immutables
- prefer_const_declarations
- prefer_const_literals_to_create_immutables
# - prefer_constructors_over_static_methods # not yet tested
- prefer_contains
# - prefer_double_quotes # opposite of prefer_single_quotes
- prefer_equal_for_default_values
# - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
- prefer_final_fields
- prefer_final_in_for_each
- prefer_final_locals
- prefer_for_elements_to_map_fromIterable
- prefer_foreach
# - prefer_function_declarations_over_variables # not yet tested
- prefer_generic_function_type_aliases
- prefer_if_elements_to_conditional_expressions
- prefer_if_null_operators
- prefer_initializing_formals
- prefer_inlined_adds
# - prefer_int_literals # not yet tested
# - prefer_interpolation_to_compose_strings # not yet tested
- prefer_is_empty
- prefer_is_not_empty
- prefer_is_not_operator
- prefer_iterable_whereType
# - prefer_mixin # https://github.com/dart-lang/language/issues/32
# - prefer_null_aware_operators # disable until NNBD, see https://github.com/flutter/flutter/pull/32711#issuecomment-492930932
# - prefer_relative_imports # not yet tested
- prefer_single_quotes
- prefer_spread_collections
- prefer_typing_uninitialized_variables
- prefer_void_to_null
# - provide_deprecation_message # not yet tested
# - public_member_api_docs # enabled on a case-by-case basis; see e.g. packages/analysis_options.yaml
- recursive_getters
- slash_for_doc_comments
# - sort_child_properties_last # not yet tested
- sort_constructors_first
- sort_pub_dependencies
- sort_unnamed_constructors_first
- test_types_in_equals
- throw_in_finally
# - type_annotate_public_apis # subset of always_specify_types
- type_init_formals
# - unawaited_futures # too many false positives
# - unnecessary_await_in_return # not yet tested
- unnecessary_brace_in_string_interps
- unnecessary_const
# - unnecessary_final # conflicts with prefer_final_locals
- unnecessary_getters_setters
# - unnecessary_lambdas # has false positives: https://github.com/dart-lang/linter/issues/498
- unnecessary_new
- unnecessary_null_aware_assignments
- unnecessary_null_in_if_null_operators
- unnecessary_overrides
- unnecessary_parenthesis
- unnecessary_statements
- unnecessary_this
- unrelated_type_equality_checks
# - unsafe_html # not yet tested
- use_full_hex_values_for_flutter_colors
# - use_function_type_syntax_for_parameters # not yet tested
# - use_key_in_widget_constructors # not yet tested
- use_rethrow_when_possible
# - use_setters_to_change_properties # not yet tested
# - use_string_buffers # has false positives: https://github.com/dart-lang/sdk/issues/34182
# - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review
- valid_regexps
- void_checks
12 changes: 6 additions & 6 deletions lib/core/utils/constants.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
class Assets {
static const String ADOBEXD = 'assets/img/adobe_xd.png';
static const String ANDROID = 'assets/img/android.png';
static const String FLUTTER = 'assets/img/flutter.png';
static const String GIT = 'assets/img/git.png';
static const String adobXd = 'assets/img/adobe_xd.png';
static const String android = 'assets/img/android.png';
static const String flutter = 'assets/img/flutter.png';
static const String git = 'assets/img/git.png';
}

class Urls {
static const String PODCAST = 'https://universoflutter.com';
static const String PROFILE = 'https://deandreamatias.com/profile.png';
static const String podcast = 'https://universoflutter.com';
static const String profile = 'https://deandreamatias.com/profile.png';
}
5 changes: 3 additions & 2 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import 'ui/shared/styles.dart';
import 'ui/views/home.dart';

Future<void> main() async {
runApp(App());
runApp(const App());
}

class App extends StatelessWidget {
const App({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
return MaterialApp(
Expand All @@ -18,7 +19,7 @@ class App extends StatelessWidget {
theme: themeDark,
initialRoute: '/',
routes: <String, WidgetBuilder>{
HomeView.route: (BuildContext context) => HomeView(),
HomeView.route: (BuildContext context) => const HomeView(),
},
localizationsDelegates: AppLocalizations.localizationsDelegates,
supportedLocales: AppLocalizations.supportedLocales,
Expand Down
32 changes: 15 additions & 17 deletions lib/ui/shared/styles.dart
Original file line number Diff line number Diff line change
@@ -1,49 +1,47 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

const Color PRIMARY = Color(0xFF222222);
const Color ACCENT = Color(0xFF7E008E);
const Color BACKGROUND = Color(0xFF333333);
const Color primary = Color(0xFF222222);
const Color accent = Color(0xFF7E008E);
const Color background = Color(0xFF333333);

final ThemeData themeDark = ThemeData(
fontFamily: 'Asap',
colorScheme: const ColorScheme(
primary: PRIMARY,
primary: primary,
onPrimary: Colors.white,
secondary: ACCENT,
secondary: accent,
error: Colors.red,
onSecondary: Colors.white,
onError: Colors.white,
onBackground: Colors.black,
background: BACKGROUND,
background: background,
primaryVariant: Colors.orange,
secondaryVariant: Colors.deepOrange,
surface: Colors.white,
onSurface: Colors.black,
brightness: Brightness.dark,
),
backgroundColor: BACKGROUND,
primaryColorDark: PRIMARY,
backgroundColor: background,
primaryColorDark: primary,
appBarTheme: const AppBarTheme(
elevation: 0.0,
color: BACKGROUND,
brightness: Brightness.dark,
color: background,
),
scaffoldBackgroundColor: BACKGROUND,
bottomSheetTheme: const BottomSheetThemeData(backgroundColor: PRIMARY),
scaffoldBackgroundColor: background,
bottomSheetTheme: const BottomSheetThemeData(backgroundColor: primary),
cardTheme: const CardTheme(
color: PRIMARY,
color: primary,
margin: EdgeInsets.all(12.0),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(30.0)),
),
),
brightness: Brightness.dark,
primaryColor: PRIMARY,
accentColor: ACCENT,
buttonColor: ACCENT,
primaryColor: primary,
elevatedButtonTheme: ElevatedButtonThemeData(
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all<Color>(ACCENT),
backgroundColor: MaterialStateProperty.all<Color>(accent),
shape: MaterialStateProperty.all<OutlinedBorder>(
const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(30.0)),
Expand Down
27 changes: 14 additions & 13 deletions lib/ui/views/home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import '../widgets/menu.dart';

class HomeView extends StatefulWidget {
static const String route = '/';
const HomeView({Key? key}) : super(key: key);

@override
_HomeViewState createState() => _HomeViewState();
Expand All @@ -19,8 +20,8 @@ class _HomeViewState extends State<HomeView> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: PreferredSize(
preferredSize: const Size.fromHeight(56.0),
appBar: const PreferredSize(
preferredSize: Size.fromHeight(56.0),
child: MenuWidget(),
),
body: Column(
Expand All @@ -43,15 +44,15 @@ class _HomeViewState extends State<HomeView> {
AppLocalizations.of(context)!.homeHeaderTitle,
subtitle: AppLocalizations.of(context)!
.homeHeaderSubtitle,
image: Urls.PROFILE,
key: const Key(Urls.PROFILE),
image: Urls.profile,
key: const Key(Urls.profile),
),
LanguagesWidget(),
const LanguagesWidget(),
],
),
Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
children: const <Widget>[
GithubWidget(),
SkillsWidget(),
ContactWidget(),
Expand All @@ -71,13 +72,13 @@ class _HomeViewState extends State<HomeView> {
AppLocalizations.of(context)!.homeHeaderTitle,
subtitle: AppLocalizations.of(context)!
.homeHeaderSubtitle,
image: Urls.PROFILE,
key: const Key(Urls.PROFILE),
image: Urls.profile,
key: const Key(Urls.profile),
),
GithubWidget(),
SkillsWidget(),
LanguagesWidget(),
ContactWidget(),
const GithubWidget(),
const SkillsWidget(),
const LanguagesWidget(),
const ContactWidget(),
],
),
),
Expand All @@ -86,7 +87,7 @@ class _HomeViewState extends State<HomeView> {
},
),
),
Align(
const Align(
alignment: Alignment.bottomCenter,
child: Footer(),
)
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/widgets/circular_image.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class CircularImage extends StatelessWidget {
),
padding: const EdgeInsets.all(2.0),
decoration: const BoxDecoration(
color: ACCENT,
color: accent,
shape: BoxShape.circle,
),
);
Expand Down
Loading

0 comments on commit 7b90f33

Please sign in to comment.