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

Remove file name entry #49

Merged
merged 4 commits into from
Jan 18, 2025
Merged

Remove file name entry #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b518de3
Fix button positions
noah-nm Jan 15, 2025
ba6d46b
Remove file name entry and fix buttons
noah-nm Jan 15, 2025
3eb6aea
Revert "Remove file name entry and fix buttons"
noah-nm Jan 18, 2025
77a36e1
Add missing override tag
noah-nm Jan 18, 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
2 changes: 2 additions & 0 deletions lib/routes/auto/AutonomousDataRoute.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ class _DataRouteState extends State<AutonomousDataRoute> {
style: ElevatedButton.styleFrom(
minimumSize: const Size(150.0, 37.0),
backgroundColor: AppStyle.textInputColor,
padding: const EdgeInsets.all(15),
),
onPressed: () {
Navigator.push(context,
Expand All @@ -112,6 +113,7 @@ class _DataRouteState extends State<AutonomousDataRoute> {
style: ElevatedButton.styleFrom(
minimumSize: const Size(150.0, 37.0),
backgroundColor: AppStyle.textInputColor,
padding: const EdgeInsets.all(15),
),
onPressed: () {
Navigator.push(context,
Expand Down
97 changes: 36 additions & 61 deletions lib/routes/comments/fields/CommentsFields.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,47 +33,45 @@ class _CommentsFields extends State<CommentsFields> {
Align(
alignment: Alignment.bottomRight,
child: Container(
padding: EdgeInsets.only(right: 10),
height: 30.0,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: AppStyle
.textInputColorLight, // Set the background color here
),
onPressed: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) {
return const TeleopRoute(title: "Teleop/Endgame");
}));
},
child: const Text("< Teleop/Endgame",
style: TextStyle(
fontSize: 12.0,
fontFamily: "Helvetica",
color: Colors.white)),
))),
padding: const EdgeInsets.all(3.0),
child: ElevatedButton(
style: ElevatedButton.styleFrom(
minimumSize: const Size(150.0, 37.0),
padding: const EdgeInsets.all(15),
backgroundColor: AppStyle.textInputColor,
),
onPressed: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) {
return const TeleopRoute(title: "Teleop");
}));
},
child: const Text("< Teleop",
style:
TextStyle(fontSize: 16.0, color: Colors.white)),
),
)),
Align(
alignment: Alignment.bottomRight,
child: Container(
padding: EdgeInsets.only(right: 60),
height: 30.0,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: AppStyle
.textInputColorLight, // Set the background color here
),
onPressed: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) {
return const QRCodeRoute(title: "QR Code");
}));
},
child: const Text("Current QR Code >",
style: TextStyle(
fontSize: 12.0,
fontFamily: "Helvetica",
color: Colors.white)),
))),
padding: const EdgeInsets.all(3.0),
child: ElevatedButton(
style: ElevatedButton.styleFrom(
minimumSize: const Size(150.0, 37.0),
padding: const EdgeInsets.all(15),
backgroundColor: AppStyle.textInputColor,
),
onPressed: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) {
return const QRCodeRoute(title: "QR Code");
}));
},
child: const Text("Current QR Code >",
style:
TextStyle(fontSize: 16.0, color: Colors.white)),
),
)),
]),
],
),
Expand Down Expand Up @@ -128,29 +126,6 @@ class _CommentsFields extends State<CommentsFields> {
height: 90.0,
maxLines: 10,
),
Align(
alignment: Alignment.bottomRight,
child: Container(
padding: const EdgeInsets.only(
top: 4.0, right: 40, left: 80.0, bottom: 20.0),
height: 80.0,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: AppStyle
.textInputColorLight, // Set the background color here
),
onPressed: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) {
return const QRCodeRoute(title: "QR Code");
}));
},
child: const Text("Current QR Code >",
style: TextStyle(
fontSize: 24.0,
fontFamily: "Helvetica",
color: Colors.white)),
))),
],
);
}
Expand Down
25 changes: 0 additions & 25 deletions lib/routes/prematch/fields/PrematchFields.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
import 'package:flutter/material.dart';
import 'package:scouting_platform/builders/bases/NumberInputField.dart';
import 'package:scouting_platform/builders/bases/TextInputField.dart';
import 'package:scouting_platform/routes/auto/AutonomousDataRoute.dart';
import 'package:scouting_platform/styles/AppStyle.dart';
import 'package:scouting_platform/utils/helpers/AppDataHelper.dart';
import 'package:scouting_platform/utils/helpers/ScheduleHelper.dart';
import 'package:scouting_platform/utils/data/values/PrematchValues.dart';
Expand Down Expand Up @@ -140,29 +138,6 @@ class _PrematchFieldsState extends State<PrematchFields> {
controller: PrematchValues.teamNumber,
hintText: "Team Number",
),
Align(
alignment: Alignment.bottomRight,
child: Container(
padding:
const EdgeInsets.only(top: 4.0, right: 13, left: 100.0),
height: 47.0,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: AppStyle
.textInputColor, // Set the background color here
),
onPressed: () {
Navigator.push(context,
MaterialPageRoute(builder: (context) {
return const AutonomousDataRoute(title: "Auto");
}));
},
child: const Text("Auto >",
style: TextStyle(
fontSize: 16.0,
fontFamily: "Helvetica",
color: Colors.white)),
)))
],
);
}
Expand Down
25 changes: 21 additions & 4 deletions lib/routes/prematch/labels/PrematchLabels.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// ignore_for_file: file_names
import 'package:scouting_platform/styles/AppStyle.dart';
import 'package:scouting_platform/routes/auto/AutonomousDataRoute.dart';
import 'package:flutter/material.dart';

class PrematchLabels extends StatefulWidget {
Expand All @@ -20,8 +22,7 @@ class _PrematchLabelsState extends State<PrematchLabels> {
alignment: Alignment.centerLeft,
child: Container(
width: 170.0,
padding:
const EdgeInsets.only(left: 20.0, top: 20.0, right: 30.0),
padding: const EdgeInsets.only(left: 20.0, top: 20.0, right: 5.0),
child: const Text(
"Initials",
textAlign: TextAlign.left,
Expand Down Expand Up @@ -62,8 +63,24 @@ class _PrematchLabelsState extends State<PrematchLabels> {
fontSize: 15.0),
),
)),

const Divider(),
const SizedBox(width: 598.0),
Container(
padding: const EdgeInsets.all(5.0),
child: ElevatedButton(
style: ElevatedButton.styleFrom(
minimumSize: const Size(150.0, 37.0),
padding: const EdgeInsets.all(15),
backgroundColor: AppStyle.textInputColor,
),
onPressed: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
return const AutonomousDataRoute(title: "Auto");
}));
},
child: const Text("Auto >",
style: TextStyle(fontSize: 16.0, color: Colors.white)),
),
)
],
);
}
Expand Down
31 changes: 28 additions & 3 deletions lib/routes/qrcode/QRCodeRoute.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import 'package:scouting_platform/utils/data/values/PrematchValues.dart';
import 'package:scouting_platform/utils/helpers/AppDataHelper.dart';
import 'package:scouting_platform/utils/helpers/ScheduleHelper.dart';
import 'package:scouting_platform/styles/AppStyle.dart';
import 'package:scouting_platform/routes/comments/CommentsRoute.dart';

class QRCodeRoute extends StatefulWidget {
const QRCodeRoute({super.key, required this.title});
Expand Down Expand Up @@ -40,11 +41,36 @@ class _QRCodeRouteState extends State<QRCodeRoute> {
),
),
Positioned(
top: 16.0,
right: 16.0,
top: 5.0,
left: 5.0,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
minimumSize: const Size(150.0, 37.0),
padding: EdgeInsets.all(15.0),
backgroundColor: AppStyle.textInputColor,
),
onPressed: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
return const CommentsRoute(title: "Comments");
}));
},
child: const Text(
"< Comments",
style: TextStyle(
fontSize: 16.0,
fontFamily: "Helvetica",
color: Colors.white,
),
),
),
),
Positioned(
top: 5.0,
right: 5.0,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
minimumSize: const Size(150.0, 37.0),
padding: EdgeInsets.all(15.0),
backgroundColor: AppStyle.textInputColor,
),
onPressed: () {
Expand Down Expand Up @@ -117,4 +143,3 @@ class _QRCodeRouteState extends State<QRCodeRoute> {
);
}
}

24 changes: 1 addition & 23 deletions lib/routes/settings/SettingsRoute.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,28 +113,6 @@ class _SettingsRoute extends State<SettingsRoute> {
margin: const EdgeInsets.only(left: 40, top: 10)),
],
),
Column(
children: [
const TitleStyle(
text: "File Name",
padding: EdgeInsets.only(left: 30, top: 10)),
TextInputField(
onChanged: (value) {
setState(() {
SettingValues.fileName.text = value;
});
},
textAlign: TextAlign.left,
hintText: "File Name",
controller: SettingValues.fileName,
margin: const EdgeInsets.only(left: 45, top: 10),
),
],
)
],
),
Row(
children: [
Column(
children: [
const TitleStyle(
Expand All @@ -161,7 +139,7 @@ class _SettingsRoute extends State<SettingsRoute> {
],
)
],
)
),
],
)));
}
Expand Down
Loading
Loading