Skip to content

fix: Reduced the extra white space around save and transfer #1421

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

Merged
merged 10 commits into from
Sep 4, 2025
Merged

fix: Reduced the extra white space around save and transfer #1421

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a7fee45
fix: Reduced the extra white space around save and transfer
samruddhi-Rahegaonkar Aug 22, 2025
5e347ee
Merge branch 'development' into issue1419
samruddhi-Rahegaonkar Aug 22, 2025
eaa3a4c
Merge branch 'development' into issue1419
samruddhi-Rahegaonkar Aug 22, 2025
cec247b
Merge branch 'development' into issue1419
samruddhi-Rahegaonkar Aug 24, 2025
aef7f36
Merge branch 'development' into issue1419
samruddhi-Rahegaonkar Aug 25, 2025
56170ed
Merge branch 'development' into issue1419
samruddhi-Rahegaonkar Aug 26, 2025
f11a0e5
Merge branch 'development' into issue1419
samruddhi-Rahegaonkar Aug 28, 2025
97c22d8
Merge branch 'development' into issue1419
mariobehling Sep 1, 2025
85d8697
Merge branch 'development' into issue1419
mariobehling Sep 1, 2025
30ed5df
Merge branch 'development' into issue1419
samruddhi-Rahegaonkar Sep 3, 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
279 changes: 131 additions & 148 deletions lib/view/homescreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ class _HomeScreenState extends State<HomeScreen>
? const NeverScrollableScrollPhysics()
: const AlwaysScrollableScrollPhysics(),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
AnimationBadge(),
Container(
Expand Down Expand Up @@ -252,7 +253,7 @@ class _HomeScreenState extends State<HomeScreen>
],
),
SizedBox(
height: 250.h,
height: 350.h,
child: TabBarView(
physics: const NeverScrollableScrollPhysics(),
controller: _tabController,
Expand All @@ -277,168 +278,150 @@ class _HomeScreenState extends State<HomeScreen>
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
padding: EdgeInsets.symmetric(vertical: 20.h),
child: Consumer<AnimationBadgeProvider>(
builder: (context, animationProvider, _) {
final isSpecial = animationProvider
.isSpecialAnimationSelected();

if (isSpecial) {
// Only show Transfer button, centered
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
padding:
EdgeInsets.symmetric(vertical: 20.h),
child: GestureDetector(
onTap: () async {
await animationProvider
.handleAnimationTransfer(
badgeData: badgeData,
inlineImageProvider:
inlineImageProvider,
speedDialProvider:
speedDialProvider,
flash: animationProvider
.isEffectActive(FlashEffect()),
marquee: animationProvider
.isEffectActive(
MarqueeEffect()),
invert: animationProvider
.isEffectActive(
InvertLEDEffect()),
);
},
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 33.w, vertical: 8.h),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(2.r),
color: mdGrey400,
),
child: const Text('Transfer'),
),
),
// Only Transfer button (for special animations)
return GestureDetector(
onTap: () async {
await animationProvider
.handleAnimationTransfer(
badgeData: badgeData,
inlineImageProvider: inlineImageProvider,
speedDialProvider: speedDialProvider,
flash: animationProvider
.isEffectActive(FlashEffect()),
marquee: animationProvider
.isEffectActive(MarqueeEffect()),
invert: animationProvider
.isEffectActive(InvertLEDEffect()),
);
},
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 33.w, vertical: 8.h),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(2.r),
color: mdGrey400,
),
],
child: const Text('Transfer'),
),
);
} else {
// Show both Save and Transfer as before
// Save + Transfer buttons
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
padding:
EdgeInsets.symmetric(vertical: 20.h),
child: GestureDetector(
onTap: () async {
if (inlineimagecontroller.text
.trim()
.isEmpty) {
ToastUtils().showToast(
"Please enter a message");
return;
}
// If we're editing an existing badge, update it instead of showing save dialog
if (widget.savedBadgeFilename !=
null) {
SavedBadgeProvider
savedBadgeProvider =
SavedBadgeProvider();
String baseFilename =
widget.savedBadgeFilename!;
if (baseFilename
.endsWith('.json')) {
baseFilename =
baseFilename.substring(0,
baseFilename.length - 5);
}
await savedBadgeProvider
.updateBadgeData(
baseFilename, // Pass the filename without .json extension
inlineimagecontroller.text,
animationProvider.isEffectActive(
FlashEffect()),
animationProvider.isEffectActive(
MarqueeEffect()),
animationProvider.isEffectActive(
InvertLEDEffect()),
speedDialProvider.getOuterValue(),
animationProvider
.getAnimationIndex() ??
1,
);
ToastUtils().showToast(
"Badge Updated Successfully");
Navigator.pushNamedAndRemoveUntil(
context,
'/savedBadge',
(route) => false);
} else {
// Show save dialog for new badges
showDialog(
context: context,
builder: (context) {
return SaveBadgeDialog(
speed: speedDialProvider,
animationProvider:
animationProvider,
textController:
inlineimagecontroller,
isInverse: animationProvider
.isEffectActive(
InvertLEDEffect()),
);
},
);
// Save button
GestureDetector(
onTap: () async {
if (inlineimagecontroller.text
.trim()
.isEmpty) {
ToastUtils().showToast(
"Please enter a message");
return;
}

if (widget.savedBadgeFilename != null) {
// Update existing badge
SavedBadgeProvider
savedBadgeProvider =
SavedBadgeProvider();
String baseFilename =
widget.savedBadgeFilename!;
if (baseFilename.endsWith('.json')) {
baseFilename =
baseFilename.substring(
0, baseFilename.length - 5);
}
},
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 33.w, vertical: 8.h),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(2.r),
color: mdGrey400,
),
child: const Text('Save'),

await savedBadgeProvider
.updateBadgeData(
baseFilename,
inlineimagecontroller.text,
animationProvider
.isEffectActive(FlashEffect()),
animationProvider.isEffectActive(
MarqueeEffect()),
animationProvider.isEffectActive(
InvertLEDEffect()),
speedDialProvider.getOuterValue(),
animationProvider
.getAnimationIndex() ??
1,
);

ToastUtils().showToast(
"Badge Updated Successfully");
Navigator.pushNamedAndRemoveUntil(
context,
'/savedBadge',
(route) => false,
);
} else {
// Save new badge dialog
showDialog(
context: context,
builder: (context) {
return SaveBadgeDialog(
speed: speedDialProvider,
animationProvider:
animationProvider,
textController:
inlineimagecontroller,
isInverse: animationProvider
.isEffectActive(
InvertLEDEffect()),
);
},
);
}
},
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 33.w, vertical: 8.h),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(2.r),
color: mdGrey400,
),
child: const Text('Save'),
),
),
SizedBox(width: 100.w),
Container(
padding:
EdgeInsets.symmetric(vertical: 20.h),
child: GestureDetector(
onTap: () async {
await animationProvider
.handleAnimationTransfer(
badgeData: badgeData,
inlineImageProvider:
inlineImageProvider,
speedDialProvider:
speedDialProvider,
flash: animationProvider
.isEffectActive(FlashEffect()),
marquee: animationProvider
.isEffectActive(
MarqueeEffect()),
invert: animationProvider
.isEffectActive(
InvertLEDEffect()),
);
},
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 20.w, vertical: 8.h),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(2.r),
color: mdGrey400,
),
child: const Text('Transfer'),

SizedBox(width: 40.w),

// Transfer button
GestureDetector(
onTap: () async {
await animationProvider
.handleAnimationTransfer(
badgeData: badgeData,
inlineImageProvider:
inlineImageProvider,
speedDialProvider: speedDialProvider,
flash: animationProvider
.isEffectActive(FlashEffect()),
marquee: animationProvider
.isEffectActive(MarqueeEffect()),
invert:
animationProvider.isEffectActive(
InvertLEDEffect()),
);
},
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 33.w, vertical: 8.h),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(2.r),
color: mdGrey400,
),
child: const Text('Transfer'),
),
),
],
Expand All @@ -448,7 +431,7 @@ class _HomeScreenState extends State<HomeScreen>
),
),
],
)
),
],
),
),
Expand Down
Loading