Skip to content

Commit

Permalink
Merge pull request #7 from Iconica-Development/feature/step_indicator…
Browse files Browse the repository at this point in the history
…_builder

Feature/step indicator builder
  • Loading branch information
Gorter-dev authored Feb 22, 2023
2 parents 2d35e8f + 3a4d571 commit f85f548
Show file tree
Hide file tree
Showing 7 changed files with 105 additions and 65 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
## [2.1.0] - 22 February 2023

- Added stepper indicator builder to the stepperIndicatorTheme

## [2.0.0] - 5 Januari 2023

- Update stepper to allow for growable content in rows
- Refactor structure of app for better maintenance
- Rename showAllStepExpandedOne to showOnlyCurrentStep
Expand Down
6 changes: 3 additions & 3 deletions example/lib/vertical_multi.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ class _VerticalMultiPageStepperState extends State<VerticalMultiPageStepper> {
theme: StepperTheme(
stepIndicatorTheme: StepIndicatorTheme(
activeBackgroundColor: Colors.white,
activeTextStyle: Theme.of(context).textTheme.bodyText2?.copyWith(
activeTextStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Colors.black,
),
activeBorder: Border.all(
color: Colors.white,
),
inactiveBackgroundColor: Colors.black,
inactiveTextStyle:
Theme.of(context).textTheme.bodyText2?.copyWith(
Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Colors.white,
),
inactiveBorder: Border.all(
color: Colors.white,
),
completedBackgroundColor: Colors.green,
completedTextStyle:
Theme.of(context).textTheme.bodyText2?.copyWith(
Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Colors.white,
),
),
Expand Down
14 changes: 7 additions & 7 deletions example/lib/vertical_single.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@ class _VerticalSinglePageStepperState extends State<VerticalSinglePageStepper> {
stepIndicatorTheme: StepIndicatorTheme(
activeBackgroundColor: Colors.white,
activeTextStyle:
Theme.of(context).textTheme.bodyText2?.copyWith(
Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Colors.black,
),
activeBorder: Border.all(
color: Colors.white,
),
inactiveBackgroundColor: Colors.black,
inactiveTextStyle:
Theme.of(context).textTheme.bodyText2?.copyWith(
Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Colors.white,
),
inactiveBorder: Border.all(
color: Colors.white,
),
completedBackgroundColor: Colors.green,
completedTextStyle:
Theme.of(context).textTheme.bodyText2?.copyWith(
Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Colors.white,
),
),
Expand All @@ -63,13 +63,13 @@ class _VerticalSinglePageStepperState extends State<VerticalSinglePageStepper> {
children: [
Text(
'Datum',
style: Theme.of(context).textTheme.headline6?.copyWith(
style: Theme.of(context).textTheme.titleLarge?.copyWith(
color: Colors.white,
),
),
Text(
'Selecteer een datum',
style: Theme.of(context).textTheme.bodyText2?.copyWith(
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Colors.white,
),
),
Expand All @@ -83,13 +83,13 @@ class _VerticalSinglePageStepperState extends State<VerticalSinglePageStepper> {
children: [
Text(
'Tijd',
style: Theme.of(context).textTheme.headline6?.copyWith(
style: Theme.of(context).textTheme.titleLarge?.copyWith(
color: Colors.white,
),
),
Text(
'Selecteer een tijd',
style: Theme.of(context).textTheme.bodyText2?.copyWith(
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Colors.white,
),
),
Expand Down
92 changes: 60 additions & 32 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,56 @@ packages:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
url: "https://pub.dev"
source: hosted
version: "2.9.0"
version: "2.10.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
url: "https://pub.dev"
source: hosted
version: "1.2.1"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev"
source: hosted
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
url: "https://pub.dev"
source: hosted
version: "1.16.0"
version: "1.17.0"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
url: "https://pub.dartlang.org"
sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
url: "https://pub.dev"
source: hosted
version: "1.0.5"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
flutter:
Expand All @@ -59,7 +66,8 @@ packages:
dependency: "direct dev"
description:
name: flutter_lints
url: "https://pub.dartlang.org"
sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
url: "https://pub.dev"
source: hosted
version: "2.0.1"
flutter_stepper:
Expand All @@ -68,45 +76,58 @@ packages:
path: ".."
relative: true
source: path
version: "1.1.0"
version: "2.1.0"
flutter_test:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
js:
dependency: transitive
description:
name: js
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
url: "https://pub.dev"
source: hosted
version: "0.6.5"
lints:
dependency: transitive
description:
name: lints
url: "https://pub.dartlang.org"
sha256: "5cfd6509652ff5e7fe149b6df4859e687fca9048437857cb2e65c8d780f396e3"
url: "https://pub.dev"
source: hosted
version: "2.0.0"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
url: "https://pub.dev"
source: hosted
version: "0.12.12"
version: "0.12.13"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.dev"
source: hosted
version: "0.1.5"
version: "0.2.0"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
url: "https://pub.dev"
source: hosted
version: "1.8.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
url: "https://pub.dev"
source: hosted
version: "1.8.2"
sky_engine:
Expand All @@ -118,51 +139,58 @@ packages:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.dev"
source: hosted
version: "1.9.0"
version: "1.9.1"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.2.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.dev"
source: hosted
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
url: "https://pub.dev"
source: hosted
version: "0.4.12"
version: "0.4.16"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.4"
sdks:
dart: ">=2.18.0 <3.0.0"
flutter: ">=1.17.0"
5 changes: 4 additions & 1 deletion lib/src/models/step_indicator_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import 'package:flutter/material.dart';

class StepIndicatorTheme {
const StepIndicatorTheme({
this.builder,
this.completedBackgroundColor,
this.completedBorder,
this.completedTextStyle,
this.completedTextStyle,
this.inactiveBackgroundColor,
this.inactiveBorder,
this.inactiveTextStyle,
Expand All @@ -17,6 +18,8 @@ class StepIndicatorTheme {
this.activeTextStyle,
});

final Widget Function(int stepIndex, int? currentIndex)? builder;

final Color? activeBackgroundColor;

final BoxBorder? activeBorder;
Expand Down
Loading

0 comments on commit f85f548

Please sign in to comment.