🔀 Fixed the ui in multiple areas

beakpeek/lib/Controller/DB/life_list_provider.dart

@@ -6,6 +6,7 @@
 import 'package:beakpeek/Model/UserProfile/user_model.dart';
 import 'package:beakpeek/config_azure.dart';
 import 'package:http/http.dart';
+import 'package:localstorage/localstorage.dart';
 import 'package:path/path.dart';
 import 'package:sqflite/sqflite.dart';
 
@@ -166,7 +167,26 @@
 
   Future<void> insertBird(int birdId) async {
     final bird = await getBirdInByID(birdId);
-    print(bird);
+    switch (bird.commonGroup.toLowerCase()) {
+      case 'weaver':
+        updateProgress(bird.commonGroup, 'Weaver Believer');
+        break;
+      case 'duck':
+        updateProgress(bird.commonGroup, 'Duck Hunter');
+        break;
+      case 'eagle':
+        updateProgress(bird.commonGroup, 'USA');
+        break;
+      case 'kingfisher':
+        updateProgress(bird.commonGroup, 'Fisherman');
+        break;
+      case 'hawk':
+        updateProgress(bird.commonGroup, 'Hawk Spotter');
+        break;
+      case 'heron':
+        updateProgress(bird.commonGroup, 'Heron Horror');
+        break;
+    }
     //await updateLifeListAchievments(bird.commonGroup, birdId);
     final db = await instance.database;
     if (!await isDuplicate(bird)) {
@@ -315,10 +335,36 @@
               whereArgs: [commonGroup]),
         ) ??
         0;
-    print('count $count');
     return count;
   }
 
+  Future<void> updateProgress(String commonGroup, String achievmentName) async {
+    final int countBird = await lifeBirdCount(commonGroup);
+    final int totalBird = await allBirdCount(commonGroup);
+    double progress = countBird / totalBird;
+    progress = progress < 1 ? progress : 1;
+    localStorage.setItem(achievmentName, progress.toString());
+    updateProvinces();
+  }
+
+  Future<void> updateProvinces() async {
+    final List<String> achivementNamesProvinces = [
+      'Risk it for the Biscuits',
+      'Gauteng Explorer',
+      'Watch The Waves',
+      'Limpopo Hoopoe',
+      'Mpumalanga Adventurer',
+      'Diamond Hunter',
+      'Directionally challenged',
+      'Western Cape Wanderer',
+      'Freesest Alive'
+    ];
+    final List<double> progress = await precentLifeListBirds();
+    for (int i = 0; i < achivementNamesProvinces.length; i++) {
+      localStorage.setItem(achivementNamesProvinces[i], progress.toString());
+    }
+  }
+
   Future<int> lifeBirdCount(String commonGroup) async {
     final db = await instance.database;
     final int count = Sqflite.firstIntValue(

beakpeek/lib/Model/Globals/globals.dart

@@ -6,27 +6,39 @@
 import 'package:beakpeek/Controller/Home/search.dart';
 import 'package:beakpeek/Controller/Main/color_palette_functions.dart';
 import 'package:beakpeek/Model/BirdInfo/bird.dart';
+import 'package:beakpeek/Model/UserProfile/achievment_list.dart';
+import 'package:beakpeek/View/Home/home.dart';
+import 'package:beakpeek/View/Map/bird_sheet.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:localstorage/localstorage.dart';
+import 'package:http/http.dart' as http;
 
 Globals global = Globals();
 
 class Globals {
   final LifeListProvider lifeList = LifeListProvider.instance;
   late List<Bird> birdList = [];
   late List<Bird> allBirdsList = [];
-  String? cachedPentadId;
+  late Future<String> cachedPentadId;
   List<Bird>? cachedBirds;
   ColorPalette palette = greenRedPalette;
 
-  void init() {
-    lifeList.fetchLifeList().then((result) {
-      birdList = result;
+  void init() async {
+    // Fetch cached Pentad ID and birds if available
+
+    cachedPentadId = getPentadId();
+
+    // Fetch birds using the cached or newly fetched Pentad ID
+    cachedPentadId.then((pentadId) {
+      fetchBirds(pentadId, http.Client());
     });
+
+    // Load bird data from assets and insert into lifeList
     listBirdFromAssets().then((result) {
       allBirdsList = result;
       lifeList.initialInsert(result);
       lifeList.initialProvInsert(result);
     });
-    //lifeList.deleteDatabaseFile();
   }
 
   Future<List<Bird>> updateLife() async {
@@ -37,5 +49,55 @@
     return allBirdsList.firstWhere((bird) => bird.id == id);
   }
 
-  late File image;
+  void getAchievments() {
+    getAchivementList().then((result) {
+      for (int i = 0; i < result.achievements.length; i++) {
+        if (localStorage.getItem(result.achievements[i].name) != null) {
+          final double localProgress =
+              double.parse(localStorage.getItem(result.achievements[i].name)!);
+
+          if (result.achievements[i].progress > localProgress) {
+            localStorage.setItem(result.achievements[i].name,
+                result.achievements[i].progress.toString());
+          }
+        } else {
+          localStorage.setItem(result.achievements[i].name,
+              result.achievements[i].progress.toString());
+        }
+      }
+    });
+  }
+
+  Future<String> getPentadId() async {
+    final Position position = await Geolocator.getCurrentPosition();
+    final latitude = position.latitude;
+    final longitude = position.longitude;
+
+    // Check if the location is within South Africa's boundaries
+    if (latitude < -35.0 ||
+        latitude > -22.0 ||
+        longitude < 16.0 ||
+        longitude > 33.0) {
+      throw Exception('Location is outside South Africa.');
+    }
+
+    final latDegrees = latitude.ceil();
+    final lonDegrees = longitude.floor();
+
+    final latDecimal = (latitude - latDegrees).abs();
+    final lonDecimal = longitude - lonDegrees;
+
+    // Convert decimal part to minutes
+    final latMinutes = ((latDecimal * 60) - (latDecimal * 60) % 5).toInt();
+    final lonMinutes = ((lonDecimal * 60) - (lonDecimal * 60) % 5).toInt();
+
+    // Format the result
+    final formattedLat =
+        '${latDegrees.abs()}${latMinutes.toString().padLeft(2, "0")}';
+    final formattedLon =
+        '${lonDegrees.abs()}${lonMinutes.toString().padLeft(2, "0")}';
+
+    // Combine with underscore
+    return '${formattedLat}_${formattedLon}';
+  }
 }

beakpeek/lib/Model/UserProfile/achievment_list.dart

@@ -138,9 +138,7 @@
   return AchievementList.fromJson(userString);
 }
 
-Future<void> updateLifeListAchievments(String commonGroup) async {
-
-}
+Future<void> updateLifeListAchievments(String commonGroup) async {}
 
 Future<void> updateProvinces(int id) async {
   final List<String> achivementNames = [

beakpeek/lib/Model/UserProfile/user_model.dart

@@ -100,6 +100,7 @@
   final String localLife = await lifelist.fetchUserLifelistString();
   if (localLife.length < user.lifelist.length) {
     final List<dynamic> valueList = json.decode(user.lifelist);
+    // ignore: avoid_function_literals_in_foreach_calls
     valueList.forEach((element) {
       final int birdId = element['id'];
       lifelist.insertBird(birdId);
@@ -135,8 +136,9 @@
 Future<void> updateOnline(
     {LifeListProvider? lifelist, bool logout = false}) async {
   lifelist = LifeListProvider.instance;
+  // ignore: unnecessary_null_comparison
   if (lifelist != null) {
-    String list = await lifelist.updateUserLifelist();
+    final String list = await lifelist.updateUserLifelist();
     user.set('lifelist', list);
   }
   final response = await http.post(Uri.parse('$userApiUrl/User/UpdateProfile'),

beakpeek/lib/Styles/colors.dart

@@ -50,6 +50,12 @@
         : primaryColorLight;
   }
 
+  static Color secondaryButtonColor(BuildContext context) {
+    return Theme.of(context).brightness == Brightness.dark
+        ? popupColorDark
+        : primaryColorLight;
+  }
+
 // Get secondary color
   static Color secondaryColor(BuildContext context) {
     return Theme.of(context).brightness == Brightness.dark

beakpeek/lib/View/Achievements/achievements_page.dart

@@ -52,7 +52,7 @@ class AchievementsPageState extends State<AchievementsPage> {
         actions: const [
           HelpIcon(
               content:
-                  'Follow the instructions to get the achievement! \n\nThis will earn you some profile experience points and helps you unlock ultimate bragging rights.'),
+                  '''Follow the instructions to get the achievement! \n\nThis will earn you some profile experience points and helps you unlock ultimate bragging rights.'''),
           SizedBox(width: 14.0)
         ],
       ),
@@ -61,7 +61,10 @@ class AchievementsPageState extends State<AchievementsPage> {
           future: _achievementlist,
           builder: (context, snapshot) {
             if (snapshot.connectionState == ConnectionState.waiting) {
-              return const Center(child: CircularProgressIndicator());
+              return Center(
+                  child: CircularProgressIndicator(
+                color: AppColors.iconColor(context),
+              ));
             } else if (snapshot.hasError) {
               return Center(
                 child: Text('Error loading achievements: ${snapshot.error}'),
@@ -130,8 +133,6 @@ class AchievementTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    print(achievement.name);
-    print(achievement.progress);
     return Card(
       color: AppColors.popupColor(context),
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),

beakpeek/lib/View/Home/home.dart

@@ -55,7 +55,7 @@
       return global.cachedPentadId!;
     }
 
-    global.cachedPentadId = await getPentadId(); // Cache pentadId
+    global.cachedPentadId = getPentadId(); // Cache pentadId
     return global.cachedPentadId!;
   }
 

beakpeek/lib/View/Map/bird_sheet.dart

@@ -210,7 +210,10 @@
                   future: _birdList,
                   builder: (context, snapshot) {
                     if (snapshot.connectionState == ConnectionState.waiting) {
-                      return const Center(child: CircularProgressIndicator());
+                      return Center(
+                          child: CircularProgressIndicator(
+                        color: AppColors.iconColor(context),
+                      ));
                     } else if (snapshot.hasError) {
                       return const Center(child: Text('No birds found.'));
                     }