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

refactor(gui): cleaned up not needed code

Browse source
This commit is contained in:
Patryk Hegenberg 2024-05-27 21:55:35 +02:00
parent 0416ab6dab
commit d9501024db
2 changed files with 53 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,10 +3,11 @@ import 'dart:io';
import 'package:file_picker/file_picker.dart'; import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_test_gui/main.dart'; import 'package:flutter_test_gui/main.dart';
import 'package:flutter_test_gui/pages/transfer_screen.dart';
import 'package:mobile_scanner/mobile_scanner.dart'; 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';
@ -82,18 +83,11 @@ class ReceiveScreenState extends State<ReceiveScreen> {
} }
if (Platform.isAndroid) { if (Platform.isAndroid) {
if (await _requestPermission(Permission.manageExternalStorage)) { if (await _requestPermission(Permission.manageExternalStorage)) {
try {
final outcome = await startRustReceiver(
filepath: filePath, transfername: input, relay: appOrigin);
print('Ergebnis von Rust: $outcome');
} catch (e) {
print('Fehler beim Starten des Receivers: $e');
}
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) => TransferScreen(
const MyHomePage(title: 'Caesar Transfer'))); transferName: input, directory: filePath)));
} else { } else {
Navigator.push( Navigator.push(
context, context,
@ -102,21 +96,13 @@ class ReceiveScreenState extends State<ReceiveScreen> {
const MyHomePage(title: 'Caesar Transfer'))); const MyHomePage(title: 'Caesar Transfer')));
} }
} else { } else {
try {
final outcome = await startRustReceiver(
filepath: filePath, transfername: input, relay: appOrigin);
print('Ergebnis von Rust: $outcome');
} catch (e) {
print('Fehler beim Starten des Receivers: $e');
}
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) =>
const MyHomePage(title: 'Caesar Transfer'))); TransferScreen(transferName: input, directory: filePath)));
} }
} }
print("Transfer startet with app_origin: $appOrigin");
} }
@override @override

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

@ -1,3 +1,5 @@
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_test_gui/main.dart'; import 'package:flutter_test_gui/main.dart';
import 'package:qr_flutter/qr_flutter.dart'; import 'package:qr_flutter/qr_flutter.dart';
@ -9,11 +11,11 @@ import 'package:flutter_test_gui/consts/consts.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
class TransferScreen extends StatefulWidget { class TransferScreen extends StatefulWidget {
final List<XFile> files;
final String transferName; final String transferName;
final String directory;
const TransferScreen( const TransferScreen(
{Key? key, required this.transferName, required this.files}) {Key? key, required this.transferName, required this.directory})
: super(key: key); : super(key: key);
@override @override
@ -32,7 +34,7 @@ class TransferScreenState extends State<TransferScreen> {
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> callStartReceiver(String appOrigin) async { Future<void> callStartReceiver(String appOrigin) async {
@ -40,36 +42,45 @@ class TransferScreenState extends State<TransferScreen> {
} }
Future<void> _startTransfer(String appOrigin) async { Future<void> _startTransfer(String appOrigin) async {
final input = inputValue.trim(); final input = widget.transferName;
String filePath = widget.directory;
if (input.isNotEmpty) { if (input.isNotEmpty) {
// if (Platform.isAndroid) { if (Platform.isAndroid) {
// if (await _requestPermission(Permission.storage)) { if (await _requestPermission(Permission.manageExternalStorage)) {
// try { try {
// final outcome = final outcome = await startRustReceiver(
// await startRustReceiver(transfername: input, relay: appOrigin); filepath: filePath, transfername: input, relay: appOrigin);
// print('Ergebnis von Rust: $outcome'); print('Ergebnis von Rust: $outcome');
// } catch (e) { } catch (e) {
// print('Fehler beim Starten des Receivers: $e'); print('Fehler beim Starten des Receivers: $e');
// } }
// Navigator.push( Navigator.push(
// context, context,
// MaterialPageRoute( MaterialPageRoute(
// builder: (context) => MyHomePage(title: 'Caesar Transfer'))); builder: (context) =>
// } else {} const MyHomePage(title: 'Caesar Transfer')));
// } else { } else {
try { Navigator.push(
// final outcome = context,
// await startRustReceiver(transfername: input, relay: appOrigin); MaterialPageRoute(
// print('Ergebnis von Rust: $outcome'); builder: (context) =>
} catch (e) { const MyHomePage(title: 'Caesar Transfer')));
print('Fehler beim Starten des Receivers: $e'); }
} else {
try {
final outcome = await startRustReceiver(
filepath: filePath, transfername: input, relay: appOrigin);
print('Ergebnis von Rust: $outcome');
} catch (e) {
print('Fehler beim Starten des Receivers: $e');
}
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
const MyHomePage(title: 'Caesar Transfer')));
} }
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => MyHomePage(title: 'Caesar Transfer')));
} }
// }
print("Transfer startet with app_origin: $appOrigin"); print("Transfer startet with app_origin: $appOrigin");
} }
@ -98,12 +109,14 @@ class TransferScreenState extends State<TransferScreen> {
widget.transferName, widget.transferName,
style: const TextStyle(color: Colors.white, fontSize: 24), style: const TextStyle(color: Colors.white, fontSize: 24),
), ),
Text("Transfer in Progress"),
const SizedBox(height: 32), const SizedBox(height: 32),
QrImageView( const Center(
data: widget.transferName, child: Icon(
version: QrVersions.auto, Icons.cloud_download_rounded,
size: 200, color: Constants.highlightColor,
foregroundColor: Constants.highlightColor, size: 200,
),
), ),
], ],
), ),