Skip to content

Commit

Permalink
Added a twitter link
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolfteam committed Jul 10, 2022
1 parent 0adf518 commit 32871b4
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 6 deletions.
Binary file modified assets/fonts/Shiori.ttf
Binary file not shown.
6 changes: 6 additions & 0 deletions assets/fonts/config.json
Expand Up @@ -107,6 +107,12 @@
"css": "globe-1",
"code": 61612,
"src": "fontawesome5"
},
{
"uid": "627abcdb627cb1789e009c08e2678ef9",
"css": "twitter",
"code": 61593,
"src": "fontawesome"
}
]
}
16 changes: 12 additions & 4 deletions lib/presentation/settings/widgets/about_settings_card.dart
Expand Up @@ -7,14 +7,13 @@ import 'package:shiori/application/bloc.dart';
import 'package:shiori/domain/app_constants.dart';
import 'package:shiori/generated/l10n.dart';
import 'package:shiori/presentation/donations/donations_bottom_sheet.dart';
import 'package:shiori/presentation/settings/widgets/settings_card.dart';
import 'package:shiori/presentation/shared/dialogs/changelog_dialog.dart';
import 'package:shiori/presentation/shared/loading.dart';
import 'package:shiori/presentation/shared/shiori_icons.dart';
import 'package:shiori/presentation/shared/styles.dart';
import 'package:url_launcher/url_launcher.dart';

import 'settings_card.dart';

class AboutSettingsCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
Expand Down Expand Up @@ -97,6 +96,15 @@ class AboutSettingsCard extends StatelessWidget {
onPressed: () => showDialog(context: context, builder: (ctx) => const ChangelogDialog()),
),
),
Tooltip(
message: 'Twitter',
child: IconButton(
splashRadius: Styles.mediumButtonSplashRadius,
icon: const Icon(Shiori.twitter),
color: Colors.blue,
onPressed: () => _launchUrl('https://twitter.com/GenshinShiori'),
),
),
Tooltip(
message: 'Discord',
child: IconButton(
Expand Down Expand Up @@ -181,8 +189,8 @@ class AboutSettingsCard extends StatelessWidget {
}

Future<void> _launchUrl(String url) async {
if (await canLaunch(url)) {
await launch(url);
if (await canLaunchUrl(Uri.parse(url))) {
await launchUrl(Uri.parse(url), mode: LaunchMode.externalNonBrowserApplication);
}
}

Expand Down
3 changes: 1 addition & 2 deletions lib/presentation/settings/widgets/other_settings.dart
Expand Up @@ -4,14 +4,13 @@ import 'package:shiori/application/bloc.dart';
import 'package:shiori/application/settings/settings_bloc.dart';
import 'package:shiori/domain/enums/enums.dart';
import 'package:shiori/generated/l10n.dart';
import 'package:shiori/presentation/settings/widgets/settings_card.dart';
import 'package:shiori/presentation/shared/common_dropdown_button.dart';
import 'package:shiori/presentation/shared/extensions/i18n_extensions.dart';
import 'package:shiori/presentation/shared/loading.dart';
import 'package:shiori/presentation/shared/styles.dart';
import 'package:shiori/presentation/shared/utils/enum_utils.dart';

import 'settings_card.dart';

class OtherSettings extends StatelessWidget {
@override
Widget build(BuildContext context) {
Expand Down
1 change: 1 addition & 0 deletions lib/presentation/shared/shiori_icons.dart
Expand Up @@ -49,6 +49,7 @@ class Shiori {
static const IconData trefoil_lily = IconData(0xead4, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData heart = IconData(0xf004, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData cogs = IconData(0xf085, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData twitter = IconData(0xf099, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData github_circled = IconData(0xf09b, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData globe_1 = IconData(0xf0ac, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData filter = IconData(0xf0b0, fontFamily: _kFontFam, fontPackage: _kFontPkg);
Expand Down

0 comments on commit 32871b4

Please sign in to comment.