mazyar/tm_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed country flags package and read flags from server and implement svg cahce structure

Browse Source
This commit is contained in:
amirrezaghabeli
2025-09-11 11:04:29 +03:30
parent 757e69f6d3
commit ffbc11d4cf
12 changed files with 230 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/detail/widgets/tender_location_section.dart
+3 -9
View File
@@ -1,4 +1,3 @@
import 'package:country_flags/country_flags.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:tm_app/core/constants/assets.dart';
@@ -6,6 +5,7 @@ import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import '../../../data/services/model/tender_data/tender_data.dart';
import '../../shared/flag.dart';
import '../strings/tender_details_strings.dart';
class TenderLocationSection extends StatelessWidget {
@@ -48,14 +48,8 @@ class TenderLocationSection extends StatelessWidget {
),
),
SizedBox(width: 4.0.w()),
SizedBox(
width: 32.0.w(),
height: 21.0.h(),
child: CountryFlag.fromCountryCode(
detail.countryCode!,
shape: RoundedRectangle(4),
),
),
if (detail.countryCode != null)
Flag(countryCode: detail.countryCode!),
],
),
SizedBox(height: 8.0.h()),
lib/views/home/tenders_list_item.dart
+3 -9
View File
@@ -1,4 +1,3 @@
import 'package:country_flags/country_flags.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
@@ -8,6 +7,7 @@ import 'package:tm_app/views/home/widgets/tender_card_progress_bar.dart';
import '../../core/constants/assets.dart';
import '../../core/theme/colors.dart';
import '../../core/utils/size_config.dart';
import '../shared/flag.dart';
class TendersListItem extends StatelessWidget {
const TendersListItem({required this.tender, super.key});
@@ -113,14 +113,8 @@ class TendersListItem extends StatelessWidget {
),
),
SizedBox(width: 8.0.w()),
SizedBox(
width: 32.0.w(),
height: 21.0.h(),
child: CountryFlag.fromCountryCode(
tender.countryCode!,
shape: RoundedRectangle(4),
),
),
if (tender.countryCode != null)
Flag(countryCode: tender.countryCode!),
Spacer(),
],
),
lib/views/liked_tenders/widgets/liked_tenders_list_item.dart
+3 -9
View File
@@ -1,4 +1,3 @@
import 'package:country_flags/country_flags.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
@@ -12,6 +11,7 @@ import 'package:tm_app/views/home/strings/home_strings.dart';
import '../../../core/constants/tender_submision_mode.dart';
import '../../../data/services/model/tender_approvals_data/tender_approvals_data.dart';
import '../../shared/flag.dart';
import '../../shared/select_submission_bottom_sheet.dart';
import '../../shared/select_submission_dialog.dart';
@@ -166,14 +166,8 @@ class LikedListItem extends StatelessWidget {
),
),
SizedBox(width: 8.0.w()),
SizedBox(
width: 32.0.w(),
height: 21.0.h(),
child: CountryFlag.fromCountryCode(
tender.countryCode!,
shape: RoundedRectangle(4),
),
),
if (tender.countryCode != null)
Flag(countryCode: tender.countryCode!),
Spacer(),
InkWell(
onTap: () {
lib/views/shared/cached_svg.dart
+96
View File
@@ -0,0 +1,96 @@
import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../../core/services/svg_cache.dart';
class CachedSvg extends StatefulWidget {
final String url;
final double? width;
final double? height;
final BoxFit fit;
const CachedSvg({
required this.url,
this.width,
this.height,
this.fit = BoxFit.contain,
super.key,
});
@override
State<CachedSvg> createState() => _CachedSvgState();
}
class _CachedSvgState extends State<CachedSvg> {
String? _svgData;
bool _isLoading = true;
@override
void initState() {
super.initState();
_loadSvg();
}
@override
void didUpdateWidget(covariant CachedSvg oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.url != widget.url) {
_isLoading = true;
_svgData = null;
_loadSvg();
}
}
Future<void> _loadSvg() async {
try {
final cache = SvgCache();
String? cachedPath = await cache.getCachedPath(widget.url);
cachedPath ??= await cache.cacheSvg(widget.url);
if (kIsWeb && cachedPath.startsWith('web_cache_')) {
final prefs = await SharedPreferences.getInstance();
final fileName = cachedPath.replaceFirst('web_cache_', '');
_svgData = prefs.getString('svg_cache_$fileName');
} else {
_svgData = await File(cachedPath).readAsString();
}
if (mounted) {
setState(() {
_isLoading = false;
});
}
} catch (e) {
if (mounted) {
setState(() {
_isLoading = false;
});
}
}
}
@override
Widget build(BuildContext context) {
if (_isLoading) {
return SizedBox(
width: widget.width ?? 20,
height: widget.height ?? 20,
child: const Center(child: CircularProgressIndicator()),
);
}
if (_svgData == null) {
return const Icon(Icons.error);
}
return SvgPicture.string(
_svgData!,
width: widget.width,
height: widget.height,
fit: widget.fit,
);
}
}
lib/views/shared/flag.dart
+26
View File
@@ -0,0 +1,26 @@
import 'package:flutter/material.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/views/shared/cached_svg.dart';
import '../../core/config/app_config.dart';
class Flag extends StatelessWidget {
const Flag({required this.countryCode, super.key});
final String countryCode;
@override
Widget build(BuildContext context) {
return countryCode.isNotEmpty
? ClipRRect(
borderRadius: BorderRadius.circular(6),
child: CachedSvg(
url: '${AppConfig.flagUrl}$countryCode',
width: 32.0.w(),
height: 21.0.h(),
fit: BoxFit.cover,
),
)
: const SizedBox();
}
}
lib/views/tenders/widgets/tender_card.dart
+2 -9
View File
@@ -1,4 +1,3 @@
import 'package:country_flags/country_flags.dart';
import 'package:flutter/material.dart' hide DateUtils;
import 'package:flutter_svg/svg.dart';
import 'package:provider/provider.dart';
@@ -11,6 +10,7 @@ import '../../../core/utils/date_utils.dart';
import '../../../core/utils/size_config.dart';
import '../../../view_models/tenders_view_model.dart';
import '../../detail/strings/tender_details_strings.dart';
import '../../shared/flag.dart';
import '../strings/tenders_strings.dart';
import 'tender_action_buttons_row.dart';
@@ -253,14 +253,7 @@ class TenderCard extends StatelessWidget {
SizedBox(width: 8.0.w()),
// Country flag placeholder
if (tender.countryCode != null)
SizedBox(
width: 32.0.w(),
height: 21.0.h(),
child: CountryFlag.fromCountryCode(
tender.countryCode!,
shape: RoundedRectangle(4),
),
),
Flag(countryCode: tender.countryCode!),
],
),
);
lib/views/your_tenders/widgets/tender_card.dart
+3 -10
View File
@@ -1,4 +1,3 @@
import 'package:country_flags/country_flags.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:tm_app/core/utils/date_utils.dart';
@@ -8,6 +7,7 @@ import '../../../core/constants/assets.dart';
import '../../../core/constants/tender_approval_status.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/size_config.dart';
import '../../shared/flag.dart';
class TenderCard extends StatelessWidget {
final bool isDesktop;
@@ -163,15 +163,8 @@ class TenderCard extends StatelessWidget {
),
),
SizedBox(width: 8.0.w()),
// Country flag
SizedBox(
width: 32.0.w(),
height: 21.0.h(),
child: CountryFlag.fromCountryCode(
tender.countryCode!,
shape: RoundedRectangle(4),
),
),
if (tender.countryCode != null)
Flag(countryCode: tender.countryCode!),
],
),
),