show flag in favourite list.

Author: Ginder-Singh

base/src/main/java/com/windscribe/vpn/localdatabase/LocalDatabaseImpl.kt

@@ -3,6 +3,7 @@
  */
 package com.windscribe.vpn.localdatabase
 
+import android.database.sqlite.SQLiteException
 import com.windscribe.vpn.Windscribe.Companion.appContext
 import com.windscribe.vpn.localdatabase.tables.NetworkInfo
 import com.windscribe.vpn.localdatabase.tables.PingTestResults
@@ -260,6 +261,14 @@ class LocalDatabaseImpl @Inject constructor(
         return cityAndRegionDao.getCityAndRegion(cityId)
     }
 
+    override fun getCountryCode(cityId: Int): String {
+        return try {
+            cityAndRegionDao.getCityAndRegion(cityId).region.countryCode
+        } catch (ignored: SQLiteException) {
+            ""
+        }
+    }
+
     override fun getConfigs(): Flow<List<ConfigFile>> {
         return configFileDao.allConfigsAsFlow
     }

base/src/main/java/com/windscribe/vpn/localdatabase/LocalDbInterface.kt

@@ -88,4 +88,5 @@ interface LocalDbInterface {
     fun deleteCustomConfig(id: Int)
     suspend fun updateNetworkSync(networkInfo: NetworkInfo): Int
     suspend fun deleteNetworkSync(networkName: String): Int
+    fun getCountryCode(cityId: Int): String
 }

mobile/src/main/java/com/windscribe/mobile/ui/serverlist/FavouriteServerList.kt

@@ -47,9 +47,11 @@ import com.windscribe.mobile.ui.common.healthColor
 import com.windscribe.mobile.ui.connection.ConnectionViewmodel
 import com.windscribe.mobile.ui.helper.HandleScrollHaptic
 import com.windscribe.mobile.ui.home.HomeViewmodel
+import com.windscribe.mobile.ui.home.UserState
 import com.windscribe.mobile.ui.theme.font12
 import com.windscribe.mobile.ui.theme.font16
 import com.windscribe.mobile.ui.theme.serverListSecondaryColor
+import com.windscribe.vpn.commonutils.FlagIconResource
 import kotlin.collections.set
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -145,7 +147,14 @@ private fun ListItemView(
             }.padding(horizontal = 8.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        ServerListIcon(item.city, userState, angle, color, showLocationLoad)
+        SplitBorderCircle(
+            angle,
+            color,
+            MaterialTheme.colorScheme.serverListSecondaryColor.copy(alpha = 0.20f),
+            FlagIconResource.getSmallFlag(item.countryCode),
+            userState !is UserState.Pro && item.city.pro == 1,
+            showLocationLoad
+        )
         Spacer(modifier = Modifier.width(8.dp))
         ServerNodeName("${item.city.nodeName} ${item.city.nickName}", Modifier.weight(1f))
         if (item.city.linkSpeed == "10000") {

mobile/src/main/java/com/windscribe/mobile/ui/serverlist/ServerViewmodel.kt

@@ -35,7 +35,7 @@ import java.util.Locale
 import kotlin.collections.map
 
 data class ServerListItem(val id: Int, val region: Region, val cities: List<City>)
-data class FavouriteListItem(val id: Int, val city: City)
+data class FavouriteListItem(val id: Int, val city: City, val countryCode: String)
 data class StaticListItem(val id: Int, val staticItem: StaticRegion)
 data class ConfigListItem(val id: Int, val config: ConfigFile)
 data class LatencyListItem(val id: Int, val time: Int)
@@ -289,14 +289,19 @@ class ServerViewModelImpl(
     }
 
     private fun fetchFavouriteList() {
-        fetchData(
-            stateFlow = _favouriteListState,
-            repositoryFlow = favouriteRepository.favourites,
-            transform = { favourites ->
-                favourites.updateCityNames().sortCities().map { FavouriteListItem(it.id, it) }
-            },
-            errorMessage = "Failed to load favourites"
-        )
+        viewModelScope.launch(Dispatchers.IO) {
+            favouriteRepository.favourites.map { favourites ->
+                favourites.updateCityNames().sortCities().map { city ->
+                    FavouriteListItem(
+                        city.id,
+                        city,
+                        localDbInterface.getCountryCode(city.id)
+                    )
+                }
+            }.collect {
+                _favouriteListState.value = ListState.Success(it)
+            }
+        }
     }
 
     private fun fetchStaticList() {