mirror of
https://github.com/Livinglist/Hacki.git
synced 2025-08-06 18:24:42 +08:00
Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
d506297f4c | |||
4e8cf9837f | |||
f73269404a |
14
README.md
14
README.md
@ -36,18 +36,18 @@ Features:
|
||||
|
||||
|
||||
<p align="center">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799288-6e98352a-fe89-4a2e-8a74-c5782463a1e1.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799297-75b52eac-2066-4df9-bdfc-7c82bf7b81c8.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799302-860c61b8-abba-486a-9592-bc84a6af3232.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799305-308743d3-1c89-45de-9645-3b6ec789c282.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798176-5212e9bf-296d-4d9b-ab48-19b741684c8a.png">
|
||||
<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/171992215-5b43443b-f2b0-4b6e-9a30-a583fda1b189.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798186-1457ae21-f1aa-40a4-9206-0f3a1e24653e.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798187-4404adea-b2bc-472e-8568-2379e6db01a4.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">
|
||||
<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">
|
||||
|
@ -5,4 +5,5 @@ linter:
|
||||
public_member_api_docs: false
|
||||
library_private_types_in_public_api: false
|
||||
omit_local_variable_types: false
|
||||
one_member_abstracts: false
|
||||
always_specify_types: true
|
@ -9,6 +9,10 @@
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<data android:scheme="https" />
|
||||
</intent>
|
||||
<intent>
|
||||
<action android:name="android.intent.action.SEND" />
|
||||
<data android:mimeType="*/*" />
|
||||
</intent>
|
||||
</queries>
|
||||
|
||||
<application
|
||||
|
5
fastlane/metadata/android/en-US/changelogs/52.txt
Normal file
5
fastlane/metadata/android/en-US/changelogs/52.txt
Normal file
@ -0,0 +1,5 @@
|
||||
- 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/53.txt
Normal file
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.
|
Binary file not shown.
Before Width: | Height: | Size: 420 KiB After Width: | Height: | Size: 617 KiB |
@ -568,7 +568,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 3;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
@ -577,7 +577,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 0.2.12;
|
||||
MARKETING_VERSION = 0.2.14;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
@ -705,7 +705,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 3;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
@ -714,7 +714,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 0.2.12;
|
||||
MARKETING_VERSION = 0.2.14;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
@ -736,7 +736,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 3;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
@ -745,7 +745,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 0.2.12;
|
||||
MARKETING_VERSION = 0.2.14;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
|
@ -39,6 +39,12 @@
|
||||
</array>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>$(CURRENT_PROJECT_VERSION)</string>
|
||||
<key>LSApplicationQueriesSchemes</key>
|
||||
<array>
|
||||
<string>https</string>
|
||||
<string>http</string>
|
||||
<string>mailto</string>
|
||||
</array>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
<true/>
|
||||
<key>UIBackgroundModes</key>
|
||||
|
@ -55,21 +55,21 @@ class CollapseCubit extends Cubit<CollapseState> {
|
||||
}
|
||||
|
||||
void hiddenCommentsStreamListener(Map<int, Set<int>> event) {
|
||||
int collapsedCount = 0;
|
||||
for (final int key in event.keys) {
|
||||
if (key == _commentId && !isClosed) {
|
||||
emit(
|
||||
state.copyWith(
|
||||
collapsedCount: event[key]?.length ?? 0,
|
||||
),
|
||||
);
|
||||
return;
|
||||
collapsedCount = event[key]?.length ?? 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (final Set<int> val in event.values) {
|
||||
if (val.contains(_commentId) && !isClosed) {
|
||||
emit(
|
||||
state.copyWith(hidden: true),
|
||||
state.copyWith(
|
||||
hidden: true,
|
||||
collapsedCount: collapsedCount,
|
||||
),
|
||||
);
|
||||
return;
|
||||
}
|
||||
@ -77,7 +77,10 @@ class CollapseCubit extends Cubit<CollapseState> {
|
||||
|
||||
if (!isClosed) {
|
||||
emit(
|
||||
state.copyWith(hidden: false),
|
||||
state.copyWith(
|
||||
hidden: false,
|
||||
collapsedCount: collapsedCount,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -1,3 +1,5 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:bloc/bloc.dart';
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:hacki/config/locator.dart';
|
||||
@ -13,42 +15,94 @@ class SearchCubit extends Cubit<SearchState> {
|
||||
|
||||
final SearchRepository _searchRepository;
|
||||
|
||||
StreamSubscription<Story>? streamSubscription;
|
||||
|
||||
void search(String query) {
|
||||
streamSubscription?.cancel();
|
||||
emit(
|
||||
state.copyWith(
|
||||
results: <Story>[],
|
||||
currentPage: 0,
|
||||
status: SearchStatus.loading,
|
||||
query: query,
|
||||
searchFilters: state.searchFilters.copyWith(query: query, page: 0),
|
||||
),
|
||||
);
|
||||
_searchRepository.search(query).listen(_onStoryFetched).onDone(() {
|
||||
emit(state.copyWith(status: SearchStatus.loaded));
|
||||
});
|
||||
streamSubscription = _searchRepository
|
||||
.search(filters: state.searchFilters)
|
||||
.listen(_onStoryFetched)
|
||||
..onDone(() {
|
||||
emit(state.copyWith(status: SearchStatus.loaded));
|
||||
});
|
||||
}
|
||||
|
||||
void loadMore() {
|
||||
final int updatedPage = state.currentPage + 1;
|
||||
if (state.status != SearchStatus.loading) {
|
||||
final int updatedPage = state.searchFilters.page + 1;
|
||||
emit(
|
||||
state.copyWith(
|
||||
status: SearchStatus.loadingMore,
|
||||
searchFilters: state.searchFilters.copyWith(page: updatedPage),
|
||||
),
|
||||
);
|
||||
streamSubscription = _searchRepository
|
||||
.search(filters: state.searchFilters)
|
||||
.listen(_onStoryFetched)
|
||||
..onDone(() {
|
||||
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(
|
||||
status: SearchStatus.loadingMore,
|
||||
currentPage: updatedPage,
|
||||
searchFilters: state.searchFilters.copyWithFilterAdded(filter),
|
||||
),
|
||||
);
|
||||
_searchRepository
|
||||
.search(state.query, page: updatedPage)
|
||||
.listen(_onStoryFetched)
|
||||
.onDone(() {
|
||||
emit(state.copyWith(status: SearchStatus.loaded));
|
||||
});
|
||||
|
||||
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) {
|
||||
emit(
|
||||
state.copyWith(
|
||||
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 {
|
||||
const SearchState({
|
||||
required this.query,
|
||||
required this.status,
|
||||
required this.results,
|
||||
required this.currentPage,
|
||||
required this.searchFilters,
|
||||
});
|
||||
|
||||
SearchState.init()
|
||||
: query = '',
|
||||
status = SearchStatus.initial,
|
||||
: status = SearchStatus.initial,
|
||||
results = <Story>[],
|
||||
currentPage = 0;
|
||||
searchFilters = SearchFilters.init();
|
||||
|
||||
final String query;
|
||||
final List<Story> results;
|
||||
final SearchStatus status;
|
||||
final int currentPage;
|
||||
final SearchFilters searchFilters;
|
||||
|
||||
SearchState copyWith({
|
||||
String? query,
|
||||
List<Story>? results,
|
||||
SearchStatus? status,
|
||||
int? currentPage,
|
||||
SearchFilters? searchFilters,
|
||||
}) {
|
||||
return SearchState(
|
||||
query: query ?? this.query,
|
||||
results: results ?? this.results,
|
||||
status: status ?? this.status,
|
||||
currentPage: currentPage ?? this.currentPage,
|
||||
searchFilters: searchFilters ?? this.searchFilters,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
List<Object?> get props => <Object?>[
|
||||
query,
|
||||
status,
|
||||
results,
|
||||
currentPage,
|
||||
searchFilters,
|
||||
];
|
||||
}
|
||||
|
@ -2,5 +2,6 @@ export 'comment.dart';
|
||||
export 'item.dart';
|
||||
export 'poll_option.dart';
|
||||
export 'post_data.dart';
|
||||
export 'search_filters.dart';
|
||||
export 'story.dart';
|
||||
export 'user.dart';
|
||||
|
104
lib/models/search_filter.dart
Normal file
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
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,
|
||||
];
|
||||
}
|
@ -6,12 +6,14 @@ import 'package:hacki/utils/utils.dart';
|
||||
class SearchRepository {
|
||||
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;
|
||||
|
||||
Stream<Story> search(String query, {int page = 0}) async* {
|
||||
final String url = '$_baseUrl${Uri.encodeComponent(query)}&page=$page';
|
||||
Stream<Story> search({
|
||||
required SearchFilters filters,
|
||||
}) async* {
|
||||
final String url = '$_baseUrl${filters.filteredQuery}';
|
||||
final Response<Map<String, dynamic>> response =
|
||||
await _dio.get<Map<String, dynamic>>(url);
|
||||
final Map<String, dynamic>? data = response.data;
|
||||
|
@ -445,7 +445,7 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
}
|
||||
|
||||
if (!offlineReading && (isJobWithLink || (showWebFirst && !hasRead))) {
|
||||
LinkUtil.launchUrl(story.url, useReader: useReader);
|
||||
LinkUtil.launch(story.url, useReader: useReader);
|
||||
}
|
||||
|
||||
context.read<StoriesBloc>().add(
|
||||
|
@ -407,7 +407,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
showAboutDialog(
|
||||
context: context,
|
||||
applicationName: 'Hacki',
|
||||
applicationVersion: 'v0.2.12',
|
||||
applicationVersion: 'v0.2.14',
|
||||
applicationIcon: ClipRRect(
|
||||
borderRadius: const BorderRadius.all(
|
||||
Radius.circular(12),
|
||||
@ -420,7 +420,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
),
|
||||
children: <Widget>[
|
||||
ElevatedButton(
|
||||
onPressed: () => LinkUtil.launchUrl(
|
||||
onPressed: () => LinkUtil.launch(
|
||||
Constants.portfolioLink,
|
||||
),
|
||||
child: Row(
|
||||
@ -436,7 +436,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
),
|
||||
),
|
||||
ElevatedButton(
|
||||
onPressed: () => LinkUtil.launchUrl(
|
||||
onPressed: () => LinkUtil.launch(
|
||||
Constants.githubLink,
|
||||
),
|
||||
child: Row(
|
||||
@ -452,7 +452,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
),
|
||||
),
|
||||
ElevatedButton(
|
||||
onPressed: () => LinkUtil.launchUrl(
|
||||
onPressed: () => LinkUtil.launch(
|
||||
Platform.isIOS
|
||||
? Constants.appStoreLink
|
||||
: Constants.googlePlayLink,
|
||||
@ -823,7 +823,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
child: Transform.translate(
|
||||
offset: const Offset(0, 1),
|
||||
child: TapDownWrapper(
|
||||
onTap: () => LinkUtil.launchUrl(
|
||||
onTap: () => LinkUtil.launch(
|
||||
Constants.endUserAgreementLink,
|
||||
),
|
||||
child: const Text(
|
||||
|
@ -107,7 +107,7 @@ class InboxView extends StatelessWidget {
|
||||
),
|
||||
maxLines: 4,
|
||||
onOpen: (LinkableElement link) =>
|
||||
LinkUtil.launchUrl(link.url),
|
||||
LinkUtil.launch(link.url),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
@ -1,4 +1,3 @@
|
||||
export 'centered_message_view.dart';
|
||||
export 'custom_chip.dart';
|
||||
export 'inbox_view.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:hacki/cubits/cubits.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/search/widgets/widgets.dart';
|
||||
import 'package:hacki/screens/widgets/widgets.dart';
|
||||
import 'package:hacki/utils/utils.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(
|
||||
height: 100,
|
||||
),
|
||||
|
75
lib/screens/search/widgets/custom_range_filter_chip.dart
Normal file
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
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
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
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';
|
@ -140,6 +140,7 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
delay: _featureDiscoveryDismissThrottleDelay,
|
||||
);
|
||||
|
||||
static const int _extraItemsCount = 2;
|
||||
static const Duration _storyLinkTapThrottleDelay = Duration(seconds: 2);
|
||||
static const Duration _featureDiscoveryDismissThrottleDelay =
|
||||
Duration(seconds: 1);
|
||||
@ -269,209 +270,229 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
onLoading: () {
|
||||
context.read<CommentsCubit>().loadMore();
|
||||
},
|
||||
child: ListView(
|
||||
child: ListView.builder(
|
||||
primary: false,
|
||||
children: <Widget>[
|
||||
SizedBox(
|
||||
height: topPadding,
|
||||
),
|
||||
if (!widget.splitViewEnabled)
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(bottom: 6),
|
||||
child: OfflineBanner(),
|
||||
),
|
||||
Slidable(
|
||||
startActionPane: ActionPane(
|
||||
motion: const BehindMotion(),
|
||||
itemCount: state.comments.length + _extraItemsCount,
|
||||
itemBuilder: (BuildContext context, int index) {
|
||||
if (index == 0) {
|
||||
return Column(
|
||||
children: <Widget>[
|
||||
SlidableAction(
|
||||
onPressed: (_) {
|
||||
HapticFeedback.lightImpact();
|
||||
|
||||
if (widget.story !=
|
||||
context.read<EditCubit>().state.replyingTo) {
|
||||
commentEditingController.clear();
|
||||
}
|
||||
context
|
||||
.read<EditCubit>()
|
||||
.onReplyTapped(widget.story);
|
||||
focusNode.requestFocus();
|
||||
},
|
||||
backgroundColor: Colors.orange,
|
||||
foregroundColor: Colors.white,
|
||||
icon: Icons.message,
|
||||
SizedBox(
|
||||
height: topPadding,
|
||||
),
|
||||
SlidableAction(
|
||||
onPressed: (_) => onMorePressed(widget.story),
|
||||
backgroundColor: Colors.orange,
|
||||
foregroundColor: Colors.white,
|
||||
icon: Icons.more_horiz,
|
||||
),
|
||||
],
|
||||
),
|
||||
child: Column(
|
||||
children: <Widget>[
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 6,
|
||||
right: 6,
|
||||
if (!widget.splitViewEnabled)
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(bottom: 6),
|
||||
child: OfflineBanner(),
|
||||
),
|
||||
child: Row(
|
||||
Slidable(
|
||||
startActionPane: ActionPane(
|
||||
motion: const BehindMotion(),
|
||||
children: <Widget>[
|
||||
Text(
|
||||
widget.story.by,
|
||||
style: const TextStyle(
|
||||
color: Colors.orange,
|
||||
),
|
||||
SlidableAction(
|
||||
onPressed: (_) {
|
||||
HapticFeedback.lightImpact();
|
||||
|
||||
if (widget.story !=
|
||||
context
|
||||
.read<EditCubit>()
|
||||
.state
|
||||
.replyingTo) {
|
||||
commentEditingController.clear();
|
||||
}
|
||||
context
|
||||
.read<EditCubit>()
|
||||
.onReplyTapped(widget.story);
|
||||
focusNode.requestFocus();
|
||||
},
|
||||
backgroundColor: Colors.orange,
|
||||
foregroundColor: Colors.white,
|
||||
icon: Icons.message,
|
||||
),
|
||||
const Spacer(),
|
||||
Text(
|
||||
widget.story.postedDate,
|
||||
style: const TextStyle(
|
||||
color: Colors.grey,
|
||||
),
|
||||
SlidableAction(
|
||||
onPressed: (_) => onMorePressed(widget.story),
|
||||
backgroundColor: Colors.orange,
|
||||
foregroundColor: Colors.white,
|
||||
icon: Icons.more_horiz,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
InkWell(
|
||||
onTap: () => LinkUtil.launchUrl(
|
||||
widget.story.url,
|
||||
useReader: context
|
||||
.read<PreferenceCubit>()
|
||||
.state
|
||||
.useReader,
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 6,
|
||||
right: 6,
|
||||
bottom: 12,
|
||||
top: 12,
|
||||
),
|
||||
child: Text(
|
||||
widget.story.title,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: widget.story.url.isNotEmpty
|
||||
? Colors.orange
|
||||
: null,
|
||||
child: Column(
|
||||
children: <Widget>[
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 6,
|
||||
right: 6,
|
||||
),
|
||||
child: Row(
|
||||
children: <Widget>[
|
||||
Text(
|
||||
widget.story.by,
|
||||
style: const TextStyle(
|
||||
color: Colors.orange,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
Text(
|
||||
widget.story.postedDate,
|
||||
style: const TextStyle(
|
||||
color: Colors.grey,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
InkWell(
|
||||
onTap: () => LinkUtil.launch(
|
||||
widget.story.url,
|
||||
useReader: context
|
||||
.read<PreferenceCubit>()
|
||||
.state
|
||||
.useReader,
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 6,
|
||||
right: 6,
|
||||
bottom: 12,
|
||||
top: 12,
|
||||
),
|
||||
child: Text(
|
||||
widget.story.title,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: widget.story.url.isNotEmpty
|
||||
? Colors.orange
|
||||
: null,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
if (widget.story.text.isNotEmpty)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 10,
|
||||
),
|
||||
child: SelectableLinkify(
|
||||
text: widget.story.text,
|
||||
style: TextStyle(
|
||||
fontSize: MediaQuery.of(context)
|
||||
.textScaleFactor *
|
||||
15,
|
||||
),
|
||||
linkStyle: TextStyle(
|
||||
fontSize: MediaQuery.of(context)
|
||||
.textScaleFactor *
|
||||
15,
|
||||
color: Colors.orange,
|
||||
),
|
||||
onOpen: (LinkableElement link) {
|
||||
if (link.url.contains(
|
||||
'news.ycombinator.com/item',
|
||||
)) {
|
||||
onStoryLinkTapped(link.url);
|
||||
} else {
|
||||
LinkUtil.launch(link.url);
|
||||
}
|
||||
},
|
||||
),
|
||||
),
|
||||
if (widget.story.isPoll)
|
||||
PollView(
|
||||
onLoginTapped: onLoginTapped,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (widget.story.text.isNotEmpty)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 10,
|
||||
),
|
||||
child: SelectableLinkify(
|
||||
text: widget.story.text,
|
||||
style: TextStyle(
|
||||
fontSize:
|
||||
MediaQuery.of(context).textScaleFactor *
|
||||
15,
|
||||
),
|
||||
linkStyle: TextStyle(
|
||||
fontSize:
|
||||
MediaQuery.of(context).textScaleFactor *
|
||||
15,
|
||||
color: Colors.orange,
|
||||
),
|
||||
onOpen: (LinkableElement link) {
|
||||
if (link.url.contains(
|
||||
'news.ycombinator.com/item',
|
||||
)) {
|
||||
onStoryLinkTapped(link.url);
|
||||
} else {
|
||||
LinkUtil.launchUrl(link.url);
|
||||
}
|
||||
},
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
const Divider(
|
||||
height: 0,
|
||||
),
|
||||
if (state.onlyShowTargetComment) ...<Widget>[
|
||||
TextButton(
|
||||
onPressed: () => context
|
||||
.read<CommentsCubit>()
|
||||
.loadAll(widget.story),
|
||||
child: const Text('View all comments'),
|
||||
),
|
||||
const Divider(
|
||||
height: 0,
|
||||
),
|
||||
],
|
||||
if (state.comments.isEmpty &&
|
||||
state.status ==
|
||||
CommentsStatus.allLoaded) ...<Widget>[
|
||||
const SizedBox(
|
||||
height: 240,
|
||||
),
|
||||
const Center(
|
||||
child: Text(
|
||||
'Nothing yet',
|
||||
style: TextStyle(color: Colors.grey),
|
||||
),
|
||||
),
|
||||
if (widget.story.isPoll)
|
||||
PollView(
|
||||
onLoginTapped: onLoginTapped,
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
if (widget.story.text.isNotEmpty)
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
const Divider(
|
||||
height: 0,
|
||||
),
|
||||
if (state.onlyShowTargetComment) ...<Widget>[
|
||||
TextButton(
|
||||
onPressed: () =>
|
||||
context.read<CommentsCubit>().loadAll(widget.story),
|
||||
child: const Text('View all comments'),
|
||||
),
|
||||
const Divider(
|
||||
height: 0,
|
||||
),
|
||||
],
|
||||
if (state.comments.isEmpty &&
|
||||
state.status == CommentsStatus.allLoaded) ...<Widget>[
|
||||
const SizedBox(
|
||||
height: 240,
|
||||
),
|
||||
const Center(
|
||||
child: Text(
|
||||
'Nothing yet',
|
||||
style: TextStyle(color: Colors.grey),
|
||||
),
|
||||
),
|
||||
],
|
||||
for (final Comment e in state.comments)
|
||||
FadeIn(
|
||||
child: CommentTile(
|
||||
comment: e,
|
||||
level: e.level,
|
||||
myUsername:
|
||||
authState.isLoggedIn ? authState.username : null,
|
||||
opUsername: widget.story.by,
|
||||
onReplyTapped: (Comment cmt) {
|
||||
HapticFeedback.lightImpact();
|
||||
if (cmt.deleted || cmt.dead) {
|
||||
return;
|
||||
}
|
||||
);
|
||||
} else if (index ==
|
||||
state.comments.length + _extraItemsCount - 1) {
|
||||
if ((state.status == CommentsStatus.allLoaded &&
|
||||
state.comments.isNotEmpty) ||
|
||||
state.onlyShowTargetComment) {
|
||||
return SizedBox(
|
||||
height: 240,
|
||||
child: Center(
|
||||
child: Text(happyFace),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
if (cmt !=
|
||||
context.read<EditCubit>().state.replyingTo) {
|
||||
commentEditingController.clear();
|
||||
}
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
|
||||
context.read<EditCubit>().onReplyTapped(cmt);
|
||||
focusNode.requestFocus();
|
||||
},
|
||||
onEditTapped: (Comment cmt) {
|
||||
HapticFeedback.lightImpact();
|
||||
if (cmt.deleted || cmt.dead) {
|
||||
return;
|
||||
}
|
||||
final Comment comment = state.comments.elementAt(index - 1);
|
||||
|
||||
return FadeIn(
|
||||
key: ValueKey<int>(comment.id),
|
||||
child: CommentTile(
|
||||
comment: comment,
|
||||
level: comment.level,
|
||||
myUsername:
|
||||
authState.isLoggedIn ? authState.username : null,
|
||||
opUsername: widget.story.by,
|
||||
onReplyTapped: (Comment cmt) {
|
||||
HapticFeedback.lightImpact();
|
||||
if (cmt.deleted || cmt.dead) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (cmt !=
|
||||
context.read<EditCubit>().state.replyingTo) {
|
||||
commentEditingController.clear();
|
||||
context.read<EditCubit>().onEditTapped(cmt);
|
||||
focusNode.requestFocus();
|
||||
},
|
||||
onMoreTapped: onMorePressed,
|
||||
onStoryLinkTapped: onStoryLinkTapped,
|
||||
onTimeMachineActivated: onTimeMachineActivated,
|
||||
),
|
||||
}
|
||||
|
||||
context.read<EditCubit>().onReplyTapped(cmt);
|
||||
focusNode.requestFocus();
|
||||
},
|
||||
onEditTapped: (Comment cmt) {
|
||||
HapticFeedback.lightImpact();
|
||||
if (cmt.deleted || cmt.dead) {
|
||||
return;
|
||||
}
|
||||
commentEditingController.clear();
|
||||
context.read<EditCubit>().onEditTapped(cmt);
|
||||
focusNode.requestFocus();
|
||||
},
|
||||
onMoreTapped: onMorePressed,
|
||||
onStoryLinkTapped: onStoryLinkTapped,
|
||||
onTimeMachineActivated: onTimeMachineActivated,
|
||||
),
|
||||
if ((state.status == CommentsStatus.allLoaded &&
|
||||
state.comments.isNotEmpty) ||
|
||||
state.onlyShowTargetComment)
|
||||
SizedBox(
|
||||
height: 240,
|
||||
child: Center(
|
||||
child: Text(happyFace),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
@ -674,7 +695,7 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
});
|
||||
});
|
||||
} else {
|
||||
LinkUtil.launchUrl(link);
|
||||
LinkUtil.launch(link);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1093,7 +1114,7 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
child: Transform.translate(
|
||||
offset: const Offset(0, 1),
|
||||
child: TapDownWrapper(
|
||||
onTap: () => LinkUtil.launchUrl(
|
||||
onTap: () => LinkUtil.launch(
|
||||
Constants.endUserAgreementLink,
|
||||
),
|
||||
child: const Text(
|
||||
|
@ -47,7 +47,7 @@ class LinkIconButton extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
onPressed: () =>
|
||||
LinkUtil.launchUrl('https://news.ycombinator.com/item?id=$storyId'),
|
||||
LinkUtil.launch('https://news.ycombinator.com/item?id=$storyId'),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -273,7 +273,7 @@ class _ReplyBoxState extends State<ReplyBox> {
|
||||
color: Colors.orange,
|
||||
),
|
||||
onOpen: (LinkableElement link) =>
|
||||
LinkUtil.launchUrl(link.url),
|
||||
LinkUtil.launch(link.url),
|
||||
text: replyingTo?.text ?? '',
|
||||
),
|
||||
),
|
||||
|
@ -229,7 +229,7 @@ class CommentTile extends StatelessWidget {
|
||||
)) {
|
||||
onStoryLinkTapped.call(link.url);
|
||||
} else {
|
||||
LinkUtil.launchUrl(link.url);
|
||||
LinkUtil.launch(link.url);
|
||||
}
|
||||
},
|
||||
),
|
||||
|
@ -141,7 +141,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
|
||||
color: Colors.orange,
|
||||
),
|
||||
onOpen: (LinkableElement link) =>
|
||||
LinkUtil.launchUrl(link.url),
|
||||
LinkUtil.launch(link.url),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
@ -1,5 +1,4 @@
|
||||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hacki/config/constants.dart';
|
||||
@ -210,11 +209,11 @@ class _LinkPreviewState extends State<LinkPreview> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final double screenWidth = MediaQuery.of(context).size.width;
|
||||
final bool showSmallerPreviewPic =
|
||||
Platform.isIOS && screenWidth > 428.0 && screenWidth < 850;
|
||||
final bool showSmallerPreviewPic = screenWidth > 428.0 && screenWidth < 850;
|
||||
final double _height = showSmallerPreviewPic
|
||||
? 100.0
|
||||
: (MediaQuery.of(context).size.height * 0.14).clamp(118.0, 140.0);
|
||||
|
||||
final Widget loadingWidget = widget.placeholderWidget ??
|
||||
Container(
|
||||
height: _height,
|
||||
|
@ -1,5 +1,3 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_fadein/flutter_fadein.dart';
|
||||
import 'package:hacki/config/constants.dart';
|
||||
@ -30,7 +28,7 @@ class StoryTile extends StatelessWidget {
|
||||
if (showWebPreview) {
|
||||
final double screenWidth = MediaQuery.of(context).size.width;
|
||||
final bool showSmallerPreviewPic =
|
||||
Platform.isIOS && screenWidth > 428.0 && screenWidth < 850;
|
||||
screenWidth > 428.0 && screenWidth < 850;
|
||||
final double height = showSmallerPreviewPic
|
||||
? 100.0
|
||||
: (MediaQuery.of(context).size.height * 0.14).clamp(118.0, 140.0);
|
||||
|
@ -1,6 +1,7 @@
|
||||
export 'circle_tab_indicator.dart';
|
||||
export 'comment_tile.dart';
|
||||
export 'countdown_reminder.dart';
|
||||
export 'custom_chip.dart';
|
||||
export 'custom_circular_progress_indicator.dart';
|
||||
export 'items_list_view.dart';
|
||||
export 'link_preview/link_preview.dart';
|
||||
|
@ -5,10 +5,10 @@ import 'package:url_launcher/url_launcher.dart';
|
||||
abstract class LinkUtil {
|
||||
static final ChromeSafariBrowser _browser = ChromeSafariBrowser();
|
||||
|
||||
static void launchUrl(String link, {bool useReader = false}) {
|
||||
static void launch(String link, {bool useReader = false}) {
|
||||
Uri rinseLink(String link) {
|
||||
if (link.contains(')')) {
|
||||
final RegExp regex = RegExp(r'\).*$');
|
||||
final RegExp regex = RegExp(r'\)|].*$');
|
||||
if (!link.contains('en.wikipedia.org') && link.contains(regex)) {
|
||||
final String match = regex.stringMatch(link) ?? '';
|
||||
return Uri.parse(link.replaceAll(match, ''));
|
||||
}
|
||||
@ -19,15 +19,21 @@ abstract class LinkUtil {
|
||||
final Uri uri = rinseLink(link);
|
||||
canLaunchUrl(uri).then((bool val) {
|
||||
if (val) {
|
||||
_browser.open(
|
||||
url: uri,
|
||||
options: ChromeSafariBrowserClassOptions(
|
||||
ios: IOSSafariOptions(
|
||||
entersReaderIfAvailable: useReader,
|
||||
preferredControlTintColor: Colors.orange,
|
||||
),
|
||||
),
|
||||
);
|
||||
if (link.contains('http')) {
|
||||
_browser
|
||||
.open(
|
||||
url: uri,
|
||||
options: ChromeSafariBrowserClassOptions(
|
||||
ios: IOSSafariOptions(
|
||||
entersReaderIfAvailable: useReader,
|
||||
preferredControlTintColor: Colors.orange,
|
||||
),
|
||||
),
|
||||
)
|
||||
.onError((_, __) => launchUrl(uri));
|
||||
} else {
|
||||
launchUrl(uri);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
name: hacki
|
||||
description: A Hacker News reader.
|
||||
version: 0.2.12+51
|
||||
version: 0.2.14+53
|
||||
publish_to: none
|
||||
|
||||
environment:
|
||||
@ -12,7 +12,7 @@ dependencies:
|
||||
bloc: ^8.0.3
|
||||
cached_network_image: ^3.2.1
|
||||
clipboard: ^0.1.3
|
||||
collection:
|
||||
collection: ^1.16.0
|
||||
connectivity_plus: ^2.2.1
|
||||
dio: ^4.0.4
|
||||
equatable: 2.0.3
|
||||
|
Reference in New Issue
Block a user