fix accidentally reverting icon change

cornell-dti · Apr 29, 2024 · 3a39394 · 3a39394
1 parent d025dc6
commit 3a39394
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 29 deletions.
diff --git a/game/assets/images/main_icon.png b/game/assets/images/main_icon.png
diff --git a/game/assets/images/old_main_icon.png b/game/assets/images/old_main_icon.png
diff --git a/game/lib/challenges/challenges_page.dart b/game/lib/challenges/challenges_page.dart
@@ -196,7 +196,6 @@ class _ChallengesPageState extends State<ChallengesPage> {
                         // print("Doing Event with now/endtime " + event.description.toString() + now.toString() + "/" + endtime.toString());
                         if (challenge == null) {
                           // print("Challenge is null for event " + event.description.toString());
-
                           continue;
                         }
                         final challengeLocation =

diff --git a/game/lib/gameplay/gameplay_map.dart b/game/lib/gameplay/gameplay_map.dart
@@ -16,20 +16,21 @@ import 'package:game/api/game_client_dto.dart';
 import 'package:game/api/game_api.dart';
 import 'package:game/model/tracker_model.dart';
 import 'package:game/model/group_model.dart';
+import 'package:game/model/event_model.dart';
 import 'package:game/model/challenge_model.dart';
 
 class GameplayMap extends StatefulWidget {
   final GeoPoint targetLocation;
   final double awardingRadius;
   final int points;
-  final int startingHints;
+  final int startingHintsUsed;
 
   const GameplayMap(
       {Key? key,
       required this.targetLocation,
       required this.awardingRadius,
       required this.points,
-      required this.startingHints})
+      required this.startingHintsUsed})
       : super(key: key);
 
   @override
@@ -95,7 +96,7 @@ class _GameplayMapState extends State<GameplayMap> {
     hintRadius = defaultHintRadius -
         (defaultHintRadius - widget.awardingRadius) *
             0.33 *
-            widget.startingHints;
+            (totalHints - widget.startingHintsUsed);
     if (hintRadius == null) {
       hintRadius = defaultHintRadius;
     }
@@ -227,7 +228,7 @@ class _GameplayMapState extends State<GameplayMap> {
    */
   BitmapDescriptor currentLocationIcon = BitmapDescriptor.defaultMarker;
   void setCustomMarkerIcon() {
-    BitmapDescriptor.fromAssetImage(ImageConfiguration(devicePixelRatio: 0.2),
+    BitmapDescriptor.fromAssetImage(ImageConfiguration(size: Size(20, 20)),
             "assets/icons/userlocation.png")
         .then(
       (icon) {
@@ -603,29 +604,31 @@ class _GameplayMapState extends State<GameplayMap> {
                   child: SvgPicture.asset('assets/images/arrived.svg',
                       fit: BoxFit.cover),
                 ),
-                ElevatedButton(
-                  onPressed: () {
-                    Navigator.pop(context);
-                    Navigator.pushReplacement(
-                      context,
-                      MaterialPageRoute(
-                          builder: (context) => ChallengeCompletedPage()),
-                    );
-                  },
-                  style: ButtonStyle(
-                    padding: MaterialStateProperty.all<EdgeInsetsGeometry>(
-                        EdgeInsets.only(left: 15, right: 15)),
-                    shape: MaterialStateProperty.all<RoundedRectangleBorder>(
-                      RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(
-                            7.3), // Adjust the radius as needed
+                Center(
+                  child: ElevatedButton(
+                    onPressed: () {
+                      Navigator.pop(context);
+                      Navigator.pushReplacement(
+                        context,
+                        MaterialPageRoute(
+                            builder: (context) => ChallengeCompletedPage()),
+                      );
+                    },
+                    style: ButtonStyle(
+                      padding: MaterialStateProperty.all<EdgeInsetsGeometry>(
+                          EdgeInsets.only(left: 15, right: 15)),
+                      shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                        RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(
+                              7.3), // Adjust the radius as needed
+                        ),
                       ),
+                      backgroundColor: MaterialStateProperty.all<Color>(
+                          Color.fromARGB(255, 237, 86, 86)),
                     ),
-                    backgroundColor: MaterialStateProperty.all<Color>(
-                        Color.fromARGB(255, 237, 86, 86)),
+                    child: Text("Point Breakdown",
+                        style: TextStyle(color: Colors.white)),
                   ),
-                  child: Text("Point Breakdown",
-                      style: TextStyle(color: Colors.white)),
                 )
               ],
             ),

diff --git a/game/lib/gameplay/gameplay_page.dart b/game/lib/gameplay/gameplay_page.dart
@@ -9,7 +9,7 @@ import 'package:geolocator/geolocator.dart';
 import 'package:game/model/challenge_model.dart';
 import 'gameplay_map.dart';
 import 'package:provider/provider.dart';
-
+import 'package:game/utils/utility_functions.dart';
 import 'package:game/progress_indicators/circular_progress_indicator.dart';
 
 import 'package:flutter_svg/flutter_svg.dart';
@@ -97,6 +97,7 @@ class _GameplayPageState extends State<GameplayPage> {
 
       GeoPoint targetLocation = GeoPoint(challenge.latF!, challenge.longF!, 0);
       double awardingRadius = challenge.awardingRadiusF!;
+      int startingHintsUsed = tracker.hintsUsed;
 
       return Scaffold(
         body: Column(
@@ -223,6 +224,7 @@ class _GameplayPageState extends State<GameplayPage> {
                     targetLocation: targetLocation,
                     awardingRadius: awardingRadius,
                     points: challenge.points ?? 0,
+                    startingHintsUsed: startingHintsUsed,
                   )),
             ),
           ],

diff --git a/game/lib/profile/completed_feed.dart b/game/lib/profile/completed_feed.dart
@@ -88,9 +88,10 @@ class CompletedFeedWidget extends StatelessWidget {
                 for (var challengeId in event.challenges ?? []) {
                   var challenge = challengeModel.getChallengeById(challengeId);
                   if (challenge != null) {
-                    pictureList.add(challenge.imageUrl!);
-                    locationList.add(
-                        friendlyLocation[challenge.location?.name ?? 'ANY']);
+                    pictureList.add(challenge.imageUrl ??
+                        "https://upload.wikimedia.org/wikipedia/commons/b/b1/Missing-image-232x150.png");
+                    locationList
+                        .add(friendlyLocation[challenge.location ?? 'ANY']);
                     totalPoints += challenge.points ?? 0;
                   }
                 }