git/caesar-transfer
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

refactor(flutter_gui); removed not needed parts

Browse source
This commit is contained in:
Patryk Hegenberg 2024-05-25 21:04:16 +02:00
parent 1586818bd6
commit 351b7b9323
6 changed files with 48 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flutter_test_gui/lib/pages/receive_screen.dart
View file

@ -6,19 +6,17 @@ import 'package:mobile_scanner/mobile_scanner.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter_test_gui/src/rust/api/simple.dart'; import 'package:flutter_test_gui/src/rust/api/simple.dart';
import 'package:flutter_test_gui/src/rust/frb_generated.dart'; // import 'package:flutter_test_gui/src/rust/frb_generated.dart';
import 'package:flutter_test_gui/consts/consts.dart'; import 'package:flutter_test_gui/consts/consts.dart';
// const backColor = Color(0xFF32363E);
// const highlightColor = Color(0xFF98C379);
// const textColor = Color(0xFFABB2BF);
class ReceiveScreen extends StatefulWidget { class ReceiveScreen extends StatefulWidget {
const ReceiveScreen({super.key});
@override @override
_ReceiveScreenState createState() => _ReceiveScreenState(); ReceiveScreenState createState() => ReceiveScreenState();
} }
class _ReceiveScreenState extends State<ReceiveScreen> { class ReceiveScreenState extends State<ReceiveScreen> {
String appOrigin = ''; String appOrigin = '';
final myController = TextEditingController(); final myController = TextEditingController();
String inputValue = ''; String inputValue = '';
@ -84,12 +82,14 @@ class _ReceiveScreenState extends State<ReceiveScreen> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => MyHomePage(title: 'Caesar Transfer'))); builder: (context) =>
const MyHomePage(title: 'Caesar Transfer')));
} else { } else {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => MyHomePage(title: 'Caesar Transfer'))); builder: (context) =>
const MyHomePage(title: 'Caesar Transfer')));
} }
} else { } else {
try { try {
@ -102,25 +102,13 @@ class _ReceiveScreenState extends State<ReceiveScreen> {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => MyHomePage(title: 'Caesar Transfer'))); builder: (context) =>
const MyHomePage(title: 'Caesar Transfer')));
} }
} }
print("Transfer startet with app_origin: $appOrigin"); print("Transfer startet with app_origin: $appOrigin");
} }
// Future<bool> requestPermission(Permission permission) async {
// if (await permission.isGranted) {
// return true;
// } else {
// var result = await permission.request();
// if (result == PermissionStatus.granted) {
// return true;
// } else {
// return false;
// }
// }
// }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@ -141,7 +129,7 @@ class _ReceiveScreenState extends State<ReceiveScreen> {
child: Container( child: Container(
width: 200, width: 200,
height: 200, height: 200,
decoration: BoxDecoration( decoration: const BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: Constants.textColor, color: Constants.textColor,
), ),

22
flutter_test_gui/lib/pages/send_screen.dart
View file

@ -6,19 +6,17 @@ import 'package:cross_file/cross_file.dart';
import 'package:file_picker/file_picker.dart'; import 'package:file_picker/file_picker.dart';
import 'package:flutter_test_gui/pages/waiting_screen.dart'; import 'package:flutter_test_gui/pages/waiting_screen.dart';
import 'package:flutter_test_gui/src/rust/api/simple.dart'; import 'package:flutter_test_gui/src/rust/api/simple.dart';
import 'package:flutter_test_gui/src/rust/frb_generated.dart'; // import 'package:flutter_test_gui/src/rust/frb_generated.dart';
import 'package:flutter_test_gui/consts/consts.dart'; import 'package:flutter_test_gui/consts/consts.dart';
// const backColor = Color(0xFF32363E);
// const highlightColor = Color(0xFF98C379);
// const textColor = Color(0xFFABB2BF);
class SendScreen extends StatefulWidget { class SendScreen extends StatefulWidget {
const SendScreen({super.key});
@override @override
_SendScreenState createState() => _SendScreenState(); SendScreenState createState() => SendScreenState();
} }
class _SendScreenState extends State<SendScreen> { class SendScreenState extends State<SendScreen> {
final List<XFile> _list = []; final List<XFile> _list = [];
String transferName = ''; String transferName = '';
bool _dragging = false; bool _dragging = false;
@ -90,12 +88,12 @@ class _SendScreenState extends State<SendScreen> {
), ),
) )
: const Center( : const Center(
child: Icon( child: Icon(
Icons.upload_rounded, Icons.upload_rounded,
color: Constants.highlightColor, color: Constants.highlightColor,
size: 200, size: 200,
),
), ),
),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
], ],

24
flutter_test_gui/lib/pages/settings_screen.dart
View file

@ -37,16 +37,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
_appRelayController.text = appRelay; _appRelayController.text = appRelay;
}); });
} }
// Future<void> loadSettings() async {
// SharedPreferences prefs = await SharedPreferences.getInstance();
// setState(() {
// _appEnvironmentController.text = prefs.getString('app_environment') ?? '';
// _appHostController.text = prefs.getString('app_host') ?? '';
// _appPortController.text = prefs.getString('app_port') ?? '';
// _appOriginController.text = prefs.getString('app_origin') ?? '';
// _appRelayController.text = prefs.getString('app_relay') ?? '';
// });
// }
Future<void> saveSettings() async { Future<void> saveSettings() async {
SharedPreferences prefs = await SharedPreferences.getInstance(); SharedPreferences prefs = await SharedPreferences.getInstance();
@ -61,7 +51,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('Settings'), title: const Text('Settings'),
), ),
body: Padding( body: Padding(
padding: const EdgeInsets.all(16.0), padding: const EdgeInsets.all(16.0),
@ -69,30 +59,30 @@ class _SettingsScreenState extends State<SettingsScreen> {
children: [ children: [
TextField( TextField(
controller: _appEnvironmentController, controller: _appEnvironmentController,
decoration: InputDecoration(labelText: 'App Environment'), decoration: const InputDecoration(labelText: 'App Environment'),
), ),
TextField( TextField(
controller: _appHostController, controller: _appHostController,
decoration: InputDecoration(labelText: 'App Host'), decoration: const InputDecoration(labelText: 'App Host'),
), ),
TextField( TextField(
controller: _appPortController, controller: _appPortController,
decoration: InputDecoration(labelText: 'App Port'), decoration: const InputDecoration(labelText: 'App Port'),
), ),
TextField( TextField(
controller: _appOriginController, controller: _appOriginController,
decoration: InputDecoration(labelText: 'App Origin'), decoration: const InputDecoration(labelText: 'App Origin'),
), ),
TextField( TextField(
controller: _appRelayController, controller: _appRelayController,
decoration: InputDecoration(labelText: 'App Relay'), decoration: const InputDecoration(labelText: 'App Relay'),
), ),
ElevatedButton( ElevatedButton(
onPressed: () async { onPressed: () async {
await saveSettings(); await saveSettings();
Navigator.pop(context); Navigator.pop(context);
}, },
child: Text('Save'), child: const Text('Save'),
), ),
], ],
), ),

10
flutter_test_gui/lib/pages/transfer_screen.dart
View file

@ -4,14 +4,10 @@ import 'package:qr_flutter/qr_flutter.dart';
import 'package:cross_file/cross_file.dart'; import 'package:cross_file/cross_file.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter_test_gui/src/rust/api/simple.dart'; import 'package:flutter_test_gui/src/rust/api/simple.dart';
import 'package:flutter_test_gui/src/rust/frb_generated.dart'; // import 'package:flutter_test_gui/src/rust/frb_generated.dart';
import 'package:flutter_test_gui/consts/consts.dart'; import 'package:flutter_test_gui/consts/consts.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
// const backColor = Color(0xFF32363E);
// const highlightColor = Color(0xFF98C379);
// const textColor = Color(0xFFABB2BF);
class TransferScreen extends StatefulWidget { class TransferScreen extends StatefulWidget {
final List<XFile> files; final List<XFile> files;
final String transferName; final String transferName;
@ -21,10 +17,10 @@ class TransferScreen extends StatefulWidget {
: super(key: key); : super(key: key);
@override @override
_TransferScreenState createState() => _TransferScreenState(); TransferScreenState createState() => TransferScreenState();
} }
class _TransferScreenState extends State<TransferScreen> { class TransferScreenState extends State<TransferScreen> {
String appOrigin = ''; String appOrigin = '';
String inputValue = ''; String inputValue = '';
@override @override

12
flutter_test_gui/lib/pages/waiting_screen.dart
View file

@ -5,13 +5,9 @@ import 'package:qr_flutter/qr_flutter.dart';
import 'package:cross_file/cross_file.dart'; import 'package:cross_file/cross_file.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter_test_gui/src/rust/api/simple.dart'; import 'package:flutter_test_gui/src/rust/api/simple.dart';
import 'package:flutter_test_gui/src/rust/frb_generated.dart'; // import 'package:flutter_test_gui/src/rust/frb_generated.dart';
import 'package:flutter_test_gui/consts/consts.dart'; import 'package:flutter_test_gui/consts/consts.dart';
// const backColor = Color(0xFF32363E);
// const highlightColor = Color(0xFF98C379);
// const textColor = Color(0xFFABB2BF);
class WaitingScreen extends StatefulWidget { class WaitingScreen extends StatefulWidget {
final List<XFile> files; final List<XFile> files;
final String transferName; final String transferName;
@ -21,10 +17,10 @@ class WaitingScreen extends StatefulWidget {
: super(key: key); : super(key: key);
@override @override
_WaitingScreenState createState() => _WaitingScreenState(); WaitingScreenState createState() => WaitingScreenState();
} }
class _WaitingScreenState extends State<WaitingScreen> { class WaitingScreenState extends State<WaitingScreen> {
String appOrigin = ''; String appOrigin = '';
@override @override
void initState() { void initState() {
@ -35,7 +31,7 @@ class _WaitingScreenState extends State<WaitingScreen> {
Future<void> loadSettings() async { Future<void> loadSettings() async {
SharedPreferences prefs = await SharedPreferences.getInstance(); SharedPreferences prefs = await SharedPreferences.getInstance();
appOrigin = prefs.getString('app_origin') ?? appOrigin = prefs.getString('app_origin') ??
'wss://caesar-transfer-iu.shuttleapp.rs'; // Laden Sie die app_origin 'wss://caesar-transfer-iu.shuttleapp.rs';
} }
Future<void> callStartSender(String appOrigin) async { Future<void> callStartSender(String appOrigin) async {

24
flutter_test_gui/pubspec.lock
View file

@ -227,26 +227,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "10.0.0" version: "10.0.4"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.0.1" version: "3.0.3"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.0.1" version: "3.0.1"
lints: lints:
dependency: transitive dependency: transitive
description: description:
@ -275,10 +275,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.11.0" version: "1.12.0"
mobile_scanner: mobile_scanner:
dependency: "direct main" dependency: "direct main"
description: description:
@ -527,10 +527,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.6.1" version: "0.7.0"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
@ -543,10 +543,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "13.0.0" version: "14.2.1"
web: web:
dependency: transitive dependency: transitive
description: description: