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

fix: UI overflow #234

Merged
merged 1 commit into from
Jan 3, 2024
Merged

fix: UI overflow #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/drawer/filter_drawer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class FilterDrawer extends StatelessWidget {
? Colors.white
: Color.fromARGB(255, 48, 46, 46)),
fontSize: 18),
//textAlign: TextAlign.right,
// textAlign: TextAlign.right,
),
),
const Divider(
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/full_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class FormSubmitButton extends StatelessWidget {
Widget build(BuildContext context) => ElevatedButton(
style: ElevatedButton.styleFrom(
shape: const StadiumBorder(),
onPrimary: Colors.white,
// onPrimary: Colors.white,
padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 12),
),
onPressed: onPressed,
Expand Down
75 changes: 41 additions & 34 deletions lib/widgets/profilefunctions/deleteprofiledialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,48 @@ class DeleteProfileDialog extends StatelessWidget {

@override
Widget build(BuildContext context) {
return AlertDialog(
scrollable: true,
content: const Text('Delete profile?'),
actions: [
TextButton(
onPressed: () {
Navigator.of(context).pop();
},
child: const Text('Cancel'),
return Center(
child: SingleChildScrollView(
child: Center(
child: AlertDialog(
scrollable: true,
title: const Text('Delete Profile?'),
// content: TextField(controller: controller),
actions: [
TextButton(
onPressed: () {
Navigator.of(context).pop();
},
child: const Text('Cancel'),
),
ElevatedButton(
onPressed: () {
try {
ProfilesWidget.of(context).deleteProfile(profile);
Navigator.of(context).pop();
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text(
'Profile: ${profile.characters} Deleted Successfully'),
backgroundColor: AppSettings.isDarkMode
? const Color.fromARGB(255, 61, 61, 61)
: const Color.fromARGB(255, 39, 39, 39),
duration: const Duration(seconds: 2)));
} catch (e) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text(
'Profile: ${profile.characters} Deletion Failed'),
backgroundColor: AppSettings.isDarkMode
? const Color.fromARGB(255, 61, 61, 61)
: const Color.fromARGB(255, 39, 39, 39),
duration: const Duration(seconds: 2)));
}
},
child: const Text('Confirm'),
),
],
),
),
ElevatedButton(
onPressed: () {
try {
ProfilesWidget.of(context).deleteProfile(profile);
Navigator.of(context).pop();
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text(
'Profile: ${profile.characters} Deleted Successfully'),
backgroundColor: AppSettings.isDarkMode
? const Color.fromARGB(255, 61, 61, 61)
: const Color.fromARGB(255, 39, 39, 39),
duration: const Duration(seconds: 2)));
} catch (e) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content:
Text('Profile: ${profile.characters} Deletion Failed'),
backgroundColor: AppSettings.isDarkMode
? const Color.fromARGB(255, 61, 61, 61)
: const Color.fromARGB(255, 39, 39, 39),
duration: const Duration(seconds: 2)));
}
},
child: const Text('Confirm'),
),
],
),
);
}
}
2 changes: 1 addition & 1 deletion lib/widgets/profilefunctions/manageprofile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ManageProfile extends StatelessWidget {
var triples = [
Tuple3(Icons.edit, 'Rename Alias', rename),
Tuple3(Icons.link, 'Configure Taskserver', configure),
Tuple3(Icons.file_download, 'Export tasks', export),
Tuple3(Icons.upload, 'Export tasks', export),
Tuple3(Icons.copy, 'Copy config to new profile', copy),
Tuple3(Icons.delete, 'Delete profile', delete),
];
Expand Down
25 changes: 15 additions & 10 deletions lib/widgets/profilefunctions/selectprofile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class SelectProfile extends StatelessWidget {
entry.key,
() => selectProfile(entry.key),
entry.value,
),
)
],
);
}
Expand Down Expand Up @@ -129,15 +129,20 @@ class SelectProfileListTile extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start,
children: [
if (alias != null && alias!.isNotEmpty)
SingleChildScrollView(
key: PageStorageKey<String>('scroll-title-$uuid'),
scrollDirection: Axis.horizontal,
child: Text(
alias!,
style: GoogleFonts.poppins(
color: AppSettings.isDarkMode
? Colors.white
: const Color.fromARGB(255, 48, 46, 46),
SizedBox(
// height: 100,
width: double.maxFinite,
child: SingleChildScrollView(
key: PageStorageKey<String>('scroll-title-$uuid'),
scrollDirection: Axis.horizontal,
child: Text(
alias!,
overflow: TextOverflow.fade,
style: GoogleFonts.poppins(
color: AppSettings.isDarkMode
? Colors.white
: const Color.fromARGB(255, 48, 46, 46),
),
),
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/project_filter.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class ProjectsColumn extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"All Projecs",
"All Projects",
style: GoogleFonts.poppins(
fontWeight: FontWeight.w600,
fontSize: 12,
Expand Down
48 changes: 40 additions & 8 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.8.1"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: e45c31f458d01fd9ef4a214feb2e153b72d5b1907435f4332b1637a2f348c021
url: "https://pub.dev"
source: hosted
version: "9.0.18"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "54808cfcfa87dbc0d74c61ac063d624adf1bd5c0407301f32b06c783c60dc4ca"
url: "https://pub.dev"
source: hosted
version: "2.0.0"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "7e71be3c161472f6c9158ac8875dd8de575060d60b5d159ebca3600ea32c9116"
url: "https://pub.dev"
source: hosted
version: "1.0.6"
lints:
dependency: transitive
description:
Expand Down Expand Up @@ -628,26 +652,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
mime:
dependency: transitive
description:
Expand Down Expand Up @@ -692,10 +716,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
path_parsing:
dependency: transitive
description:
Expand Down Expand Up @@ -1205,6 +1229,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
vm_service:
dependency: transitive
description:
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "13.0.0"
watcher:
dependency: transitive
description:
Expand Down
Loading