mirror of
https://github.com/Livinglist/Hacki.git
synced 2025-08-06 18:24:42 +08:00
Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
d506297f4c |
@ -34,6 +34,7 @@ Features:
|
|||||||
- Launch from system share sheet.
|
- Launch from system share sheet.
|
||||||
- And more...
|
- And more...
|
||||||
|
|
||||||
|
|
||||||
<p align="center">
|
<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/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/171450536-ea61c176-37d7-4744-8674-4668e0e7e774.png">
|
||||||
@ -44,7 +45,7 @@ Features:
|
|||||||
<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/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/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/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/159798186-1457ae21-f1aa-40a4-9206-0f3a1e24653e.png">
|
||||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450557-ab038e72-78c4-4daf-9b77-3873be1700db.png">
|
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450557-ab038e72-78c4-4daf-9b77-3873be1700db.png">
|
||||||
|
|
||||||
|
@ -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
|
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_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.14;
|
||||||
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.14;
|
||||||
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.14;
|
||||||
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 = "";
|
||||||
|
@ -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
|
||||||
emit(state.copyWith(status: SearchStatus.loaded));
|
.search(filters: state.searchFilters)
|
||||||
});
|
.listen(_onStoryFetched)
|
||||||
|
..onDone(() {
|
||||||
|
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(
|
||||||
|
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(
|
emit(
|
||||||
state.copyWith(
|
state.copyWith(
|
||||||
status: SearchStatus.loadingMore,
|
searchFilters: state.searchFilters.copyWithFilterAdded(filter),
|
||||||
currentPage: updatedPage,
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
_searchRepository
|
|
||||||
.search(state.query, page: updatedPage)
|
search(state.searchFilters.query);
|
||||||
.listen(_onStoryFetched)
|
}
|
||||||
.onDone(() {
|
|
||||||
emit(state.copyWith(status: SearchStatus.loaded));
|
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,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -2,5 +2,6 @@ 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
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 {
|
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;
|
||||||
|
@ -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.14',
|
||||||
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
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';
|
@ -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,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.14+53
|
||||||
publish_to: none
|
publish_to: none
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
|
Reference in New Issue
Block a user