Skip to content

Commit b047150

Browse files
author
Ian Tapply
authored
Merge pull request #20 from Simbotics/master
Version 2.0.0
2 parents 8350dec + 1629ae3 commit b047150

File tree

130 files changed

+7631
-1755
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+7631
-1755
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
# Setup the flutter environment.
2424
- uses: subosito/flutter-action@v1
2525
with:
26-
channel: 'beta' # 'dev', 'alpha', default to: 'stable'
26+
channel: 'stable' # 'dev', 'alpha', default to: 'stable'
2727
flutter-version: '3.7.x' # you can also specify exact version of flutter
2828

2929
# Get flutter dependencies.

.vscode/extensions.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"recommendations": [
3+
"github.copilot"
4+
]
5+
}

LICENSE

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
BSD 3-Clause License
2+
3+
Copyright (c) 2023, Team 1114 - Simbotics
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are met:
7+
8+
1. Redistributions of source code must retain the above copyright notice, this
9+
list of conditions and the following disclaimer.
10+
11+
2. Redistributions in binary form must reproduce the above copyright notice,
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
14+
15+
3. Neither the name of the copyright holder nor the names of its
16+
contributors may be used to endorse or promote products derived from
17+
this software without specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
23+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
25+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
26+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
27+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
1-
# scouting_platform
1+
# 2023 Scouting Platform
22

3-
A new Flutter project.
3+
This branch is for development and not production.
44

5-
## Getting Started
5+
A clean and easy to use socuting app for FRC pre-scouting and official scouting.
66

7-
This project is a starting point for a Flutter application.
8-
9-
A few resources to get you started if this is your first Flutter project:
10-
11-
- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
12-
- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
13-
14-
For help getting started with Flutter development, view the
15-
[online documentation](https://docs.flutter.dev/), which offers tutorials,
16-
samples, guidance on mobile development, and a full API reference.
7+
Documentation can be found [here](https://scouting-platform.ian-tapply.me).

android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ android {
4747
applicationId "org.simbotics.scouting_platform"
4848
minSdkVersion 21
4949
targetSdkVersion 29
50+
compileSdkVersion 33
5051
versionCode 1
5152
versionName "1.0"
5253
versionCode flutterVersionCode.toInteger()

android/app/src/debug/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->
66
<uses-permission android:name="android.permission.INTERNET"/>
7+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
8+
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
79
</manifest>

android/app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
package="org.simbotics.scouting_platform">
33
<application
44
android:label="SimScout"
5-
android:name="${applicationName}">
5+
android:name="${applicationName}"
6+
android:icon="@mipmap/ic_launcher">
67
<activity
78
android:name=".MainActivity"
89
android:exported="true"
910
android:launchMode="singleTop"
10-
android:requestLegacyExternalStorage="true"
1111
android:theme="@style/LaunchTheme"
1212
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1313
android:hardwareAccelerated="true"
14+
android:requestLegacyExternalStorage="true"
1415
android:windowSoftInputMode="adjustResize">
1516
<!-- Specifies an Android theme to apply to this Activity as soon as
1617
the Android process has started. This theme is visible to the user
-371 Bytes
Loading
-347 Bytes
Loading
-1000 Bytes
Loading
Loading
Loading

android/app/src/profile/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
-->
66
<uses-permission android:name="android.permission.INTERNET"/>
77
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
8-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
98
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
109
</manifest>

assets/images/app_icon.png

7.84 KB
Loading
Loading
100 KB
Loading
78.6 KB
Loading
Loading
506 KB
Loading
Loading
Loading
Loading
Loading

lib/builders/dropdownMenu.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ class ScoutingDropdownMenu extends StatefulWidget {
4949
}
5050

5151
class _DropdownMenuState extends State<ScoutingDropdownMenu> {
52-
@override
53-
void initState() {
54-
super.initState();
55-
}
56-
5752
@override
5853
Widget build(BuildContext context) {
5954
return Container(

lib/builders/numberFieldWithCounter.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ class NumberInputFieldWithCounter extends StatefulWidget {
3333

3434
class _NumberInputFieldWithCounterState
3535
extends State<NumberInputFieldWithCounter> {
36-
@override
37-
void initState() {
38-
super.initState();
39-
}
40-
4136
@override
4237
Widget build(BuildContext context) {
4338
return Container(

lib/builders/numberInputField.dart

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,22 @@ class NumberInputField extends StatefulWidget {
88
99
// Controller which holds the currently types text
1010
final TextEditingController controller;
11+
final Function onChanged;
1112
// "Hint Text" which shows up when nothing it typed in the field
1213
final String hintText;
1314
// Margin from sides/top/botto of the screen/widget
1415
final EdgeInsets margin;
1516
// Width of the container which holds the field
1617
final double width;
18+
// Defines if the field is read only or not (editable)
19+
final bool readOnly;
1720

1821
const NumberInputField(
1922
{Key? key,
2023
required this.controller,
24+
required this.onChanged,
2125
required this.hintText,
26+
this.readOnly = false,
2227
this.margin = const EdgeInsets.only(top: 4.0, left: 10.0),
2328
this.width = 150})
2429
: super(key: key);
@@ -28,11 +33,6 @@ class NumberInputField extends StatefulWidget {
2833
}
2934

3035
class _NumberInputFieldState extends State<NumberInputField> {
31-
@override
32-
void initState() {
33-
super.initState();
34-
}
35-
3636
@override
3737
Widget build(BuildContext context) {
3838
return Container(
@@ -53,6 +53,10 @@ class _NumberInputFieldState extends State<NumberInputField> {
5353
borderRadius: BorderRadius.circular(0),
5454
color: AppStyle.textInputColor),
5555
child: TextFormField(
56+
readOnly: widget.readOnly,
57+
onChanged: (value) {
58+
widget.onChanged(value);
59+
},
5660
style: const TextStyle(
5761
color: Colors.white,
5862
fontSize: 16.0,

lib/builders/stopwatchButton.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class StopwatchButton extends StatelessWidget {
3131
backgroundColor: AppStyle.textInputColorLight),
3232
onPressed: () {
3333
stopwatchMethod();
34-
//print("pressed");
3534
},
3635
),
3736
);

0 commit comments

Comments
 (0)