Skip to content

Commit

Permalink
Merge branch 'develop' into feature/778304-scroll-reply
Browse files Browse the repository at this point in the history
  • Loading branch information
Andre Rossi committed Jan 6, 2025
2 parents 3036abc + 001ec2d commit 8c7e84b
Show file tree
Hide file tree
Showing 66 changed files with 49 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
- uses: actions/checkout@v3
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.27.0'
flutter-version: '3.27.1'
channel: 'stable'
- name: Install dependencies
run: flutter pub get
Expand All @@ -96,7 +96,7 @@ jobs:
- name: Install Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: '3.27.0'
flutter-version: '3.27.1'
channel: 'stable'
- name: Check Publish Warnings
run: dart pub publish --dry-run
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v3
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.27.0"
flutter-version: "3.27.1"
channel: "stable"
- name: Install dependencies
run: flutter pub get
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.3.0

- Add support to new Flutter version (3.27.1)

## 0.2.6

- [DSVideoMessageBubble] Fix when thumbnail is unavailable.
Expand Down
4 changes: 2 additions & 2 deletions lib/src/services/ds_bottom_sheet.service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ class DSBottomSheetService {
backgroundColor: Colors.transparent,
isScrollControlled: true,
context: context,
builder: (_) => WillPopScope(
onWillPop: () async => false,
builder: (_) => PopScope(
canPop: false,
child: _buildBottomSheet(
hideGrabber: true,
),
Expand Down
6 changes: 4 additions & 2 deletions lib/src/services/ds_context.service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ abstract class DSContextService {
static BuildContext? _context = Get.context;
static BuildContext? _overlayContext = Get.overlayContext;

static init(final BuildContext context,
[final BuildContext? overlayContext]) {
static init(
final BuildContext context, [
final BuildContext? overlayContext,
]) {
_context = context;
_overlayContext = overlayContext;
}
Expand Down
8 changes: 5 additions & 3 deletions lib/src/services/ds_dialog.service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ class DSDialogService {
Widget _buildDialog(final DSDialogType type) {
return AnnotatedRegion<SystemUiOverlayStyle>(
value: DSSystemOverlayStyle.light,
child: WillPopScope(
onWillPop: () async => false,
child: PopScope(
canPop: false,
child: Dialog(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(15.0),
Expand All @@ -81,7 +81,9 @@ class DSDialogService {
borderRadius: const BorderRadius.all(Radius.circular(15.0)),
boxShadow: [
BoxShadow(
color: DSColors.neutralDarkEclipse.withOpacity(0.4),
color: DSColors.neutralDarkEclipse.withValues(
alpha: 0.4,
),
blurRadius: 15.0,
offset: const Offset(0.0, 3.0),
),
Expand Down
4 changes: 3 additions & 1 deletion lib/src/themes/texts/ds_text_selection_theme.theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import '../colors/ds_colors.theme.dart';
class DSTextSelectionThemeData extends TextSelectionThemeData {
DSTextSelectionThemeData()
: super(
selectionColor: DSColors.primaryMain.withOpacity(0.5),
selectionColor: DSColors.primaryMain.withValues(
alpha: 0.5,
),
selectionHandleColor: DSColors.primaryDark,
);
}
4 changes: 3 additions & 1 deletion lib/src/widgets/animations/ds_spinner_loading.widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ class DSSpinnerLoadingState extends State<DSSpinnerLoading>
color: Colors.transparent,
border: Border.all(
width: widget.lineWidth,
color: DSColors.neutralDarkEclipse.withOpacity(0.32),
color: DSColors.neutralDarkEclipse.withValues(
alpha: 0.32,
),
style: BorderStyle.solid,
),
),
Expand Down
17 changes: 14 additions & 3 deletions lib/src/widgets/chat/video/ds_video_player.widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,27 @@ class DSVideoPlayer extends StatelessWidget {

return AnnotatedRegion<SystemUiOverlayStyle>(
value: overlayStyle,
child: WillPopScope(
onWillPop: () => Get.delete<DSVideoPlayerController>(),
child: PopScope(
canPop: false,
onPopInvokedWithResult: (didPop, result) async {
if (didPop) {
return;
}

if (await Get.delete<DSVideoPlayerController>()) {
NavigationService.pop(result);
}
},
child: Scaffold(
backgroundColor: Colors.black,
appBar: DSHeader(
showBorder: false,
title: appBarText,
customerUri: appBarPhotoUri,
customerName: appBarText,
backgroundColor: Colors.black.withOpacity(.7),
backgroundColor: Colors.black.withValues(
alpha: .7,
),
systemUiOverlayStyle: overlayStyle,
onBackButtonPressed: () {
Get.delete<DSVideoPlayerController>();
Expand Down
2 changes: 1 addition & 1 deletion lib/src/widgets/radio/ds_radio_tile.widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class DSRadioTile<T> extends StatelessWidget {

/// Determines the grouping of buttons allowing one of them to be selected
///
/// The <T> type determines which type of variable to use as [value],
/// The &lt;T&gt; type determines which type of variable to use as [value],
/// which can be int, String, or even an object.
final T? groupValue;

Expand Down
2 changes: 0 additions & 2 deletions lib/src/widgets/switch/ds_switch.widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ class DSSwitch extends DSSwitchBase {
return isEnabled ? _activeColor : DSColors.primaryLight;
case (false):
return isEnabled ? _inactiveColor : DSColors.neutralMediumWave;
default:
return _activeColor;
}
}
}
4 changes: 3 additions & 1 deletion lib/src/widgets/tags/ds_input_chip.widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ class _DSInputChipState extends State<DSInputChip> {
size: 32.0,
icon: Icon(
DSIcons.error_solid,
color: DSColors.neutralDarkCity.withOpacity(0.6),
color: DSColors.neutralDarkCity.withValues(
alpha: 0.6,
),
),
onPressed: () => widget.onDeleted?.call(index),
),
Expand Down
4 changes: 3 additions & 1 deletion lib/src/widgets/utils/ds_expanded_image.widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,9 @@ class DSExpandedImage extends StatelessWidget {
title: appBarText,
customerUri: appBarPhotoUri,
customerName: appBarText,
backgroundColor: Colors.black.withOpacity(0.7),
backgroundColor: Colors.black.withValues(
alpha: 0.7,
),
onBackButtonPressed: NavigationService.pop,
systemUiOverlayStyle: DSSystemOverlayStyle.light,
),
Expand Down
4 changes: 3 additions & 1 deletion lib/src/widgets/utils/ds_progress_bar.widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ class _AnimatedBarWidgetState extends State<AnimatedBarWidget>
child: Text(
'/',
style: TextStyle(
color: Colors.black.withOpacity(0.2),
color: Colors.black.withValues(
alpha: 0.2,
),
fontSize: 14.0,
height: 1.0,
),
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: blip_ds
description: Blip Design System for Flutter.
version: 0.2.6
version: 0.3.0
homepage: https://github.com/takenet/blip-ds-flutter#readme
repository: https://github.com/takenet/blip-ds-flutter

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/widgets/buttons/goldens/ds_pause_button/ds_pause_button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/widgets/buttons/goldens/ds_play_button/ds_play_button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8c7e84b

Please sign in to comment.