Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Creating generic squircle container #1454

Open
wants to merge 4 commits into
base: ui/redesign
Choose a base branch
from
+44 −42
Open

Creating generic squircle container #1454

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1e5ba2
creating generic squircle container
AugustoVSoares Feb 6, 2025
23655ae
Removed unnecessary figma package
AugustoVSoares Feb 6, 2025
44b8ada
removed unused
Adriano-7 Feb 6, 2025
5558751
Merge branch 'ui/redesign' into redesign/genericSquircle
vitormpp Feb 14, 2025
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
8 changes: 2 additions & 6 deletions packages/uni_ui/lib/calendar/calendar_item.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:figma_squircle/figma_squircle.dart';
import 'package:flutter/material.dart';

class _CalendarItemDate extends StatelessWidget {
Expand Down Expand Up @@ -137,11 +136,8 @@ class CalendarItem extends StatelessWidget {
width: 140,
decoration: ShapeDecoration(
color: Theme.of(context).colorScheme.secondary,
shape: SmoothRectangleBorder(
borderRadius: SmoothBorderRadius(
cornerRadius: 12,
cornerSmoothing: 1,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
shadows: [
BoxShadow(
Expand Down
9 changes: 2 additions & 7 deletions packages/uni_ui/lib/cards/generic_card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:figma_squircle/figma_squircle.dart';
import 'package:flutter/material.dart';
import 'package:uni_ui/common/generic_squircle.dart';

class GenericCard extends StatelessWidget {
const GenericCard(
Expand Down Expand Up @@ -31,12 +31,7 @@ class GenericCard extends StatelessWidget {
padding: margin ?? cardTheme.margin ?? const EdgeInsets.all(4),
child: GestureDetector(
onTap: () => onClick,
child: ClipSmoothRect(
radius: SmoothBorderRadius(
cornerRadius: borderRadius ?? 20,
cornerSmoothing: 1,
),
child: Container(
child: GenericSquircle(child: Container(
decoration: BoxDecoration(
color: color ??
cardTheme.color ??
Expand Down
29 changes: 29 additions & 0 deletions packages/uni_ui/lib/common/generic_squircle.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import 'package:figma_squircle/figma_squircle.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';

class GenericSquircle extends StatelessWidget {
const GenericSquircle({
super.key,
this.margin,
this.padding,
this.borderRadius,
required this.child,
});

final EdgeInsetsGeometry? margin;
final EdgeInsetsGeometry? padding;
final double? borderRadius;
final Widget child;

@override
Widget build(BuildContext context) {
return ClipSmoothRect(
radius: SmoothBorderRadius(
cornerRadius: borderRadius ?? 20,
cornerSmoothing: 1,
),
child: child,
);
}
}
9 changes: 2 additions & 7 deletions packages/uni_ui/lib/courses/average_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:figma_squircle/figma_squircle.dart';
import 'package:flutter/material.dart';
import 'package:uni_ui/common/generic_squircle.dart';

class AverageBar extends StatelessWidget {
const AverageBar(
Expand All @@ -20,12 +20,7 @@ class AverageBar extends StatelessWidget {
Widget build(BuildContext context) {
return LayoutBuilder(builder: (context, constraints) {
return Row(children: [
ClipSmoothRect(
radius: SmoothBorderRadius(
cornerRadius: 10,
cornerSmoothing: 1,
),
child: Container(
GenericSquircle(child: Container(
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.secondary,
borderRadius: BorderRadius.all(Radius.circular(5))),
Expand Down
6 changes: 2 additions & 4 deletions packages/uni_ui/lib/modal/modal.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:figma_squircle/figma_squircle.dart';
import 'package:flutter/material.dart';
import 'package:uni_ui/common/generic_squircle.dart';

class ModalDialog extends StatelessWidget {
const ModalDialog({
Expand All @@ -12,9 +12,7 @@ class ModalDialog extends StatelessWidget {
Widget build(BuildContext context) {
return Dialog(
backgroundColor: Colors.transparent,
child: ClipSmoothRect(
radius: SmoothBorderRadius(cornerRadius: 30, cornerSmoothing: 1),
child: Container(
child: GenericSquircle(borderRadius: 30, child: Container(
padding: const EdgeInsets.all(20.0),
color: Theme.of(context).colorScheme.surface,
child: Column(
Expand Down
16 changes: 5 additions & 11 deletions packages/uni_ui/lib/navbar/bottom_navbar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:figma_squircle/figma_squircle.dart';

import 'package:flutter/material.dart';
import 'package:uni_ui/navbar/bottom_navbar_item.dart';
import 'package:uni_ui/common/generic_squircle.dart';

class _BottomNavbarContainer extends StatelessWidget {
_BottomNavbarContainer({required this.child});
Expand All @@ -14,11 +15,8 @@ class _BottomNavbarContainer extends StatelessWidget {
margin: EdgeInsets.only(left: 20, right: 20, bottom: 20),
decoration: ShapeDecoration(
color: Theme.of(context).colorScheme.primary,
shape: SmoothRectangleBorder(
borderRadius: SmoothBorderRadius(
cornerRadius: 20,
cornerSmoothing: 1,
)),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20)),
shadows: [
BoxShadow(
color: Theme.of(context).colorScheme.shadow.withAlpha(0x7f),
Expand All @@ -27,11 +25,7 @@ class _BottomNavbarContainer extends StatelessWidget {
),
],
),
child: ClipSmoothRect(
radius: SmoothBorderRadius(
cornerRadius: 20,
cornerSmoothing: 1,
),
child: GenericSquircle(
child: Container(
decoration: BoxDecoration(
gradient: RadialGradient(
Expand Down
9 changes: 2 additions & 7 deletions packages/uni_ui/lib/timeline/timeline.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:figma_squircle/figma_squircle.dart';
import 'package:flutter/material.dart';
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
import 'package:uni_ui/common/generic_squircle.dart';

class Timeline extends StatefulWidget {
const Timeline({
Expand Down Expand Up @@ -102,12 +102,7 @@ class _TimelineState extends State<Timeline> {
onTap: () => _onTabTapped(index),
child: Padding(
padding: const EdgeInsets.all(7.0),
child: ClipSmoothRect(
radius: SmoothBorderRadius(
cornerRadius: 10,
cornerSmoothing: 1,
),
child: Container(
child: GenericSquircle(borderRadius: 10, child: Container(
key: _tabKeys[index],
padding: const EdgeInsets.symmetric(
vertical: 10.0, horizontal: 15.0),
Expand Down