mirror of
https://github.com/Livinglist/Hacki.git
synced 2025-08-06 18:24:42 +08:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 459ab961d1 | |||
| 362d7005df | |||
| 6b7c1d42de | |||
| 2a889bca56 | |||
| e25026f129 | |||
| fefc86275d | |||
| 1a73a6991e | |||
| 36d7f4606e | |||
| 9312c56dd0 | |||
| 6e71de5913 | |||
| a9590af3e9 | |||
| 18dadaa5ec |
13
.github/FUNDING.yml
vendored
Normal file
13
.github/FUNDING.yml
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
# These are supported funding model platforms
|
||||
|
||||
github: livinglist
|
||||
patreon: # Replace with a single Patreon username
|
||||
open_collective: # Replace with a single Open Collective username
|
||||
ko_fi: # Replace with a single Ko-fi username
|
||||
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
||||
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
||||
liberapay: jfeng_for_open_source
|
||||
issuehunt: # Replace with a single IssueHunt username
|
||||
otechie: # Replace with a single Otechie username
|
||||
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
|
||||
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
||||
37
README.md
37
README.md
@ -4,7 +4,8 @@
|
||||
A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
|
||||
|
||||
[](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone)
|
||||
[](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US)
|
||||
[](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)
|
||||
[](https://github.com/Livinglist/Hacki/releases/latest)
|
||||
[](https://badges.pufler.dev)
|
||||
[](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
|
||||
[](https://pub.dev/packages/effective_dart)
|
||||
@ -36,24 +37,22 @@ Features:
|
||||
|
||||
|
||||
<p align="center">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450528-02c561ed-0ebb-4c1b-9ee0-a935211db0f2.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450536-ea61c176-37d7-4744-8674-4668e0e7e774.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450541-a9af3417-526f-4dbd-96d7-781c95c886d3.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450543-fb631b02-5f46-4455-b8ff-9ef119a486f1.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450548-38e98b02-6201-48c9-9674-87bdfc61f456.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798179-72edbe49-7444-4e54-a07c-fc1244447a74.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798182-28397805-a7cc-4124-b65b-c02c80afbbec.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798183-c2984270-ee99-4419-841e-65e98890464f.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798184-2fce5d97-710e-44a7-b99a-3296ebcf273b.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171992215-5b43443b-f2b0-4b6e-9a30-a583fda1b189.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798186-1457ae21-f1aa-40a4-9206-0f3a1e24653e.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450557-ab038e72-78c4-4daf-9b77-3873be1700db.png">
|
||||
<img width="200" alt="01" src="assets/screenshots/01.png">
|
||||
<img width="200" alt="02" src="assets/screenshots/02.png">
|
||||
<img width="200" alt="03" src="assets/screenshots/03.png">
|
||||
<img width="200" alt="04" src="assets/screenshots/04.png">
|
||||
<img width="200" alt="05" src="assets/screenshots/05.png">
|
||||
<img width="200" alt="06" src="assets/screenshots/06.png">
|
||||
<img width="200" alt="07" src="assets/screenshots/07.png">
|
||||
<img width="200" alt="08" src="assets/screenshots/08.png">
|
||||
<img width="200" alt="09" src="assets/screenshots/09.png">
|
||||
<img width="200" alt="10" src="assets/screenshots/10.png">
|
||||
<img width="200" alt="11" src="assets/screenshots/11.png">
|
||||
<img width="200" alt="12" src="assets/screenshots/12.png">
|
||||
|
||||
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162711-a9146326-9645-4db6-a04e-1f82e6133e40.png">
|
||||
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162726-ef1d3f2a-5179-417c-8a5f-0cddb52249da.png">
|
||||
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162733-906c4afd-39a8-48ae-946a-8019b327eaa0.png">
|
||||
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162735-f2b25119-4702-4308-b2f5-281a2a2c5901.png">
|
||||
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160163024-6dcd65b6-bada-4c1c-95af-387fd4f42fb2.png">
|
||||
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160163033-7bcf7038-b9aa-4ce4-8b58-64578eae8531.png">
|
||||
<img width="400" alt="ipad-01" src="assets/screenshots/ipad-01.png">
|
||||
<img width="400" alt="ipad-02" src="assets/screenshots/ipad-02.png">
|
||||
<img width="400" alt="ipad-03" src="assets/screenshots/ipad-03.png">
|
||||
<img width="400" alt="ipad-04" src="assets/screenshots/ipad-04.png">
|
||||
</p>
|
||||
|
||||
|
||||
@ -17,7 +17,8 @@
|
||||
|
||||
<application
|
||||
android:label="hacki"
|
||||
android:icon="@mipmap/ic_launcher">
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:usesCleartextTraffic="true">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:launchMode="singleTop"
|
||||
@ -52,6 +53,21 @@
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<data android:mimeType="*/*" />
|
||||
</intent-filter>
|
||||
|
||||
<intent-filter android:autoVerify="true">
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
|
||||
<data
|
||||
android:scheme="http"
|
||||
android:host="news.ycombinator.com"
|
||||
android:pathPrefix="/item" />
|
||||
<data
|
||||
android:scheme="https"
|
||||
android:host="news.ycombinator.com"
|
||||
android:pathPrefix="/item" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<!-- Don't delete the meta-data below.
|
||||
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
|
||||
|
||||
BIN
assets/screenshots/01.png
Normal file
BIN
assets/screenshots/01.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 522 KiB |
BIN
assets/screenshots/02.png
Normal file
BIN
assets/screenshots/02.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 835 KiB |
BIN
assets/screenshots/03.png
Normal file
BIN
assets/screenshots/03.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 282 KiB |
BIN
assets/screenshots/04.png
Normal file
BIN
assets/screenshots/04.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 298 KiB |
BIN
assets/screenshots/05.png
Normal file
BIN
assets/screenshots/05.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 698 KiB |
BIN
assets/screenshots/06.png
Normal file
BIN
assets/screenshots/06.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 868 KiB |
BIN
assets/screenshots/07.png
Normal file
BIN
assets/screenshots/07.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 121 KiB |
BIN
assets/screenshots/08.png
Normal file
BIN
assets/screenshots/08.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 375 KiB |
BIN
assets/screenshots/09.png
Normal file
BIN
assets/screenshots/09.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 282 KiB |
BIN
assets/screenshots/10.png
Normal file
BIN
assets/screenshots/10.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 414 KiB |
BIN
assets/screenshots/11.png
Normal file
BIN
assets/screenshots/11.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 530 KiB |
BIN
assets/screenshots/12.png
Normal file
BIN
assets/screenshots/12.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 390 KiB |
BIN
assets/screenshots/ipad-01.png
Normal file
BIN
assets/screenshots/ipad-01.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 763 KiB |
BIN
assets/screenshots/ipad-02.png
Normal file
BIN
assets/screenshots/ipad-02.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 MiB |
BIN
assets/screenshots/ipad-03.png
Normal file
BIN
assets/screenshots/ipad-03.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
BIN
assets/screenshots/ipad-04.png
Normal file
BIN
assets/screenshots/ipad-04.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1005 KiB |
6
fastlane/metadata/android/en-US/changelogs/54.txt
Normal file
6
fastlane/metadata/android/en-US/changelogs/54.txt
Normal file
@ -0,0 +1,6 @@
|
||||
- You can now add filters for searching.
|
||||
- You can now participate in polls.
|
||||
- Pick up where you left off.
|
||||
- Swipe left on comment tile to view its parents without scrolling all the way up.
|
||||
- Huge performance boost.
|
||||
- Bugfixes.
|
||||
6
fastlane/metadata/android/en-US/changelogs/55.txt
Normal file
6
fastlane/metadata/android/en-US/changelogs/55.txt
Normal file
@ -0,0 +1,6 @@
|
||||
- You can now add filters for searching.
|
||||
- You can now participate in polls.
|
||||
- Pick up where you left off.
|
||||
- Swipe left on comment tile to view its parents without scrolling all the way up.
|
||||
- Huge performance boost.
|
||||
- Bugfixes.
|
||||
6
fastlane/metadata/android/en-US/changelogs/56.txt
Normal file
6
fastlane/metadata/android/en-US/changelogs/56.txt
Normal file
@ -0,0 +1,6 @@
|
||||
- You can now add filters for searching.
|
||||
- You can now participate in polls.
|
||||
- Pick up where you left off.
|
||||
- Swipe left on comment tile to view its parents without scrolling all the way up.
|
||||
- Huge performance boost.
|
||||
- Bugfixes.
|
||||
7
fastlane/metadata/android/en-US/changelogs/57.txt
Normal file
7
fastlane/metadata/android/en-US/changelogs/57.txt
Normal file
@ -0,0 +1,7 @@
|
||||
- You can share links.
|
||||
- You can now add filters for searching.
|
||||
- You can now participate in polls.
|
||||
- Pick up where you left off.
|
||||
- Swipe left on comment tile to view its parents without scrolling all the way up.
|
||||
- Huge performance boost.
|
||||
- Bugfixes.
|
||||
1
fastlane/metadata/android/en-US/changelogs/58.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/58.txt
Normal file
@ -0,0 +1 @@
|
||||
- Offline mode now includes web pages.
|
||||
1
fastlane/metadata/android/en-US/changelogs/59.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/59.txt
Normal file
@ -0,0 +1 @@
|
||||
- Offline mode now includes web pages.
|
||||
1
fastlane/metadata/android/en-US/changelogs/60.txt
Normal file
1
fastlane/metadata/android/en-US/changelogs/60.txt
Normal file
@ -0,0 +1 @@
|
||||
- Offline mode now includes web pages.
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 422 KiB After Width: | Height: | Size: 522 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 712 KiB After Width: | Height: | Size: 835 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 252 KiB After Width: | Height: | Size: 282 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 262 KiB After Width: | Height: | Size: 298 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 672 KiB After Width: | Height: | Size: 698 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 931 KiB After Width: | Height: | Size: 868 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 298 KiB After Width: | Height: | Size: 121 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 247 KiB After Width: | Height: | Size: 375 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 496 KiB After Width: | Height: | Size: 282 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 617 KiB After Width: | Height: | Size: 414 KiB |
BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/11.png
Normal file
BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/11.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 530 KiB |
BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/12.png
Normal file
BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/12.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 390 KiB |
@ -14,6 +14,8 @@ PODS:
|
||||
- Flutter
|
||||
- flutter_secure_storage (3.3.1):
|
||||
- Flutter
|
||||
- flutter_siri_suggestions (0.0.1):
|
||||
- Flutter
|
||||
- FMDB (2.7.5):
|
||||
- FMDB/standard (= 2.7.5)
|
||||
- FMDB/standard (2.7.5)
|
||||
@ -23,6 +25,8 @@ PODS:
|
||||
- ReachabilitySwift (5.0.0)
|
||||
- receive_sharing_intent (0.0.1):
|
||||
- Flutter
|
||||
- share_plus (0.0.1):
|
||||
- Flutter
|
||||
- shared_preferences_ios (0.0.1):
|
||||
- Flutter
|
||||
- sqflite (0.0.2):
|
||||
@ -32,8 +36,6 @@ PODS:
|
||||
- Flutter
|
||||
- url_launcher_ios (0.0.1):
|
||||
- Flutter
|
||||
- video_player_avfoundation (0.0.1):
|
||||
- Flutter
|
||||
- wakelock (0.0.1):
|
||||
- Flutter
|
||||
- webview_flutter_wkwebview (0.0.1):
|
||||
@ -47,13 +49,14 @@ DEPENDENCIES:
|
||||
- flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
|
||||
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
|
||||
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
|
||||
- flutter_siri_suggestions (from `.symlinks/plugins/flutter_siri_suggestions/ios`)
|
||||
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
|
||||
- receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
|
||||
- share_plus (from `.symlinks/plugins/share_plus/ios`)
|
||||
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
|
||||
- sqflite (from `.symlinks/plugins/sqflite/ios`)
|
||||
- synced_shared_preferences (from `.symlinks/plugins/synced_shared_preferences/ios`)
|
||||
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
|
||||
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
|
||||
- wakelock (from `.symlinks/plugins/wakelock/ios`)
|
||||
- webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
|
||||
- workmanager (from `.symlinks/plugins/workmanager/ios`)
|
||||
@ -75,10 +78,14 @@ EXTERNAL SOURCES:
|
||||
:path: ".symlinks/plugins/flutter_local_notifications/ios"
|
||||
flutter_secure_storage:
|
||||
:path: ".symlinks/plugins/flutter_secure_storage/ios"
|
||||
flutter_siri_suggestions:
|
||||
:path: ".symlinks/plugins/flutter_siri_suggestions/ios"
|
||||
path_provider_ios:
|
||||
:path: ".symlinks/plugins/path_provider_ios/ios"
|
||||
receive_sharing_intent:
|
||||
:path: ".symlinks/plugins/receive_sharing_intent/ios"
|
||||
share_plus:
|
||||
:path: ".symlinks/plugins/share_plus/ios"
|
||||
shared_preferences_ios:
|
||||
:path: ".symlinks/plugins/shared_preferences_ios/ios"
|
||||
sqflite:
|
||||
@ -87,8 +94,6 @@ EXTERNAL SOURCES:
|
||||
:path: ".symlinks/plugins/synced_shared_preferences/ios"
|
||||
url_launcher_ios:
|
||||
:path: ".symlinks/plugins/url_launcher_ios/ios"
|
||||
video_player_avfoundation:
|
||||
:path: ".symlinks/plugins/video_player_avfoundation/ios"
|
||||
wakelock:
|
||||
:path: ".symlinks/plugins/wakelock/ios"
|
||||
webview_flutter_wkwebview:
|
||||
@ -102,16 +107,17 @@ SPEC CHECKSUMS:
|
||||
flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
|
||||
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
|
||||
flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
|
||||
flutter_siri_suggestions: 226fb7ef33d25d3fe0d4aa2a8bcf4b72730c466f
|
||||
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
|
||||
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
|
||||
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
|
||||
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
|
||||
receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
|
||||
share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
|
||||
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
|
||||
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
|
||||
synced_shared_preferences: f722742b06d65c7315b8e9f56b794c9fbd5597f7
|
||||
url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
|
||||
video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
|
||||
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
|
||||
webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
|
||||
workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6
|
||||
|
||||
@ -568,7 +568,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
CURRENT_PROJECT_VERSION = 5;
|
||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
@ -577,7 +577,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 0.2.14;
|
||||
MARKETING_VERSION = 0.2.19;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
@ -705,7 +705,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
CURRENT_PROJECT_VERSION = 5;
|
||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
@ -714,7 +714,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 0.2.14;
|
||||
MARKETING_VERSION = 0.2.19;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
@ -736,7 +736,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
CURRENT_PROJECT_VERSION = 5;
|
||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
@ -745,7 +745,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 0.2.14;
|
||||
MARKETING_VERSION = 0.2.19;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
|
||||
@ -32,6 +32,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
||||
on<StoryRead>(onStoryRead);
|
||||
on<StoriesLoaded>(onStoriesLoaded);
|
||||
on<StoriesDownload>(onDownload);
|
||||
on<StoryDownloaded>(onStoryDownloaded);
|
||||
on<StoriesExitOffline>(onExitOffline);
|
||||
on<StoriesPageSizeChanged>(onPageSizeChanged);
|
||||
on<ClearAllReadStories>(onClearAllReadStories);
|
||||
@ -48,6 +49,15 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
||||
static const int _tabletSmallPageSize = 15;
|
||||
static const int _tabletLargePageSize = 25;
|
||||
|
||||
/// Types of story to be shown in the tab bar.
|
||||
static const Set<StoryType> types = <StoryType>{
|
||||
StoryType.top,
|
||||
StoryType.best,
|
||||
StoryType.latest,
|
||||
StoryType.ask,
|
||||
StoryType.show,
|
||||
};
|
||||
|
||||
Future<void> onInitialize(
|
||||
StoriesInitialize event,
|
||||
Emitter<StoriesState> emit,
|
||||
@ -70,11 +80,9 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
||||
currentPageSize: pageSize,
|
||||
),
|
||||
);
|
||||
await loadStories(of: StoryType.top, emit: emit);
|
||||
await loadStories(of: StoryType.latest, emit: emit);
|
||||
await loadStories(of: StoryType.ask, emit: emit);
|
||||
await loadStories(of: StoryType.show, emit: emit);
|
||||
await loadStories(of: StoryType.jobs, emit: emit);
|
||||
for (final StoryType type in types) {
|
||||
await loadStories(of: type, emit: emit);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> loadStories({
|
||||
@ -237,56 +245,117 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
||||
await _cacheRepository.deleteAllStories();
|
||||
await _cacheRepository.deleteAllComments();
|
||||
|
||||
final List<int> topIds =
|
||||
await _storiesRepository.fetchStoryIds(of: StoryType.top);
|
||||
final List<int> newIds =
|
||||
await _storiesRepository.fetchStoryIds(of: StoryType.latest);
|
||||
final List<int> askIds =
|
||||
await _storiesRepository.fetchStoryIds(of: StoryType.ask);
|
||||
final List<int> showIds =
|
||||
await _storiesRepository.fetchStoryIds(of: StoryType.show);
|
||||
final List<int> jobIds =
|
||||
await _storiesRepository.fetchStoryIds(of: StoryType.jobs);
|
||||
final Set<int> prioritizedIds = <int>{};
|
||||
final List<StoryType> prioritizedTypes = <StoryType>[...types]
|
||||
..remove(StoryType.latest);
|
||||
|
||||
await _cacheRepository.cacheStoryIds(of: StoryType.top, ids: topIds);
|
||||
await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: newIds);
|
||||
await _cacheRepository.cacheStoryIds(of: StoryType.ask, ids: askIds);
|
||||
await _cacheRepository.cacheStoryIds(of: StoryType.show, ids: showIds);
|
||||
await _cacheRepository.cacheStoryIds(of: StoryType.jobs, ids: jobIds);
|
||||
for (final StoryType type in prioritizedTypes) {
|
||||
final List<int> ids = await _storiesRepository.fetchStoryIds(of: type);
|
||||
await _cacheRepository.cacheStoryIds(of: type, ids: ids);
|
||||
prioritizedIds.addAll(ids);
|
||||
}
|
||||
|
||||
final List<int> allIds = <int>[
|
||||
...topIds,
|
||||
...newIds,
|
||||
...askIds,
|
||||
...showIds,
|
||||
...jobIds
|
||||
];
|
||||
emit(
|
||||
state.copyWith(
|
||||
storiesDownloaded: 0,
|
||||
storiesToBeDownloaded: prioritizedIds.length,
|
||||
),
|
||||
);
|
||||
|
||||
try {
|
||||
_storiesRepository
|
||||
.fetchStoriesStream(ids: allIds)
|
||||
.listen((Story story) async {
|
||||
if (story.kids.isNotEmpty) {
|
||||
await fetchAndCacheStories(
|
||||
prioritizedIds,
|
||||
includingWebPage: event.includingWebPage,
|
||||
isPrioritized: true,
|
||||
);
|
||||
|
||||
final Set<int> latestIds = <int>{};
|
||||
final List<int> ids = await _storiesRepository.fetchStoryIds(
|
||||
of: StoryType.latest,
|
||||
);
|
||||
await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: ids);
|
||||
latestIds.addAll(ids);
|
||||
|
||||
await fetchAndCacheStories(
|
||||
latestIds,
|
||||
includingWebPage: event.includingWebPage,
|
||||
isPrioritized: false,
|
||||
);
|
||||
|
||||
emit(
|
||||
state.copyWith(
|
||||
downloadStatus: StoriesDownloadStatus.finished,
|
||||
),
|
||||
);
|
||||
} catch (_) {
|
||||
emit(
|
||||
state.copyWith(
|
||||
downloadStatus: StoriesDownloadStatus.failure,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> fetchAndCacheStories(
|
||||
Iterable<int> ids, {
|
||||
required bool includingWebPage,
|
||||
required bool isPrioritized,
|
||||
}) async {
|
||||
for (final int id in ids) {
|
||||
final Story? story = await _storiesRepository.fetchStoryBy(id);
|
||||
|
||||
if (story == null) {
|
||||
if (isPrioritized) {
|
||||
add(StoryDownloaded(skipped: true));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (story.kids.isEmpty) {
|
||||
if (isPrioritized) {
|
||||
add(StoryDownloaded(skipped: true));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
await _cacheRepository.cacheStory(story: story);
|
||||
|
||||
if (story.url.isNotEmpty && includingWebPage) {
|
||||
await _cacheRepository.cacheUrl(url: story.url);
|
||||
}
|
||||
|
||||
final Completer<void> completer = Completer<void>();
|
||||
_storiesRepository
|
||||
.fetchAllChildrenComments(ids: story.kids)
|
||||
.listen((Comment? comment) async {
|
||||
if (comment != null) {
|
||||
await _cacheRepository.cacheComment(comment: comment);
|
||||
}
|
||||
});
|
||||
}
|
||||
}).onDone(() {
|
||||
completer.complete();
|
||||
add(StoryDownloaded(skipped: false));
|
||||
});
|
||||
|
||||
await completer.future;
|
||||
}
|
||||
}
|
||||
|
||||
void onStoryDownloaded(StoryDownloaded event, Emitter<StoriesState> emit) {
|
||||
if (event.skipped) {
|
||||
emit(
|
||||
state.copyWith(
|
||||
downloadStatus: StoriesDownloadStatus.finished,
|
||||
storiesToBeDownloaded: state.storiesToBeDownloaded - 1,
|
||||
),
|
||||
);
|
||||
});
|
||||
} catch (_) {
|
||||
} else {
|
||||
final int updatedStoriesDownloaded = state.storiesDownloaded + 1;
|
||||
emit(
|
||||
state.copyWith(
|
||||
downloadStatus: StoriesDownloadStatus.failure,
|
||||
storiesDownloaded: updatedStoriesDownloaded,
|
||||
storiesToBeDownloaded:
|
||||
updatedStoriesDownloaded > state.storiesToBeDownloaded
|
||||
? state.storiesToBeDownloaded + 1
|
||||
: state.storiesToBeDownloaded,
|
||||
),
|
||||
);
|
||||
}
|
||||
@ -307,6 +376,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
||||
await _cacheRepository.deleteAllStoryIds();
|
||||
await _cacheRepository.deleteAllStories();
|
||||
await _cacheRepository.deleteAllComments();
|
||||
await _cacheRepository.deleteAllWebPages();
|
||||
emit(state.copyWith(offlineReading: false));
|
||||
add(StoriesInitialize());
|
||||
}
|
||||
|
||||
@ -38,8 +38,21 @@ class StoriesLoadMore extends StoriesEvent {
|
||||
}
|
||||
|
||||
class StoriesDownload extends StoriesEvent {
|
||||
StoriesDownload({required this.includingWebPage});
|
||||
|
||||
final bool includingWebPage;
|
||||
|
||||
@override
|
||||
List<Object?> get props => <Object?>[];
|
||||
List<Object?> get props => <Object?>[includingWebPage];
|
||||
}
|
||||
|
||||
class StoryDownloaded extends StoriesEvent {
|
||||
StoryDownloaded({required this.skipped});
|
||||
|
||||
final bool skipped;
|
||||
|
||||
@override
|
||||
List<Object?> get props => <Object?>[skipped];
|
||||
}
|
||||
|
||||
class StoriesExitOffline extends StoriesEvent {
|
||||
|
||||
@ -23,11 +23,14 @@ class StoriesState extends Equatable {
|
||||
required this.offlineReading,
|
||||
required this.downloadStatus,
|
||||
required this.currentPageSize,
|
||||
required this.storiesDownloaded,
|
||||
required this.storiesToBeDownloaded,
|
||||
});
|
||||
|
||||
const StoriesState.init({
|
||||
this.storiesByType = const <StoryType, List<Story>>{
|
||||
StoryType.top: <Story>[],
|
||||
StoryType.best: <Story>[],
|
||||
StoryType.latest: <Story>[],
|
||||
StoryType.ask: <Story>[],
|
||||
StoryType.show: <Story>[],
|
||||
@ -35,6 +38,7 @@ class StoriesState extends Equatable {
|
||||
},
|
||||
this.storyIdsByType = const <StoryType, List<int>>{
|
||||
StoryType.top: <int>[],
|
||||
StoryType.best: <int>[],
|
||||
StoryType.latest: <int>[],
|
||||
StoryType.ask: <int>[],
|
||||
StoryType.show: <int>[],
|
||||
@ -42,6 +46,7 @@ class StoriesState extends Equatable {
|
||||
},
|
||||
this.statusByType = const <StoryType, StoriesStatus>{
|
||||
StoryType.top: StoriesStatus.initial,
|
||||
StoryType.best: StoriesStatus.initial,
|
||||
StoryType.latest: StoriesStatus.initial,
|
||||
StoryType.ask: StoriesStatus.initial,
|
||||
StoryType.show: StoriesStatus.initial,
|
||||
@ -49,6 +54,7 @@ class StoriesState extends Equatable {
|
||||
},
|
||||
this.currentPageByType = const <StoryType, int>{
|
||||
StoryType.top: 0,
|
||||
StoryType.best: 0,
|
||||
StoryType.latest: 0,
|
||||
StoryType.ask: 0,
|
||||
StoryType.show: 0,
|
||||
@ -57,7 +63,9 @@ class StoriesState extends Equatable {
|
||||
}) : offlineReading = false,
|
||||
downloadStatus = StoriesDownloadStatus.initial,
|
||||
currentPageSize = 0,
|
||||
readStoriesIds = const <int>{};
|
||||
readStoriesIds = const <int>{},
|
||||
storiesDownloaded = 0,
|
||||
storiesToBeDownloaded = 0;
|
||||
|
||||
final Map<StoryType, List<Story>> storiesByType;
|
||||
final Map<StoryType, List<int>> storyIdsByType;
|
||||
@ -67,6 +75,8 @@ class StoriesState extends Equatable {
|
||||
final StoriesDownloadStatus downloadStatus;
|
||||
final bool offlineReading;
|
||||
final int currentPageSize;
|
||||
final int storiesDownloaded;
|
||||
final int storiesToBeDownloaded;
|
||||
|
||||
StoriesState copyWith({
|
||||
Map<StoryType, List<Story>>? storiesByType,
|
||||
@ -77,6 +87,8 @@ class StoriesState extends Equatable {
|
||||
StoriesDownloadStatus? downloadStatus,
|
||||
bool? offlineReading,
|
||||
int? currentPageSize,
|
||||
int? storiesDownloaded,
|
||||
int? storiesToBeDownloaded,
|
||||
}) {
|
||||
return StoriesState(
|
||||
storiesByType: storiesByType ?? this.storiesByType,
|
||||
@ -87,6 +99,9 @@ class StoriesState extends Equatable {
|
||||
offlineReading: offlineReading ?? this.offlineReading,
|
||||
downloadStatus: downloadStatus ?? this.downloadStatus,
|
||||
currentPageSize: currentPageSize ?? this.currentPageSize,
|
||||
storiesDownloaded: storiesDownloaded ?? this.storiesDownloaded,
|
||||
storiesToBeDownloaded:
|
||||
storiesToBeDownloaded ?? this.storiesToBeDownloaded,
|
||||
);
|
||||
}
|
||||
|
||||
@ -98,18 +113,12 @@ class StoriesState extends Equatable {
|
||||
final Map<StoryType, List<Story>> newMap =
|
||||
Map<StoryType, List<Story>>.from(storiesByType);
|
||||
newMap[of] = List<Story>.from(newMap[of]!)..add(story);
|
||||
return StoriesState(
|
||||
return copyWith(
|
||||
storiesByType: newMap,
|
||||
storyIdsByType: storyIdsByType,
|
||||
statusByType: statusByType,
|
||||
currentPageByType: currentPageByType,
|
||||
readStoriesIds: <int>{
|
||||
...readStoriesIds,
|
||||
if (hasRead) story.id,
|
||||
},
|
||||
offlineReading: offlineReading,
|
||||
downloadStatus: downloadStatus,
|
||||
currentPageSize: currentPageSize,
|
||||
);
|
||||
}
|
||||
|
||||
@ -120,15 +129,8 @@ class StoriesState extends Equatable {
|
||||
final Map<StoryType, List<int>> newMap =
|
||||
Map<StoryType, List<int>>.from(storyIdsByType);
|
||||
newMap[of] = to;
|
||||
return StoriesState(
|
||||
storiesByType: storiesByType,
|
||||
return copyWith(
|
||||
storyIdsByType: newMap,
|
||||
statusByType: statusByType,
|
||||
currentPageByType: currentPageByType,
|
||||
readStoriesIds: readStoriesIds,
|
||||
offlineReading: offlineReading,
|
||||
downloadStatus: downloadStatus,
|
||||
currentPageSize: currentPageSize,
|
||||
);
|
||||
}
|
||||
|
||||
@ -139,15 +141,8 @@ class StoriesState extends Equatable {
|
||||
final Map<StoryType, StoriesStatus> newMap =
|
||||
Map<StoryType, StoriesStatus>.from(statusByType);
|
||||
newMap[of] = to;
|
||||
return StoriesState(
|
||||
storiesByType: storiesByType,
|
||||
storyIdsByType: storyIdsByType,
|
||||
return copyWith(
|
||||
statusByType: newMap,
|
||||
currentPageByType: currentPageByType,
|
||||
readStoriesIds: readStoriesIds,
|
||||
offlineReading: offlineReading,
|
||||
downloadStatus: downloadStatus,
|
||||
currentPageSize: currentPageSize,
|
||||
);
|
||||
}
|
||||
|
||||
@ -158,15 +153,8 @@ class StoriesState extends Equatable {
|
||||
final Map<StoryType, int> newMap =
|
||||
Map<StoryType, int>.from(currentPageByType);
|
||||
newMap[of] = to;
|
||||
return StoriesState(
|
||||
storiesByType: storiesByType,
|
||||
storyIdsByType: storyIdsByType,
|
||||
statusByType: statusByType,
|
||||
return copyWith(
|
||||
currentPageByType: newMap,
|
||||
readStoriesIds: readStoriesIds,
|
||||
offlineReading: offlineReading,
|
||||
downloadStatus: downloadStatus,
|
||||
currentPageSize: currentPageSize,
|
||||
);
|
||||
}
|
||||
|
||||
@ -183,15 +171,11 @@ class StoriesState extends Equatable {
|
||||
final Map<StoryType, int> newCurrentPageMap =
|
||||
Map<StoryType, int>.from(currentPageByType);
|
||||
newCurrentPageMap[of] = 0;
|
||||
return StoriesState(
|
||||
return copyWith(
|
||||
storiesByType: newStoriesMap,
|
||||
storyIdsByType: newStoryIdsMap,
|
||||
statusByType: newStatusMap,
|
||||
currentPageByType: newCurrentPageMap,
|
||||
readStoriesIds: readStoriesIds,
|
||||
offlineReading: offlineReading,
|
||||
downloadStatus: downloadStatus,
|
||||
currentPageSize: currentPageSize,
|
||||
);
|
||||
}
|
||||
|
||||
@ -205,5 +189,7 @@ class StoriesState extends Equatable {
|
||||
offlineReading,
|
||||
downloadStatus,
|
||||
currentPageSize,
|
||||
storiesDownloaded,
|
||||
storiesToBeDownloaded,
|
||||
];
|
||||
}
|
||||
|
||||
@ -9,6 +9,7 @@ abstract class Constants {
|
||||
'https://apps.apple.com/us/app/hacki/id1602043763?action=write-review';
|
||||
static const String googlePlayLink =
|
||||
'https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US';
|
||||
static const String sponsorLink = 'https://github.com/sponsors/Livinglist';
|
||||
|
||||
static const String _imagePath = 'assets/images';
|
||||
static const String hackerNewsLogoPath = '$_imagePath/hacker_news_logo.png';
|
||||
|
||||
@ -2,6 +2,7 @@ import 'dart:async';
|
||||
|
||||
import 'package:bloc/bloc.dart';
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:flutter_linkify/flutter_linkify.dart';
|
||||
import 'package:hacki/config/locator.dart';
|
||||
import 'package:hacki/models/models.dart';
|
||||
import 'package:hacki/repositories/repositories.dart';
|
||||
@ -159,16 +160,29 @@ class CommentsCubit extends Cubit<CommentsState> {
|
||||
..addKid(comment.id, to: comment.parent)
|
||||
..cacheComment(comment);
|
||||
_sembastRepository.cacheComment(comment);
|
||||
|
||||
final List<LinkifyElement> elements = linkify(
|
||||
comment.text,
|
||||
);
|
||||
|
||||
final BuildableComment buildableComment =
|
||||
BuildableComment.fromComment(comment, elements: elements);
|
||||
|
||||
final List<Comment> updatedComments = <Comment>[
|
||||
...state.comments,
|
||||
comment
|
||||
buildableComment
|
||||
];
|
||||
|
||||
emit(state.copyWith(comments: updatedComments));
|
||||
|
||||
if (updatedComments.length >= _pageSize + _pageSize * state.currentPage &&
|
||||
updatedComments.length <=
|
||||
_pageSize * 2 + _pageSize * state.currentPage) {
|
||||
final bool isHidden = _cacheService.isHidden(comment.id);
|
||||
|
||||
if (!isHidden) {
|
||||
_streamSubscription?.pause();
|
||||
}
|
||||
|
||||
emit(
|
||||
state.copyWith(
|
||||
@ -180,6 +194,31 @@ class CommentsCubit extends Cubit<CommentsState> {
|
||||
}
|
||||
}
|
||||
|
||||
List<LinkifyElement> linkify(
|
||||
String text, {
|
||||
LinkifyOptions options = const LinkifyOptions(),
|
||||
List<Linkifier> linkifiers = const <Linkifier>[
|
||||
UrlLinkifier(),
|
||||
EmailLinkifier(),
|
||||
],
|
||||
}) {
|
||||
List<LinkifyElement> list = <LinkifyElement>[TextElement(text)];
|
||||
|
||||
if (text.isEmpty) {
|
||||
return <LinkifyElement>[];
|
||||
}
|
||||
|
||||
if (linkifiers.isEmpty) {
|
||||
return list;
|
||||
}
|
||||
|
||||
for (final Linkifier linkifier in linkifiers) {
|
||||
list = linkifier.parse(list, options);
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> close() async {
|
||||
await _streamSubscription?.cancel();
|
||||
|
||||
@ -14,4 +14,5 @@ export 'search/search_cubit.dart';
|
||||
export 'split_view/split_view_cubit.dart';
|
||||
export 'submit/submit_cubit.dart';
|
||||
export 'time_machine/time_machine_cubit.dart';
|
||||
export 'user/user_cubit.dart';
|
||||
export 'vote/vote_cubit.dart';
|
||||
|
||||
@ -21,4 +21,6 @@ class SplitViewCubit extends Cubit<SplitViewState> {
|
||||
void enableSplitView() => emit(state.copyWith(enabled: true));
|
||||
|
||||
void disableSplitView() => emit(state.copyWith(enabled: false));
|
||||
|
||||
void zoom() => emit(state.copyWith(expanded: !state.expanded));
|
||||
}
|
||||
|
||||
@ -3,19 +3,27 @@ part of 'split_view_cubit.dart';
|
||||
class SplitViewState extends Equatable {
|
||||
const SplitViewState({
|
||||
required this.storyScreenArgs,
|
||||
required this.expanded,
|
||||
required this.enabled,
|
||||
});
|
||||
|
||||
const SplitViewState.init()
|
||||
: enabled = false,
|
||||
expanded = false,
|
||||
storyScreenArgs = null;
|
||||
|
||||
final bool enabled;
|
||||
final bool expanded;
|
||||
final StoryScreenArgs? storyScreenArgs;
|
||||
|
||||
SplitViewState copyWith({bool? enabled, StoryScreenArgs? storyScreenArgs}) {
|
||||
SplitViewState copyWith({
|
||||
bool? enabled,
|
||||
bool? expanded,
|
||||
StoryScreenArgs? storyScreenArgs,
|
||||
}) {
|
||||
return SplitViewState(
|
||||
enabled: enabled ?? this.enabled,
|
||||
expanded: expanded ?? this.expanded,
|
||||
storyScreenArgs: storyScreenArgs ?? this.storyScreenArgs,
|
||||
);
|
||||
}
|
||||
@ -23,6 +31,7 @@ class SplitViewState extends Equatable {
|
||||
@override
|
||||
List<Object?> get props => <Object?>[
|
||||
enabled,
|
||||
expanded,
|
||||
storyScreenArgs,
|
||||
];
|
||||
}
|
||||
|
||||
26
lib/cubits/user/user_cubit.dart
Normal file
26
lib/cubits/user/user_cubit.dart
Normal file
@ -0,0 +1,26 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:hacki/config/locator.dart';
|
||||
import 'package:hacki/models/models.dart';
|
||||
import 'package:hacki/repositories/repositories.dart';
|
||||
|
||||
part 'user_state.dart';
|
||||
|
||||
class UserCubit extends Cubit<UserState> {
|
||||
UserCubit({StoriesRepository? storiesRepository})
|
||||
: _storiesRepository =
|
||||
storiesRepository ?? locator.get<StoriesRepository>(),
|
||||
super(UserState.init());
|
||||
|
||||
final StoriesRepository _storiesRepository;
|
||||
|
||||
void init({required String userId}) {
|
||||
emit(state.copyWith(status: UserStatus.loading));
|
||||
_storiesRepository.fetchUserBy(userId: userId).then((User user) {
|
||||
emit(state.copyWith(user: user, status: UserStatus.loaded));
|
||||
}).onError((_, __) {
|
||||
emit(state.copyWith(status: UserStatus.failure));
|
||||
return;
|
||||
});
|
||||
}
|
||||
}
|
||||
38
lib/cubits/user/user_state.dart
Normal file
38
lib/cubits/user/user_state.dart
Normal file
@ -0,0 +1,38 @@
|
||||
part of 'user_cubit.dart';
|
||||
|
||||
enum UserStatus {
|
||||
initial,
|
||||
loading,
|
||||
loaded,
|
||||
failure,
|
||||
}
|
||||
|
||||
class UserState extends Equatable {
|
||||
const UserState({
|
||||
required this.user,
|
||||
required this.status,
|
||||
});
|
||||
|
||||
UserState.init()
|
||||
: user = User.empty(),
|
||||
status = UserStatus.initial;
|
||||
|
||||
final User user;
|
||||
final UserStatus status;
|
||||
|
||||
UserState copyWith({
|
||||
User? user,
|
||||
UserStatus? status,
|
||||
}) {
|
||||
return UserState(
|
||||
user: user ?? this.user,
|
||||
status: status ?? this.status,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
List<Object?> get props => <Object?>[
|
||||
user,
|
||||
status,
|
||||
];
|
||||
}
|
||||
@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter/scheduler.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
|
||||
import 'package:flutter_siri_suggestions/flutter_siri_suggestions.dart';
|
||||
import 'package:hacki/blocs/blocs.dart';
|
||||
import 'package:hacki/config/custom_router.dart';
|
||||
import 'package:hacki/config/locator.dart';
|
||||
@ -24,6 +25,10 @@ import 'package:workmanager/workmanager.dart';
|
||||
final BehaviorSubject<String?> selectNotificationSubject =
|
||||
BehaviorSubject<String?>();
|
||||
|
||||
// For receiving payload event from siri suggestions.
|
||||
final BehaviorSubject<String?> siriSuggestionSubject =
|
||||
BehaviorSubject<String?>();
|
||||
|
||||
Future<void> main() async {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
@ -57,6 +62,16 @@ Future<void> main() async {
|
||||
badge: true,
|
||||
sound: true,
|
||||
);
|
||||
|
||||
FlutterSiriSuggestions.instance.configure(
|
||||
onLaunch: (Map<String, dynamic> message) async {
|
||||
final String? storyId = message['key'] as String?;
|
||||
|
||||
if (storyId == null) return;
|
||||
|
||||
siriSuggestionSubject.add(storyId);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
final Directory tempDir = await getTemporaryDirectory();
|
||||
|
||||
33
lib/models/buildable_comment.dart
Normal file
33
lib/models/buildable_comment.dart
Normal file
@ -0,0 +1,33 @@
|
||||
import 'package:flutter_linkify/flutter_linkify.dart';
|
||||
import 'package:hacki/models/comment.dart';
|
||||
import 'package:hacki/models/models.dart';
|
||||
|
||||
class BuildableComment extends Comment {
|
||||
BuildableComment({
|
||||
required super.id,
|
||||
required super.time,
|
||||
required super.parent,
|
||||
required super.score,
|
||||
required super.by,
|
||||
required super.text,
|
||||
required super.kids,
|
||||
required super.deleted,
|
||||
required super.level,
|
||||
required this.elements,
|
||||
});
|
||||
|
||||
BuildableComment.fromComment(Comment comment, {required this.elements})
|
||||
: super(
|
||||
id: comment.id,
|
||||
time: comment.time,
|
||||
parent: comment.parent,
|
||||
score: comment.score,
|
||||
by: comment.by,
|
||||
text: comment.text,
|
||||
kids: comment.kids,
|
||||
deleted: comment.deleted,
|
||||
level: comment.level,
|
||||
);
|
||||
|
||||
final List<LinkifyElement> elements;
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
export 'buildable_comment.dart';
|
||||
export 'comment.dart';
|
||||
export 'item.dart';
|
||||
export 'poll_option.dart';
|
||||
|
||||
@ -5,6 +5,7 @@ import 'package:hacki/models/item.dart';
|
||||
|
||||
enum StoryType {
|
||||
top('topstories'),
|
||||
best('beststories'),
|
||||
latest('newstories'),
|
||||
ask('askstories'),
|
||||
show('showstories'),
|
||||
@ -13,6 +14,23 @@ enum StoryType {
|
||||
const StoryType(this.path);
|
||||
|
||||
final String path;
|
||||
|
||||
String get label {
|
||||
switch (this) {
|
||||
case StoryType.top:
|
||||
return 'TOP';
|
||||
case StoryType.best:
|
||||
return 'BEST';
|
||||
case StoryType.latest:
|
||||
return 'NEW';
|
||||
case StoryType.ask:
|
||||
return 'ASK';
|
||||
case StoryType.show:
|
||||
return 'SHOW';
|
||||
case StoryType.jobs:
|
||||
return 'JOBS';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class Story extends Item {
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:intl/intl.dart';
|
||||
|
||||
class User {
|
||||
User({
|
||||
required this.about,
|
||||
@ -29,6 +31,12 @@ class User {
|
||||
final String id;
|
||||
final int karma;
|
||||
|
||||
static final DateFormat _dateTimeFormatter = DateFormat.yMMMd();
|
||||
|
||||
String get description {
|
||||
return '''$karma karma, created on ${_dateTimeFormatter.format(DateTime.fromMillisecondsSinceEpoch(created * 1000))}''';
|
||||
}
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
final String prettyString =
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:hacki/models/models.dart';
|
||||
import 'package:hive/hive.dart';
|
||||
import 'package:http/http.dart';
|
||||
|
||||
/// [CacheRepository] is for storing stories and comments for offline reading.
|
||||
/// It's using [Hive] as its database which is being stored in temp directory.
|
||||
@ -7,19 +9,23 @@ class CacheRepository {
|
||||
CacheRepository({
|
||||
Future<Box<List<int>>>? storyIdBox,
|
||||
Future<Box<Map<dynamic, dynamic>>>? storyBox,
|
||||
Future<Box<String>>? webPageBox,
|
||||
Future<LazyBox<Map<dynamic, dynamic>>>? commentBox,
|
||||
}) : _storyIdBox = storyIdBox ?? Hive.openBox<List<int>>(_storyIdBoxName),
|
||||
_storyBox =
|
||||
storyBox ?? Hive.openBox<Map<dynamic, dynamic>>(_storyBoxName),
|
||||
_webPageBox = webPageBox ?? Hive.openBox<String>(_webPageBoxName),
|
||||
_commentBox = commentBox ??
|
||||
Hive.openLazyBox<Map<dynamic, dynamic>>(_commentBoxName);
|
||||
|
||||
static const String _storyIdBoxName = 'storyIdBox';
|
||||
static const String _storyBoxName = 'storyBox';
|
||||
static const String _commentBoxName = 'commentBox';
|
||||
static const String _webPageBoxName = 'webPageBox';
|
||||
final Future<Box<List<int>>> _storyIdBox;
|
||||
final Future<Box<Map<dynamic, dynamic>>> _storyBox;
|
||||
final Future<LazyBox<Map<dynamic, dynamic>>> _commentBox;
|
||||
final Future<Box<String>> _webPageBox;
|
||||
|
||||
Future<bool> get hasCachedStories =>
|
||||
_storyBox.then((Box<Map<dynamic, dynamic>> box) => box.isNotEmpty);
|
||||
@ -37,6 +43,22 @@ class CacheRepository {
|
||||
return box.put(story.id.toString(), story.toJson());
|
||||
}
|
||||
|
||||
Future<void> cacheUrl({required String url}) async {
|
||||
final Box<String> box = await _webPageBox;
|
||||
final String html = await compute(downloadWebPage, url);
|
||||
return box.put(url, html);
|
||||
}
|
||||
|
||||
Future<String?> getHtml({required String url}) async {
|
||||
final Box<String> box = await _webPageBox;
|
||||
return box.get(url);
|
||||
}
|
||||
|
||||
Future<bool> hasCachedWebPage({required String url}) async {
|
||||
final Box<String> box = await _webPageBox;
|
||||
return box.containsKey(url);
|
||||
}
|
||||
|
||||
Future<List<int>> getCachedStoryIds({required StoryType of}) async {
|
||||
final Box<List<int>> box = await _storyIdBox;
|
||||
final List<int>? ids = box.get(of.name);
|
||||
@ -119,9 +141,27 @@ class CacheRepository {
|
||||
return box.clear();
|
||||
}
|
||||
|
||||
Future<int> deleteAllWebPages() async {
|
||||
final Box<String> box = await _webPageBox;
|
||||
return box.clear();
|
||||
}
|
||||
|
||||
Future<int> deleteAll() async {
|
||||
return deleteAllStoryIds()
|
||||
.whenComplete(deleteAllStories)
|
||||
.whenComplete(deleteAllComments);
|
||||
.whenComplete(deleteAllComments)
|
||||
.whenComplete(deleteAllWebPages);
|
||||
}
|
||||
|
||||
static Future<String> downloadWebPage(String link) async {
|
||||
try {
|
||||
final Client client = Client();
|
||||
final Uri url = Uri.parse(link);
|
||||
final Response response = await client.get(url);
|
||||
final String body = response.body;
|
||||
return body;
|
||||
} catch (_) {
|
||||
return '''Web page not available.''';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:badges/badges.dart';
|
||||
import 'package:feature_discovery/feature_discovery.dart';
|
||||
@ -10,6 +11,7 @@ import 'package:flutter/scheduler.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:flutter_fadein/flutter_fadein.dart';
|
||||
import 'package:flutter_siri_suggestions/flutter_siri_suggestions.dart';
|
||||
import 'package:flutter_slidable/flutter_slidable.dart';
|
||||
import 'package:hacki/blocs/blocs.dart';
|
||||
import 'package:hacki/config/constants.dart';
|
||||
@ -52,6 +54,7 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
late final TabController tabController;
|
||||
late final StreamSubscription<String> intentDataStreamSubscription;
|
||||
late final StreamSubscription<String?> notificationStreamSubscription;
|
||||
late final StreamSubscription<String?> siriSuggestionStreamSubscription;
|
||||
|
||||
int currentIndex = 0;
|
||||
|
||||
@ -59,11 +62,14 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
|
||||
@override
|
||||
void didPopNext() {
|
||||
super.didPopNext();
|
||||
if (context.read<StoriesBloc>().deviceScreenType ==
|
||||
DeviceScreenType.mobile) {
|
||||
cacheService.resetCollapsedComments();
|
||||
Future<void>.delayed(
|
||||
const Duration(milliseconds: 500),
|
||||
cacheService.resetCollapsedComments,
|
||||
);
|
||||
}
|
||||
super.didPopNext();
|
||||
}
|
||||
|
||||
@override
|
||||
@ -88,6 +94,11 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
selectNotificationSubject.stream.listen(onNotificationTapped);
|
||||
}
|
||||
|
||||
if (!siriSuggestionSubject.hasListener) {
|
||||
siriSuggestionStreamSubscription =
|
||||
siriSuggestionSubject.stream.listen(onSiriSuggestionTapped);
|
||||
}
|
||||
|
||||
SchedulerBinding.instance
|
||||
..addPostFrameCallback((_) {
|
||||
FeatureDiscovery.discoverFeatures(
|
||||
@ -132,6 +143,7 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
tabController.dispose();
|
||||
intentDataStreamSubscription.cancel();
|
||||
notificationStreamSubscription.cancel();
|
||||
siriSuggestionStreamSubscription.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@ -171,7 +183,7 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
child: Container(
|
||||
color: Colors.orangeAccent.withOpacity(0.2),
|
||||
child: StoryTile(
|
||||
key: ObjectKey(story),
|
||||
key: ValueKey<String>('${story.id}-PinnedStoryTile'),
|
||||
story: story,
|
||||
onTap: () => onStoryTapped(story, isPin: true),
|
||||
showWebPreview: preferenceState.showComplexStoryTile,
|
||||
@ -222,56 +234,16 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
HapticFeedback.selectionClick();
|
||||
},
|
||||
tabs: <Widget>[
|
||||
for (int i = 0; i < StoriesBloc.types.length; i++)
|
||||
Tab(
|
||||
key: ValueKey<StoryType>(
|
||||
StoriesBloc.types.elementAt(i),
|
||||
),
|
||||
child: Text(
|
||||
'TOP',
|
||||
StoriesBloc.types.elementAt(i).label,
|
||||
style: TextStyle(
|
||||
fontSize: currentIndex == 0 ? 14 : 10,
|
||||
color: currentIndex == 0
|
||||
? Colors.orange
|
||||
: Colors.grey,
|
||||
),
|
||||
),
|
||||
),
|
||||
Tab(
|
||||
child: Text(
|
||||
'NEW',
|
||||
style: TextStyle(
|
||||
fontSize: currentIndex == 1 ? 14 : 10,
|
||||
color: currentIndex == 1
|
||||
? Colors.orange
|
||||
: Colors.grey,
|
||||
),
|
||||
),
|
||||
),
|
||||
Tab(
|
||||
child: Text(
|
||||
'ASK',
|
||||
style: TextStyle(
|
||||
fontSize: currentIndex == 2 ? 14 : 10,
|
||||
color: currentIndex == 2
|
||||
? Colors.orange
|
||||
: Colors.grey,
|
||||
),
|
||||
),
|
||||
),
|
||||
Tab(
|
||||
child: Text(
|
||||
'SHOW',
|
||||
style: TextStyle(
|
||||
fontSize: currentIndex == 3 ? 14 : 10,
|
||||
color: currentIndex == 3
|
||||
? Colors.orange
|
||||
: Colors.grey,
|
||||
),
|
||||
),
|
||||
),
|
||||
Tab(
|
||||
child: Text(
|
||||
'JOBS',
|
||||
style: TextStyle(
|
||||
fontSize: currentIndex == 4 ? 14 : 10,
|
||||
color: currentIndex == 4
|
||||
fontSize: currentIndex == i ? 14 : 10,
|
||||
color: currentIndex == i
|
||||
? Colors.orange
|
||||
: Colors.grey,
|
||||
),
|
||||
@ -349,33 +321,10 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
controller: tabController,
|
||||
children: <Widget>[
|
||||
for (final StoryType type in StoriesBloc.types)
|
||||
StoriesListView(
|
||||
key: const ValueKey<StoryType>(StoryType.top),
|
||||
storyType: StoryType.top,
|
||||
header: pinnedStories,
|
||||
onStoryTapped: onStoryTapped,
|
||||
),
|
||||
StoriesListView(
|
||||
key: const ValueKey<StoryType>(StoryType.latest),
|
||||
storyType: StoryType.latest,
|
||||
header: pinnedStories,
|
||||
onStoryTapped: onStoryTapped,
|
||||
),
|
||||
StoriesListView(
|
||||
key: const ValueKey<StoryType>(StoryType.ask),
|
||||
storyType: StoryType.ask,
|
||||
header: pinnedStories,
|
||||
onStoryTapped: onStoryTapped,
|
||||
),
|
||||
StoriesListView(
|
||||
key: const ValueKey<StoryType>(StoryType.show),
|
||||
storyType: StoryType.show,
|
||||
header: pinnedStories,
|
||||
onStoryTapped: onStoryTapped,
|
||||
),
|
||||
StoriesListView(
|
||||
key: const ValueKey<StoryType>(StoryType.jobs),
|
||||
storyType: StoryType.jobs,
|
||||
key: ValueKey<StoryType>(type),
|
||||
storyType: type,
|
||||
header: pinnedStories,
|
||||
onStoryTapped: onStoryTapped,
|
||||
),
|
||||
@ -390,11 +339,11 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
return ScreenTypeLayout.builder(
|
||||
mobile: (BuildContext context) {
|
||||
context.read<SplitViewCubit>().disableSplitView();
|
||||
return _MobileHomeScreenBuilder(
|
||||
return _MobileHomeScreen(
|
||||
homeScreen: homeScreen,
|
||||
);
|
||||
},
|
||||
tablet: (BuildContext context) => _TabletHomeScreenBuilder(
|
||||
tablet: (BuildContext context) => _TabletHomeScreen(
|
||||
homeScreen: homeScreen,
|
||||
),
|
||||
);
|
||||
@ -444,8 +393,12 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
}
|
||||
}
|
||||
|
||||
if (!offlineReading && (isJobWithLink || (showWebFirst && !hasRead))) {
|
||||
LinkUtil.launch(story.url, useReader: useReader);
|
||||
if (story.url.isNotEmpty && (isJobWithLink || (showWebFirst && !hasRead))) {
|
||||
LinkUtil.launch(
|
||||
story.url,
|
||||
useReader: useReader,
|
||||
offlineReading: offlineReading,
|
||||
);
|
||||
}
|
||||
|
||||
context.read<StoriesBloc>().add(
|
||||
@ -453,6 +406,18 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
story: story,
|
||||
),
|
||||
);
|
||||
|
||||
if (Platform.isIOS) {
|
||||
FlutterSiriSuggestions.instance.registerActivity(
|
||||
FlutterSiriActivity(
|
||||
story.title,
|
||||
story.id.toString(),
|
||||
suggestedInvocationPhrase: '',
|
||||
contentDescription: story.text,
|
||||
persistentIdentifier: story.id.toString(),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
void showOnboarding() {
|
||||
@ -484,6 +449,24 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> onSiriSuggestionTapped(String? id) async {
|
||||
if (id == null) return;
|
||||
final int? storyId = int.tryParse(id);
|
||||
if (storyId == null) return;
|
||||
|
||||
await locator
|
||||
.get<StoriesRepository>()
|
||||
.fetchStoryBy(storyId)
|
||||
.then((Story? story) {
|
||||
if (story == null) {
|
||||
showSnackBar(content: 'Something went wrong...');
|
||||
return;
|
||||
}
|
||||
final StoryScreenArgs args = StoryScreenArgs(story: story);
|
||||
goToStoryScreen(args: args);
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> onNotificationTapped(String? payload) async {
|
||||
if (payload == null) return;
|
||||
|
||||
@ -511,8 +494,8 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
}
|
||||
}
|
||||
|
||||
class _MobileHomeScreenBuilder extends StatelessWidget {
|
||||
const _MobileHomeScreenBuilder({
|
||||
class _MobileHomeScreen extends StatelessWidget {
|
||||
const _MobileHomeScreen({
|
||||
Key? key,
|
||||
required this.homeScreen,
|
||||
}) : super(key: key);
|
||||
@ -537,8 +520,8 @@ class _MobileHomeScreenBuilder extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
class _TabletHomeScreenBuilder extends StatelessWidget {
|
||||
const _TabletHomeScreenBuilder({
|
||||
class _TabletHomeScreen extends StatelessWidget {
|
||||
const _TabletHomeScreen({
|
||||
Key? key,
|
||||
required this.homeScreen,
|
||||
}) : super(key: key);
|
||||
@ -556,13 +539,19 @@ class _TabletHomeScreenBuilder extends StatelessWidget {
|
||||
homeScreenWidth = 345.0;
|
||||
}
|
||||
|
||||
return BlocBuilder<SplitViewCubit, SplitViewState>(
|
||||
buildWhen: (SplitViewState previous, SplitViewState current) =>
|
||||
previous.expanded != current.expanded,
|
||||
builder: (BuildContext context, SplitViewState state) {
|
||||
return Stack(
|
||||
children: <Widget>[
|
||||
Positioned(
|
||||
AnimatedPositioned(
|
||||
left: 0,
|
||||
top: 0,
|
||||
bottom: 0,
|
||||
width: homeScreenWidth,
|
||||
width: state.expanded ? 0 : homeScreenWidth,
|
||||
duration: const Duration(milliseconds: 300),
|
||||
curve: Curves.elasticOut,
|
||||
child: homeScreen,
|
||||
),
|
||||
Positioned(
|
||||
@ -572,17 +561,21 @@ class _TabletHomeScreenBuilder extends StatelessWidget {
|
||||
width: homeScreenWidth - 24,
|
||||
child: const CountdownReminder(),
|
||||
),
|
||||
Positioned(
|
||||
AnimatedPositioned(
|
||||
right: 0,
|
||||
top: 0,
|
||||
bottom: 0,
|
||||
left: homeScreenWidth,
|
||||
left: state.expanded ? 0 : homeScreenWidth,
|
||||
duration: const Duration(milliseconds: 300),
|
||||
curve: Curves.elasticOut,
|
||||
child: const _TabletStoryView(),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -596,7 +589,7 @@ class _TabletStoryView extends StatelessWidget {
|
||||
previous.storyScreenArgs != current.storyScreenArgs,
|
||||
builder: (BuildContext context, SplitViewState state) {
|
||||
if (state.storyScreenArgs != null) {
|
||||
return StoryScreen.build(state.storyScreenArgs!);
|
||||
return StoryScreen.build(context, state.storyScreenArgs!);
|
||||
}
|
||||
|
||||
return Material(
|
||||
|
||||
@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
|
||||
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
|
||||
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
||||
import 'package:hacki/blocs/blocs.dart';
|
||||
import 'package:hacki/config/constants.dart';
|
||||
@ -407,7 +408,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
showAboutDialog(
|
||||
context: context,
|
||||
applicationName: 'Hacki',
|
||||
applicationVersion: 'v0.2.14',
|
||||
applicationVersion: 'v0.2.19',
|
||||
applicationIcon: ClipRRect(
|
||||
borderRadius: const BorderRadius.all(
|
||||
Radius.circular(12),
|
||||
@ -447,7 +448,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
Text('Source Code'),
|
||||
Text('Source code'),
|
||||
],
|
||||
),
|
||||
),
|
||||
@ -465,7 +466,23 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
Text('Like the App?'),
|
||||
Text('Like the app?'),
|
||||
],
|
||||
),
|
||||
),
|
||||
ElevatedButton(
|
||||
onPressed: () => LinkUtil.launch(
|
||||
Constants.sponsorLink,
|
||||
),
|
||||
child: Row(
|
||||
children: const <Widget>[
|
||||
Icon(
|
||||
FeatherIcons.coffee,
|
||||
),
|
||||
SizedBox(
|
||||
width: 12,
|
||||
),
|
||||
Text('Buy me a coffee'),
|
||||
],
|
||||
),
|
||||
),
|
||||
@ -648,11 +665,11 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
child: const Text(
|
||||
'Cancel',
|
||||
style: TextStyle(
|
||||
color: Colors.red,
|
||||
color: Colors.orange,
|
||||
),
|
||||
),
|
||||
),
|
||||
ElevatedButton(
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
Navigator.pop(context);
|
||||
locator
|
||||
@ -671,15 +688,8 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
showSnackBar(content: 'Data cleared!');
|
||||
});
|
||||
},
|
||||
style: ButtonStyle(
|
||||
backgroundColor: MaterialStateProperty.all(Colors.deepOrange),
|
||||
),
|
||||
child: const Text(
|
||||
'Yes',
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
@ -855,9 +865,6 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
},
|
||||
child: const Text(
|
||||
'Cancel',
|
||||
style: TextStyle(
|
||||
color: Colors.red,
|
||||
),
|
||||
),
|
||||
),
|
||||
ElevatedButton(
|
||||
@ -909,63 +916,30 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
context: context,
|
||||
barrierDismissible: false,
|
||||
builder: (BuildContext context) {
|
||||
return SimpleDialog(
|
||||
children: <Widget>[
|
||||
...<Widget>[
|
||||
const SizedBox(
|
||||
height: 16,
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 18,
|
||||
),
|
||||
child: Text(
|
||||
return AlertDialog(
|
||||
content: Text(
|
||||
'Log out as ${authBloc.state.username}?',
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 16,
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
right: 12,
|
||||
),
|
||||
child: ButtonBar(
|
||||
children: <Widget>[
|
||||
actions: <Widget>[
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context),
|
||||
child: const Text(
|
||||
'Cancel',
|
||||
style: TextStyle(
|
||||
color: Colors.red,
|
||||
),
|
||||
),
|
||||
),
|
||||
ElevatedButton(
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
Navigator.pop(context);
|
||||
context.read<AuthBloc>().add(AuthLogout());
|
||||
context.read<HistoryCubit>().reset();
|
||||
},
|
||||
style: ButtonStyle(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all(Colors.deepOrange),
|
||||
),
|
||||
child: const Text(
|
||||
'Log out',
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
);
|
||||
},
|
||||
|
||||
@ -14,12 +14,15 @@ class OfflineListTile extends StatelessWidget {
|
||||
listenWhen: (StoriesState previous, StoriesState current) =>
|
||||
previous.downloadStatus != current.downloadStatus,
|
||||
listener: (BuildContext context, StoriesState state) {
|
||||
if (state.downloadStatus == StoriesDownloadStatus.failure) {
|
||||
if (state.downloadStatus == StoriesDownloadStatus.failure ||
|
||||
state.downloadStatus == StoriesDownloadStatus.finished) {
|
||||
Wakelock.disable();
|
||||
}
|
||||
},
|
||||
buildWhen: (StoriesState previous, StoriesState current) =>
|
||||
previous.downloadStatus != current.downloadStatus,
|
||||
previous.downloadStatus != current.downloadStatus ||
|
||||
previous.storiesDownloaded != current.storiesDownloaded ||
|
||||
previous.storiesToBeDownloaded != current.storiesToBeDownloaded,
|
||||
builder: (BuildContext context, StoriesState state) {
|
||||
final bool downloading =
|
||||
state.downloadStatus == StoriesDownloadStatus.downloading;
|
||||
@ -41,19 +44,53 @@ class OfflineListTile extends StatelessWidget {
|
||||
|
||||
return ListTile(
|
||||
title: Text(
|
||||
downloading ? 'Downloading All Stories...' : 'Download All Stories',
|
||||
downloading
|
||||
? '''Downloading All Stories (${state.storiesDownloaded}/${state.storiesToBeDownloaded})'''
|
||||
: 'Download All Stories',
|
||||
),
|
||||
subtitle: const Text(
|
||||
'download all latest stories that have at least one comment '
|
||||
"for offline reading. (web page won't be downloaded)",
|
||||
'for offline reading. (Please keep Hacki in foreground while '
|
||||
'downloading.)',
|
||||
),
|
||||
trailing: trailingWidget,
|
||||
isThreeLine: true,
|
||||
onTap: () {
|
||||
if (state.downloadStatus == StoriesDownloadStatus.downloading) {
|
||||
return;
|
||||
}
|
||||
Connectivity().checkConnectivity().then((ConnectivityResult res) {
|
||||
if (res != ConnectivityResult.none) {
|
||||
showDialog<bool>(
|
||||
context: context,
|
||||
builder: (BuildContext context) => AlertDialog(
|
||||
title: const Text('Download web pages as well?'),
|
||||
content: const Text('It will take longer time.'),
|
||||
actions: <Widget>[
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context),
|
||||
child: const Text('Cancel'),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context, false),
|
||||
child: const Text('No'),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context, true),
|
||||
child: const Text('Yes'),
|
||||
),
|
||||
],
|
||||
),
|
||||
).then((bool? includeWebPage) {
|
||||
if (includeWebPage != null) {
|
||||
Wakelock.enable();
|
||||
context.read<StoriesBloc>().add(StoriesDownload());
|
||||
context.read<StoriesBloc>().add(
|
||||
StoriesDownload(
|
||||
includingWebPage: includeWebPage,
|
||||
),
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
@ -3,3 +3,4 @@ export 'profile/profile_screen.dart';
|
||||
export 'search/search_screen.dart';
|
||||
export 'story/story_screen.dart';
|
||||
export 'submit/submit_screen.dart';
|
||||
export 'web_view/web_view_screen.dart';
|
||||
|
||||
@ -22,10 +22,12 @@ import 'package:hacki/services/services.dart';
|
||||
import 'package:hacki/utils/utils.dart';
|
||||
import 'package:pull_to_refresh/pull_to_refresh.dart';
|
||||
import 'package:responsive_builder/responsive_builder.dart';
|
||||
import 'package:share_plus/share_plus.dart';
|
||||
|
||||
enum _MenuAction {
|
||||
upvote,
|
||||
downvote,
|
||||
share,
|
||||
block,
|
||||
flag,
|
||||
cancel,
|
||||
@ -88,8 +90,17 @@ class StoryScreen extends StatefulWidget {
|
||||
);
|
||||
}
|
||||
|
||||
static Widget build(StoryScreenArgs args) {
|
||||
return MultiBlocProvider(
|
||||
static Widget build(BuildContext context, StoryScreenArgs args) {
|
||||
return WillPopScope(
|
||||
onWillPop: () async {
|
||||
if (context.read<SplitViewCubit>().state.expanded) {
|
||||
context.read<SplitViewCubit>().zoom();
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
},
|
||||
child: MultiBlocProvider(
|
||||
key: ValueKey<StoryScreenArgs>(args),
|
||||
providers: <BlocProvider<dynamic>>[
|
||||
BlocProvider<CommentsCubit>(
|
||||
@ -112,6 +123,7 @@ class StoryScreen extends StatefulWidget {
|
||||
parentComments: args.targetComments ?? <Comment>[],
|
||||
splitViewEnabled: true,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@ -140,7 +152,6 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
delay: _featureDiscoveryDismissThrottleDelay,
|
||||
);
|
||||
|
||||
static const int _extraItemsCount = 2;
|
||||
static const Duration _storyLinkTapThrottleDelay = Duration(seconds: 2);
|
||||
static const Duration _featureDiscoveryDismissThrottleDelay =
|
||||
Duration(seconds: 1);
|
||||
@ -270,12 +281,8 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
onLoading: () {
|
||||
context.read<CommentsCubit>().loadMore();
|
||||
},
|
||||
child: ListView.builder(
|
||||
child: ListView(
|
||||
primary: false,
|
||||
itemCount: state.comments.length + _extraItemsCount,
|
||||
itemBuilder: (BuildContext context, int index) {
|
||||
if (index == 0) {
|
||||
return Column(
|
||||
children: <Widget>[
|
||||
SizedBox(
|
||||
height: topPadding,
|
||||
@ -294,10 +301,7 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
HapticFeedback.lightImpact();
|
||||
|
||||
if (widget.story !=
|
||||
context
|
||||
.read<EditCubit>()
|
||||
.state
|
||||
.replyingTo) {
|
||||
context.read<EditCubit>().state.replyingTo) {
|
||||
commentEditingController.clear();
|
||||
}
|
||||
context
|
||||
@ -349,6 +353,10 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
.read<PreferenceCubit>()
|
||||
.state
|
||||
.useReader,
|
||||
offlineReading: context
|
||||
.read<StoriesBloc>()
|
||||
.state
|
||||
.offlineReading,
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
@ -377,13 +385,13 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
child: SelectableLinkify(
|
||||
text: widget.story.text,
|
||||
style: TextStyle(
|
||||
fontSize: MediaQuery.of(context)
|
||||
.textScaleFactor *
|
||||
fontSize:
|
||||
MediaQuery.of(context).textScaleFactor *
|
||||
15,
|
||||
),
|
||||
linkStyle: TextStyle(
|
||||
fontSize: MediaQuery.of(context)
|
||||
.textScaleFactor *
|
||||
fontSize:
|
||||
MediaQuery.of(context).textScaleFactor *
|
||||
15,
|
||||
color: Colors.orange,
|
||||
),
|
||||
@ -413,19 +421,20 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
height: 0,
|
||||
),
|
||||
if (state.onlyShowTargetComment) ...<Widget>[
|
||||
TextButton(
|
||||
Center(
|
||||
child: TextButton(
|
||||
onPressed: () => context
|
||||
.read<CommentsCubit>()
|
||||
.loadAll(widget.story),
|
||||
child: const Text('View all comments'),
|
||||
),
|
||||
),
|
||||
const Divider(
|
||||
height: 0,
|
||||
),
|
||||
],
|
||||
if (state.comments.isEmpty &&
|
||||
state.status ==
|
||||
CommentsStatus.allLoaded) ...<Widget>[
|
||||
state.status == CommentsStatus.allLoaded) ...<Widget>[
|
||||
const SizedBox(
|
||||
height: 240,
|
||||
),
|
||||
@ -436,28 +445,9 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
);
|
||||
} else if (index ==
|
||||
state.comments.length + _extraItemsCount - 1) {
|
||||
if ((state.status == CommentsStatus.allLoaded &&
|
||||
state.comments.isNotEmpty) ||
|
||||
state.onlyShowTargetComment) {
|
||||
return SizedBox(
|
||||
height: 240,
|
||||
child: Center(
|
||||
child: Text(happyFace),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
|
||||
final Comment comment = state.comments.elementAt(index - 1);
|
||||
|
||||
return FadeIn(
|
||||
key: ValueKey<int>(comment.id),
|
||||
for (final Comment comment in state.comments)
|
||||
FadeIn(
|
||||
key: ValueKey<String>('${comment.id}-FadeIn'),
|
||||
child: CommentTile(
|
||||
comment: comment,
|
||||
level: comment.level,
|
||||
@ -491,8 +481,17 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
onStoryLinkTapped: onStoryLinkTapped,
|
||||
onTimeMachineActivated: onTimeMachineActivated,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
if ((state.status == CommentsStatus.allLoaded &&
|
||||
state.comments.isNotEmpty) ||
|
||||
state.onlyShowTargetComment)
|
||||
SizedBox(
|
||||
height: 240,
|
||||
child: Center(
|
||||
child: Text(happyFace),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
@ -525,7 +524,15 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
Positioned.fill(
|
||||
child: mainView,
|
||||
),
|
||||
Positioned(
|
||||
BlocBuilder<SplitViewCubit, SplitViewState>(
|
||||
buildWhen: (
|
||||
SplitViewState previous,
|
||||
SplitViewState current,
|
||||
) =>
|
||||
previous.expanded != current.expanded,
|
||||
builder:
|
||||
(BuildContext context, SplitViewState state) {
|
||||
return Positioned(
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
@ -535,9 +542,16 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
.withOpacity(0.6),
|
||||
story: widget.story,
|
||||
scrollController: scrollController,
|
||||
onBackgroundTap: onFeatureDiscoveryDismissed,
|
||||
onBackgroundTap:
|
||||
onFeatureDiscoveryDismissed,
|
||||
onDismiss: onFeatureDiscoveryDismissed,
|
||||
splitViewEnabled: state.enabled,
|
||||
expanded: state.expanded,
|
||||
onZoomTap:
|
||||
context.read<SplitViewCubit>().zoom,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
Positioned(
|
||||
bottom: 0,
|
||||
@ -616,6 +630,7 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
builder: (BuildContext context, TimeMachineState state) {
|
||||
return Center(
|
||||
child: Material(
|
||||
color: Theme.of(context).canvasColor,
|
||||
borderRadius: const BorderRadius.all(Radius.circular(4)),
|
||||
child: SizedBox(
|
||||
height: size.height * 0.8,
|
||||
@ -751,12 +766,77 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
final bool upvoted = voteState.vote == Vote.up;
|
||||
final bool downvoted = voteState.vote == Vote.down;
|
||||
return Container(
|
||||
height: 300,
|
||||
height: item is Comment ? 430 : 450,
|
||||
color: Theme.of(context).canvasColor,
|
||||
child: Material(
|
||||
color: Colors.transparent,
|
||||
child: Column(
|
||||
children: <Widget>[
|
||||
BlocProvider<UserCubit>(
|
||||
create: (BuildContext context) =>
|
||||
UserCubit()..init(userId: item.by),
|
||||
child: BlocBuilder<UserCubit, UserState>(
|
||||
builder: (BuildContext context, UserState state) {
|
||||
return ListTile(
|
||||
leading: const Icon(
|
||||
Icons.account_circle,
|
||||
),
|
||||
title: Text(item.by),
|
||||
subtitle: Text(
|
||||
state.user.description,
|
||||
),
|
||||
onTap: () {
|
||||
showDialog<void>(
|
||||
context: context,
|
||||
builder: (BuildContext context) =>
|
||||
AlertDialog(
|
||||
title: Text('About ${state.user.id}'),
|
||||
content: state.user.about.isEmpty
|
||||
? Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.center,
|
||||
children: const <Widget>[
|
||||
Text(
|
||||
'empty',
|
||||
style: TextStyle(
|
||||
color: Colors.grey,
|
||||
),
|
||||
),
|
||||
],
|
||||
)
|
||||
: SelectableLinkify(
|
||||
text: HtmlUtil.parseHtml(
|
||||
state.user.about,
|
||||
),
|
||||
linkStyle: const TextStyle(
|
||||
color: Colors.orange,
|
||||
),
|
||||
onOpen: (LinkableElement link) {
|
||||
if (link.url.contains(
|
||||
'news.ycombinator.com/item',
|
||||
)) {
|
||||
onStoryLinkTapped
|
||||
.call(link.url);
|
||||
} else {
|
||||
LinkUtil.launch(link.url);
|
||||
}
|
||||
},
|
||||
),
|
||||
actions: <Widget>[
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context),
|
||||
child: const Text(
|
||||
'Okay',
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
ListTile(
|
||||
leading: Icon(
|
||||
FeatherIcons.chevronUp,
|
||||
@ -785,6 +865,16 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
),
|
||||
onTap: context.read<VoteCubit>().downvote,
|
||||
),
|
||||
ListTile(
|
||||
leading: const Icon(FeatherIcons.share),
|
||||
title: const Text(
|
||||
'Share',
|
||||
),
|
||||
onTap: () => Navigator.pop(
|
||||
context,
|
||||
_MenuAction.share,
|
||||
),
|
||||
),
|
||||
ListTile(
|
||||
leading: const Icon(Icons.local_police),
|
||||
title: const Text(
|
||||
@ -832,6 +922,9 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
break;
|
||||
case _MenuAction.downvote:
|
||||
break;
|
||||
case _MenuAction.share:
|
||||
onShareTapped(item);
|
||||
break;
|
||||
case _MenuAction.flag:
|
||||
onFlagTapped(item);
|
||||
break;
|
||||
@ -845,57 +938,32 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
});
|
||||
}
|
||||
|
||||
void onShareTapped(Item item) =>
|
||||
Share.share('https://news.ycombinator.com/item?id=${item.id}');
|
||||
|
||||
void onFlagTapped(Item item) {
|
||||
showDialog<bool>(
|
||||
context: context,
|
||||
builder: (BuildContext context) {
|
||||
return SimpleDialog(
|
||||
return AlertDialog(
|
||||
title: const Text('Flag this comment?'),
|
||||
children: <Widget>[
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 24,
|
||||
right: 12,
|
||||
),
|
||||
child: Text(
|
||||
content: Text(
|
||||
'Flag this comment posted by ${item.by}?',
|
||||
style: const TextStyle(
|
||||
color: Colors.grey,
|
||||
),
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
right: 12,
|
||||
),
|
||||
child: ButtonBar(
|
||||
children: <Widget>[
|
||||
actions: <Widget>[
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context, false),
|
||||
child: const Text(
|
||||
'Cancel',
|
||||
style: TextStyle(
|
||||
color: Colors.red,
|
||||
),
|
||||
),
|
||||
),
|
||||
ElevatedButton(
|
||||
onPressed: () {
|
||||
Navigator.pop(context, true);
|
||||
},
|
||||
style: ButtonStyle(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all(Colors.deepOrange),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context, true),
|
||||
child: const Text(
|
||||
'Yes',
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
@ -913,15 +981,9 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
showDialog<bool>(
|
||||
context: context,
|
||||
builder: (BuildContext context) {
|
||||
return SimpleDialog(
|
||||
return AlertDialog(
|
||||
title: Text('${isBlocked ? 'Unblock' : 'Block'} this user?'),
|
||||
children: <Widget>[
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 24,
|
||||
right: 12,
|
||||
),
|
||||
child: Text(
|
||||
content: Text(
|
||||
'Do you want to ${isBlocked ? 'unblock' : 'block'} ${item.by}'
|
||||
' and ${isBlocked ? 'display' : 'hide'} '
|
||||
'comments posted by this user?',
|
||||
@ -929,39 +991,17 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
color: Colors.grey,
|
||||
),
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
right: 12,
|
||||
),
|
||||
child: ButtonBar(
|
||||
children: <Widget>[
|
||||
actions: <Widget>[
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context, false),
|
||||
child: const Text(
|
||||
'Cancel',
|
||||
style: TextStyle(
|
||||
color: Colors.red,
|
||||
),
|
||||
),
|
||||
),
|
||||
ElevatedButton(
|
||||
onPressed: () {
|
||||
Navigator.pop(context, true);
|
||||
},
|
||||
style: ButtonStyle(
|
||||
backgroundColor:
|
||||
MaterialStateProperty.all(Colors.deepOrange),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context, true),
|
||||
child: const Text(
|
||||
'Yes',
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
@ -1146,9 +1186,6 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
},
|
||||
child: const Text(
|
||||
'Cancel',
|
||||
style: TextStyle(
|
||||
color: Colors.red,
|
||||
),
|
||||
),
|
||||
),
|
||||
ElevatedButton(
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
|
||||
import 'package:hacki/models/models.dart';
|
||||
import 'package:hacki/screens/story/widgets/fav_icon_button.dart';
|
||||
import 'package:hacki/screens/story/widgets/link_icon_button.dart';
|
||||
@ -13,11 +15,29 @@ class CustomAppBar extends AppBar {
|
||||
required Color backgroundColor,
|
||||
required Future<bool> Function() onBackgroundTap,
|
||||
required Future<bool> Function() onDismiss,
|
||||
bool splitViewEnabled = false,
|
||||
VoidCallback? onZoomTap,
|
||||
bool? expanded,
|
||||
}) : super(
|
||||
key: key,
|
||||
backgroundColor: backgroundColor,
|
||||
elevation: 0,
|
||||
actions: <Widget>[
|
||||
if (splitViewEnabled) ...<Widget>[
|
||||
IconButton(
|
||||
icon: Icon(
|
||||
expanded ?? false
|
||||
? FeatherIcons.minimize2
|
||||
: FeatherIcons.maximize2,
|
||||
size: 20,
|
||||
),
|
||||
onPressed: () {
|
||||
HapticFeedback.lightImpact();
|
||||
onZoomTap?.call();
|
||||
},
|
||||
),
|
||||
const Spacer(),
|
||||
],
|
||||
ScrollUpIconButton(
|
||||
scrollController: scrollController,
|
||||
),
|
||||
|
||||
@ -25,6 +25,7 @@ class FavIconButton extends StatelessWidget {
|
||||
builder: (BuildContext context, FavState favState) {
|
||||
final bool isFav = favState.favIds.contains(storyId);
|
||||
return IconButton(
|
||||
tooltip: 'Add to favorites',
|
||||
icon: DescribedFeatureOverlay(
|
||||
onBackgroundTap: onBackgroundTap,
|
||||
onDismiss: onDismiss,
|
||||
|
||||
@ -21,6 +21,7 @@ class LinkIconButton extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return IconButton(
|
||||
tooltip: 'Open this story in browser',
|
||||
icon: DescribedFeatureOverlay(
|
||||
onBackgroundTap: onBackgroundTap,
|
||||
onDismiss: onDismiss,
|
||||
|
||||
@ -31,6 +31,7 @@ class PinIconButton extends StatelessWidget {
|
||||
child: Transform.translate(
|
||||
offset: const Offset(2, 0),
|
||||
child: IconButton(
|
||||
tooltip: 'Pin to home screen',
|
||||
icon: DescribedFeatureOverlay(
|
||||
onBackgroundTap: onBackgroundTap,
|
||||
onDismiss: onDismiss,
|
||||
|
||||
@ -189,6 +189,7 @@ class _ReplyBoxState extends State<ReplyBox> {
|
||||
border: InputBorder.none,
|
||||
),
|
||||
keyboardType: TextInputType.multiline,
|
||||
textCapitalization: TextCapitalization.sentences,
|
||||
textInputAction: TextInputAction.newline,
|
||||
onChanged: widget.onChanged,
|
||||
),
|
||||
|
||||
@ -187,6 +187,7 @@ class _SubmitScreenState extends State<SubmitScreen> {
|
||||
),
|
||||
),
|
||||
onChanged: context.read<SubmitCubit>().onTextChanged,
|
||||
textCapitalization: TextCapitalization.sentences,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
54
lib/screens/web_view/web_view_screen.dart
Normal file
54
lib/screens/web_view/web_view_screen.dart
Normal file
@ -0,0 +1,54 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hacki/config/locator.dart';
|
||||
import 'package:hacki/repositories/repositories.dart';
|
||||
import 'package:webview_flutter/webview_flutter.dart';
|
||||
|
||||
class WebViewScreen extends StatefulWidget {
|
||||
const WebViewScreen({
|
||||
super.key,
|
||||
required this.url,
|
||||
});
|
||||
|
||||
final String url;
|
||||
|
||||
@override
|
||||
State<WebViewScreen> createState() => _WebViewScreenState();
|
||||
}
|
||||
|
||||
class _WebViewScreenState extends State<WebViewScreen> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
backgroundColor: Theme.of(context).canvasColor,
|
||||
title: Text(
|
||||
humanize(widget.url),
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
centerTitle: true,
|
||||
),
|
||||
body: WebView(
|
||||
onWebViewCreated: (WebViewController controller) async {
|
||||
final String? html = await locator.get<CacheRepository>().getHtml(
|
||||
url: widget.url,
|
||||
);
|
||||
|
||||
if (html != null) {
|
||||
await controller.loadHtmlString(html);
|
||||
}
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
static String humanize(String link) {
|
||||
final String humanized = link
|
||||
.replaceFirst(RegExp('https?://'), '')
|
||||
.replaceFirst(RegExp(r'www\.'), '');
|
||||
return humanized;
|
||||
}
|
||||
}
|
||||
@ -38,6 +38,7 @@ class CommentTile extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BlocProvider<CollapseCubit>(
|
||||
key: ValueKey<String>('${comment.id}-BlocProvider'),
|
||||
lazy: false,
|
||||
create: (_) => CollapseCubit(
|
||||
commentId: comment.id,
|
||||
@ -209,8 +210,39 @@ class CommentTile extends StatelessWidget {
|
||||
top: 6,
|
||||
bottom: 12,
|
||||
),
|
||||
child: SelectableLinkify(
|
||||
key: ObjectKey(comment),
|
||||
child: comment is BuildableComment
|
||||
? SelectableText.rich(
|
||||
key: ValueKey<int>(comment.id),
|
||||
buildTextSpan(
|
||||
(comment as BuildableComment)
|
||||
.elements,
|
||||
style: TextStyle(
|
||||
fontSize: MediaQuery.of(context)
|
||||
.textScaleFactor *
|
||||
15,
|
||||
),
|
||||
linkStyle: TextStyle(
|
||||
fontSize: MediaQuery.of(context)
|
||||
.textScaleFactor *
|
||||
15,
|
||||
decoration:
|
||||
TextDecoration.underline,
|
||||
color: Colors.orange,
|
||||
),
|
||||
onOpen: (LinkableElement link) {
|
||||
if (link.url.contains(
|
||||
'news.ycombinator.com/item',
|
||||
)) {
|
||||
onStoryLinkTapped
|
||||
.call(link.url);
|
||||
} else {
|
||||
LinkUtil.launch(link.url);
|
||||
}
|
||||
},
|
||||
),
|
||||
)
|
||||
: SelectableLinkify(
|
||||
key: ValueKey<int>(comment.id),
|
||||
text: comment.text,
|
||||
style: TextStyle(
|
||||
fontSize: MediaQuery.of(context)
|
||||
@ -227,7 +259,8 @@ class CommentTile extends StatelessWidget {
|
||||
if (link.url.contains(
|
||||
'news.ycombinator.com/item',
|
||||
)) {
|
||||
onStoryLinkTapped.call(link.url);
|
||||
onStoryLinkTapped
|
||||
.call(link.url);
|
||||
} else {
|
||||
LinkUtil.launch(link.url);
|
||||
}
|
||||
|
||||
@ -87,7 +87,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
|
||||
)
|
||||
: null,
|
||||
child: StoryTile(
|
||||
key: ObjectKey(e),
|
||||
key: ValueKey<int>(e.id),
|
||||
story: e,
|
||||
onTap: () => onTap(e),
|
||||
showWebPreview: showWebPreview,
|
||||
|
||||
@ -13,6 +13,7 @@ class LinkPreview extends StatefulWidget {
|
||||
required this.link,
|
||||
required this.story,
|
||||
required this.showMetadata,
|
||||
required this.offlineReading,
|
||||
this.cache = const Duration(days: 30),
|
||||
this.titleStyle,
|
||||
this.bodyStyle,
|
||||
@ -100,6 +101,7 @@ class LinkPreview extends StatefulWidget {
|
||||
final List<BoxShadow>? boxShadow;
|
||||
|
||||
final bool showMetadata;
|
||||
final bool offlineReading;
|
||||
|
||||
@override
|
||||
_LinkPreviewState createState() => _LinkPreviewState();
|
||||
@ -138,12 +140,14 @@ class _LinkPreviewState extends State<LinkPreview> {
|
||||
_url,
|
||||
story: widget.story,
|
||||
cache: widget.cache,
|
||||
offlineReading: widget.offlineReading,
|
||||
);
|
||||
} else {
|
||||
_info = await WebAnalyzer.getInfo(
|
||||
widget.story.id.toString(),
|
||||
null,
|
||||
story: widget.story,
|
||||
cache: widget.cache,
|
||||
offlineReading: widget.offlineReading,
|
||||
);
|
||||
}
|
||||
|
||||
@ -188,8 +192,8 @@ class _LinkPreviewState extends State<LinkPreview> {
|
||||
key: widget.key ?? Key(widget.link),
|
||||
metadata: widget.story.simpleMetadata,
|
||||
url: widget.link,
|
||||
title: title!,
|
||||
description: desc!,
|
||||
title: widget.story.title,
|
||||
description: desc ?? title ?? 'no comments yet.',
|
||||
imageUri: imageUri,
|
||||
imagePath: Constants.hackerNewsLogoPath,
|
||||
onTap: _launchURL,
|
||||
@ -228,16 +232,6 @@ class _LinkPreviewState extends State<LinkPreview> {
|
||||
|
||||
Widget loadedWidget;
|
||||
|
||||
if (_info is WebImageInfo) {
|
||||
final String img = (_info as WebImageInfo?)?.image ?? '';
|
||||
loadedWidget = _buildLinkContainer(
|
||||
_height,
|
||||
title: _errorTitle,
|
||||
desc: _errorBody,
|
||||
imageUri:
|
||||
widget.showMultimedia ? (img.trim() == '' ? null : img) : null,
|
||||
);
|
||||
} else {
|
||||
final WebInfo? info = _info as WebInfo?;
|
||||
loadedWidget = _info == null
|
||||
? _buildLinkContainer(
|
||||
@ -261,7 +255,6 @@ class _LinkPreviewState extends State<LinkPreview> {
|
||||
: null,
|
||||
isIcon: !WebAnalyzer.isNotEmpty(info.image),
|
||||
);
|
||||
}
|
||||
|
||||
return AnimatedCrossFade(
|
||||
firstChild: loadingWidget,
|
||||
|
||||
@ -16,6 +16,7 @@ import 'package:http/io_client.dart';
|
||||
|
||||
abstract class InfoBase {
|
||||
late DateTime _timeout;
|
||||
late bool _shouldRetry;
|
||||
|
||||
Map<String, dynamic> toJson();
|
||||
}
|
||||
@ -112,40 +113,25 @@ class WebAnalyzer {
|
||||
required Story story,
|
||||
Duration cache = const Duration(hours: 24),
|
||||
bool multimedia = true,
|
||||
required bool offlineReading,
|
||||
}) async {
|
||||
InfoBase? info = getInfoFromCache(url);
|
||||
|
||||
if (info != null) return info;
|
||||
|
||||
if (story.url.isEmpty && story.text.isNotEmpty) {
|
||||
info = WebInfo(
|
||||
title: story.title,
|
||||
description: story.text,
|
||||
).._timeout = DateTime.now().add(cache);
|
||||
)
|
||||
.._timeout = DateTime.now().add(cache)
|
||||
.._shouldRetry = false;
|
||||
cacheMap[story.id.toString()] = info;
|
||||
|
||||
return info;
|
||||
}
|
||||
|
||||
try {
|
||||
info = await _getInfoByIsolate(url, multimedia);
|
||||
|
||||
if (info != null) {
|
||||
info._timeout = DateTime.now().add(cache);
|
||||
cacheMap[url] = info;
|
||||
}
|
||||
} catch (e) {
|
||||
//locator.get<Logger>().log(Level.error, e);
|
||||
}
|
||||
|
||||
if ((info == null ||
|
||||
info is WebImageInfo ||
|
||||
(info is WebInfo && (info.description?.isEmpty ?? true))) &&
|
||||
story.kids.isNotEmpty) {
|
||||
bool shouldRetry = false;
|
||||
final Comment? comment = await locator
|
||||
.get<StoriesRepository>()
|
||||
.fetchCommentBy(id: story.kids.first)
|
||||
.catchError((Object err) async {
|
||||
if (offlineReading) {
|
||||
int index = 0;
|
||||
Comment? comment;
|
||||
|
||||
@ -156,24 +142,37 @@ class WebAnalyzer {
|
||||
index++;
|
||||
}
|
||||
|
||||
shouldRetry = true;
|
||||
return comment;
|
||||
});
|
||||
|
||||
info = WebInfo(
|
||||
description:
|
||||
comment != null ? '${comment.by}: ${comment.text}' : 'no comments',
|
||||
image: info is WebInfo ? info.image : (info as WebImageInfo?)?.image,
|
||||
icon: info is WebInfo ? info.icon : null,
|
||||
title: story.title,
|
||||
description: comment != null ? '${comment.by}: ${comment.text}' : null,
|
||||
)
|
||||
.._shouldRetry = false
|
||||
.._timeout = DateTime.now();
|
||||
cacheMap[url] = info;
|
||||
return info;
|
||||
}
|
||||
|
||||
try {
|
||||
info = await _getInfoByIsolate(
|
||||
url: url,
|
||||
multimedia: multimedia,
|
||||
story: story,
|
||||
);
|
||||
|
||||
if (!shouldRetry) {
|
||||
if (info != null && !info._shouldRetry) {
|
||||
info._timeout = DateTime.now().add(cache);
|
||||
cacheMap[url] = info;
|
||||
}
|
||||
}
|
||||
|
||||
return info;
|
||||
} catch (e) {
|
||||
return WebInfo(
|
||||
title: story.title,
|
||||
description: story.text,
|
||||
)
|
||||
.._shouldRetry = true
|
||||
.._timeout = DateTime.now();
|
||||
}
|
||||
}
|
||||
|
||||
static Future<InfoBase?> _getInfo(String url, bool? multimedia) async {
|
||||
@ -195,36 +194,66 @@ class WebAnalyzer {
|
||||
return _getWebInfo(response, url, multimedia);
|
||||
}
|
||||
|
||||
static Future<InfoBase?> _getInfoByIsolate(
|
||||
static Future<InfoBase?> _getInfoByIsolate({
|
||||
String? url,
|
||||
bool multimedia,
|
||||
) async {
|
||||
final List<dynamic>? res = await compute(
|
||||
_isolate,
|
||||
required bool multimedia,
|
||||
required Story story,
|
||||
}) async {
|
||||
List<dynamic>? res;
|
||||
|
||||
if (url != null) {
|
||||
res = await compute(
|
||||
_fetchInfoFromUrl,
|
||||
<dynamic>[url, multimedia],
|
||||
);
|
||||
}
|
||||
|
||||
late final bool shouldRetry;
|
||||
InfoBase? info;
|
||||
String? fallbackDescription;
|
||||
|
||||
if (res == null || isEmpty(res[2] as String?)) {
|
||||
final String? commentText = await compute(
|
||||
_fetchInfoFromStoryId,
|
||||
story.kids,
|
||||
);
|
||||
|
||||
shouldRetry = commentText == null;
|
||||
fallbackDescription = commentText ?? 'no comments yet';
|
||||
} else {
|
||||
shouldRetry = false;
|
||||
}
|
||||
|
||||
if (res != null) {
|
||||
if (res[0] == '0') {
|
||||
info = WebInfo(
|
||||
title: res[1] as String?,
|
||||
description:
|
||||
res[2] == null ? null : (res[2] as String).removeAllEmojis(),
|
||||
title: story.title,
|
||||
description: isEmpty(res[2] as String?)
|
||||
? (fallbackDescription ??
|
||||
(story.text.isEmpty ? res[1] as String? : story.text))
|
||||
: (res[2] as String).removeAllEmojis(),
|
||||
icon: res[3] as String?,
|
||||
image: res[4] as String?,
|
||||
);
|
||||
} else if (res[0] == '1') {
|
||||
info = WebVideoInfo(image: res[1] as String);
|
||||
} else if (res[0] == '2') {
|
||||
info = WebImageInfo(image: res[1] as String);
|
||||
).._shouldRetry = shouldRetry;
|
||||
} else {
|
||||
info = WebInfo(
|
||||
image: res[1] as String,
|
||||
title: story.title,
|
||||
description: story.text.isEmpty ? fallbackDescription : story.text,
|
||||
).._shouldRetry = shouldRetry;
|
||||
}
|
||||
} else {
|
||||
return WebInfo(
|
||||
title: story.title,
|
||||
description: fallbackDescription,
|
||||
).._shouldRetry = shouldRetry;
|
||||
}
|
||||
|
||||
return info;
|
||||
}
|
||||
|
||||
static Future<List<dynamic>?> _isolate(dynamic message) async {
|
||||
static Future<List<dynamic>?> _fetchInfoFromUrl(dynamic message) async {
|
||||
try {
|
||||
// ignore: avoid_dynamic_calls
|
||||
final String url = message[0] as String;
|
||||
// ignore: avoid_dynamic_calls
|
||||
@ -247,6 +276,18 @@ class WebAnalyzer {
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
} catch (_) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
static Future<String?> _fetchInfoFromStoryId(List<int> kids) async {
|
||||
if (kids.isEmpty) return null;
|
||||
|
||||
final Comment? comment =
|
||||
await StoriesRepository().fetchCommentBy(id: kids.first);
|
||||
|
||||
return comment != null ? '${comment.by}: ${comment.text}' : null;
|
||||
}
|
||||
|
||||
static bool _certificateCheck(X509Certificate cert, String host, int port) =>
|
||||
@ -275,13 +316,9 @@ class WebAnalyzer {
|
||||
..headers['accept'] =
|
||||
'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9';
|
||||
|
||||
try {
|
||||
final IOStreamedResponse stream =
|
||||
await client.send(request).catchError((dynamic err) {
|
||||
// locator.get<Logger>().log(
|
||||
// Level.error,
|
||||
// 'Error in getting the link => ${request.url}\n$err',
|
||||
// );
|
||||
});
|
||||
await client.send(request).timeout(const Duration(seconds: 10));
|
||||
|
||||
if (stream.statusCode == HttpStatus.movedTemporarily ||
|
||||
stream.statusCode == HttpStatus.movedPermanently) {
|
||||
@ -315,6 +352,9 @@ class WebAnalyzer {
|
||||
}
|
||||
client.close();
|
||||
return res;
|
||||
} catch (_) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
static Future<InfoBase?> _getWebInfo(
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:flutter_fadein/flutter_fadein.dart';
|
||||
import 'package:hacki/blocs/blocs.dart';
|
||||
import 'package:hacki/config/constants.dart';
|
||||
import 'package:hacki/models/models.dart';
|
||||
import 'package:hacki/screens/widgets/widgets.dart';
|
||||
@ -43,6 +45,7 @@ class StoryTile extends StatelessWidget {
|
||||
child: LinkPreview(
|
||||
story: story,
|
||||
link: story.url,
|
||||
offlineReading: context.read<StoriesBloc>().state.offlineReading,
|
||||
placeholderWidget: FadeIn(
|
||||
child: SizedBox(
|
||||
height: height,
|
||||
|
||||
@ -1,11 +1,38 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
|
||||
import 'package:hacki/config/locator.dart';
|
||||
import 'package:hacki/main.dart';
|
||||
import 'package:hacki/repositories/repositories.dart';
|
||||
import 'package:hacki/screens/screens.dart' show WebViewScreen;
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
|
||||
abstract class LinkUtil {
|
||||
static final ChromeSafariBrowser _browser = ChromeSafariBrowser();
|
||||
|
||||
static void launch(String link, {bool useReader = false}) {
|
||||
static void launch(
|
||||
String link, {
|
||||
bool useReader = false,
|
||||
bool offlineReading = false,
|
||||
}) {
|
||||
if (offlineReading) {
|
||||
locator
|
||||
.get<CacheRepository>()
|
||||
.hasCachedWebPage(url: link)
|
||||
.then((bool cached) {
|
||||
if (cached) {
|
||||
HackiApp.navigatorKey.currentState?.push<void>(
|
||||
MaterialPageRoute<void>(
|
||||
builder: (BuildContext context) => WebViewScreen(url: link),
|
||||
),
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
Uri rinseLink(String link) {
|
||||
final RegExp regex = RegExp(r'\)|].*$');
|
||||
if (!link.contains('en.wikipedia.org') && link.contains(regex)) {
|
||||
@ -20,6 +47,9 @@ abstract class LinkUtil {
|
||||
canLaunchUrl(uri).then((bool val) {
|
||||
if (val) {
|
||||
if (link.contains('http')) {
|
||||
if (Platform.isAndroid) {
|
||||
launchUrl(uri, mode: LaunchMode.externalApplication);
|
||||
} else {
|
||||
_browser
|
||||
.open(
|
||||
url: uri,
|
||||
@ -31,6 +61,7 @@ abstract class LinkUtil {
|
||||
),
|
||||
)
|
||||
.onError((_, __) => launchUrl(uri));
|
||||
}
|
||||
} else {
|
||||
launchUrl(uri);
|
||||
}
|
||||
|
||||
160
pubspec.lock
160
pubspec.lock
@ -99,20 +99,6 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.3.1"
|
||||
chewie:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: chewie
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.3.3"
|
||||
chewie_audio:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: chewie_audio
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.3.0"
|
||||
clipboard:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -204,13 +190,6 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.17.1"
|
||||
cupertino_icons:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: cupertino_icons
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.0.4"
|
||||
dbus:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -316,13 +295,6 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.0+1"
|
||||
flutter_html:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_html
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.2.1"
|
||||
flutter_inappwebview:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -330,13 +302,6 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "5.4.3+7"
|
||||
flutter_layout_grid:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: flutter_layout_grid
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.0.6"
|
||||
flutter_linkify:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -365,13 +330,6 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "5.0.0"
|
||||
flutter_math_fork:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: flutter_math_fork
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.5.0"
|
||||
flutter_secure_storage:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -414,6 +372,13 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.1.2"
|
||||
flutter_siri_suggestions:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_siri_suggestions
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.1.0"
|
||||
flutter_slidable:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -421,13 +386,6 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.2.1"
|
||||
flutter_svg:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: flutter_svg
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.23.0+1"
|
||||
flutter_test:
|
||||
dependency: "direct dev"
|
||||
description: flutter
|
||||
@ -613,13 +571,6 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.1"
|
||||
numerus:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: numerus
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.1.1"
|
||||
octo_image:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -641,20 +592,6 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "1.8.1"
|
||||
path_drawing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_drawing
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.5.1+1"
|
||||
path_parsing:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path_parsing
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "0.2.1"
|
||||
path_provider:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -804,6 +741,48 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.2.0"
|
||||
share_plus:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: share_plus
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "4.0.8"
|
||||
share_plus_linux:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: share_plus_linux
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.0"
|
||||
share_plus_macos:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: share_plus_macos
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
share_plus_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: share_plus_platform_interface
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.3"
|
||||
share_plus_web:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: share_plus_web
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
share_plus_windows:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: share_plus_windows
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "3.0.1"
|
||||
shared_preferences:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@ -1032,7 +1011,7 @@ packages:
|
||||
name: url_launcher
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "6.1.2"
|
||||
version: "6.1.3"
|
||||
url_launcher_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -1103,41 +1082,6 @@ packages:
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.4.0"
|
||||
video_player:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: video_player
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.4.2"
|
||||
video_player_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: video_player_android
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.3.3"
|
||||
video_player_avfoundation:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: video_player_avfoundation
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.3.4"
|
||||
video_player_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: video_player_platform_interface
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "5.1.2"
|
||||
video_player_web:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: video_player_web
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.0.10"
|
||||
vm_service:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -1202,12 +1146,12 @@ packages:
|
||||
source: hosted
|
||||
version: "1.0.1"
|
||||
webview_flutter:
|
||||
dependency: transitive
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: webview_flutter
|
||||
url: "https://pub.dartlang.org"
|
||||
source: hosted
|
||||
version: "2.8.0"
|
||||
version: "3.0.4"
|
||||
webview_flutter_android:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
name: hacki
|
||||
description: A Hacker News reader.
|
||||
version: 0.2.14+53
|
||||
version: 0.2.19+60
|
||||
publish_to: none
|
||||
|
||||
environment:
|
||||
@ -28,11 +28,11 @@ dependencies:
|
||||
flutter_cache_manager: ^3.3.0
|
||||
flutter_fadein: ^2.0.0
|
||||
flutter_feather_icons: 2.0.0+1
|
||||
flutter_html: ^2.2.1
|
||||
flutter_inappwebview: ^5.4.3+4
|
||||
flutter_linkify: ^5.0.2
|
||||
flutter_local_notifications: ^9.5.0
|
||||
flutter_secure_storage: ^5.0.2
|
||||
flutter_siri_suggestions: ^2.1.0
|
||||
flutter_slidable: ^1.2.1
|
||||
font_awesome_flutter: ^9.2.0
|
||||
gbk_codec: ^0.4.0
|
||||
@ -56,6 +56,7 @@ dependencies:
|
||||
responsive_builder: ^0.4.2
|
||||
rxdart: ^0.27.3
|
||||
sembast: ^3.1.1+1
|
||||
share_plus: ^4.0.8
|
||||
shared_preferences: ^2.0.11
|
||||
shared_preferences_android: ^2.0.11
|
||||
shared_preferences_ios: ^2.0.11
|
||||
@ -64,8 +65,9 @@ dependencies:
|
||||
path: components/synced_shared_preferences
|
||||
tuple: ^2.0.0
|
||||
universal_platform: ^1.0.0+1
|
||||
url_launcher: ^6.0.10
|
||||
url_launcher: ^6.1.3
|
||||
wakelock: ^0.6.1+2
|
||||
webview_flutter: ^3.0.4
|
||||
workmanager: ^0.5.0
|
||||
|
||||
dev_dependencies:
|
||||
|
||||
Reference in New Issue
Block a user