Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [3.0.1]

- GradientScaffoldWrapper backarrow added

## [3.0.0]

- GradientScaffoldWrapper slider error fixed, FlexColorTheme package removed
Expand Down
4 changes: 2 additions & 2 deletions android/local.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sdk.dir=C:\\Users\\windo\\AppData\\Local\\Android\\sdk
flutter.sdk=C:\\Users\\windo\\fvm\\versions\\3.32.8
sdk.dir=/Users/arsen/Library/Android/sdk
flutter.sdk=/Users/arsen/fvm/versions/3.27.4
3 changes: 3 additions & 0 deletions assets/icons/gradient_scaffold_wrapper/back_arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion lib/_core/precached_icons.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ class PrecachedIcons {
static const settingsButton = 'assets/icons/circle_button/settings.svg';
static const leaveCallButton = 'assets/icons/circle_button/leave_call.svg';
static const startCallButton = 'assets/icons/circle_button/start_call.svg';
static const participantMicIcon = 'assets/icons/participants/mic_muted_mini.svg';
static const participantMicIcon =
'assets/icons/participants/mic_muted_mini.svg';
static const backArrow =
'assets/icons/gradient_scaffold_wrapper/back_arrow.svg';

List<SvgAssetLoader> get iconsToPrecache => const [
SvgAssetLoader(copyDefaultIcon),
Expand All @@ -43,6 +46,7 @@ class PrecachedIcons {
SvgAssetLoader(leaveCallButton),
SvgAssetLoader(startCallButton),
SvgAssetLoader(participantMicIcon),
SvgAssetLoader(backArrow),
];

void precache(BuildContext context) {
Expand Down
4 changes: 4 additions & 0 deletions lib/_stories/widgets/gradient_scaffold_wrapper_story.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ class _GradientScaffoldWrapperStoryState
return GradientScaffoldWrapper(
showLogo: showLogo,
iosTopPadding: iosTopPadding.toDouble(),
onTapBack: () {
// ignore: avoid_print
print('Back tapped');
},
child: showScroll
? Stack(
children: [
Expand Down
26 changes: 25 additions & 1 deletion lib/widgets/gradient_scaffold_wrapper.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:md_ui_kit/_core/precached_icons.dart';
import 'package:md_ui_kit/widgets/blurred_circle.dart';
import 'package:md_ui_kit/widgets/wave_logo.dart';

Expand All @@ -8,11 +10,15 @@ class GradientScaffoldWrapper extends StatelessWidget {
required this.child,
required this.showLogo,
this.iosTopPadding = 80,
this.onTapBack,
this.showArrow = true,
});

final Widget child;
final bool showLogo;
final double? iosTopPadding;
final VoidCallback? onTapBack;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

обнови стори, чтобы соответствовала новому виджету

final bool showArrow;

@override
Widget build(BuildContext context) {
Expand All @@ -26,15 +32,33 @@ class GradientScaffoldWrapper extends StatelessWidget {
children: [
if (showLogo)
Row(
mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Padding(
padding: EdgeInsets.only(
top: iosTopPadding != null ? iosTopPadding! : 20,
bottom: 20,
left: 20,
),
child: InkWell(
onTap: onTapBack?.call,
child: SizedBox(
width: 24,
height: 24,
child: SvgPicture.asset(
PrecachedIcons.backArrow,
),
),
),
),
Padding(
padding: EdgeInsets.only(
top: iosTopPadding != null ? iosTopPadding! : 20,
bottom: 20,
),
child: const WaveLogo(),
),
const SizedBox(width: 24),
],
),

Expand Down
3 changes: 2 additions & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: md_ui_kit
description: "Miracle Development UI Kit"
publish_to: "none"
version: 3.0.0
version: 3.0.1

environment:
sdk: ">=3.3.0 <4.0.0"
Expand Down Expand Up @@ -43,6 +43,7 @@ flutter:
- assets/icons/mic/
- assets/icons/circle_button/
- assets/icons/participants/
- assets/icons/gradient_scaffold_wrapper/

fonts:
- family: Play
Expand Down