diff --git a/android/app/build.gradle b/android/app/build.gradle index 3c36a91..17a664b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -64,12 +64,15 @@ android { storePassword keystoreProperties['storePassword'] } } + buildTypes { release { signingConfig signingConfigs.release + + minifyEnabled true + shrinkResources true } } - } flutter { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index ec20773..2b29e76 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -37,15 +37,6 @@ android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" /> - - diff --git a/lib/extensions/widget_extension.dart b/lib/extensions/widget_extension.dart index 1926453..6b89774 100644 --- a/lib/extensions/widget_extension.dart +++ b/lib/extensions/widget_extension.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:hacki/config/constants.dart'; import 'package:hacki/models/models.dart'; -import 'package:hacki/screens/widgets/custom_linkify/linkifiers/linkifiers.dart'; +import 'package:hacki/screens/widgets/custom_linkify/custom_linkify.dart'; import 'package:hacki/utils/utils.dart'; extension WidgetModifier on Widget { diff --git a/lib/screens/profile/widgets/settings.dart b/lib/screens/profile/widgets/settings.dart index 53cca9d..5b2cc8c 100644 --- a/lib/screens/profile/widgets/settings.dart +++ b/lib/screens/profile/widgets/settings.dart @@ -426,7 +426,7 @@ class _SettingsState extends State { DefaultCacheManager().emptyCache, ) .whenComplete(() { - showSnackBar(content: 'Data cleared!'); + showSnackBar(content: 'Cache cleared!'); }); }, child: const Text( diff --git a/lib/screens/widgets/custom_linkify/custom_linkify.dart b/lib/screens/widgets/custom_linkify/custom_linkify.dart index 2919aa1..6b9a64b 100644 --- a/lib/screens/widgets/custom_linkify/custom_linkify.dart +++ b/lib/screens/widgets/custom_linkify/custom_linkify.dart @@ -5,6 +5,7 @@ import 'package:hacki/styles/palette.dart'; import 'package:hacki/utils/utils.dart'; import 'package:linkify/linkify.dart'; +export 'package:hacki/screens/widgets/custom_linkify/linkifiers/linkifiers.dart'; export 'package:linkify/linkify.dart' show LinkifyElement, @@ -27,7 +28,7 @@ class Linkify extends StatelessWidget { required this.text, this.linkifiers = defaultLinkifiers, this.onOpen, - this.options = const LinkifyOptions(), + this.options = LinkifierUtil.linkifyOptions, // TextSpan this.style, this.linkStyle, @@ -154,7 +155,7 @@ class SelectableLinkify extends StatelessWidget { required this.text, this.linkifiers = defaultLinkifiers, this.onOpen, - this.options = const LinkifyOptions(), + this.options = LinkifierUtil.linkifyOptions, // TextSpan this.style, this.linkStyle, diff --git a/lib/screens/widgets/custom_linkify/linkifiers/quote_linkifier.dart b/lib/screens/widgets/custom_linkify/linkifiers/quote_linkifier.dart index 68352af..2ae4a91 100644 --- a/lib/screens/widgets/custom_linkify/linkifiers/quote_linkifier.dart +++ b/lib/screens/widgets/custom_linkify/linkifiers/quote_linkifier.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:linkify/linkify.dart'; final RegExp _quoteRegex = RegExp( - r'(?=^> )(.*?)(?=\n|$)', + r'(?=^>)(.*?)(?=\n|$)', multiLine: true, ); diff --git a/lib/utils/linkifier_util.dart b/lib/utils/linkifier_util.dart index eff3689..0195f10 100644 --- a/lib/utils/linkifier_util.dart +++ b/lib/utils/linkifier_util.dart @@ -2,8 +2,9 @@ import 'package:hacki/screens/widgets/custom_linkify/linkifiers/linkifiers.dart' import 'package:linkify/linkify.dart'; abstract class LinkifierUtil { + static const LinkifyOptions linkifyOptions = LinkifyOptions(humanize: false); + static List linkify(String text) { - const LinkifyOptions options = LinkifyOptions(); const List linkifiers = [ UrlLinkifier(), EmailLinkifier(), @@ -21,7 +22,7 @@ abstract class LinkifierUtil { } for (final Linkifier linkifier in linkifiers) { - list = linkifier.parse(list, options); + list = linkifier.parse(list, linkifyOptions); } return list; diff --git a/pubspec.yaml b/pubspec.yaml index 504ae12..5b2ddf4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: hacki description: A Hacker News reader. -version: 1.3.0+99 +version: 1.3.1+100 publish_to: none environment: