Skip to content

Commit 31c74b0

Browse files
committed
feat: Add common option and markdown widgets, repos repository, and update various dependencies.
1 parent c581a46 commit 31c74b0

9 files changed

Lines changed: 90 additions & 78 deletions

File tree

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "disabled"
3+
}

android/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ android {
2424
main.java.srcDirs += 'src/main/kotlin'
2525
}
2626

27-
lintOptions {
28-
disable 'InvalidPackage'
27+
lint {
28+
disable += 'InvalidPackage'
2929
}
3030

3131
defaultConfig {
@@ -62,8 +62,8 @@ android {
6262
signingConfig signingConfigs.release
6363
}
6464
}
65-
lintOptions {
66-
abortOnError false
65+
lint {
66+
abortOnError = false
6767
}
6868

6969
dependenciesInfo {

android/gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8
2-
android.enableR8=true
32
android.useAndroidX=true
4-
android.enableJetifier=true
53
#systemProp.http.proxyHost=127.0.0.1
64
#systemProp.http.proxyPort=7890
75
#systemProp.https.proxyHost=127.0.0.1

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pluginManagement {
1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2121
id "com.android.application" version "8.9.1" apply false
22-
id "org.jetbrains.kotlin.android" version "1.8.10" apply false
22+
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
2323
}
2424

2525
include ":app"

lib/common/repositories/repos_repository.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,10 +707,12 @@ class ReposRepository {
707707
printLog("newsHad $result");
708708
}
709709
if (result > 0) {
710+
if (!context.mounted) return;
710711
CommonUtils.showUpdateDialog(
711712
context, "${release.name!}: ${release.body!}");
712713
} else {
713714
if (showTip) {
715+
if (!context.mounted) return;
714716
showToast(context.l10n.app_not_new_version);
715717
}
716718
}

lib/widget/gsy_common_option_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class GSYCommonOptionWidget extends StatelessWidget {
4949
}),
5050
GSYOptionModel(context.l10n.option_share, context.l10n.option_share,
5151
(model) {
52-
Share.share(context.l10n.option_share_title + (url ?? ""));
52+
SharePlus.instance.share(ShareParams(text: context.l10n.option_share_title + (url ?? "")));
5353
}),
5454
];
5555
var list = [...constList, ...?otherList];

lib/widget/markdown/gsy_markdown_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'dart:io';
66

77
import 'package:dio/dio.dart';
88
import 'package:flutter/material.dart';
9-
import 'package:flutter_markdown/flutter_markdown.dart';
9+
import 'package:flutter_markdown_plus/flutter_markdown_plus.dart';
1010
import 'package:flutter_spinkit/flutter_spinkit.dart';
1111
import 'package:flutter_svg/flutter_svg.dart';
1212
import 'package:gsy_github_app_flutter/common/logger.dart';

pubspec.lock

Lines changed: 60 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ packages:
4545
dependency: "direct main"
4646
description:
4747
name: animations
48-
sha256: d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb
48+
sha256: "18938cefd7dcc04e1ecac0db78973761a01e4bc2d6bfae0cfa596bfeac9e96ab"
4949
url: "https://pub.flutter-io.cn"
5050
source: hosted
51-
version: "2.0.11"
51+
version: "2.1.1"
5252
ansicolor:
5353
dependency: transitive
5454
description:
@@ -61,10 +61,10 @@ packages:
6161
dependency: transitive
6262
description:
6363
name: archive
64-
sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
64+
sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
6565
url: "https://pub.flutter-io.cn"
6666
source: hosted
67-
version: "3.6.1"
67+
version: "4.0.7"
6868
args:
6969
dependency: transitive
7070
description:
@@ -309,10 +309,10 @@ packages:
309309
dependency: "direct main"
310310
description:
311311
name: dio
312-
sha256: "0dfb6b6a1979dac1c1245e17cef824d7b452ea29bd33d3467269f9bef3715fb0"
312+
sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9
313313
url: "https://pub.flutter-io.cn"
314314
source: hosted
315-
version: "5.6.0"
315+
version: "5.9.0"
316316
dio_web_adapter:
317317
dependency: transitive
318318
description:
@@ -379,10 +379,10 @@ packages:
379379
dependency: "direct main"
380380
description:
381381
name: flutter_inappwebview
382-
sha256: bdfcf87dd49e1bd036781e308cfde61e258749852ba5e337c6128670b4428fda
382+
sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5"
383383
url: "https://pub.flutter-io.cn"
384384
source: hosted
385-
version: "6.1.0+1"
385+
version: "6.1.5"
386386
flutter_inappwebview_android:
387387
dependency: transitive
388388
description:
@@ -435,31 +435,31 @@ packages:
435435
dependency: transitive
436436
description:
437437
name: flutter_inappwebview_windows
438-
sha256: "2c1c13c32835c4a0afa49aabc207cd5cf80967c00bfdfe49259d082182d7c81f"
438+
sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055"
439439
url: "https://pub.flutter-io.cn"
440440
source: hosted
441-
version: "0.1.0"
441+
version: "0.6.0"
442442
flutter_lints:
443443
dependency: "direct dev"
444444
description:
445445
name: flutter_lints
446-
sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
446+
sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
447447
url: "https://pub.flutter-io.cn"
448448
source: hosted
449-
version: "4.0.0"
449+
version: "5.0.0"
450450
flutter_localizations:
451451
dependency: "direct main"
452452
description: flutter
453453
source: sdk
454454
version: "0.0.0"
455-
flutter_markdown:
455+
flutter_markdown_plus:
456456
dependency: "direct main"
457457
description:
458-
name: flutter_markdown
459-
sha256: e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5
458+
name: flutter_markdown_plus
459+
sha256: a3335b1047d4cbdcd20819cf69d9f2ac0e334ae13420104fb6035da1b404a0fa
460460
url: "https://pub.flutter-io.cn"
461461
source: hosted
462-
version: "0.7.6+2"
462+
version: "1.0.6"
463463
flutter_redux:
464464
dependency: "direct main"
465465
description:
@@ -472,10 +472,10 @@ packages:
472472
dependency: "direct main"
473473
description:
474474
name: flutter_riverpod
475-
sha256: ca2480512a8e840291325249f4857e363ffa5d1b77b132e189c9313a9d9fb9e0
475+
sha256: "9e2d6907f12cc7d23a846847615941bddee8709bf2bfd274acdf5e80bcf22fde"
476476
url: "https://pub.flutter-io.cn"
477477
source: hosted
478-
version: "3.0.0"
478+
version: "3.0.3"
479479
flutter_slidable:
480480
dependency: "direct main"
481481
description:
@@ -722,10 +722,10 @@ packages:
722722
dependency: transitive
723723
description:
724724
name: lints
725-
sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
725+
sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
726726
url: "https://pub.flutter-io.cn"
727727
source: hosted
728-
version: "4.0.0"
728+
version: "5.1.1"
729729
logging:
730730
dependency: transitive
731731
description:
@@ -738,10 +738,10 @@ packages:
738738
dependency: "direct main"
739739
description:
740740
name: lottie
741-
sha256: "1f0ce68112072d66ea271a9841994fa8d16442e23d8cf8996c9fa74174e58b4e"
741+
sha256: "8ae0be46dbd9e19641791dc12ee480d34e1fd3f84c749adc05f3ad9342b71b95"
742742
url: "https://pub.flutter-io.cn"
743743
source: hosted
744-
version: "3.0.0"
744+
version: "3.3.2"
745745
markdown:
746746
dependency: transitive
747747
description:
@@ -1006,6 +1006,14 @@ packages:
10061006
url: "https://pub.flutter-io.cn"
10071007
source: hosted
10081008
version: "1.5.2"
1009+
posix:
1010+
dependency: transitive
1011+
description:
1012+
name: posix
1013+
sha256: "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61"
1014+
url: "https://pub.flutter-io.cn"
1015+
source: hosted
1016+
version: "6.0.3"
10091017
preact_signals:
10101018
dependency: transitive
10111019
description:
@@ -1018,10 +1026,10 @@ packages:
10181026
dependency: "direct main"
10191027
description:
10201028
name: provider
1021-
sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
1029+
sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
10221030
url: "https://pub.flutter-io.cn"
10231031
source: hosted
1024-
version: "6.1.2"
1032+
version: "6.1.5+1"
10251033
pub_semver:
10261034
dependency: "direct main"
10271035
description:
@@ -1066,34 +1074,34 @@ packages:
10661074
dependency: transitive
10671075
description:
10681076
name: riverpod
1069-
sha256: "135723ec44dfba141bc4696224048a408336e794228a0117439e7ad0a8be6d05"
1077+
sha256: c406de02bff19d920b832bddfb8283548bfa05ce41c59afba57ce643e116aa59
10701078
url: "https://pub.flutter-io.cn"
10711079
source: hosted
1072-
version: "3.0.0"
1080+
version: "3.0.3"
10731081
riverpod_analyzer_utils:
10741082
dependency: transitive
10751083
description:
10761084
name: riverpod_analyzer_utils
1077-
sha256: c971e50f678d55c87d9e3b5015df7fcaadb2302a84ea101247cf99387b4554fe
1085+
sha256: a0f68adb078b790faa3c655110a017f9a7b7b079a57bbd40f540e80dce5fcd29
10781086
url: "https://pub.flutter-io.cn"
10791087
source: hosted
1080-
version: "1.0.0-dev.6"
1088+
version: "1.0.0-dev.7"
10811089
riverpod_annotation:
10821090
dependency: "direct main"
10831091
description:
10841092
name: riverpod_annotation
1085-
sha256: "1f9c1bc10b13f68ebc83ab391e77a865ff796880461d2a60c5ce301e1fb65f51"
1093+
sha256: "7230014155777fc31ba3351bc2cb5a3b5717b11bfafe52b1553cb47d385f8897"
10861094
url: "https://pub.flutter-io.cn"
10871095
source: hosted
1088-
version: "3.0.0"
1096+
version: "3.0.3"
10891097
riverpod_generator:
10901098
dependency: "direct dev"
10911099
description:
10921100
name: riverpod_generator
1093-
sha256: "178d6bfa6de66d7db97db2466e5fad2da91a678ab376a7309235eec731755046"
1101+
sha256: "49894543a42cf7a9954fc4e7366b6d3cb2e6ec0fa07775f660afcdd92d097702"
10941102
url: "https://pub.flutter-io.cn"
10951103
source: hosted
1096-
version: "3.0.0"
1104+
version: "3.0.3"
10971105
rxdart:
10981106
dependency: "direct main"
10991107
description:
@@ -1106,26 +1114,26 @@ packages:
11061114
dependency: "direct main"
11071115
description:
11081116
name: share_plus
1109-
sha256: "38658034f9f3c29f3b37ab0068db15caea9df2dd70d83e99300991a0d756c2a6"
1117+
sha256: "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840"
11101118
url: "https://pub.flutter-io.cn"
11111119
source: hosted
1112-
version: "10.0.1"
1120+
version: "12.0.1"
11131121
share_plus_platform_interface:
11141122
dependency: transitive
11151123
description:
11161124
name: share_plus_platform_interface
1117-
sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
1125+
sha256: "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a"
11181126
url: "https://pub.flutter-io.cn"
11191127
source: hosted
1120-
version: "5.0.2"
1128+
version: "6.1.0"
11211129
shared_preferences:
11221130
dependency: "direct main"
11231131
description:
11241132
name: shared_preferences
1125-
sha256: c272f9cabca5a81adc9b0894381e9c1def363e980f960fa903c604c471b22f68
1133+
sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
11261134
url: "https://pub.flutter-io.cn"
11271135
source: hosted
1128-
version: "2.3.1"
1136+
version: "2.5.4"
11291137
shared_preferences_android:
11301138
dependency: transitive
11311139
description:
@@ -1210,10 +1218,10 @@ packages:
12101218
dependency: "direct main"
12111219
description:
12121220
name: signals
1213-
sha256: "85225d03e71720b6fff62a8296ba7328a3e363d1ffbb9f3a85efaa05d9e85e67"
1221+
sha256: "0d644f4ec8ce4862c61e3d3d1168d08a7b9b6ecbe067d4f96e26dd35287f5dcd"
12141222
url: "https://pub.flutter-io.cn"
12151223
source: hosted
1216-
version: "6.0.2"
1224+
version: "6.3.0"
12171225
signals_core:
12181226
dependency: transitive
12191227
description:
@@ -1234,10 +1242,10 @@ packages:
12341242
dependency: "direct main"
12351243
description:
12361244
name: simple_animations
1237-
sha256: "1ea7b93fb98e2a611b6865d632de55607b766328d14700143353129ee0559d3a"
1245+
sha256: "2f4817d7e56a8ae34f1666ba9906aed394a48c7e1568d0fcd63efefb95142dd5"
12381246
url: "https://pub.flutter-io.cn"
12391247
source: hosted
1240-
version: "5.0.2"
1248+
version: "5.2.0"
12411249
sky_engine:
12421250
dependency: transitive
12431251
description: flutter
@@ -1367,34 +1375,34 @@ packages:
13671375
dependency: transitive
13681376
description:
13691377
name: talker
1370-
sha256: "028a753874d98df39f210cb74f0ee09a0a95e28f8bc2dc975c3c328e24fde23d"
1378+
sha256: e5d4f7cce6a639037e551660ae1b93b451f107e78dabcc9f89fc52ffeb6d63d5
13711379
url: "https://pub.flutter-io.cn"
13721380
source: hosted
1373-
version: "4.9.3"
1381+
version: "5.1.9"
13741382
talker_dio_logger:
13751383
dependency: "direct main"
13761384
description:
13771385
name: talker_dio_logger
1378-
sha256: "52c1b554cccedec6073637a6d4f6a3e267dd4451c1545fe57e1b26897a560ccb"
1386+
sha256: "634434970a8f9428fd753aaae204f453eee65244562f69af117a4474d9b98d35"
13791387
url: "https://pub.flutter-io.cn"
13801388
source: hosted
1381-
version: "4.7.1"
1389+
version: "5.1.9"
13821390
talker_flutter:
13831391
dependency: "direct main"
13841392
description:
13851393
name: talker_flutter
1386-
sha256: "77458ca11638dfefb651e898a26101ee54e60dc0b168ad7481a05b1c97ce2680"
1394+
sha256: c4b77632e9fe9cc2c370b7ea294294973ce4d394c584f28e87f7f8b5f5f31a51
13871395
url: "https://pub.flutter-io.cn"
13881396
source: hosted
1389-
version: "4.7.1"
1397+
version: "5.1.9"
13901398
talker_logger:
13911399
dependency: transitive
13921400
description:
13931401
name: talker_logger
1394-
sha256: "778ec673f1b71a6516e5576ae8d90ea23bbbcf9f405a97cc30e8ccdc33e26d27"
1402+
sha256: "0c9f37cd17012e5f45986007340de95e9ebccb7a64c5375919cb27e2f0cc60ee"
13951403
url: "https://pub.flutter-io.cn"
13961404
source: hosted
1397-
version: "4.9.3"
1405+
version: "5.1.9"
13981406
term_glyph:
13991407
dependency: transitive
14001408
description:
@@ -1439,10 +1447,10 @@ packages:
14391447
dependency: "direct main"
14401448
description:
14411449
name: url_launcher
1442-
sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
1450+
sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
14431451
url: "https://pub.flutter-io.cn"
14441452
source: hosted
1445-
version: "6.3.0"
1453+
version: "6.3.2"
14461454
url_launcher_android:
14471455
dependency: transitive
14481456
description:

0 commit comments

Comments
 (0)