arso9914/FikaAndFocus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed exception and some cleaning up

Browse Source
This commit is contained in:
sabina 2022-05-30 09:54:52 +02:00
parent e8c97c8302
commit 49c86a5f94
2 changed files with 39 additions and 57 deletions
fika_and_fokus/lib
screens
CafePage.dart
widgets
ReviewDialog.dart

59
fika_and_fokus/lib/screens/CafePage.dart

@ -5,7 +5,6 @@ import 'package:google_fonts/google_fonts.dart';
import 'package:http/http.dart' as http;
import 'dart:convert';
import '../models/CafeIModel.dart';
import '../widgets/GoogleMapMarkerInfoWindow.dart';
import '../widgets/Heart.dart';
import '../widgets/ReviewDialog.dart';
import '../misc/ReviewPage.dart';
@ -29,7 +28,6 @@ class _CafePageState extends State<CafePage> {
void initState() {
refreshReviews();
super.initState();
}
@override
@ -63,14 +61,17 @@ class _CafePageState extends State<CafePage> {
decoration: const BoxDecoration(
// color: Colors.white,
shape: BoxShape.circle,
boxShadow: [BoxShadow(
blurRadius: 10,
color: Colors.black54,
spreadRadius: 3)
boxShadow: [
BoxShadow(
blurRadius: 10,
color: Colors.black54,
spreadRadius: 3)
],
),
child: const CircleAvatar(radius: 110,
backgroundImage: AssetImage("images/test_cafe.jpg")),
child: const CircleAvatar(
radius: 110,
backgroundImage:
AssetImage("images/test_cafe.jpg")),
),
)
],
@ -148,7 +149,8 @@ class _CafePageState extends State<CafePage> {
color: Color(0xFF696969)),
Transform.scale(
scale: 0.6,
child: DirectionButton(currentCafe: widget.cafeItem),
child: DirectionButton(
currentCafe: widget.cafeItem),
),
const VerticalDivider(
width: 20,
@ -176,14 +178,14 @@ class _CafePageState extends State<CafePage> {
Row(mainAxisAlignment: MainAxisAlignment.center, children: [
ElevatedButton(
onPressed: () async {
ReviewDialogResult result = await showDialog(
ReviewDialogResult? result = await showDialog(
context: context,
builder: (_) => ReviewDialog(widget.cafeItem)
);
if(result.rating == 0) {
builder: (_) => ReviewDialog(widget.cafeItem));
if (result == null) {
return;
} else {
createReview(result.rating.toDouble(), result.review, result.hideName);
createReview(
result.rating, result.review, result.hideName);
}
},
child: Text(
@ -300,37 +302,23 @@ class _CafePageState extends State<CafePage> {
);
}
Future<ReviewModel> createReview(double rating, String review, bool hideName) async {
/*
Required parameters:
@RequestParam String rating,
@RequestParam String reviewText,
@RequestParam String cafeId,
@RequestParam String userEmail
*/
Future<ReviewModel> createReview(
double rating, String review, bool hideName) async {
String emailToPost = "anonymous";
if (!hideName)
emailToPost = widget.user.getEmail;
if (!hideName) emailToPost = widget.user.getEmail;
Uri newReview = Uri.parse(
'https://group-1-75.pvt.dsv.su.se/fikafocus-0.0.1-SNAPSHOT/reviews/add?'
'rating=${rating.toString()}'
'&reviewText=$review'
'&cafeId=${widget.cafeItem.id}'
'&userEmail=${emailToPost}');
'rating=${rating.toString()}'
'&reviewText=$review'
'&cafeId=${widget.cafeItem.id}'
'&userEmail=${emailToPost}');
final response = await http.post(newReview);
if (response.statusCode == 200) {
// If the server did return a 201 CREATED response,
// then parse the JSON.
return ReviewModel.fromJson(jsonDecode(response.body));
} else {
// If the server did not return a 201 CREATED response,
// then throw an exception.
throw Exception(
'Failed to create review. ' + response.statusCode.toString());
}
@ -366,7 +354,6 @@ class _CafePageState extends State<CafePage> {
BoxDecoration _getBoxStyle() {
return BoxDecoration(
color: Colors.white,
// border: Border.all(color: Colors.black),
borderRadius: const BorderRadius.all(Radius.circular(20)),
boxShadow: [
BoxShadow(

37
fika_and_fokus/lib/widgets/ReviewDialog.dart

@ -24,6 +24,7 @@ class _ReviewDialogState extends State<ReviewDialog> {
double _rating = 0;
final TextEditingController _controller = TextEditingController();
bool hideNameChecked = false;
@override
Widget build(BuildContext context) {
return AlertDialog(
@ -100,31 +101,25 @@ class _ReviewDialogState extends State<ReviewDialog> {
borderSide: BorderSide(color: Color(0xFF75AB98), width: 2.0),
),
),
// validator: (value) {
// if (value == null || value.isEmpty) {
// return 'Required';
// }
// return null;
// },
),
],
),
actions: <Widget>[
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text("Hide my name"),
Checkbox(value: hideNameChecked, onChanged: (bool? newValue) {
print(newValue);
setState(() {
hideNameChecked = newValue!;
});
} ),
ElevatedButton(
Row(mainAxisAlignment: MainAxisAlignment.center, children: [
Text("Hide my name"),
Checkbox(
value: hideNameChecked,
onChanged: (bool? newValue) {
print(newValue);
setState(() {
hideNameChecked = newValue!;
});
}),
ElevatedButton(
onPressed: () {
if (_rating != 0) {
Navigator.of(context)
.pop(ReviewDialogResult(_rating, _controller.text, hideNameChecked));
Navigator.of(context).pop(ReviewDialogResult(
_rating, _controller.text, hideNameChecked));
}
},
child: Text(
@ -140,8 +135,8 @@ class _ReviewDialogState extends State<ReviewDialog> {
borderRadius: BorderRadius.circular(30),
),
),
),]
),
),
]),
],
);
}