Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
fefc86275d | |||
1a73a6991e | |||
36d7f4606e | |||
9312c56dd0 | |||
6e71de5913 | |||
a9590af3e9 | |||
18dadaa5ec | |||
d506297f4c |
40
README.md
@ -4,7 +4,8 @@
|
|||||||
A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
|
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://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://badges.pufler.dev)
|
||||||
[](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
|
[](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
|
||||||
[](https://pub.dev/packages/effective_dart)
|
[](https://pub.dev/packages/effective_dart)
|
||||||
@ -34,25 +35,24 @@ Features:
|
|||||||
- Launch from system share sheet.
|
- Launch from system share sheet.
|
||||||
- And more...
|
- And more...
|
||||||
|
|
||||||
<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/159798185-d7c81348-956e-483c-a1bc-5cd872bdad62.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="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">
|
<p align="center">
|
||||||
<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="200" alt="01" src="assets/screenshots/01.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="200" alt="02" src="assets/screenshots/02.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="200" alt="03" src="assets/screenshots/03.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="200" alt="04" src="assets/screenshots/04.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="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="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>
|
</p>
|
||||||
|
|
||||||
|
@ -5,4 +5,5 @@ linter:
|
|||||||
public_member_api_docs: false
|
public_member_api_docs: false
|
||||||
library_private_types_in_public_api: false
|
library_private_types_in_public_api: false
|
||||||
omit_local_variable_types: false
|
omit_local_variable_types: false
|
||||||
|
one_member_abstracts: false
|
||||||
always_specify_types: true
|
always_specify_types: true
|
@ -17,7 +17,8 @@
|
|||||||
|
|
||||||
<application
|
<application
|
||||||
android:label="hacki"
|
android:label="hacki"
|
||||||
android:icon="@mipmap/ic_launcher">
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:usesCleartextTraffic="true">
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:launchMode="singleTop"
|
android:launchMode="singleTop"
|
||||||
@ -52,6 +53,21 @@
|
|||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<data android:mimeType="*/*" />
|
<data android:mimeType="*/*" />
|
||||||
</intent-filter>
|
</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>
|
</activity>
|
||||||
<!-- Don't delete the meta-data below.
|
<!-- Don't delete the meta-data below.
|
||||||
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
|
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
|
||||||
|
BIN
assets/screenshots/01.png
Normal file
After Width: | Height: | Size: 522 KiB |
BIN
assets/screenshots/02.png
Normal file
After Width: | Height: | Size: 835 KiB |
BIN
assets/screenshots/03.png
Normal file
After Width: | Height: | Size: 282 KiB |
BIN
assets/screenshots/04.png
Normal file
After Width: | Height: | Size: 298 KiB |
BIN
assets/screenshots/05.png
Normal file
After Width: | Height: | Size: 698 KiB |
BIN
assets/screenshots/06.png
Normal file
After Width: | Height: | Size: 868 KiB |
BIN
assets/screenshots/07.png
Normal file
After Width: | Height: | Size: 121 KiB |
BIN
assets/screenshots/08.png
Normal file
After Width: | Height: | Size: 375 KiB |
BIN
assets/screenshots/09.png
Normal file
After Width: | Height: | Size: 282 KiB |
BIN
assets/screenshots/10.png
Normal file
After Width: | Height: | Size: 414 KiB |
BIN
assets/screenshots/11.png
Normal file
After Width: | Height: | Size: 530 KiB |
BIN
assets/screenshots/12.png
Normal file
After Width: | Height: | Size: 313 KiB |
BIN
assets/screenshots/ipad-01.png
Normal file
After Width: | Height: | Size: 763 KiB |
BIN
assets/screenshots/ipad-02.png
Normal file
After Width: | Height: | Size: 1.7 MiB |
BIN
assets/screenshots/ipad-03.png
Normal file
After Width: | Height: | Size: 1.1 MiB |
BIN
assets/screenshots/ipad-04.png
Normal file
After Width: | Height: | Size: 1005 KiB |
6
fastlane/metadata/android/en-US/changelogs/53.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/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
@ -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
@ -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
@ -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.
|
Before Width: | Height: | Size: 422 KiB After Width: | Height: | Size: 522 KiB |
Before Width: | Height: | Size: 712 KiB After Width: | Height: | Size: 835 KiB |
Before Width: | Height: | Size: 252 KiB After Width: | Height: | Size: 282 KiB |
Before Width: | Height: | Size: 262 KiB After Width: | Height: | Size: 298 KiB |
Before Width: | Height: | Size: 672 KiB After Width: | Height: | Size: 698 KiB |
Before Width: | Height: | Size: 931 KiB After Width: | Height: | Size: 868 KiB |
Before Width: | Height: | Size: 298 KiB After Width: | Height: | Size: 121 KiB |
Before Width: | Height: | Size: 247 KiB After Width: | Height: | Size: 375 KiB |
Before Width: | Height: | Size: 496 KiB After Width: | Height: | Size: 282 KiB |
Before Width: | Height: | Size: 420 KiB After Width: | Height: | Size: 414 KiB |
BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/11.png
Normal file
After Width: | Height: | Size: 530 KiB |
BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/12.png
Normal file
After Width: | Height: | Size: 313 KiB |
@ -14,6 +14,8 @@ PODS:
|
|||||||
- Flutter
|
- Flutter
|
||||||
- flutter_secure_storage (3.3.1):
|
- flutter_secure_storage (3.3.1):
|
||||||
- Flutter
|
- Flutter
|
||||||
|
- flutter_siri_suggestions (0.0.1):
|
||||||
|
- Flutter
|
||||||
- FMDB (2.7.5):
|
- FMDB (2.7.5):
|
||||||
- FMDB/standard (= 2.7.5)
|
- FMDB/standard (= 2.7.5)
|
||||||
- FMDB/standard (2.7.5)
|
- FMDB/standard (2.7.5)
|
||||||
@ -23,6 +25,8 @@ PODS:
|
|||||||
- ReachabilitySwift (5.0.0)
|
- ReachabilitySwift (5.0.0)
|
||||||
- receive_sharing_intent (0.0.1):
|
- receive_sharing_intent (0.0.1):
|
||||||
- Flutter
|
- Flutter
|
||||||
|
- share_plus (0.0.1):
|
||||||
|
- Flutter
|
||||||
- shared_preferences_ios (0.0.1):
|
- shared_preferences_ios (0.0.1):
|
||||||
- Flutter
|
- Flutter
|
||||||
- sqflite (0.0.2):
|
- sqflite (0.0.2):
|
||||||
@ -47,8 +51,10 @@ DEPENDENCIES:
|
|||||||
- flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
|
- flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
|
||||||
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
|
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
|
||||||
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/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`)
|
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
|
||||||
- receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/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`)
|
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
|
||||||
- sqflite (from `.symlinks/plugins/sqflite/ios`)
|
- sqflite (from `.symlinks/plugins/sqflite/ios`)
|
||||||
- synced_shared_preferences (from `.symlinks/plugins/synced_shared_preferences/ios`)
|
- synced_shared_preferences (from `.symlinks/plugins/synced_shared_preferences/ios`)
|
||||||
@ -75,10 +81,14 @@ EXTERNAL SOURCES:
|
|||||||
:path: ".symlinks/plugins/flutter_local_notifications/ios"
|
:path: ".symlinks/plugins/flutter_local_notifications/ios"
|
||||||
flutter_secure_storage:
|
flutter_secure_storage:
|
||||||
:path: ".symlinks/plugins/flutter_secure_storage/ios"
|
:path: ".symlinks/plugins/flutter_secure_storage/ios"
|
||||||
|
flutter_siri_suggestions:
|
||||||
|
:path: ".symlinks/plugins/flutter_siri_suggestions/ios"
|
||||||
path_provider_ios:
|
path_provider_ios:
|
||||||
:path: ".symlinks/plugins/path_provider_ios/ios"
|
:path: ".symlinks/plugins/path_provider_ios/ios"
|
||||||
receive_sharing_intent:
|
receive_sharing_intent:
|
||||||
:path: ".symlinks/plugins/receive_sharing_intent/ios"
|
:path: ".symlinks/plugins/receive_sharing_intent/ios"
|
||||||
|
share_plus:
|
||||||
|
:path: ".symlinks/plugins/share_plus/ios"
|
||||||
shared_preferences_ios:
|
shared_preferences_ios:
|
||||||
:path: ".symlinks/plugins/shared_preferences_ios/ios"
|
:path: ".symlinks/plugins/shared_preferences_ios/ios"
|
||||||
sqflite:
|
sqflite:
|
||||||
@ -102,11 +112,13 @@ SPEC CHECKSUMS:
|
|||||||
flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
|
flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
|
||||||
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
|
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
|
||||||
flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
|
flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
|
||||||
|
flutter_siri_suggestions: 226fb7ef33d25d3fe0d4aa2a8bcf4b72730c466f
|
||||||
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
|
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
|
||||||
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
|
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
|
||||||
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
|
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
|
||||||
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
|
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
|
||||||
receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
|
receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
|
||||||
|
share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
|
||||||
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
|
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
|
||||||
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
|
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
|
||||||
synced_shared_preferences: f722742b06d65c7315b8e9f56b794c9fbd5597f7
|
synced_shared_preferences: f722742b06d65c7315b8e9f56b794c9fbd5597f7
|
||||||
|
@ -568,7 +568,7 @@
|
|||||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||||
CODE_SIGN_IDENTITY = "Apple Development";
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 3;
|
CURRENT_PROJECT_VERSION = 1;
|
||||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = Runner/Info.plist;
|
INFOPLIST_FILE = Runner/Info.plist;
|
||||||
@ -577,7 +577,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 0.2.13;
|
MARKETING_VERSION = 0.2.18;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
@ -705,7 +705,7 @@
|
|||||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||||
CODE_SIGN_IDENTITY = "Apple Development";
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 3;
|
CURRENT_PROJECT_VERSION = 1;
|
||||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = Runner/Info.plist;
|
INFOPLIST_FILE = Runner/Info.plist;
|
||||||
@ -714,7 +714,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 0.2.13;
|
MARKETING_VERSION = 0.2.18;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
@ -736,7 +736,7 @@
|
|||||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||||
CODE_SIGN_IDENTITY = "Apple Development";
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 3;
|
CURRENT_PROJECT_VERSION = 1;
|
||||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = Runner/Info.plist;
|
INFOPLIST_FILE = Runner/Info.plist;
|
||||||
@ -745,7 +745,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 0.2.13;
|
MARKETING_VERSION = 0.2.18;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
|
@ -48,6 +48,15 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
|||||||
static const int _tabletSmallPageSize = 15;
|
static const int _tabletSmallPageSize = 15;
|
||||||
static const int _tabletLargePageSize = 25;
|
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(
|
Future<void> onInitialize(
|
||||||
StoriesInitialize event,
|
StoriesInitialize event,
|
||||||
Emitter<StoriesState> emit,
|
Emitter<StoriesState> emit,
|
||||||
@ -70,11 +79,9 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
|||||||
currentPageSize: pageSize,
|
currentPageSize: pageSize,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
await loadStories(of: StoryType.top, emit: emit);
|
for (final StoryType type in types) {
|
||||||
await loadStories(of: StoryType.latest, emit: emit);
|
await loadStories(of: type, emit: emit);
|
||||||
await loadStories(of: StoryType.ask, emit: emit);
|
}
|
||||||
await loadStories(of: StoryType.show, emit: emit);
|
|
||||||
await loadStories(of: StoryType.jobs, emit: emit);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> loadStories({
|
Future<void> loadStories({
|
||||||
@ -237,34 +244,17 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
|||||||
await _cacheRepository.deleteAllStories();
|
await _cacheRepository.deleteAllStories();
|
||||||
await _cacheRepository.deleteAllComments();
|
await _cacheRepository.deleteAllComments();
|
||||||
|
|
||||||
final List<int> topIds =
|
final Set<int> allIds = <int>{};
|
||||||
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);
|
|
||||||
|
|
||||||
await _cacheRepository.cacheStoryIds(of: StoryType.top, ids: topIds);
|
for (final StoryType type in types) {
|
||||||
await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: newIds);
|
final List<int> ids = await _storiesRepository.fetchStoryIds(of: type);
|
||||||
await _cacheRepository.cacheStoryIds(of: StoryType.ask, ids: askIds);
|
await _cacheRepository.cacheStoryIds(of: type, ids: ids);
|
||||||
await _cacheRepository.cacheStoryIds(of: StoryType.show, ids: showIds);
|
allIds.addAll(ids);
|
||||||
await _cacheRepository.cacheStoryIds(of: StoryType.jobs, ids: jobIds);
|
}
|
||||||
|
|
||||||
final List<int> allIds = <int>[
|
|
||||||
...topIds,
|
|
||||||
...newIds,
|
|
||||||
...askIds,
|
|
||||||
...showIds,
|
|
||||||
...jobIds
|
|
||||||
];
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
_storiesRepository
|
_storiesRepository
|
||||||
.fetchStoriesStream(ids: allIds)
|
.fetchStoriesStream(ids: allIds.toList())
|
||||||
.listen((Story story) async {
|
.listen((Story story) async {
|
||||||
if (story.kids.isNotEmpty) {
|
if (story.kids.isNotEmpty) {
|
||||||
await _cacheRepository.cacheStory(story: story);
|
await _cacheRepository.cacheStory(story: story);
|
||||||
|
@ -28,6 +28,7 @@ class StoriesState extends Equatable {
|
|||||||
const StoriesState.init({
|
const StoriesState.init({
|
||||||
this.storiesByType = const <StoryType, List<Story>>{
|
this.storiesByType = const <StoryType, List<Story>>{
|
||||||
StoryType.top: <Story>[],
|
StoryType.top: <Story>[],
|
||||||
|
StoryType.best: <Story>[],
|
||||||
StoryType.latest: <Story>[],
|
StoryType.latest: <Story>[],
|
||||||
StoryType.ask: <Story>[],
|
StoryType.ask: <Story>[],
|
||||||
StoryType.show: <Story>[],
|
StoryType.show: <Story>[],
|
||||||
@ -35,6 +36,7 @@ class StoriesState extends Equatable {
|
|||||||
},
|
},
|
||||||
this.storyIdsByType = const <StoryType, List<int>>{
|
this.storyIdsByType = const <StoryType, List<int>>{
|
||||||
StoryType.top: <int>[],
|
StoryType.top: <int>[],
|
||||||
|
StoryType.best: <int>[],
|
||||||
StoryType.latest: <int>[],
|
StoryType.latest: <int>[],
|
||||||
StoryType.ask: <int>[],
|
StoryType.ask: <int>[],
|
||||||
StoryType.show: <int>[],
|
StoryType.show: <int>[],
|
||||||
@ -42,6 +44,7 @@ class StoriesState extends Equatable {
|
|||||||
},
|
},
|
||||||
this.statusByType = const <StoryType, StoriesStatus>{
|
this.statusByType = const <StoryType, StoriesStatus>{
|
||||||
StoryType.top: StoriesStatus.initial,
|
StoryType.top: StoriesStatus.initial,
|
||||||
|
StoryType.best: StoriesStatus.initial,
|
||||||
StoryType.latest: StoriesStatus.initial,
|
StoryType.latest: StoriesStatus.initial,
|
||||||
StoryType.ask: StoriesStatus.initial,
|
StoryType.ask: StoriesStatus.initial,
|
||||||
StoryType.show: StoriesStatus.initial,
|
StoryType.show: StoriesStatus.initial,
|
||||||
@ -49,6 +52,7 @@ class StoriesState extends Equatable {
|
|||||||
},
|
},
|
||||||
this.currentPageByType = const <StoryType, int>{
|
this.currentPageByType = const <StoryType, int>{
|
||||||
StoryType.top: 0,
|
StoryType.top: 0,
|
||||||
|
StoryType.best: 0,
|
||||||
StoryType.latest: 0,
|
StoryType.latest: 0,
|
||||||
StoryType.ask: 0,
|
StoryType.ask: 0,
|
||||||
StoryType.show: 0,
|
StoryType.show: 0,
|
||||||
|
@ -2,6 +2,7 @@ import 'dart:async';
|
|||||||
|
|
||||||
import 'package:bloc/bloc.dart';
|
import 'package:bloc/bloc.dart';
|
||||||
import 'package:equatable/equatable.dart';
|
import 'package:equatable/equatable.dart';
|
||||||
|
import 'package:flutter_linkify/flutter_linkify.dart';
|
||||||
import 'package:hacki/config/locator.dart';
|
import 'package:hacki/config/locator.dart';
|
||||||
import 'package:hacki/models/models.dart';
|
import 'package:hacki/models/models.dart';
|
||||||
import 'package:hacki/repositories/repositories.dart';
|
import 'package:hacki/repositories/repositories.dart';
|
||||||
@ -159,10 +160,19 @@ class CommentsCubit extends Cubit<CommentsState> {
|
|||||||
..addKid(comment.id, to: comment.parent)
|
..addKid(comment.id, to: comment.parent)
|
||||||
..cacheComment(comment);
|
..cacheComment(comment);
|
||||||
_sembastRepository.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>[
|
final List<Comment> updatedComments = <Comment>[
|
||||||
...state.comments,
|
...state.comments,
|
||||||
comment
|
buildableComment
|
||||||
];
|
];
|
||||||
|
|
||||||
emit(state.copyWith(comments: updatedComments));
|
emit(state.copyWith(comments: updatedComments));
|
||||||
|
|
||||||
if (updatedComments.length >= _pageSize + _pageSize * state.currentPage &&
|
if (updatedComments.length >= _pageSize + _pageSize * state.currentPage &&
|
||||||
@ -180,6 +190,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
|
@override
|
||||||
Future<void> close() async {
|
Future<void> close() async {
|
||||||
await _streamSubscription?.cancel();
|
await _streamSubscription?.cancel();
|
||||||
|
@ -14,4 +14,5 @@ export 'search/search_cubit.dart';
|
|||||||
export 'split_view/split_view_cubit.dart';
|
export 'split_view/split_view_cubit.dart';
|
||||||
export 'submit/submit_cubit.dart';
|
export 'submit/submit_cubit.dart';
|
||||||
export 'time_machine/time_machine_cubit.dart';
|
export 'time_machine/time_machine_cubit.dart';
|
||||||
|
export 'user/user_cubit.dart';
|
||||||
export 'vote/vote_cubit.dart';
|
export 'vote/vote_cubit.dart';
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
import 'package:bloc/bloc.dart';
|
import 'package:bloc/bloc.dart';
|
||||||
import 'package:equatable/equatable.dart';
|
import 'package:equatable/equatable.dart';
|
||||||
import 'package:hacki/config/locator.dart';
|
import 'package:hacki/config/locator.dart';
|
||||||
@ -13,42 +15,94 @@ class SearchCubit extends Cubit<SearchState> {
|
|||||||
|
|
||||||
final SearchRepository _searchRepository;
|
final SearchRepository _searchRepository;
|
||||||
|
|
||||||
|
StreamSubscription<Story>? streamSubscription;
|
||||||
|
|
||||||
void search(String query) {
|
void search(String query) {
|
||||||
|
streamSubscription?.cancel();
|
||||||
emit(
|
emit(
|
||||||
state.copyWith(
|
state.copyWith(
|
||||||
results: <Story>[],
|
results: <Story>[],
|
||||||
currentPage: 0,
|
|
||||||
status: SearchStatus.loading,
|
status: SearchStatus.loading,
|
||||||
query: query,
|
searchFilters: state.searchFilters.copyWith(query: query, page: 0),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
_searchRepository.search(query).listen(_onStoryFetched).onDone(() {
|
streamSubscription = _searchRepository
|
||||||
|
.search(filters: state.searchFilters)
|
||||||
|
.listen(_onStoryFetched)
|
||||||
|
..onDone(() {
|
||||||
emit(state.copyWith(status: SearchStatus.loaded));
|
emit(state.copyWith(status: SearchStatus.loaded));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void loadMore() {
|
void loadMore() {
|
||||||
final int updatedPage = state.currentPage + 1;
|
if (state.status != SearchStatus.loading) {
|
||||||
|
final int updatedPage = state.searchFilters.page + 1;
|
||||||
emit(
|
emit(
|
||||||
state.copyWith(
|
state.copyWith(
|
||||||
status: SearchStatus.loadingMore,
|
status: SearchStatus.loadingMore,
|
||||||
currentPage: updatedPage,
|
searchFilters: state.searchFilters.copyWith(page: updatedPage),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
_searchRepository
|
streamSubscription = _searchRepository
|
||||||
.search(state.query, page: updatedPage)
|
.search(filters: state.searchFilters)
|
||||||
.listen(_onStoryFetched)
|
.listen(_onStoryFetched)
|
||||||
.onDone(() {
|
..onDone(() {
|
||||||
emit(state.copyWith(status: SearchStatus.loaded));
|
emit(state.copyWith(status: SearchStatus.loaded));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void addFilter<T extends SearchFilter>(T filter) {
|
||||||
|
if (state.searchFilters.contains<T>()) {
|
||||||
|
emit(
|
||||||
|
state.copyWith(
|
||||||
|
searchFilters: state.searchFilters.copyWithFilterRemoved<T>(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
emit(
|
||||||
|
state.copyWith(
|
||||||
|
searchFilters: state.searchFilters.copyWithFilterAdded(filter),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
search(state.searchFilters.query);
|
||||||
|
}
|
||||||
|
|
||||||
|
void removeFilter<T extends SearchFilter>() {
|
||||||
|
emit(
|
||||||
|
state.copyWith(
|
||||||
|
searchFilters: state.searchFilters.copyWithFilterRemoved<T>(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
search(state.searchFilters.query);
|
||||||
|
}
|
||||||
|
|
||||||
|
void onSortToggled() {
|
||||||
|
emit(
|
||||||
|
state.copyWith(
|
||||||
|
searchFilters: state.searchFilters.copyWith(
|
||||||
|
sorted: !state.searchFilters.sorted,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
search(state.searchFilters.query);
|
||||||
|
}
|
||||||
|
|
||||||
void _onStoryFetched(Story story) {
|
void _onStoryFetched(Story story) {
|
||||||
emit(
|
emit(
|
||||||
state.copyWith(
|
state.copyWith(
|
||||||
results: List<Story>.from(state.results)..add(story),
|
results: List<Story>.from(state.results)..add(story),
|
||||||
status: SearchStatus.loaded,
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> close() async {
|
||||||
|
await streamSubscription?.cancel();
|
||||||
|
await super.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,42 +9,36 @@ enum SearchStatus {
|
|||||||
|
|
||||||
class SearchState extends Equatable {
|
class SearchState extends Equatable {
|
||||||
const SearchState({
|
const SearchState({
|
||||||
required this.query,
|
|
||||||
required this.status,
|
required this.status,
|
||||||
required this.results,
|
required this.results,
|
||||||
required this.currentPage,
|
required this.searchFilters,
|
||||||
});
|
});
|
||||||
|
|
||||||
SearchState.init()
|
SearchState.init()
|
||||||
: query = '',
|
: status = SearchStatus.initial,
|
||||||
status = SearchStatus.initial,
|
|
||||||
results = <Story>[],
|
results = <Story>[],
|
||||||
currentPage = 0;
|
searchFilters = SearchFilters.init();
|
||||||
|
|
||||||
final String query;
|
|
||||||
final List<Story> results;
|
final List<Story> results;
|
||||||
final SearchStatus status;
|
final SearchStatus status;
|
||||||
final int currentPage;
|
final SearchFilters searchFilters;
|
||||||
|
|
||||||
SearchState copyWith({
|
SearchState copyWith({
|
||||||
String? query,
|
|
||||||
List<Story>? results,
|
List<Story>? results,
|
||||||
SearchStatus? status,
|
SearchStatus? status,
|
||||||
int? currentPage,
|
SearchFilters? searchFilters,
|
||||||
}) {
|
}) {
|
||||||
return SearchState(
|
return SearchState(
|
||||||
query: query ?? this.query,
|
|
||||||
results: results ?? this.results,
|
results: results ?? this.results,
|
||||||
status: status ?? this.status,
|
status: status ?? this.status,
|
||||||
currentPage: currentPage ?? this.currentPage,
|
searchFilters: searchFilters ?? this.searchFilters,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
List<Object?> get props => <Object?>[
|
List<Object?> get props => <Object?>[
|
||||||
query,
|
|
||||||
status,
|
status,
|
||||||
results,
|
results,
|
||||||
currentPage,
|
searchFilters,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -21,4 +21,6 @@ class SplitViewCubit extends Cubit<SplitViewState> {
|
|||||||
void enableSplitView() => emit(state.copyWith(enabled: true));
|
void enableSplitView() => emit(state.copyWith(enabled: true));
|
||||||
|
|
||||||
void disableSplitView() => emit(state.copyWith(enabled: false));
|
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 {
|
class SplitViewState extends Equatable {
|
||||||
const SplitViewState({
|
const SplitViewState({
|
||||||
required this.storyScreenArgs,
|
required this.storyScreenArgs,
|
||||||
|
required this.expanded,
|
||||||
required this.enabled,
|
required this.enabled,
|
||||||
});
|
});
|
||||||
|
|
||||||
const SplitViewState.init()
|
const SplitViewState.init()
|
||||||
: enabled = false,
|
: enabled = false,
|
||||||
|
expanded = false,
|
||||||
storyScreenArgs = null;
|
storyScreenArgs = null;
|
||||||
|
|
||||||
final bool enabled;
|
final bool enabled;
|
||||||
|
final bool expanded;
|
||||||
final StoryScreenArgs? storyScreenArgs;
|
final StoryScreenArgs? storyScreenArgs;
|
||||||
|
|
||||||
SplitViewState copyWith({bool? enabled, StoryScreenArgs? storyScreenArgs}) {
|
SplitViewState copyWith({
|
||||||
|
bool? enabled,
|
||||||
|
bool? expanded,
|
||||||
|
StoryScreenArgs? storyScreenArgs,
|
||||||
|
}) {
|
||||||
return SplitViewState(
|
return SplitViewState(
|
||||||
enabled: enabled ?? this.enabled,
|
enabled: enabled ?? this.enabled,
|
||||||
|
expanded: expanded ?? this.expanded,
|
||||||
storyScreenArgs: storyScreenArgs ?? this.storyScreenArgs,
|
storyScreenArgs: storyScreenArgs ?? this.storyScreenArgs,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -23,6 +31,7 @@ class SplitViewState extends Equatable {
|
|||||||
@override
|
@override
|
||||||
List<Object?> get props => <Object?>[
|
List<Object?> get props => <Object?>[
|
||||||
enabled,
|
enabled,
|
||||||
|
expanded,
|
||||||
storyScreenArgs,
|
storyScreenArgs,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
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
@ -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/scheduler.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_local_notifications/flutter_local_notifications.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/blocs/blocs.dart';
|
||||||
import 'package:hacki/config/custom_router.dart';
|
import 'package:hacki/config/custom_router.dart';
|
||||||
import 'package:hacki/config/locator.dart';
|
import 'package:hacki/config/locator.dart';
|
||||||
@ -24,6 +25,10 @@ import 'package:workmanager/workmanager.dart';
|
|||||||
final BehaviorSubject<String?> selectNotificationSubject =
|
final BehaviorSubject<String?> selectNotificationSubject =
|
||||||
BehaviorSubject<String?>();
|
BehaviorSubject<String?>();
|
||||||
|
|
||||||
|
// For receiving payload event from siri suggestions.
|
||||||
|
final BehaviorSubject<String?> siriSuggestionSubject =
|
||||||
|
BehaviorSubject<String?>();
|
||||||
|
|
||||||
Future<void> main() async {
|
Future<void> main() async {
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
|
|
||||||
@ -57,6 +62,16 @@ Future<void> main() async {
|
|||||||
badge: true,
|
badge: true,
|
||||||
sound: 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();
|
final Directory tempDir = await getTemporaryDirectory();
|
||||||
|
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,6 +1,8 @@
|
|||||||
|
export 'buildable_comment.dart';
|
||||||
export 'comment.dart';
|
export 'comment.dart';
|
||||||
export 'item.dart';
|
export 'item.dart';
|
||||||
export 'poll_option.dart';
|
export 'poll_option.dart';
|
||||||
export 'post_data.dart';
|
export 'post_data.dart';
|
||||||
|
export 'search_filters.dart';
|
||||||
export 'story.dart';
|
export 'story.dart';
|
||||||
export 'user.dart';
|
export 'user.dart';
|
||||||
|
104
lib/models/search_filter.dart
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
part of 'search_filters.dart';
|
||||||
|
|
||||||
|
abstract class SearchFilter {
|
||||||
|
String get query;
|
||||||
|
}
|
||||||
|
|
||||||
|
abstract class NumericFilter extends SearchFilter {}
|
||||||
|
|
||||||
|
abstract class TagFilter extends SearchFilter {}
|
||||||
|
|
||||||
|
class DateTimeRangeFilter implements NumericFilter {
|
||||||
|
DateTimeRangeFilter({
|
||||||
|
this.startTime,
|
||||||
|
this.endTime,
|
||||||
|
});
|
||||||
|
|
||||||
|
final DateTime? startTime;
|
||||||
|
final DateTime? endTime;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get query {
|
||||||
|
final int? startTimestamp = startTime == null
|
||||||
|
? null
|
||||||
|
: startTime!.toUtc().millisecondsSinceEpoch ~/ 1000;
|
||||||
|
final int? endTimestamp = endTime == null
|
||||||
|
? null
|
||||||
|
: endTime!.toUtc().millisecondsSinceEpoch ~/ 1000;
|
||||||
|
final String query =
|
||||||
|
'''${startTimestamp == null ? '' : 'created_at_i>$startTimestamp'},${endTimestamp == null ? '' : 'created_at_i<$endTimestamp'}''';
|
||||||
|
|
||||||
|
if (query.endsWith(',')) {
|
||||||
|
return query.replaceFirst(',', '');
|
||||||
|
}
|
||||||
|
|
||||||
|
return query;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class PostedByFilter implements TagFilter {
|
||||||
|
PostedByFilter({required this.author});
|
||||||
|
|
||||||
|
final String author;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get query {
|
||||||
|
return 'author_$author';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class FrontPageFilter implements TagFilter {
|
||||||
|
FrontPageFilter();
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get query {
|
||||||
|
return 'front_page';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ShowHnFilter implements TagFilter {
|
||||||
|
ShowHnFilter();
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get query {
|
||||||
|
return 'show_hn';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class AskHnFilter implements TagFilter {
|
||||||
|
AskHnFilter();
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get query {
|
||||||
|
return 'ask_hn';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class PollFilter implements TagFilter {
|
||||||
|
PollFilter();
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get query {
|
||||||
|
return 'poll';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class StoryFilter implements TagFilter {
|
||||||
|
StoryFilter();
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get query {
|
||||||
|
return 'story';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class CombinedFilter implements TagFilter {
|
||||||
|
CombinedFilter({required this.filters});
|
||||||
|
|
||||||
|
final List<TagFilter> filters;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get query {
|
||||||
|
return '''(${filters.map((TagFilter e) => e.query).reduce((String value, String element) => '$value, $element')})''';
|
||||||
|
}
|
||||||
|
}
|
116
lib/models/search_filters.dart
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
import 'package:collection/collection.dart';
|
||||||
|
import 'package:equatable/equatable.dart';
|
||||||
|
|
||||||
|
part 'search_filter.dart';
|
||||||
|
|
||||||
|
class SearchFilters extends Equatable {
|
||||||
|
const SearchFilters({
|
||||||
|
required this.filters,
|
||||||
|
required this.query,
|
||||||
|
required this.page,
|
||||||
|
this.sorted = false,
|
||||||
|
});
|
||||||
|
|
||||||
|
SearchFilters.init()
|
||||||
|
: filters = <SearchFilter>{},
|
||||||
|
query = '',
|
||||||
|
page = 0,
|
||||||
|
sorted = false;
|
||||||
|
|
||||||
|
final Set<SearchFilter> filters;
|
||||||
|
final String query;
|
||||||
|
final int page;
|
||||||
|
final bool sorted;
|
||||||
|
|
||||||
|
SearchFilters copyWith({
|
||||||
|
Set<SearchFilter>? filters,
|
||||||
|
String? query,
|
||||||
|
int? page,
|
||||||
|
bool? sorted,
|
||||||
|
}) {
|
||||||
|
return SearchFilters(
|
||||||
|
filters: filters ?? this.filters,
|
||||||
|
query: query ?? this.query,
|
||||||
|
page: page ?? this.page,
|
||||||
|
sorted: sorted ?? this.sorted,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
SearchFilters copyWithFilterRemoved<T extends SearchFilter>() {
|
||||||
|
return SearchFilters(
|
||||||
|
filters: <SearchFilter>{...filters}
|
||||||
|
..removeWhere((SearchFilter e) => e is T),
|
||||||
|
query: query,
|
||||||
|
page: page,
|
||||||
|
sorted: sorted,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
SearchFilters copyWithFilterAdded(
|
||||||
|
SearchFilter filter,
|
||||||
|
) {
|
||||||
|
return SearchFilters(
|
||||||
|
filters: <SearchFilter>{...filters, filter},
|
||||||
|
query: query,
|
||||||
|
page: page,
|
||||||
|
sorted: sorted,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
String get filteredQuery {
|
||||||
|
final StringBuffer buffer = StringBuffer();
|
||||||
|
|
||||||
|
if (sorted) {
|
||||||
|
buffer.write('search_by_date?query=${Uri.encodeComponent(query)}');
|
||||||
|
} else {
|
||||||
|
buffer.write('search?query=${Uri.encodeComponent(query)}');
|
||||||
|
}
|
||||||
|
|
||||||
|
final Iterable<NumericFilter> numericFilters =
|
||||||
|
filters.whereType<NumericFilter>();
|
||||||
|
final List<TagFilter> tagFilters = <TagFilter>[
|
||||||
|
...filters.whereType<TagFilter>(),
|
||||||
|
CombinedFilter(filters: <TagFilter>[StoryFilter(), PollFilter()]),
|
||||||
|
];
|
||||||
|
|
||||||
|
if (numericFilters.isNotEmpty) {
|
||||||
|
buffer
|
||||||
|
..write('&numericFilters=')
|
||||||
|
..writeAll(
|
||||||
|
numericFilters.map<String>((NumericFilter e) => e.query),
|
||||||
|
',',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tagFilters.isNotEmpty) {
|
||||||
|
buffer
|
||||||
|
..write('&tags=')
|
||||||
|
..writeAll(
|
||||||
|
tagFilters.map<String>((TagFilter e) => e.query),
|
||||||
|
',',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
buffer.write('&page=$page');
|
||||||
|
|
||||||
|
return buffer.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool contains<T extends SearchFilter>() {
|
||||||
|
return filters.whereType<T>().isNotEmpty;
|
||||||
|
}
|
||||||
|
|
||||||
|
T? get<T extends SearchFilter>() {
|
||||||
|
return filters.singleWhereOrNull(
|
||||||
|
(SearchFilter e) => e is T,
|
||||||
|
) as T?;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => <Object?>[
|
||||||
|
filters,
|
||||||
|
query,
|
||||||
|
page,
|
||||||
|
sorted,
|
||||||
|
];
|
||||||
|
}
|
@ -5,6 +5,7 @@ import 'package:hacki/models/item.dart';
|
|||||||
|
|
||||||
enum StoryType {
|
enum StoryType {
|
||||||
top('topstories'),
|
top('topstories'),
|
||||||
|
best('beststories'),
|
||||||
latest('newstories'),
|
latest('newstories'),
|
||||||
ask('askstories'),
|
ask('askstories'),
|
||||||
show('showstories'),
|
show('showstories'),
|
||||||
@ -13,6 +14,23 @@ enum StoryType {
|
|||||||
const StoryType(this.path);
|
const StoryType(this.path);
|
||||||
|
|
||||||
final String 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 {
|
class Story extends Item {
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:intl/intl.dart';
|
||||||
|
|
||||||
class User {
|
class User {
|
||||||
User({
|
User({
|
||||||
required this.about,
|
required this.about,
|
||||||
@ -29,6 +31,12 @@ class User {
|
|||||||
final String id;
|
final String id;
|
||||||
final int karma;
|
final int karma;
|
||||||
|
|
||||||
|
static final DateFormat _dateTimeFormatter = DateFormat.yMMMd();
|
||||||
|
|
||||||
|
String get description {
|
||||||
|
return '''$karma karma, created on ${_dateTimeFormatter.format(DateTime.fromMillisecondsSinceEpoch(created * 1000))}''';
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String toString() {
|
String toString() {
|
||||||
final String prettyString =
|
final String prettyString =
|
||||||
|
@ -6,12 +6,14 @@ import 'package:hacki/utils/utils.dart';
|
|||||||
class SearchRepository {
|
class SearchRepository {
|
||||||
SearchRepository({Dio? dio}) : _dio = dio ?? Dio();
|
SearchRepository({Dio? dio}) : _dio = dio ?? Dio();
|
||||||
|
|
||||||
static const String _baseUrl = 'http://hn.algolia.com/api/v1/search?query=';
|
static const String _baseUrl = 'http://hn.algolia.com/api/v1/';
|
||||||
|
|
||||||
final Dio _dio;
|
final Dio _dio;
|
||||||
|
|
||||||
Stream<Story> search(String query, {int page = 0}) async* {
|
Stream<Story> search({
|
||||||
final String url = '$_baseUrl${Uri.encodeComponent(query)}&page=$page';
|
required SearchFilters filters,
|
||||||
|
}) async* {
|
||||||
|
final String url = '$_baseUrl${filters.filteredQuery}';
|
||||||
final Response<Map<String, dynamic>> response =
|
final Response<Map<String, dynamic>> response =
|
||||||
await _dio.get<Map<String, dynamic>>(url);
|
await _dio.get<Map<String, dynamic>>(url);
|
||||||
final Map<String, dynamic>? data = response.data;
|
final Map<String, dynamic>? data = response.data;
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:badges/badges.dart';
|
import 'package:badges/badges.dart';
|
||||||
import 'package:feature_discovery/feature_discovery.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/services.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_fadein/flutter_fadein.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:flutter_slidable/flutter_slidable.dart';
|
||||||
import 'package:hacki/blocs/blocs.dart';
|
import 'package:hacki/blocs/blocs.dart';
|
||||||
import 'package:hacki/config/constants.dart';
|
import 'package:hacki/config/constants.dart';
|
||||||
@ -52,6 +54,7 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
late final TabController tabController;
|
late final TabController tabController;
|
||||||
late final StreamSubscription<String> intentDataStreamSubscription;
|
late final StreamSubscription<String> intentDataStreamSubscription;
|
||||||
late final StreamSubscription<String?> notificationStreamSubscription;
|
late final StreamSubscription<String?> notificationStreamSubscription;
|
||||||
|
late final StreamSubscription<String?> siriSuggestionStreamSubscription;
|
||||||
|
|
||||||
int currentIndex = 0;
|
int currentIndex = 0;
|
||||||
|
|
||||||
@ -88,6 +91,11 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
selectNotificationSubject.stream.listen(onNotificationTapped);
|
selectNotificationSubject.stream.listen(onNotificationTapped);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!siriSuggestionSubject.hasListener) {
|
||||||
|
siriSuggestionStreamSubscription =
|
||||||
|
siriSuggestionSubject.stream.listen(onSiriSuggestionTapped);
|
||||||
|
}
|
||||||
|
|
||||||
SchedulerBinding.instance
|
SchedulerBinding.instance
|
||||||
..addPostFrameCallback((_) {
|
..addPostFrameCallback((_) {
|
||||||
FeatureDiscovery.discoverFeatures(
|
FeatureDiscovery.discoverFeatures(
|
||||||
@ -132,6 +140,7 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
tabController.dispose();
|
tabController.dispose();
|
||||||
intentDataStreamSubscription.cancel();
|
intentDataStreamSubscription.cancel();
|
||||||
notificationStreamSubscription.cancel();
|
notificationStreamSubscription.cancel();
|
||||||
|
siriSuggestionStreamSubscription.cancel();
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,7 +180,7 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
child: Container(
|
child: Container(
|
||||||
color: Colors.orangeAccent.withOpacity(0.2),
|
color: Colors.orangeAccent.withOpacity(0.2),
|
||||||
child: StoryTile(
|
child: StoryTile(
|
||||||
key: ObjectKey(story),
|
key: ValueKey<String>('${story.id}-PinnedStoryTile'),
|
||||||
story: story,
|
story: story,
|
||||||
onTap: () => onStoryTapped(story, isPin: true),
|
onTap: () => onStoryTapped(story, isPin: true),
|
||||||
showWebPreview: preferenceState.showComplexStoryTile,
|
showWebPreview: preferenceState.showComplexStoryTile,
|
||||||
@ -222,56 +231,16 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
HapticFeedback.selectionClick();
|
HapticFeedback.selectionClick();
|
||||||
},
|
},
|
||||||
tabs: <Widget>[
|
tabs: <Widget>[
|
||||||
|
for (int i = 0; i < StoriesBloc.types.length; i++)
|
||||||
Tab(
|
Tab(
|
||||||
|
key: ValueKey<StoryType>(
|
||||||
|
StoriesBloc.types.elementAt(i),
|
||||||
|
),
|
||||||
child: Text(
|
child: Text(
|
||||||
'TOP',
|
StoriesBloc.types.elementAt(i).label,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: currentIndex == 0 ? 14 : 10,
|
fontSize: currentIndex == i ? 14 : 10,
|
||||||
color: currentIndex == 0
|
color: currentIndex == i
|
||||||
? 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
|
|
||||||
? Colors.orange
|
? Colors.orange
|
||||||
: Colors.grey,
|
: Colors.grey,
|
||||||
),
|
),
|
||||||
@ -349,33 +318,10 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
physics: const NeverScrollableScrollPhysics(),
|
physics: const NeverScrollableScrollPhysics(),
|
||||||
controller: tabController,
|
controller: tabController,
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
|
for (final StoryType type in StoriesBloc.types)
|
||||||
StoriesListView(
|
StoriesListView(
|
||||||
key: const ValueKey<StoryType>(StoryType.top),
|
key: ValueKey<StoryType>(type),
|
||||||
storyType: StoryType.top,
|
storyType: type,
|
||||||
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,
|
|
||||||
header: pinnedStories,
|
header: pinnedStories,
|
||||||
onStoryTapped: onStoryTapped,
|
onStoryTapped: onStoryTapped,
|
||||||
),
|
),
|
||||||
@ -390,11 +336,11 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
return ScreenTypeLayout.builder(
|
return ScreenTypeLayout.builder(
|
||||||
mobile: (BuildContext context) {
|
mobile: (BuildContext context) {
|
||||||
context.read<SplitViewCubit>().disableSplitView();
|
context.read<SplitViewCubit>().disableSplitView();
|
||||||
return _MobileHomeScreenBuilder(
|
return _MobileHomeScreen(
|
||||||
homeScreen: homeScreen,
|
homeScreen: homeScreen,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
tablet: (BuildContext context) => _TabletHomeScreenBuilder(
|
tablet: (BuildContext context) => _TabletHomeScreen(
|
||||||
homeScreen: homeScreen,
|
homeScreen: homeScreen,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@ -453,6 +399,18 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
story: story,
|
story: story,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (Platform.isIOS) {
|
||||||
|
FlutterSiriSuggestions.instance.registerActivity(
|
||||||
|
FlutterSiriActivity(
|
||||||
|
story.title,
|
||||||
|
story.id.toString(),
|
||||||
|
suggestedInvocationPhrase: '',
|
||||||
|
contentDescription: story.text,
|
||||||
|
persistentIdentifier: story.id.toString(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void showOnboarding() {
|
void showOnboarding() {
|
||||||
@ -484,6 +442,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 {
|
Future<void> onNotificationTapped(String? payload) async {
|
||||||
if (payload == null) return;
|
if (payload == null) return;
|
||||||
|
|
||||||
@ -511,8 +487,8 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _MobileHomeScreenBuilder extends StatelessWidget {
|
class _MobileHomeScreen extends StatelessWidget {
|
||||||
const _MobileHomeScreenBuilder({
|
const _MobileHomeScreen({
|
||||||
Key? key,
|
Key? key,
|
||||||
required this.homeScreen,
|
required this.homeScreen,
|
||||||
}) : super(key: key);
|
}) : super(key: key);
|
||||||
@ -537,8 +513,8 @@ class _MobileHomeScreenBuilder extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _TabletHomeScreenBuilder extends StatelessWidget {
|
class _TabletHomeScreen extends StatelessWidget {
|
||||||
const _TabletHomeScreenBuilder({
|
const _TabletHomeScreen({
|
||||||
Key? key,
|
Key? key,
|
||||||
required this.homeScreen,
|
required this.homeScreen,
|
||||||
}) : super(key: key);
|
}) : super(key: key);
|
||||||
@ -556,13 +532,19 @@ class _TabletHomeScreenBuilder extends StatelessWidget {
|
|||||||
homeScreenWidth = 345.0;
|
homeScreenWidth = 345.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return BlocBuilder<SplitViewCubit, SplitViewState>(
|
||||||
|
buildWhen: (SplitViewState previous, SplitViewState current) =>
|
||||||
|
previous.expanded != current.expanded,
|
||||||
|
builder: (BuildContext context, SplitViewState state) {
|
||||||
return Stack(
|
return Stack(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Positioned(
|
AnimatedPositioned(
|
||||||
left: 0,
|
left: 0,
|
||||||
top: 0,
|
top: 0,
|
||||||
bottom: 0,
|
bottom: 0,
|
||||||
width: homeScreenWidth,
|
width: state.expanded ? 0 : homeScreenWidth,
|
||||||
|
duration: const Duration(milliseconds: 300),
|
||||||
|
curve: Curves.elasticOut,
|
||||||
child: homeScreen,
|
child: homeScreen,
|
||||||
),
|
),
|
||||||
Positioned(
|
Positioned(
|
||||||
@ -572,17 +554,21 @@ class _TabletHomeScreenBuilder extends StatelessWidget {
|
|||||||
width: homeScreenWidth - 24,
|
width: homeScreenWidth - 24,
|
||||||
child: const CountdownReminder(),
|
child: const CountdownReminder(),
|
||||||
),
|
),
|
||||||
Positioned(
|
AnimatedPositioned(
|
||||||
right: 0,
|
right: 0,
|
||||||
top: 0,
|
top: 0,
|
||||||
bottom: 0,
|
bottom: 0,
|
||||||
left: homeScreenWidth,
|
left: state.expanded ? 0 : homeScreenWidth,
|
||||||
|
duration: const Duration(milliseconds: 300),
|
||||||
|
curve: Curves.elasticOut,
|
||||||
child: const _TabletStoryView(),
|
child: const _TabletStoryView(),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -596,7 +582,7 @@ class _TabletStoryView extends StatelessWidget {
|
|||||||
previous.storyScreenArgs != current.storyScreenArgs,
|
previous.storyScreenArgs != current.storyScreenArgs,
|
||||||
builder: (BuildContext context, SplitViewState state) {
|
builder: (BuildContext context, SplitViewState state) {
|
||||||
if (state.storyScreenArgs != null) {
|
if (state.storyScreenArgs != null) {
|
||||||
return StoryScreen.build(state.storyScreenArgs!);
|
return StoryScreen.build(context, state.storyScreenArgs!);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Material(
|
return Material(
|
||||||
|
@ -407,7 +407,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
|||||||
showAboutDialog(
|
showAboutDialog(
|
||||||
context: context,
|
context: context,
|
||||||
applicationName: 'Hacki',
|
applicationName: 'Hacki',
|
||||||
applicationVersion: 'v0.2.13',
|
applicationVersion: 'v0.2.18',
|
||||||
applicationIcon: ClipRRect(
|
applicationIcon: ClipRRect(
|
||||||
borderRadius: const BorderRadius.all(
|
borderRadius: const BorderRadius.all(
|
||||||
Radius.circular(12),
|
Radius.circular(12),
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
export 'centered_message_view.dart';
|
export 'centered_message_view.dart';
|
||||||
export 'custom_chip.dart';
|
|
||||||
export 'inbox_view.dart';
|
export 'inbox_view.dart';
|
||||||
export 'offline_list_tile.dart';
|
export 'offline_list_tile.dart';
|
||||||
|
@ -3,8 +3,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';
|
|||||||
import 'package:flutter_fadein/flutter_fadein.dart';
|
import 'package:flutter_fadein/flutter_fadein.dart';
|
||||||
import 'package:hacki/cubits/cubits.dart';
|
import 'package:hacki/cubits/cubits.dart';
|
||||||
import 'package:hacki/extensions/extensions.dart';
|
import 'package:hacki/extensions/extensions.dart';
|
||||||
import 'package:hacki/models/story.dart';
|
import 'package:hacki/models/models.dart';
|
||||||
import 'package:hacki/screens/screens.dart';
|
import 'package:hacki/screens/screens.dart';
|
||||||
|
import 'package:hacki/screens/search/widgets/widgets.dart';
|
||||||
import 'package:hacki/screens/widgets/widgets.dart';
|
import 'package:hacki/screens/widgets/widgets.dart';
|
||||||
import 'package:hacki/utils/utils.dart';
|
import 'package:hacki/utils/utils.dart';
|
||||||
import 'package:pull_to_refresh/pull_to_refresh.dart';
|
import 'package:pull_to_refresh/pull_to_refresh.dart';
|
||||||
@ -56,7 +57,64 @@ class _SearchScreenState extends State<SearchScreen> {
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
if (state.status == SearchStatus.loading) ...<Widget>[
|
const SizedBox(
|
||||||
|
height: 6,
|
||||||
|
),
|
||||||
|
SingleChildScrollView(
|
||||||
|
scrollDirection: Axis.horizontal,
|
||||||
|
child: Row(
|
||||||
|
children: <Widget>[
|
||||||
|
const SizedBox(
|
||||||
|
width: 8,
|
||||||
|
),
|
||||||
|
DateTimeRangeFilterChip(
|
||||||
|
filter:
|
||||||
|
state.searchFilters.get<DateTimeRangeFilter>(),
|
||||||
|
onDateTimeRangeUpdated:
|
||||||
|
(DateTime start, DateTime end) =>
|
||||||
|
context.read<SearchCubit>().addFilter(
|
||||||
|
DateTimeRangeFilter(
|
||||||
|
startTime: start,
|
||||||
|
endTime: end,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onDateTimeRangeRemoved: context
|
||||||
|
.read<SearchCubit>()
|
||||||
|
.removeFilter<DateTimeRangeFilter>,
|
||||||
|
),
|
||||||
|
const SizedBox(
|
||||||
|
width: 8,
|
||||||
|
),
|
||||||
|
CustomChip(
|
||||||
|
onSelected: (_) =>
|
||||||
|
context.read<SearchCubit>().onSortToggled(),
|
||||||
|
selected: state.searchFilters.sorted,
|
||||||
|
label: '''newest first''',
|
||||||
|
),
|
||||||
|
const SizedBox(
|
||||||
|
width: 8,
|
||||||
|
),
|
||||||
|
for (final CustomDateTimeRange range
|
||||||
|
in CustomDateTimeRange.values) ...<Widget>[
|
||||||
|
CustomRangeFilterChip(
|
||||||
|
range: range,
|
||||||
|
onTap: (DateTime start, DateTime end) =>
|
||||||
|
context.read<SearchCubit>().addFilter(
|
||||||
|
DateTimeRangeFilter(
|
||||||
|
startTime: start,
|
||||||
|
endTime: end,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(
|
||||||
|
width: 8,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (state.status == SearchStatus.loading &&
|
||||||
|
state.results.isEmpty) ...<Widget>[
|
||||||
const SizedBox(
|
const SizedBox(
|
||||||
height: 100,
|
height: 100,
|
||||||
),
|
),
|
||||||
|
75
lib/screens/search/widgets/custom_range_filter_chip.dart
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:hacki/screens/widgets/widgets.dart';
|
||||||
|
|
||||||
|
typedef DateRangeCallback = Function(DateTime, DateTime);
|
||||||
|
|
||||||
|
enum CustomDateTimeRange {
|
||||||
|
pastDay(Duration(days: 1), label: 'past day'),
|
||||||
|
pastWeek(Duration(days: 7), label: 'past week'),
|
||||||
|
pastMonth(Duration(days: 31), label: 'past month'),
|
||||||
|
pastYear(Duration(days: 365), label: 'past year');
|
||||||
|
|
||||||
|
const CustomDateTimeRange(this.duration, {required this.label});
|
||||||
|
|
||||||
|
final Duration duration;
|
||||||
|
final String label;
|
||||||
|
}
|
||||||
|
|
||||||
|
class CustomRangeFilterChip extends StatelessWidget {
|
||||||
|
const CustomRangeFilterChip({
|
||||||
|
Key? key,
|
||||||
|
required this.range,
|
||||||
|
required this.onTap,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
final CustomDateTimeRange range;
|
||||||
|
final DateRangeCallback onTap;
|
||||||
|
|
||||||
|
static Widget pastDay({
|
||||||
|
required DateRangeCallback onTap,
|
||||||
|
}) {
|
||||||
|
return CustomRangeFilterChip(
|
||||||
|
range: CustomDateTimeRange.pastDay,
|
||||||
|
onTap: onTap,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
static Widget pastWeek({
|
||||||
|
required DateRangeCallback onTap,
|
||||||
|
}) {
|
||||||
|
return CustomRangeFilterChip(
|
||||||
|
range: CustomDateTimeRange.pastWeek,
|
||||||
|
onTap: onTap,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
static Widget pastMonth({
|
||||||
|
required DateRangeCallback onTap,
|
||||||
|
}) {
|
||||||
|
return CustomRangeFilterChip(
|
||||||
|
range: CustomDateTimeRange.pastMonth,
|
||||||
|
onTap: onTap,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
static Widget pastYear({
|
||||||
|
required DateRangeCallback onTap,
|
||||||
|
}) {
|
||||||
|
return CustomRangeFilterChip(
|
||||||
|
range: CustomDateTimeRange.pastYear,
|
||||||
|
onTap: onTap,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return CustomChip(
|
||||||
|
onSelected: (bool value) {
|
||||||
|
final DateTime now = DateTime.now();
|
||||||
|
onTap(now.subtract(range.duration), now);
|
||||||
|
},
|
||||||
|
selected: false,
|
||||||
|
label: range.label,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
47
lib/screens/search/widgets/date_time_range_filter_chip.dart
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:hacki/models/search_filters.dart';
|
||||||
|
import 'package:hacki/screens/widgets/widgets.dart';
|
||||||
|
import 'package:intl/intl.dart';
|
||||||
|
|
||||||
|
class DateTimeRangeFilterChip extends StatelessWidget {
|
||||||
|
const DateTimeRangeFilterChip({
|
||||||
|
Key? key,
|
||||||
|
required this.filter,
|
||||||
|
required this.onDateTimeRangeUpdated,
|
||||||
|
required this.onDateTimeRangeRemoved,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
final DateTimeRangeFilter? filter;
|
||||||
|
final Function(DateTime, DateTime) onDateTimeRangeUpdated;
|
||||||
|
final VoidCallback onDateTimeRangeRemoved;
|
||||||
|
|
||||||
|
static final DateFormat _dateTimeFormatter = DateFormat.yMMMd();
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return CustomChip(
|
||||||
|
onSelected: (bool value) {
|
||||||
|
showDateRangePicker(
|
||||||
|
context: context,
|
||||||
|
firstDate: DateTime.now().subtract(const Duration(days: 20 * 365)),
|
||||||
|
lastDate: DateTime.now(),
|
||||||
|
).then((DateTimeRange? range) {
|
||||||
|
if (range != null) {
|
||||||
|
onDateTimeRangeUpdated(range.start, range.end);
|
||||||
|
} else {
|
||||||
|
onDateTimeRangeRemoved();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
selected: filter != null,
|
||||||
|
label:
|
||||||
|
'''from ${_formatDateTime(filter?.startTime) ?? 'START DATE'} to ${_formatDateTime(filter?.endTime) ?? 'END DATE'}''',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
static String? _formatDateTime(DateTime? dateTime) {
|
||||||
|
if (dateTime == null) return null;
|
||||||
|
|
||||||
|
return _dateTimeFormatter.format(dateTime);
|
||||||
|
}
|
||||||
|
}
|
21
lib/screens/search/widgets/posted_by_filter_chip.dart
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:hacki/models/search_filters.dart';
|
||||||
|
import 'package:hacki/screens/widgets/widgets.dart';
|
||||||
|
|
||||||
|
class PostedByFilterChip extends StatelessWidget {
|
||||||
|
const PostedByFilterChip({
|
||||||
|
Key? key,
|
||||||
|
required this.filter,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
final PostedByFilter? filter;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return CustomChip(
|
||||||
|
onSelected: (bool value) {},
|
||||||
|
selected: filter != null,
|
||||||
|
label: '''posted by ${filter?.author ?? ''}''',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
3
lib/screens/search/widgets/widgets.dart
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
export 'custom_range_filter_chip.dart';
|
||||||
|
export 'date_time_range_filter_chip.dart';
|
||||||
|
export 'posted_by_filter_chip.dart';
|
@ -22,10 +22,12 @@ import 'package:hacki/services/services.dart';
|
|||||||
import 'package:hacki/utils/utils.dart';
|
import 'package:hacki/utils/utils.dart';
|
||||||
import 'package:pull_to_refresh/pull_to_refresh.dart';
|
import 'package:pull_to_refresh/pull_to_refresh.dart';
|
||||||
import 'package:responsive_builder/responsive_builder.dart';
|
import 'package:responsive_builder/responsive_builder.dart';
|
||||||
|
import 'package:share_plus/share_plus.dart';
|
||||||
|
|
||||||
enum _MenuAction {
|
enum _MenuAction {
|
||||||
upvote,
|
upvote,
|
||||||
downvote,
|
downvote,
|
||||||
|
share,
|
||||||
block,
|
block,
|
||||||
flag,
|
flag,
|
||||||
cancel,
|
cancel,
|
||||||
@ -88,8 +90,17 @@ class StoryScreen extends StatefulWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Widget build(StoryScreenArgs args) {
|
static Widget build(BuildContext context, StoryScreenArgs args) {
|
||||||
return MultiBlocProvider(
|
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),
|
key: ValueKey<StoryScreenArgs>(args),
|
||||||
providers: <BlocProvider<dynamic>>[
|
providers: <BlocProvider<dynamic>>[
|
||||||
BlocProvider<CommentsCubit>(
|
BlocProvider<CommentsCubit>(
|
||||||
@ -112,6 +123,7 @@ class StoryScreen extends StatefulWidget {
|
|||||||
parentComments: args.targetComments ?? <Comment>[],
|
parentComments: args.targetComments ?? <Comment>[],
|
||||||
splitViewEnabled: true,
|
splitViewEnabled: true,
|
||||||
),
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -140,7 +152,6 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
delay: _featureDiscoveryDismissThrottleDelay,
|
delay: _featureDiscoveryDismissThrottleDelay,
|
||||||
);
|
);
|
||||||
|
|
||||||
static const int _extraItemsCount = 2;
|
|
||||||
static const Duration _storyLinkTapThrottleDelay = Duration(seconds: 2);
|
static const Duration _storyLinkTapThrottleDelay = Duration(seconds: 2);
|
||||||
static const Duration _featureDiscoveryDismissThrottleDelay =
|
static const Duration _featureDiscoveryDismissThrottleDelay =
|
||||||
Duration(seconds: 1);
|
Duration(seconds: 1);
|
||||||
@ -270,12 +281,8 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
onLoading: () {
|
onLoading: () {
|
||||||
context.read<CommentsCubit>().loadMore();
|
context.read<CommentsCubit>().loadMore();
|
||||||
},
|
},
|
||||||
child: ListView.builder(
|
child: ListView(
|
||||||
primary: false,
|
primary: false,
|
||||||
itemCount: state.comments.length + _extraItemsCount,
|
|
||||||
itemBuilder: (BuildContext context, int index) {
|
|
||||||
if (index == 0) {
|
|
||||||
return Column(
|
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
SizedBox(
|
SizedBox(
|
||||||
height: topPadding,
|
height: topPadding,
|
||||||
@ -294,10 +301,7 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
HapticFeedback.lightImpact();
|
HapticFeedback.lightImpact();
|
||||||
|
|
||||||
if (widget.story !=
|
if (widget.story !=
|
||||||
context
|
context.read<EditCubit>().state.replyingTo) {
|
||||||
.read<EditCubit>()
|
|
||||||
.state
|
|
||||||
.replyingTo) {
|
|
||||||
commentEditingController.clear();
|
commentEditingController.clear();
|
||||||
}
|
}
|
||||||
context
|
context
|
||||||
@ -377,13 +381,13 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
child: SelectableLinkify(
|
child: SelectableLinkify(
|
||||||
text: widget.story.text,
|
text: widget.story.text,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: MediaQuery.of(context)
|
fontSize:
|
||||||
.textScaleFactor *
|
MediaQuery.of(context).textScaleFactor *
|
||||||
15,
|
15,
|
||||||
),
|
),
|
||||||
linkStyle: TextStyle(
|
linkStyle: TextStyle(
|
||||||
fontSize: MediaQuery.of(context)
|
fontSize:
|
||||||
.textScaleFactor *
|
MediaQuery.of(context).textScaleFactor *
|
||||||
15,
|
15,
|
||||||
color: Colors.orange,
|
color: Colors.orange,
|
||||||
),
|
),
|
||||||
@ -414,9 +418,8 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
),
|
),
|
||||||
if (state.onlyShowTargetComment) ...<Widget>[
|
if (state.onlyShowTargetComment) ...<Widget>[
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: () => context
|
onPressed: () =>
|
||||||
.read<CommentsCubit>()
|
context.read<CommentsCubit>().loadAll(widget.story),
|
||||||
.loadAll(widget.story),
|
|
||||||
child: const Text('View all comments'),
|
child: const Text('View all comments'),
|
||||||
),
|
),
|
||||||
const Divider(
|
const Divider(
|
||||||
@ -424,8 +427,7 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
if (state.comments.isEmpty &&
|
if (state.comments.isEmpty &&
|
||||||
state.status ==
|
state.status == CommentsStatus.allLoaded) ...<Widget>[
|
||||||
CommentsStatus.allLoaded) ...<Widget>[
|
|
||||||
const SizedBox(
|
const SizedBox(
|
||||||
height: 240,
|
height: 240,
|
||||||
),
|
),
|
||||||
@ -436,28 +438,9 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
],
|
for (final Comment comment in state.comments)
|
||||||
);
|
FadeIn(
|
||||||
} else if (index ==
|
key: ValueKey<String>('${comment.id}-FadeIn'),
|
||||||
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),
|
|
||||||
child: CommentTile(
|
child: CommentTile(
|
||||||
comment: comment,
|
comment: comment,
|
||||||
level: comment.level,
|
level: comment.level,
|
||||||
@ -491,8 +474,17 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
onStoryLinkTapped: onStoryLinkTapped,
|
onStoryLinkTapped: onStoryLinkTapped,
|
||||||
onTimeMachineActivated: onTimeMachineActivated,
|
onTimeMachineActivated: onTimeMachineActivated,
|
||||||
),
|
),
|
||||||
);
|
),
|
||||||
},
|
if ((state.status == CommentsStatus.allLoaded &&
|
||||||
|
state.comments.isNotEmpty) ||
|
||||||
|
state.onlyShowTargetComment)
|
||||||
|
SizedBox(
|
||||||
|
height: 240,
|
||||||
|
child: Center(
|
||||||
|
child: Text(happyFace),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -525,7 +517,15 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
Positioned.fill(
|
Positioned.fill(
|
||||||
child: mainView,
|
child: mainView,
|
||||||
),
|
),
|
||||||
Positioned(
|
BlocBuilder<SplitViewCubit, SplitViewState>(
|
||||||
|
buildWhen: (
|
||||||
|
SplitViewState previous,
|
||||||
|
SplitViewState current,
|
||||||
|
) =>
|
||||||
|
previous.expanded != current.expanded,
|
||||||
|
builder:
|
||||||
|
(BuildContext context, SplitViewState state) {
|
||||||
|
return Positioned(
|
||||||
top: 0,
|
top: 0,
|
||||||
left: 0,
|
left: 0,
|
||||||
right: 0,
|
right: 0,
|
||||||
@ -535,9 +535,16 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
.withOpacity(0.6),
|
.withOpacity(0.6),
|
||||||
story: widget.story,
|
story: widget.story,
|
||||||
scrollController: scrollController,
|
scrollController: scrollController,
|
||||||
onBackgroundTap: onFeatureDiscoveryDismissed,
|
onBackgroundTap:
|
||||||
|
onFeatureDiscoveryDismissed,
|
||||||
onDismiss: onFeatureDiscoveryDismissed,
|
onDismiss: onFeatureDiscoveryDismissed,
|
||||||
|
splitViewEnabled: state.enabled,
|
||||||
|
expanded: state.expanded,
|
||||||
|
onZoomTap:
|
||||||
|
context.read<SplitViewCubit>().zoom,
|
||||||
),
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
Positioned(
|
Positioned(
|
||||||
bottom: 0,
|
bottom: 0,
|
||||||
@ -751,12 +758,82 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
final bool upvoted = voteState.vote == Vote.up;
|
final bool upvoted = voteState.vote == Vote.up;
|
||||||
final bool downvoted = voteState.vote == Vote.down;
|
final bool downvoted = voteState.vote == Vote.down;
|
||||||
return Container(
|
return Container(
|
||||||
height: 300,
|
height: item is Comment ? 430 : 450,
|
||||||
color: Theme.of(context).canvasColor,
|
color: Theme.of(context).canvasColor,
|
||||||
child: Material(
|
child: Material(
|
||||||
color: Colors.transparent,
|
color: Colors.transparent,
|
||||||
child: Column(
|
child: Column(
|
||||||
children: <Widget>[
|
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) =>
|
||||||
|
SimpleDialog(
|
||||||
|
title: Text('About ${state.user.id}'),
|
||||||
|
contentPadding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 24,
|
||||||
|
vertical: 12,
|
||||||
|
),
|
||||||
|
children: <Widget>[
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
ButtonBar(
|
||||||
|
children: <Widget>[
|
||||||
|
ElevatedButton(
|
||||||
|
onPressed: () =>
|
||||||
|
Navigator.pop(context),
|
||||||
|
style: ButtonStyle(
|
||||||
|
backgroundColor:
|
||||||
|
MaterialStateProperty.all(
|
||||||
|
Colors.deepOrange,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: const Text(
|
||||||
|
'Okay',
|
||||||
|
style: TextStyle(
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
ListTile(
|
ListTile(
|
||||||
leading: Icon(
|
leading: Icon(
|
||||||
FeatherIcons.chevronUp,
|
FeatherIcons.chevronUp,
|
||||||
@ -785,6 +862,16 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
),
|
),
|
||||||
onTap: context.read<VoteCubit>().downvote,
|
onTap: context.read<VoteCubit>().downvote,
|
||||||
),
|
),
|
||||||
|
ListTile(
|
||||||
|
leading: const Icon(FeatherIcons.share),
|
||||||
|
title: const Text(
|
||||||
|
'Share',
|
||||||
|
),
|
||||||
|
onTap: () => Navigator.pop(
|
||||||
|
context,
|
||||||
|
_MenuAction.share,
|
||||||
|
),
|
||||||
|
),
|
||||||
ListTile(
|
ListTile(
|
||||||
leading: const Icon(Icons.local_police),
|
leading: const Icon(Icons.local_police),
|
||||||
title: const Text(
|
title: const Text(
|
||||||
@ -832,6 +919,9 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
break;
|
break;
|
||||||
case _MenuAction.downvote:
|
case _MenuAction.downvote:
|
||||||
break;
|
break;
|
||||||
|
case _MenuAction.share:
|
||||||
|
onShareTapped(item);
|
||||||
|
break;
|
||||||
case _MenuAction.flag:
|
case _MenuAction.flag:
|
||||||
onFlagTapped(item);
|
onFlagTapped(item);
|
||||||
break;
|
break;
|
||||||
@ -845,6 +935,9 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void onShareTapped(Item item) =>
|
||||||
|
Share.share('https://news.ycombinator.com/item?id=${item.id}');
|
||||||
|
|
||||||
void onFlagTapped(Item item) {
|
void onFlagTapped(Item item) {
|
||||||
showDialog<bool>(
|
showDialog<bool>(
|
||||||
context: context,
|
context: context,
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
import 'package:flutter/material.dart';
|
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/models/models.dart';
|
||||||
import 'package:hacki/screens/story/widgets/fav_icon_button.dart';
|
import 'package:hacki/screens/story/widgets/fav_icon_button.dart';
|
||||||
import 'package:hacki/screens/story/widgets/link_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 Color backgroundColor,
|
||||||
required Future<bool> Function() onBackgroundTap,
|
required Future<bool> Function() onBackgroundTap,
|
||||||
required Future<bool> Function() onDismiss,
|
required Future<bool> Function() onDismiss,
|
||||||
|
bool splitViewEnabled = false,
|
||||||
|
VoidCallback? onZoomTap,
|
||||||
|
bool? expanded,
|
||||||
}) : super(
|
}) : super(
|
||||||
key: key,
|
key: key,
|
||||||
backgroundColor: backgroundColor,
|
backgroundColor: backgroundColor,
|
||||||
elevation: 0,
|
elevation: 0,
|
||||||
actions: <Widget>[
|
actions: <Widget>[
|
||||||
|
if (splitViewEnabled) ...<Widget>[
|
||||||
|
IconButton(
|
||||||
|
icon: Icon(
|
||||||
|
expanded ?? false
|
||||||
|
? FeatherIcons.minimize2
|
||||||
|
: FeatherIcons.maximize2,
|
||||||
|
size: 20,
|
||||||
|
),
|
||||||
|
onPressed: () {
|
||||||
|
HapticFeedback.lightImpact();
|
||||||
|
onZoomTap?.call();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
const Spacer(),
|
||||||
|
],
|
||||||
ScrollUpIconButton(
|
ScrollUpIconButton(
|
||||||
scrollController: scrollController,
|
scrollController: scrollController,
|
||||||
),
|
),
|
||||||
|
@ -25,6 +25,7 @@ class FavIconButton extends StatelessWidget {
|
|||||||
builder: (BuildContext context, FavState favState) {
|
builder: (BuildContext context, FavState favState) {
|
||||||
final bool isFav = favState.favIds.contains(storyId);
|
final bool isFav = favState.favIds.contains(storyId);
|
||||||
return IconButton(
|
return IconButton(
|
||||||
|
tooltip: 'Add to favorites',
|
||||||
icon: DescribedFeatureOverlay(
|
icon: DescribedFeatureOverlay(
|
||||||
onBackgroundTap: onBackgroundTap,
|
onBackgroundTap: onBackgroundTap,
|
||||||
onDismiss: onDismiss,
|
onDismiss: onDismiss,
|
||||||
|
@ -21,6 +21,7 @@ class LinkIconButton extends StatelessWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return IconButton(
|
return IconButton(
|
||||||
|
tooltip: 'Open this story in browser',
|
||||||
icon: DescribedFeatureOverlay(
|
icon: DescribedFeatureOverlay(
|
||||||
onBackgroundTap: onBackgroundTap,
|
onBackgroundTap: onBackgroundTap,
|
||||||
onDismiss: onDismiss,
|
onDismiss: onDismiss,
|
||||||
|
@ -31,6 +31,7 @@ class PinIconButton extends StatelessWidget {
|
|||||||
child: Transform.translate(
|
child: Transform.translate(
|
||||||
offset: const Offset(2, 0),
|
offset: const Offset(2, 0),
|
||||||
child: IconButton(
|
child: IconButton(
|
||||||
|
tooltip: 'Pin to home screen',
|
||||||
icon: DescribedFeatureOverlay(
|
icon: DescribedFeatureOverlay(
|
||||||
onBackgroundTap: onBackgroundTap,
|
onBackgroundTap: onBackgroundTap,
|
||||||
onDismiss: onDismiss,
|
onDismiss: onDismiss,
|
||||||
|
@ -189,6 +189,7 @@ class _ReplyBoxState extends State<ReplyBox> {
|
|||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
),
|
),
|
||||||
keyboardType: TextInputType.multiline,
|
keyboardType: TextInputType.multiline,
|
||||||
|
textCapitalization: TextCapitalization.sentences,
|
||||||
textInputAction: TextInputAction.newline,
|
textInputAction: TextInputAction.newline,
|
||||||
onChanged: widget.onChanged,
|
onChanged: widget.onChanged,
|
||||||
),
|
),
|
||||||
|
@ -187,6 +187,7 @@ class _SubmitScreenState extends State<SubmitScreen> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
onChanged: context.read<SubmitCubit>().onTextChanged,
|
onChanged: context.read<SubmitCubit>().onTextChanged,
|
||||||
|
textCapitalization: TextCapitalization.sentences,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
@ -38,6 +38,7 @@ class CommentTile extends StatelessWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return BlocProvider<CollapseCubit>(
|
return BlocProvider<CollapseCubit>(
|
||||||
|
key: ValueKey<String>('${comment.id}-BlocProvider'),
|
||||||
lazy: false,
|
lazy: false,
|
||||||
create: (_) => CollapseCubit(
|
create: (_) => CollapseCubit(
|
||||||
commentId: comment.id,
|
commentId: comment.id,
|
||||||
@ -209,8 +210,39 @@ class CommentTile extends StatelessWidget {
|
|||||||
top: 6,
|
top: 6,
|
||||||
bottom: 12,
|
bottom: 12,
|
||||||
),
|
),
|
||||||
child: SelectableLinkify(
|
child: comment is BuildableComment
|
||||||
key: ObjectKey(comment),
|
? 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,
|
text: comment.text,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: MediaQuery.of(context)
|
fontSize: MediaQuery.of(context)
|
||||||
@ -227,7 +259,8 @@ class CommentTile extends StatelessWidget {
|
|||||||
if (link.url.contains(
|
if (link.url.contains(
|
||||||
'news.ycombinator.com/item',
|
'news.ycombinator.com/item',
|
||||||
)) {
|
)) {
|
||||||
onStoryLinkTapped.call(link.url);
|
onStoryLinkTapped
|
||||||
|
.call(link.url);
|
||||||
} else {
|
} else {
|
||||||
LinkUtil.launch(link.url);
|
LinkUtil.launch(link.url);
|
||||||
}
|
}
|
||||||
|
@ -87,7 +87,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
|
|||||||
)
|
)
|
||||||
: null,
|
: null,
|
||||||
child: StoryTile(
|
child: StoryTile(
|
||||||
key: ObjectKey(e),
|
key: ValueKey<int>(e.id),
|
||||||
story: e,
|
story: e,
|
||||||
onTap: () => onTap(e),
|
onTap: () => onTap(e),
|
||||||
showWebPreview: showWebPreview,
|
showWebPreview: showWebPreview,
|
||||||
|
@ -141,7 +141,7 @@ class _LinkPreviewState extends State<LinkPreview> {
|
|||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
_info = await WebAnalyzer.getInfo(
|
_info = await WebAnalyzer.getInfo(
|
||||||
widget.story.id.toString(),
|
null,
|
||||||
story: widget.story,
|
story: widget.story,
|
||||||
cache: widget.cache,
|
cache: widget.cache,
|
||||||
);
|
);
|
||||||
@ -188,8 +188,8 @@ class _LinkPreviewState extends State<LinkPreview> {
|
|||||||
key: widget.key ?? Key(widget.link),
|
key: widget.key ?? Key(widget.link),
|
||||||
metadata: widget.story.simpleMetadata,
|
metadata: widget.story.simpleMetadata,
|
||||||
url: widget.link,
|
url: widget.link,
|
||||||
title: title!,
|
title: widget.story.title,
|
||||||
description: desc!,
|
description: desc ?? title ?? 'no comments yet.',
|
||||||
imageUri: imageUri,
|
imageUri: imageUri,
|
||||||
imagePath: Constants.hackerNewsLogoPath,
|
imagePath: Constants.hackerNewsLogoPath,
|
||||||
onTap: _launchURL,
|
onTap: _launchURL,
|
||||||
@ -228,16 +228,6 @@ class _LinkPreviewState extends State<LinkPreview> {
|
|||||||
|
|
||||||
Widget loadedWidget;
|
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?;
|
final WebInfo? info = _info as WebInfo?;
|
||||||
loadedWidget = _info == null
|
loadedWidget = _info == null
|
||||||
? _buildLinkContainer(
|
? _buildLinkContainer(
|
||||||
@ -261,7 +251,6 @@ class _LinkPreviewState extends State<LinkPreview> {
|
|||||||
: null,
|
: null,
|
||||||
isIcon: !WebAnalyzer.isNotEmpty(info.image),
|
isIcon: !WebAnalyzer.isNotEmpty(info.image),
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
return AnimatedCrossFade(
|
return AnimatedCrossFade(
|
||||||
firstChild: loadingWidget,
|
firstChild: loadingWidget,
|
||||||
|
@ -5,7 +5,6 @@ import 'dart:io';
|
|||||||
import 'package:collection/collection.dart' show IterableExtension;
|
import 'package:collection/collection.dart' show IterableExtension;
|
||||||
import 'package:fast_gbk/fast_gbk.dart';
|
import 'package:fast_gbk/fast_gbk.dart';
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:hacki/config/locator.dart';
|
|
||||||
import 'package:hacki/extensions/extensions.dart';
|
import 'package:hacki/extensions/extensions.dart';
|
||||||
import 'package:hacki/models/models.dart';
|
import 'package:hacki/models/models.dart';
|
||||||
import 'package:hacki/repositories/repositories.dart';
|
import 'package:hacki/repositories/repositories.dart';
|
||||||
@ -16,6 +15,7 @@ import 'package:http/io_client.dart';
|
|||||||
|
|
||||||
abstract class InfoBase {
|
abstract class InfoBase {
|
||||||
late DateTime _timeout;
|
late DateTime _timeout;
|
||||||
|
late bool _shouldRetry;
|
||||||
|
|
||||||
Map<String, dynamic> toJson();
|
Map<String, dynamic> toJson();
|
||||||
}
|
}
|
||||||
@ -114,22 +114,29 @@ class WebAnalyzer {
|
|||||||
bool multimedia = true,
|
bool multimedia = true,
|
||||||
}) async {
|
}) async {
|
||||||
InfoBase? info = getInfoFromCache(url);
|
InfoBase? info = getInfoFromCache(url);
|
||||||
|
|
||||||
if (info != null) return info;
|
if (info != null) return info;
|
||||||
|
|
||||||
if (story.url.isEmpty && story.text.isNotEmpty) {
|
if (story.url.isEmpty && story.text.isNotEmpty) {
|
||||||
info = WebInfo(
|
info = WebInfo(
|
||||||
title: story.title,
|
title: story.title,
|
||||||
description: story.text,
|
description: story.text,
|
||||||
).._timeout = DateTime.now().add(cache);
|
)
|
||||||
|
.._timeout = DateTime.now().add(cache)
|
||||||
|
.._shouldRetry = false;
|
||||||
cacheMap[story.id.toString()] = info;
|
cacheMap[story.id.toString()] = info;
|
||||||
|
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
info = await _getInfoByIsolate(url, multimedia);
|
info = await _getInfoByIsolate(
|
||||||
|
url: url,
|
||||||
|
multimedia: multimedia,
|
||||||
|
story: story,
|
||||||
|
);
|
||||||
|
|
||||||
if (info != null) {
|
if (info != null && !info._shouldRetry) {
|
||||||
info._timeout = DateTime.now().add(cache);
|
info._timeout = DateTime.now().add(cache);
|
||||||
cacheMap[url] = info;
|
cacheMap[url] = info;
|
||||||
}
|
}
|
||||||
@ -137,42 +144,6 @@ class WebAnalyzer {
|
|||||||
//locator.get<Logger>().log(Level.error, 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 {
|
|
||||||
int index = 0;
|
|
||||||
Comment? comment;
|
|
||||||
|
|
||||||
while (comment == null && index < story.kids.length) {
|
|
||||||
comment = await locator
|
|
||||||
.get<CacheRepository>()
|
|
||||||
.getCachedComment(id: story.kids.elementAt(index));
|
|
||||||
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,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!shouldRetry) {
|
|
||||||
info._timeout = DateTime.now().add(cache);
|
|
||||||
cacheMap[url] = info;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -195,36 +166,66 @@ class WebAnalyzer {
|
|||||||
return _getWebInfo(response, url, multimedia);
|
return _getWebInfo(response, url, multimedia);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Future<InfoBase?> _getInfoByIsolate(
|
static Future<InfoBase?> _getInfoByIsolate({
|
||||||
String? url,
|
String? url,
|
||||||
bool multimedia,
|
required bool multimedia,
|
||||||
) async {
|
required Story story,
|
||||||
final List<dynamic>? res = await compute(
|
}) async {
|
||||||
_isolate,
|
List<dynamic>? res;
|
||||||
|
|
||||||
|
if (url != null) {
|
||||||
|
res = await compute(
|
||||||
|
_fetchInfoFromUrl,
|
||||||
<dynamic>[url, multimedia],
|
<dynamic>[url, multimedia],
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
late final bool shouldRetry;
|
||||||
InfoBase? info;
|
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 != null) {
|
||||||
if (res[0] == '0') {
|
if (res[0] == '0') {
|
||||||
info = WebInfo(
|
info = WebInfo(
|
||||||
title: res[1] as String?,
|
title: story.title,
|
||||||
description:
|
description: isEmpty(res[2] as String?)
|
||||||
res[2] == null ? null : (res[2] as String).removeAllEmojis(),
|
? (fallbackDescription ??
|
||||||
|
(story.text.isEmpty ? res[1] as String? : story.text))
|
||||||
|
: (res[2] as String).removeAllEmojis(),
|
||||||
icon: res[3] as String?,
|
icon: res[3] as String?,
|
||||||
image: res[4] as String?,
|
image: res[4] as String?,
|
||||||
);
|
).._shouldRetry = shouldRetry;
|
||||||
} else if (res[0] == '1') {
|
} else {
|
||||||
info = WebVideoInfo(image: res[1] as String);
|
info = WebInfo(
|
||||||
} else if (res[0] == '2') {
|
image: res[1] as String,
|
||||||
info = WebImageInfo(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;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Future<List<dynamic>?> _isolate(dynamic message) async {
|
static Future<List<dynamic>?> _fetchInfoFromUrl(dynamic message) async {
|
||||||
|
try {
|
||||||
// ignore: avoid_dynamic_calls
|
// ignore: avoid_dynamic_calls
|
||||||
final String url = message[0] as String;
|
final String url = message[0] as String;
|
||||||
// ignore: avoid_dynamic_calls
|
// ignore: avoid_dynamic_calls
|
||||||
@ -247,6 +248,30 @@ class WebAnalyzer {
|
|||||||
} else {
|
} else {
|
||||||
return null;
|
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)
|
||||||
|
.catchError((Object err) async {
|
||||||
|
int index = 0;
|
||||||
|
Comment? comment;
|
||||||
|
|
||||||
|
while (comment == null && index < kids.length) {
|
||||||
|
comment =
|
||||||
|
await CacheRepository().getCachedComment(id: kids.elementAt(index));
|
||||||
|
index++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return comment;
|
||||||
|
});
|
||||||
|
|
||||||
|
return comment != null ? '${comment.by}: ${comment.text}' : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool _certificateCheck(X509Certificate cert, String host, int port) =>
|
static bool _certificateCheck(X509Certificate cert, String host, int port) =>
|
||||||
@ -275,13 +300,9 @@ class WebAnalyzer {
|
|||||||
..headers['accept'] =
|
..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';
|
'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 =
|
final IOStreamedResponse stream =
|
||||||
await client.send(request).catchError((dynamic err) {
|
await client.send(request).timeout(const Duration(seconds: 10));
|
||||||
// locator.get<Logger>().log(
|
|
||||||
// Level.error,
|
|
||||||
// 'Error in getting the link => ${request.url}\n$err',
|
|
||||||
// );
|
|
||||||
});
|
|
||||||
|
|
||||||
if (stream.statusCode == HttpStatus.movedTemporarily ||
|
if (stream.statusCode == HttpStatus.movedTemporarily ||
|
||||||
stream.statusCode == HttpStatus.movedPermanently) {
|
stream.statusCode == HttpStatus.movedPermanently) {
|
||||||
@ -315,6 +336,9 @@ class WebAnalyzer {
|
|||||||
}
|
}
|
||||||
client.close();
|
client.close();
|
||||||
return res;
|
return res;
|
||||||
|
} catch (_) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static Future<InfoBase?> _getWebInfo(
|
static Future<InfoBase?> _getWebInfo(
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
export 'circle_tab_indicator.dart';
|
export 'circle_tab_indicator.dart';
|
||||||
export 'comment_tile.dart';
|
export 'comment_tile.dart';
|
||||||
export 'countdown_reminder.dart';
|
export 'countdown_reminder.dart';
|
||||||
|
export 'custom_chip.dart';
|
||||||
export 'custom_circular_progress_indicator.dart';
|
export 'custom_circular_progress_indicator.dart';
|
||||||
export 'items_list_view.dart';
|
export 'items_list_view.dart';
|
||||||
export 'link_preview/link_preview.dart';
|
export 'link_preview/link_preview.dart';
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
|
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
|
||||||
import 'package:url_launcher/url_launcher.dart';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
@ -20,6 +22,9 @@ abstract class LinkUtil {
|
|||||||
canLaunchUrl(uri).then((bool val) {
|
canLaunchUrl(uri).then((bool val) {
|
||||||
if (val) {
|
if (val) {
|
||||||
if (link.contains('http')) {
|
if (link.contains('http')) {
|
||||||
|
if (Platform.isAndroid) {
|
||||||
|
launchUrl(uri, mode: LaunchMode.externalApplication);
|
||||||
|
} else {
|
||||||
_browser
|
_browser
|
||||||
.open(
|
.open(
|
||||||
url: uri,
|
url: uri,
|
||||||
@ -31,6 +36,7 @@ abstract class LinkUtil {
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
.onError((_, __) => launchUrl(uri));
|
.onError((_, __) => launchUrl(uri));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
launchUrl(uri);
|
launchUrl(uri);
|
||||||
}
|
}
|
||||||
|
51
pubspec.lock
@ -414,6 +414,13 @@ packages:
|
|||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.1.2"
|
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:
|
flutter_slidable:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@ -804,6 +811,48 @@ packages:
|
|||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "3.2.0"
|
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:
|
shared_preferences:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@ -1032,7 +1081,7 @@ packages:
|
|||||||
name: url_launcher
|
name: url_launcher
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "6.1.2"
|
version: "6.1.3"
|
||||||
url_launcher_android:
|
url_launcher_android:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
name: hacki
|
name: hacki
|
||||||
description: A Hacker News reader.
|
description: A Hacker News reader.
|
||||||
version: 0.2.13+52
|
version: 0.2.18+57
|
||||||
publish_to: none
|
publish_to: none
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
@ -33,6 +33,7 @@ dependencies:
|
|||||||
flutter_linkify: ^5.0.2
|
flutter_linkify: ^5.0.2
|
||||||
flutter_local_notifications: ^9.5.0
|
flutter_local_notifications: ^9.5.0
|
||||||
flutter_secure_storage: ^5.0.2
|
flutter_secure_storage: ^5.0.2
|
||||||
|
flutter_siri_suggestions: ^2.1.0
|
||||||
flutter_slidable: ^1.2.1
|
flutter_slidable: ^1.2.1
|
||||||
font_awesome_flutter: ^9.2.0
|
font_awesome_flutter: ^9.2.0
|
||||||
gbk_codec: ^0.4.0
|
gbk_codec: ^0.4.0
|
||||||
@ -56,6 +57,7 @@ dependencies:
|
|||||||
responsive_builder: ^0.4.2
|
responsive_builder: ^0.4.2
|
||||||
rxdart: ^0.27.3
|
rxdart: ^0.27.3
|
||||||
sembast: ^3.1.1+1
|
sembast: ^3.1.1+1
|
||||||
|
share_plus: ^4.0.8
|
||||||
shared_preferences: ^2.0.11
|
shared_preferences: ^2.0.11
|
||||||
shared_preferences_android: ^2.0.11
|
shared_preferences_android: ^2.0.11
|
||||||
shared_preferences_ios: ^2.0.11
|
shared_preferences_ios: ^2.0.11
|
||||||
@ -64,7 +66,7 @@ dependencies:
|
|||||||
path: components/synced_shared_preferences
|
path: components/synced_shared_preferences
|
||||||
tuple: ^2.0.0
|
tuple: ^2.0.0
|
||||||
universal_platform: ^1.0.0+1
|
universal_platform: ^1.0.0+1
|
||||||
url_launcher: ^6.0.10
|
url_launcher: ^6.1.3
|
||||||
wakelock: ^0.6.1+2
|
wakelock: ^0.6.1+2
|
||||||
workmanager: ^0.5.0
|
workmanager: ^0.5.0
|
||||||
|
|
||||||
|