Compare commits
5 Commits
69f0600d21
...
1.2
| Author | SHA1 | Date | |
|---|---|---|---|
| c7233daec7 | |||
| c03e9556b7 | |||
| bcd10ed512 | |||
| 4ab8b70524 | |||
| 10377a2a0a |
1
buildandpush.sh
Normal file
1
buildandpush.sh
Normal file
@@ -0,0 +1 @@
|
|||||||
|
flutter build web --release && docker buildx build --platform linux/amd64 -t git.degnedict.de/bene/ifrbuddy --push .
|
||||||
@@ -184,7 +184,7 @@ class ComparisonPageState extends State<ComparisonPage> {
|
|||||||
child: Padding(
|
child: Padding(
|
||||||
padding: EdgeInsets.all(16.0),
|
padding: EdgeInsets.all(16.0),
|
||||||
child: Text(
|
child: Text(
|
||||||
'Use this Page while receiving your clearance. The arrow button copies the expected value. Same if left empty.',
|
'Use this Page while receiving your clearance.\nThe arrow button copies the expected value. If left empty, expected values are still copied. the arrow buttons are a help for the Brain :)',
|
||||||
style: TextStyle(fontSize: 16),
|
style: TextStyle(fontSize: 16),
|
||||||
textAlign: TextAlign.center,
|
textAlign: TextAlign.center,
|
||||||
),
|
),
|
||||||
@@ -214,7 +214,7 @@ class ComparisonPageState extends State<ComparisonPage> {
|
|||||||
buildExpectedClearanceField('Route', widget.expectedRoute),
|
buildExpectedClearanceField('Route', widget.expectedRoute),
|
||||||
buildExpectedClearanceField('Altitude', widget.expectedAltitude),
|
buildExpectedClearanceField('Altitude', widget.expectedAltitude),
|
||||||
buildExpectedClearanceField('Frequency', widget.expectedFrequency),
|
buildExpectedClearanceField('Frequency', widget.expectedFrequency),
|
||||||
buildExpectedClearanceField('Transponder (Squawk)', widget.expectedSquawk),
|
// buildExpectedClearanceField('Transponder (Squawk)', widget.expectedSquawk),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,8 +1,13 @@
|
|||||||
|
// ignore_for_file: prefer_const_constructors
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'comparison_page.dart';
|
import 'comparison_page.dart';
|
||||||
import 'final_clearance_page.dart'; // Import final clearance page
|
import 'final_clearance_page.dart'; // Import final clearance page
|
||||||
import '../utils/frequency_input_formatter.dart'; // Ensure this path is correct
|
import '../utils/frequency_input_formatter.dart'; // Ensure this path is correct
|
||||||
|
import 'package:http/http.dart' as http;
|
||||||
|
import 'dart:convert';
|
||||||
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
|
||||||
class ExpectationInputPage extends StatefulWidget {
|
class ExpectationInputPage extends StatefulWidget {
|
||||||
final bool isDarkMode;
|
final bool isDarkMode;
|
||||||
@@ -30,6 +35,7 @@ class ExpectationInputPageState extends State<ExpectationInputPage> {
|
|||||||
TextEditingController();
|
TextEditingController();
|
||||||
final TextEditingController _expectedFrequencyController =
|
final TextEditingController _expectedFrequencyController =
|
||||||
TextEditingController();
|
TextEditingController();
|
||||||
|
final TextEditingController _simbriefIdController = TextEditingController();
|
||||||
|
|
||||||
// FocusNodes for each field
|
// FocusNodes for each field
|
||||||
final FocusNode _clearanceLimitFocusNode = FocusNode();
|
final FocusNode _clearanceLimitFocusNode = FocusNode();
|
||||||
@@ -38,6 +44,38 @@ class ExpectationInputPageState extends State<ExpectationInputPage> {
|
|||||||
final FocusNode _frequencyFocusNode = FocusNode();
|
final FocusNode _frequencyFocusNode = FocusNode();
|
||||||
final FocusNode _squawkFocusNode = FocusNode();
|
final FocusNode _squawkFocusNode = FocusNode();
|
||||||
|
|
||||||
|
// Neue Variablen
|
||||||
|
bool _saveSimbriefId = false;
|
||||||
|
static const String _simbriefIdKey = 'simbrief_id';
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_loadSavedSimbriefId();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Methode zum Laden der gespeicherten ID
|
||||||
|
Future<void> _loadSavedSimbriefId() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
final savedId = prefs.getString(_simbriefIdKey);
|
||||||
|
if (savedId != null) {
|
||||||
|
setState(() {
|
||||||
|
_simbriefIdController.text = savedId;
|
||||||
|
_saveSimbriefId = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Methode zum Speichern der ID
|
||||||
|
Future<void> _saveSimbriefIdToPrefs() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
if (_saveSimbriefId) {
|
||||||
|
await prefs.setString(_simbriefIdKey, _simbriefIdController.text);
|
||||||
|
} else {
|
||||||
|
await prefs.remove(_simbriefIdKey);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_expectedClearanceLimitController.dispose();
|
_expectedClearanceLimitController.dispose();
|
||||||
@@ -53,6 +91,44 @@ class ExpectationInputPageState extends State<ExpectationInputPage> {
|
|||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> _fetchSimbriefData() async {
|
||||||
|
try {
|
||||||
|
if (_saveSimbriefId) {
|
||||||
|
await _saveSimbriefIdToPrefs();
|
||||||
|
}
|
||||||
|
final response = await http.get(
|
||||||
|
Uri.parse('https://www.simbrief.com/api/xml.fetcher.php?userid=${_simbriefIdController.text}&json=1'),
|
||||||
|
);
|
||||||
|
|
||||||
|
// Prüfe ob Widget noch mounted ist
|
||||||
|
if (!mounted) return;
|
||||||
|
|
||||||
|
if (response.statusCode == 200) {
|
||||||
|
final data = json.decode(response.body);
|
||||||
|
|
||||||
|
String fullRoute = data['general']['route'] ?? '';
|
||||||
|
String sid = fullRoute.split(' ').first;
|
||||||
|
|
||||||
|
setState(() {
|
||||||
|
_expectedClearanceLimitController.text = data['destination']['icao_code'] ?? '';
|
||||||
|
_expectedRouteController.text = sid;
|
||||||
|
_expectedAltitudeController.text = '';
|
||||||
|
_expectedFrequencyController.text = '';
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!mounted) return; // Zweiter Check vor ScaffoldMessenger
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
const SnackBar(content: Text('SimBrief Daten erfolgreich geladen')),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
if (!mounted) return; // Check vor Error-SnackBar
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(content: Text('Fehler beim Laden der SimBrief Daten: $e')),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void _navigateToComparisonPage() {
|
void _navigateToComparisonPage() {
|
||||||
if (_formKey.currentState?.validate() ?? false) {
|
if (_formKey.currentState?.validate() ?? false) {
|
||||||
Navigator.push(
|
Navigator.push(
|
||||||
@@ -181,27 +257,86 @@ class ExpectationInputPageState extends State<ExpectationInputPage> {
|
|||||||
padding: const EdgeInsets.all(16.0),
|
padding: const EdgeInsets.all(16.0),
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
const Card(
|
// IntrinsicHeight Widget hinzufügen
|
||||||
elevation: 2,
|
IntrinsicHeight(
|
||||||
child: Padding(
|
child: Row(
|
||||||
padding: EdgeInsets.all(16.0),
|
crossAxisAlignment: CrossAxisAlignment.stretch, // Stretch hinzufügen
|
||||||
child: Column(
|
children: [
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
// Welcome Card - nimmt 60% der Breite
|
||||||
children: [
|
Expanded(
|
||||||
Text(
|
flex: 3,
|
||||||
'Welcome to IFR Buddy!',
|
child: Card(
|
||||||
style: TextStyle(
|
elevation: 2,
|
||||||
fontSize: 18, fontWeight: FontWeight.bold),
|
child: Padding(
|
||||||
textAlign: TextAlign.left,
|
padding: const EdgeInsets.all(16.0),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: const [
|
||||||
|
Text(
|
||||||
|
'Welcome to IFR Buddy!',
|
||||||
|
style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
|
||||||
|
),
|
||||||
|
SizedBox(height: 10),
|
||||||
|
Text(
|
||||||
|
'Just an easy tool for writing down IFR clearances without a pen.',
|
||||||
|
style: TextStyle(fontSize: 16),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 10),
|
),
|
||||||
Text(
|
const SizedBox(width: 16), // Abstand zwischen den Cards
|
||||||
'Just an easy tool for writing down IFR clearances without a pen.',
|
// SimBrief Card - nimmt 40% der Breite
|
||||||
style: TextStyle(fontSize: 16),
|
Expanded(
|
||||||
textAlign: TextAlign.left,
|
flex: 2,
|
||||||
|
child: Card(
|
||||||
|
elevation: 2,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(16.0),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
const Text(
|
||||||
|
'SimBrief Import',
|
||||||
|
style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
TextFormField(
|
||||||
|
controller: _simbriefIdController,
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: 'SimBrief Pilot ID',
|
||||||
|
border: OutlineInputBorder(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Checkbox(
|
||||||
|
value: _saveSimbriefId,
|
||||||
|
onChanged: (bool? value) {
|
||||||
|
setState(() {
|
||||||
|
_saveSimbriefId = value ?? false;
|
||||||
|
});
|
||||||
|
_saveSimbriefIdToPrefs();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
const Text('Save SimBrief ID'),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
width: double.infinity,
|
||||||
|
child: ElevatedButton(
|
||||||
|
onPressed: _fetchSimbriefData,
|
||||||
|
child: const Text('Load SimBrief Data'),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
),
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
@@ -219,12 +354,15 @@ class ExpectationInputPageState extends State<ExpectationInputPage> {
|
|||||||
),
|
),
|
||||||
const SizedBox(height: 10),
|
const SizedBox(height: 10),
|
||||||
const Text(
|
const Text(
|
||||||
'Enter your expected clearance information below. '
|
'Enter your expected clearance information below (Or use the SimBrief import). '
|
||||||
'Use the listening page or skip to the readback page.',
|
'Use the listening page or skip to the readback page.',
|
||||||
style: TextStyle(fontSize: 16),
|
style: TextStyle(fontSize: 16),
|
||||||
textAlign: TextAlign.left,
|
textAlign: TextAlign.left,
|
||||||
),
|
),
|
||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.all(8.0),
|
||||||
|
),
|
||||||
Form(
|
Form(
|
||||||
key: _formKey,
|
key: _formKey,
|
||||||
child: Column(
|
child: Column(
|
||||||
@@ -287,23 +425,23 @@ class ExpectationInputPageState extends State<ExpectationInputPage> {
|
|||||||
enableIMEPersonalizedLearning:
|
enableIMEPersonalizedLearning:
|
||||||
false, // iOS-specific
|
false, // iOS-specific
|
||||||
),
|
),
|
||||||
buildTextField(
|
// buildTextField(
|
||||||
label: 'Transponder (Squawk)', // Now last field
|
// label: 'Transponder (Squawk)', // Now last field
|
||||||
controller: _expectedSquawkController,
|
// controller: _expectedSquawkController,
|
||||||
currentFocus: _squawkFocusNode,
|
// currentFocus: _squawkFocusNode,
|
||||||
isLastField: true, // Mark as last field
|
// isLastField: true, // Mark as last field
|
||||||
keyboardType: TextInputType.text, // Standard keyboard
|
// keyboardType: TextInputType.text, // Standard keyboard
|
||||||
inputFormatters: [
|
// inputFormatters: [
|
||||||
// Allow only digits 0-7 and limit to 4 characters
|
// // Allow only digits 0-7 and limit to 4 characters
|
||||||
FilteringTextInputFormatter.allow(
|
// FilteringTextInputFormatter.allow(
|
||||||
RegExp(r'[0-7]')),
|
// RegExp(r'[0-7]')),
|
||||||
LengthLimitingTextInputFormatter(4),
|
// LengthLimitingTextInputFormatter(4),
|
||||||
],
|
// ],
|
||||||
enableAutocorrect: false, // Disable autocorrect
|
// enableAutocorrect: false, // Disable autocorrect
|
||||||
enableSuggestions: false, // Disable suggestions
|
// enableSuggestions: false, // Disable suggestions
|
||||||
enableIMEPersonalizedLearning:
|
// enableIMEPersonalizedLearning:
|
||||||
false, // iOS-specific
|
// false, // iOS-specific
|
||||||
),
|
// ),
|
||||||
const SizedBox(height: 20),
|
const SizedBox(height: 20),
|
||||||
ElevatedButton(
|
ElevatedButton(
|
||||||
onPressed: _navigateToComparisonPage,
|
onPressed: _navigateToComparisonPage,
|
||||||
|
|||||||
@@ -8,5 +8,7 @@
|
|||||||
<true/>
|
<true/>
|
||||||
<key>com.apple.security.network.server</key>
|
<key>com.apple.security.network.server</key>
|
||||||
<true/>
|
<true/>
|
||||||
|
<key>com.apple.security.network.client</key>
|
||||||
|
<true/>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|||||||
@@ -4,5 +4,8 @@
|
|||||||
<dict>
|
<dict>
|
||||||
<key>com.apple.security.app-sandbox</key>
|
<key>com.apple.security.app-sandbox</key>
|
||||||
<true/>
|
<true/>
|
||||||
|
<key>com.apple.security.network.client</key>
|
||||||
|
<true/>
|
||||||
|
<key>com.apple.security.network.server</key>w
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|||||||
Reference in New Issue
Block a user