Skip to content

Commit 79eaedf

Browse files
authored
Merge branch 'development' into drawer-adaptable
2 parents 26e0da8 + c0041d6 commit 79eaedf

5 files changed

Lines changed: 46 additions & 20 deletions

File tree

lib/l10n/app_en.arb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060
"contactUs": "Contact Us",
6161
"contactWithUs": "Contact With Us",
6262
"license": "License",
63+
"appLicense": "App License (Apache 2.0)",
64+
"openSourceLicenses": "Open Source Licenses",
65+
"openSourceLicensesDescription": "View licenses of the open source libraries used in this app.",
6366
"speed": "Speed",
6467
"speedTitle": "Speed",
6568
"animation": "Animation",

lib/l10n/app_hi.arb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@
5252
"fossasiaContributors": "FOSSASIA टीम द्वारा",
5353
"contactWithUs": "हमसे संपर्क करें",
5454
"license": "लाइसेंस",
55+
"appLicense": "ऐप लाइसेंस (Apache 2.0)",
56+
"openSourceLicenses": "ओपन सोर्स लाइसेंस",
57+
"openSourceLicensesDescription": "इस ऐप में उपयोग की गई ओपन सोर्स लाइब्रेरी के लाइसेंस देखें।",
5558
"speed": "स्पीड",
5659
"speedTitle": "स्पीड",
5760
"animation": "एनिमेशन",

lib/l10n/app_it.arb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060
"contactUs": "Contattaci",
6161
"contactWithUs": "Contatta con Noi",
6262
"license": "Licenza",
63+
"appLicense": "Licenza dell'app (Apache 2.0)",
64+
"openSourceLicenses": "Licenze open source",
65+
"openSourceLicensesDescription": "Visualizza le licenze delle librerie open source utilizzate in questa app.",
6366
"speed": "Velocità",
6467
"speedTitle": "Velocità",
6568
"animation": "Animazione",

lib/providers/animation_badge_provider.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ class AnimationBadgeProvider extends ChangeNotifier {
218218
int? getAnimationIndex() {
219219
for (var animation in animationMap.entries) {
220220
if (animation.value != null && animation.value == _currentAnimation) {
221-
logger.i("Animation Index: ${animation.key}");
222221
return animation.key;
223222
}
224223
}

lib/view/about_us_screen.dart

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class _AboutUsScreenState extends State<AboutUsScreen> {
204204
fit: BoxFit.contain,
205205
),
206206
title: Text(
207-
l10n.license,
207+
l10n.appLicense,
208208
style: GoogleFonts.sora(
209209
fontSize: 16,
210210
fontWeight: FontWeight.w500,
@@ -223,24 +223,42 @@ class _AboutUsScreenState extends State<AboutUsScreen> {
223223
onTap: () => openUrl(
224224
'https://github.com/fossasia/badgemagic-app/blob/development/LICENSE'),
225225
),
226-
// ListTile(
227-
// leading: Image.asset('assets/icons/book.png', height: 40),
228-
// title: Text(
229-
// 'Library Licenses',
230-
// style: GoogleFonts.sora(
231-
// fontSize: 16,
232-
// fontWeight: FontWeight.w500,
233-
// color: Colors.black),
234-
// ),
235-
// subtitle: Text(
236-
// 'Check third-party libs used on Badge Magic.',
237-
// style: GoogleFonts.sora(
238-
// fontSize: 12,
239-
// fontWeight: FontWeight.w500,
240-
// color: Colors.grey),
241-
// ),
242-
// onTap: () => showLicenseDialog(context),
243-
// ),
226+
ListTile(
227+
leading: const Icon(
228+
Icons.description_outlined,
229+
size: 38,
230+
color: Colors.black,
231+
),
232+
title: Text(
233+
l10n.openSourceLicenses,
234+
style: GoogleFonts.sora(
235+
fontSize: 16,
236+
fontWeight: FontWeight.w500,
237+
color: Colors.black,
238+
),
239+
),
240+
subtitle: Text(
241+
l10n.openSourceLicensesDescription,
242+
style: GoogleFonts.sora(
243+
fontSize: 12,
244+
fontWeight: FontWeight.w500,
245+
color: Colors.grey,
246+
),
247+
softWrap: true,
248+
),
249+
onTap: () => showLicensePage(
250+
context: context,
251+
applicationName: l10n.appTitle,
252+
applicationIcon: Padding(
253+
padding: const EdgeInsets.all(8.0),
254+
child: Image.asset(
255+
'assets/icons/icon.png',
256+
height: 48,
257+
fit: BoxFit.contain,
258+
),
259+
),
260+
),
261+
),
244262
],
245263
),
246264
),

0 commit comments

Comments
 (0)