Skip to content

Commit

Permalink
Merge branch 'develop' into bug/WGJS-3972
Browse files Browse the repository at this point in the history
  • Loading branch information
myeonginwoo authored Feb 6, 2025
2 parents c50d115 + 528b73b commit 3f305c1
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 27 deletions.
2 changes: 1 addition & 1 deletion example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ packages:
path: ".."
relative: true
source: path
version: "0.0.22"
version: "0.0.23"
rxdart:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
sdk: flutter
flutter_bloc: ^8.1.6
cupertino_icons: ^1.0.8
quantum_dots: ^0.0.22
quantum_dots: ^0.0.23

dev_dependencies:
flutter_test:
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec_overrides.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 25 additions & 23 deletions lib/src/bottom_sheet/title/bottom_sheet_header.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,36 +31,38 @@ class BottomSheetHeader extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
alignment: Alignment.centerLeft,
width: _leadingAndActionsAreaSize,
child: hasLeading
? SizedIcon(
size: 24,
asset: _uiState.leading!.assetPath,
)
: const SizedBox(),
),
if (hasLeading)
Container(
alignment: Alignment.centerLeft,
width: _leadingAndActionsAreaSize,
child: hasLeading
? SizedIcon(
size: 24,
asset: _uiState.leading!.assetPath,
)
: const SizedBox(),
),
Expanded(
child: Text(
_uiState.title.title,
textAlign: TextAlign.center,
style: headline20Bold.copyWith(color: wippyGray900),
),
),
Container(
alignment: Alignment.centerRight,
width: _leadingAndActionsAreaSize,
child: hasActions
? TextButton(
onPressed: () {
_uiState.actions!.onPressed?.call();
},
text: _uiState.actions!.text,
style: headline16Bold.copyWith(color: wippyPink500),
)
: const SizedBox(),
),
if (hasActions)
Container(
alignment: Alignment.centerRight,
width: _leadingAndActionsAreaSize,
child: hasActions
? TextButton(
onPressed: () {
_uiState.actions!.onPressed?.call();
},
text: _uiState.actions!.text,
style: headline16Bold.copyWith(color: wippyPink500),
)
: const SizedBox(),
),
],
),
if (description != null) ...[
Expand Down
1 change: 1 addition & 0 deletions lib/src/button/extension_widget/bottom_cta_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class BottomCtaButton extends StatelessWidget {
child: Padding(
padding: EdgeInsets.fromLTRB(16, 0, 16, 20),
child: QdsBoxButton(
key: Key("bottom_cta_button $_state"),
onPressed: () {
_onPressed();
},
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: quantum_dots
description: the design system for wippy global product
version: 0.0.22
version: 0.0.23
homepage: https://github.com/nrise/Quantum-Dots
topics:
- animations
Expand Down

0 comments on commit 3f305c1

Please sign in to comment.