Alot of changes
This commit is contained in:
ImBenji
@@ -1,5 +1,6 @@
|
||||
|
||||
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:bus_infotainment/audio_cache.dart';
|
||||
@@ -7,9 +8,12 @@ import 'package:bus_infotainment/backend/live_information.dart';
|
||||
import 'package:bus_infotainment/backend/modules/commands.dart';
|
||||
import 'package:bus_infotainment/utils/delegates.dart';
|
||||
import 'package:file_picker/file_picker.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
import 'package:permission_handler/permission_handler.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'package:text_scroll/text_scroll.dart';
|
||||
import 'package:url_launcher/url_launcher_string.dart';
|
||||
|
||||
@@ -184,10 +188,24 @@ class _AnnouncementUploadState extends State<AnnouncementUpload> {
|
||||
|
||||
AnnouncementCache cache = LiveInformation().announcementModule.announcementCache;
|
||||
|
||||
LiveInformation().announcementModule.setBundleBytes(result.files[0].bytes!);
|
||||
late Uint8List bytes;
|
||||
|
||||
if (kIsWeb) {
|
||||
bytes = result.files.single.bytes!;
|
||||
} else {
|
||||
File file = File(result.files.single.path!);
|
||||
|
||||
bytes = file.readAsBytesSync();
|
||||
}
|
||||
|
||||
|
||||
LiveInformation().announcementModule.setBundleBytes(bytes);
|
||||
|
||||
|
||||
|
||||
|
||||
// load a random announcement to ensure that the file is usable
|
||||
await cache.loadAnnouncementsFromBytes(result.files[0].bytes!, ["S_WALTHAMSTOW_CENTRAL_001.mp3"]);
|
||||
await cache.loadAnnouncementsFromBytes(bytes, ["S_WALTHAMSTOW_CENTRAL_001.mp3"]);
|
||||
|
||||
print("Loaded announcements");
|
||||
|
||||
@@ -195,17 +213,60 @@ class _AnnouncementUploadState extends State<AnnouncementUpload> {
|
||||
|
||||
});
|
||||
|
||||
if (!kIsWeb) {
|
||||
|
||||
// Use shared preferences to store the file location
|
||||
SharedPreferences prefs = await SharedPreferences.getInstance();
|
||||
|
||||
prefs.setString("AnnouncementsFileLocation", result.files.single.path!);
|
||||
}
|
||||
|
||||
widget.onUploaded();
|
||||
|
||||
} else {
|
||||
// User canceled the picker
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
// TODO: implement initState
|
||||
super.initState();
|
||||
|
||||
if (!kIsWeb) {
|
||||
SharedPreferences.getInstance().then((prefs) async {
|
||||
String FileLocation = prefs.getString("AnnouncementsFileLocation")!;
|
||||
|
||||
File file = File(FileLocation);
|
||||
|
||||
Uint8List bytes = file.readAsBytesSync();
|
||||
|
||||
LiveInformation().announcementModule.setBundleBytes(bytes);
|
||||
|
||||
AnnouncementCache cache = LiveInformation().announcementModule.announcementCache;
|
||||
await cache.loadAnnouncementsFromBytes(bytes, ["S_WALTHAMSTOW_CENTRAL_001.mp3"]);
|
||||
|
||||
setState(() {
|
||||
|
||||
});
|
||||
|
||||
print("Loaded announcemends from SharedPrefs");
|
||||
|
||||
widget.onUploaded();
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// TODO: implement build
|
||||
|
||||
bool checkPassed = LiveInformation().announcementModule.announcementCache.keys.length != 0;
|
||||
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
@@ -224,77 +285,61 @@ class _AnnouncementUploadState extends State<AnnouncementUpload> {
|
||||
child: Column(
|
||||
|
||||
children: [
|
||||
if (!checkPassed)
|
||||
Row(
|
||||
|
||||
Row(
|
||||
children: [
|
||||
|
||||
children: [
|
||||
|
||||
Icon(
|
||||
Icons.error,
|
||||
color: Colors.red,
|
||||
size: 18,
|
||||
),
|
||||
|
||||
SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
|
||||
Transform.translate(
|
||||
offset: Offset(0, 0),
|
||||
child: Text(
|
||||
"IMPORTANT",
|
||||
style: GoogleFonts.interTight(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Colors.white70,
|
||||
letterSpacing: 0.1,
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
],
|
||||
|
||||
),
|
||||
|
||||
Row(
|
||||
|
||||
children: [
|
||||
|
||||
if (LiveInformation().announcementModule.announcementCache.keys.length == 0)
|
||||
Icon(
|
||||
Icons.error,
|
||||
color: Colors.red,
|
||||
size: 18,
|
||||
)
|
||||
else
|
||||
),
|
||||
|
||||
SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
|
||||
|
||||
Transform.translate(
|
||||
offset: Offset(0, 0),
|
||||
child: Text(
|
||||
"NO ANNOUNCEMENTS LOADED",
|
||||
style: GoogleFonts.interTight(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Colors.white70,
|
||||
letterSpacing: 0.1,
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
],
|
||||
|
||||
)
|
||||
else
|
||||
Row(
|
||||
|
||||
children: [
|
||||
|
||||
Icon(
|
||||
Icons.check,
|
||||
Icons.check_box,
|
||||
color: Colors.green,
|
||||
size: 18,
|
||||
),
|
||||
|
||||
SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
|
||||
|
||||
if (LiveInformation().announcementModule.announcementCache.keys.length == 0)
|
||||
Transform.translate(
|
||||
offset: Offset(0, 0),
|
||||
child: Text(
|
||||
"No announcements",
|
||||
style: GoogleFonts.interTight(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Colors.white70,
|
||||
letterSpacing: 0.1,
|
||||
),
|
||||
),
|
||||
)
|
||||
else
|
||||
Transform.translate(
|
||||
offset: Offset(0, 0),
|
||||
child: Text(
|
||||
"Announcements loaded successfully",
|
||||
"ANNOUNCEMENTS LOADED",
|
||||
style: GoogleFonts.interTight(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
@@ -303,10 +348,9 @@ class _AnnouncementUploadState extends State<AnnouncementUpload> {
|
||||
),
|
||||
),
|
||||
)
|
||||
],
|
||||
|
||||
],
|
||||
|
||||
),
|
||||
),
|
||||
|
||||
SizedBox(
|
||||
height: 8,
|
||||
@@ -368,6 +412,23 @@ class _AnnouncementUploadState extends State<AnnouncementUpload> {
|
||||
),
|
||||
),
|
||||
|
||||
if (kIsWeb)
|
||||
SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
|
||||
if (kIsWeb)
|
||||
Text(
|
||||
"Announcements uploaded on web are not persistent, and will need to be re-uploaded each time the site is loaded.",
|
||||
style: GoogleFonts.interTight(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w400,
|
||||
color: Colors.white70,
|
||||
letterSpacing: 0.1,
|
||||
height: 1
|
||||
),
|
||||
),
|
||||
|
||||
SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
@@ -407,6 +468,153 @@ class _AnnouncementUploadState extends State<AnnouncementUpload> {
|
||||
}
|
||||
}
|
||||
|
||||
class PermissionsSetup extends StatefulWidget {
|
||||
|
||||
@override
|
||||
State<PermissionsSetup> createState() => _PermissionsSetupState();
|
||||
}
|
||||
|
||||
class _PermissionsSetupState extends State<PermissionsSetup> {
|
||||
List<bool> _hasPermissions = [];
|
||||
|
||||
bool get hasPermissions {
|
||||
return !_hasPermissions.contains(false) && _hasPermissions.length > 0;
|
||||
}
|
||||
|
||||
Future<void> requestPermission() async {
|
||||
_hasPermissions = [];
|
||||
|
||||
print("Requesting location permission");
|
||||
if (!await Permission.location.isGranted){
|
||||
PermissionStatus locationStatus = await Permission.location.request();
|
||||
if (locationStatus.isGranted) {
|
||||
_hasPermissions.add(true);
|
||||
LiveInformation().initTrackerModule();
|
||||
} else {
|
||||
_hasPermissions.add(false);
|
||||
}
|
||||
} else {
|
||||
_hasPermissions.add(true);
|
||||
}
|
||||
print("Gotten result for location permission");
|
||||
|
||||
if (!kIsWeb){
|
||||
print("Requesting storage permissions");
|
||||
PermissionStatus fileStatus = await Permission.manageExternalStorage.request();
|
||||
|
||||
if (fileStatus.isGranted) {
|
||||
_hasPermissions.add(true);
|
||||
} else {
|
||||
_hasPermissions.add(false);
|
||||
}
|
||||
} else {
|
||||
_hasPermissions.add(true);
|
||||
}
|
||||
|
||||
print("Permissions: $_hasPermissions");
|
||||
|
||||
setState(() {
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
color: Colors.white70,
|
||||
width: 2
|
||||
),
|
||||
),
|
||||
|
||||
margin: EdgeInsets.symmetric(
|
||||
horizontal: 8
|
||||
),
|
||||
padding: EdgeInsets.all(8),
|
||||
|
||||
child: Column(
|
||||
|
||||
children: [
|
||||
|
||||
Row(
|
||||
|
||||
children: [
|
||||
|
||||
Icon(
|
||||
hasPermissions ? Icons.check_box : Icons.error,
|
||||
color: hasPermissions ? Colors.green : Colors.red,
|
||||
size: 18,
|
||||
),
|
||||
|
||||
SizedBox(
|
||||
width: 4,
|
||||
),
|
||||
|
||||
Transform.translate(
|
||||
offset: Offset(0, 0),
|
||||
child: Text(
|
||||
hasPermissions ? "PERMISSIONS GRANTED" : "MISSING PERMISSIONS",
|
||||
style: GoogleFonts.interTight(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Colors.white70,
|
||||
letterSpacing: 0.1,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
|
||||
|
||||
],
|
||||
|
||||
),
|
||||
|
||||
SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
|
||||
SizedBox(
|
||||
height: 32,
|
||||
width: double.infinity,
|
||||
child: ElevatedButton(
|
||||
onPressed: (){
|
||||
requestPermission();
|
||||
},
|
||||
|
||||
// make the corner radius 4, background color match the theme, and text colour white, fill to width of parent
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: Theme.of(context).colorScheme.primary,
|
||||
foregroundColor: Colors.white,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(4)
|
||||
),
|
||||
),
|
||||
|
||||
child: Text(
|
||||
"Request permissions",
|
||||
style: GoogleFonts.interTight(
|
||||
fontSize: 15,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Colors.white,
|
||||
letterSpacing: 0.5
|
||||
)
|
||||
)
|
||||
),
|
||||
)
|
||||
|
||||
],
|
||||
|
||||
),
|
||||
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
enum _LoginType {
|
||||
login,
|
||||
signup
|
||||
|
||||
Reference in New Issue
Block a user