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

Jump to bottom

Fix RenderFlex overflow #21

Merged
merged 3 commits into from
Feb 11, 2023
Merged

Fix RenderFlex overflow #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37e9460
add constrain to row childs
KingGorrin Jan 25, 2023
6963659
Merge branch 'cicd' into fix-rf-overflow
KingGorrin Feb 9, 2023
259568d
Fix deprecated text theme
KingGorrin Feb 9, 2023
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
56 changes: 30 additions & 26 deletions lib/widgets/modular_widgets/pillars_widgets/pillars_list_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,33 +402,37 @@ class _PillarsListWidgetState extends State<PillarsListWidget> {
width: 5.0,
),
),
pillarItem.isRevocable
? CancelTimer(
Duration(
seconds: pillarItem.revokeCooldown,
),
AppColors.znnColor,
onTimeFinishedCallback: () {
model.refreshResults();
},
)
: CancelTimer(
Duration(
seconds: pillarItem.revokeCooldown,
Expanded(
child: pillarItem.isRevocable
? CancelTimer(
Duration(
seconds: pillarItem.revokeCooldown,
),
AppColors.znnColor,
onTimeFinishedCallback: () {
model.refreshResults();
},
)
: CancelTimer(
Duration(
seconds: pillarItem.revokeCooldown,
),
AppColors.errorColor,
onTimeFinishedCallback: () {
model.refreshResults();
},
),
AppColors.errorColor,
onTimeFinishedCallback: () {
model.refreshResults();
},
),
StandardTooltipIcon(
pillarItem.isRevocable
? 'Revocation window is open'
: 'Until revocation window opens',
Icons.help,
iconColor: pillarItem.isRevocable
? AppColors.znnColor
: AppColors.errorColor,
),
Expanded(
child: StandardTooltipIcon(
pillarItem.isRevocable
? 'Revocation window is open'
: 'Until revocation window opens',
Icons.help,
iconColor: pillarItem.isRevocable
? AppColors.znnColor
: AppColors.errorColor,
),
),
],
),
Expand Down
44 changes: 25 additions & 19 deletions lib/widgets/reusable_widgets/layout_scaffold/card_scaffold.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,11 @@ class _CardScaffoldState<T> extends State<CardScaffold<T>> {
const SizedBox(
width: 5.0,
),
Text(
'Discreet mode',
style: Theme.of(context).textTheme.bodyLarge,
Expanded(
child: Text(
'Discreet mode',
style: Theme.of(context).textTheme.bodyLarge,
),
),
const Spacer(),
Switch(
Expand Down Expand Up @@ -219,22 +221,26 @@ class _CardScaffoldState<T> extends State<CardScaffold<T>> {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Padding(
padding: const EdgeInsets.all(14.0),
child: Row(
children: [
Text(
title,
style: Theme.of(context).textTheme.bodyLarge!.copyWith(
fontSize: widget.titleFontSize,
height: 1.0,
),
),
const SizedBox(
width: 5.0,
),
widget.titleIcon != null ? widget.titleIcon! : Container(),
],
Expanded(
child: Padding(
padding: const EdgeInsets.all(14.0),
child: Row(
children: [
Expanded(
child: Text(
title,
style: Theme.of(context).textTheme.bodyText1!.copyWith(
fontSize: widget.titleFontSize,
height: 1.0,
),
),
),
const SizedBox(
width: 5.0,
),
widget.titleIcon != null ? widget.titleIcon! : Container(),
],
),
),
),
Row(
Expand Down