mirror of
https://github.com/Livinglist/Hacki.git
synced 2025-08-06 18:24:42 +08:00
Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
d4778d9530 | |||
c702e08481 |
@ -50,7 +50,7 @@ android {
|
|||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "com.jiaqifeng.hacki"
|
applicationId "com.jiaqifeng.hacki"
|
||||||
minSdkVersion 26
|
minSdkVersion 30
|
||||||
targetSdkVersion 33
|
targetSdkVersion 33
|
||||||
versionCode flutterVersionCode.toInteger()
|
versionCode flutterVersionCode.toInteger()
|
||||||
versionName flutterVersionName
|
versionName flutterVersionName
|
||||||
|
@ -160,6 +160,13 @@ class FavCubit extends Cubit<FavState> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void removeAll() {
|
||||||
|
_preferenceRepository
|
||||||
|
..clearAllFavs(username: '')
|
||||||
|
..clearAllFavs(username: _authBloc.state.username);
|
||||||
|
emit(FavState.init());
|
||||||
|
}
|
||||||
|
|
||||||
void _onItemLoaded(Item item) {
|
void _onItemLoaded(Item item) {
|
||||||
emit(
|
emit(
|
||||||
state.copyWith(
|
state.copyWith(
|
||||||
|
@ -5,4 +5,15 @@ extension ObjectExtension on Object {
|
|||||||
void log({String identifier = ''}) {
|
void log({String identifier = ''}) {
|
||||||
locator.get<Logger>().d('$identifier ${toString()}');
|
locator.get<Logger>().d('$identifier ${toString()}');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void logInfo({String identifier = ''}) {
|
||||||
|
locator.get<Logger>().i('$identifier ${toString()}');
|
||||||
|
}
|
||||||
|
|
||||||
|
void logError({
|
||||||
|
String identifier = '',
|
||||||
|
StackTrace? stackTrace,
|
||||||
|
}) {
|
||||||
|
locator.get<Logger>().e(identifier, this, stackTrace ?? StackTrace.current);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ abstract class Preference<T> extends Equatable with SettingsDisplayable {
|
|||||||
const NotificationModePreference(),
|
const NotificationModePreference(),
|
||||||
const SwipeGesturePreference(),
|
const SwipeGesturePreference(),
|
||||||
const CollapseModePreference(),
|
const CollapseModePreference(),
|
||||||
NavigationModePreference(),
|
const NavigationModePreference(),
|
||||||
const ReaderModePreference(),
|
const ReaderModePreference(),
|
||||||
const MarkReadStoriesModePreference(),
|
const MarkReadStoriesModePreference(),
|
||||||
const EyeCandyModePreference(),
|
const EyeCandyModePreference(),
|
||||||
@ -54,8 +54,7 @@ abstract class IntPreference extends Preference<int> {
|
|||||||
const bool _notificationModeDefaultValue = true;
|
const bool _notificationModeDefaultValue = true;
|
||||||
const bool _swipeGestureModeDefaultValue = false;
|
const bool _swipeGestureModeDefaultValue = false;
|
||||||
const bool _displayModeDefaultValue = true;
|
const bool _displayModeDefaultValue = true;
|
||||||
const bool _navigationModeDefaultValueIOS = false;
|
const bool _navigationModeDefaultValue = false;
|
||||||
const bool _navigationModeDefaultValueAndroid = false;
|
|
||||||
const bool _eyeCandyModeDefaultValue = false;
|
const bool _eyeCandyModeDefaultValue = false;
|
||||||
const bool _trueDarkModeDefaultValue = false;
|
const bool _trueDarkModeDefaultValue = false;
|
||||||
const bool _readerModeDefaultValue = true;
|
const bool _readerModeDefaultValue = true;
|
||||||
@ -193,12 +192,9 @@ class StoryUrlModePreference extends BooleanPreference {
|
|||||||
/// The value deciding whether or not user should be
|
/// The value deciding whether or not user should be
|
||||||
/// navigated to web view first. Defaults to false.
|
/// navigated to web view first. Defaults to false.
|
||||||
class NavigationModePreference extends BooleanPreference {
|
class NavigationModePreference extends BooleanPreference {
|
||||||
NavigationModePreference({bool? val})
|
const NavigationModePreference({bool? val})
|
||||||
: super(
|
: super(
|
||||||
val: val ??
|
val: val ?? _navigationModeDefaultValue,
|
||||||
(Platform.isAndroid
|
|
||||||
? _navigationModeDefaultValueAndroid
|
|
||||||
: _navigationModeDefaultValueIOS),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
@ -207,6 +207,23 @@ class PreferenceRepository {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> clearAllFavs({required String username}) async {
|
||||||
|
final String key = _getFavKey(username);
|
||||||
|
|
||||||
|
if (Platform.isIOS) {
|
||||||
|
await _syncedPrefs.setStringList(
|
||||||
|
key: key,
|
||||||
|
val: <String>[],
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
final SharedPreferences prefs = await _prefs;
|
||||||
|
await prefs.setStringList(
|
||||||
|
key,
|
||||||
|
<String>[],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static String _getFavKey(String username) => 'fav_$username';
|
static String _getFavKey(String username) => 'fav_$username';
|
||||||
|
|
||||||
//#endregion
|
//#endregion
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
import 'dart:io';
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
|
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
|
||||||
@ -25,16 +23,8 @@ class MorePopupMenu extends StatelessWidget {
|
|||||||
final bool isBlocked;
|
final bool isBlocked;
|
||||||
final VoidCallback onLoginTapped;
|
final VoidCallback onLoginTapped;
|
||||||
|
|
||||||
static double? _cachedStoryHeight;
|
static const double _storySheetHeight = 500;
|
||||||
static double? _cachedCommentHeight;
|
static const double _commentSheetHeight = 480;
|
||||||
|
|
||||||
static double get storyHeight {
|
|
||||||
return _cachedStoryHeight ??= Platform.isIOS ? 500 : 530;
|
|
||||||
}
|
|
||||||
|
|
||||||
static double get commentHeight {
|
|
||||||
return _cachedCommentHeight ??= Platform.isIOS ? 480 : 520;
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
@ -80,7 +70,7 @@ class MorePopupMenu extends StatelessWidget {
|
|||||||
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: item is Comment ? commentHeight : storyHeight,
|
height: item is Comment ? _commentSheetHeight : _storySheetHeight,
|
||||||
color: Theme.of(context).canvasColor,
|
color: Theme.of(context).canvasColor,
|
||||||
child: Material(
|
child: Material(
|
||||||
color: Palette.transparent,
|
color: Palette.transparent,
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:adaptive_theme/adaptive_theme.dart';
|
import 'package:adaptive_theme/adaptive_theme.dart';
|
||||||
|
import 'package:clipboard/clipboard.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.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';
|
||||||
@ -21,7 +22,6 @@ import 'package:hacki/screens/profile/widgets/tab_bar_settings.dart';
|
|||||||
import 'package:hacki/screens/widgets/widgets.dart';
|
import 'package:hacki/screens/widgets/widgets.dart';
|
||||||
import 'package:hacki/styles/styles.dart';
|
import 'package:hacki/styles/styles.dart';
|
||||||
import 'package:hacki/utils/utils.dart';
|
import 'package:hacki/utils/utils.dart';
|
||||||
import 'package:logger/logger.dart';
|
|
||||||
import 'package:package_info_plus/package_info_plus.dart';
|
import 'package:package_info_plus/package_info_plus.dart';
|
||||||
import 'package:path_provider/path_provider.dart';
|
import 'package:path_provider/path_provider.dart';
|
||||||
import 'package:share_plus/share_plus.dart';
|
import 'package:share_plus/share_plus.dart';
|
||||||
@ -192,7 +192,7 @@ class _SettingsState extends State<Settings> {
|
|||||||
.whereType<BooleanPreference>()
|
.whereType<BooleanPreference>()
|
||||||
.where(
|
.where(
|
||||||
(Preference<dynamic> e) => e.isDisplayable,
|
(Preference<dynamic> e) => e.isDisplayable,
|
||||||
))
|
)) ...<Widget>[
|
||||||
SwitchListTile(
|
SwitchListTile(
|
||||||
title: Text(preference.title),
|
title: Text(preference.title),
|
||||||
subtitle: preference.subtitle.isNotEmpty
|
subtitle: preference.subtitle.isNotEmpty
|
||||||
@ -217,6 +217,8 @@ class _SettingsState extends State<Settings> {
|
|||||||
},
|
},
|
||||||
activeColor: Palette.orange,
|
activeColor: Palette.orange,
|
||||||
),
|
),
|
||||||
|
if (preference is StoryUrlModePreference) const Divider(),
|
||||||
|
],
|
||||||
ListTile(
|
ListTile(
|
||||||
title: const Text(
|
title: const Text(
|
||||||
'Font',
|
'Font',
|
||||||
@ -229,11 +231,24 @@ class _SettingsState extends State<Settings> {
|
|||||||
),
|
),
|
||||||
onTap: showThemeSettingDialog,
|
onTap: showThemeSettingDialog,
|
||||||
),
|
),
|
||||||
|
const Divider(),
|
||||||
ListTile(
|
ListTile(
|
||||||
title: const Text(
|
title: const Text(
|
||||||
'Clear Data',
|
'Export Favorites',
|
||||||
),
|
),
|
||||||
onTap: showClearDataDialog,
|
onTap: onExportFavoritesTapped,
|
||||||
|
),
|
||||||
|
ListTile(
|
||||||
|
title: const Text(
|
||||||
|
'Clear Favorites',
|
||||||
|
),
|
||||||
|
onTap: showClearFavoritesDialog,
|
||||||
|
),
|
||||||
|
ListTile(
|
||||||
|
title: const Text(
|
||||||
|
'Clear Cache',
|
||||||
|
),
|
||||||
|
onTap: showClearCacheDialog,
|
||||||
),
|
),
|
||||||
ListTile(
|
ListTile(
|
||||||
title: const Text('About'),
|
title: const Text('About'),
|
||||||
@ -376,12 +391,12 @@ class _SettingsState extends State<Settings> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
void showClearDataDialog() {
|
void showClearCacheDialog() {
|
||||||
showDialog<void>(
|
showDialog<void>(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (_) {
|
builder: (_) {
|
||||||
return AlertDialog(
|
return AlertDialog(
|
||||||
title: const Text('Clear Data?'),
|
title: const Text('Clear Cache?'),
|
||||||
content: const Text(
|
content: const Text(
|
||||||
'Clear all cached images, stories and comments.',
|
'Clear all cached images, stories and comments.',
|
||||||
),
|
),
|
||||||
@ -621,11 +636,64 @@ class _SettingsState extends State<Settings> {
|
|||||||
LinkUtil.launchInExternalBrowser(Constants.githubIssueLink);
|
LinkUtil.launchInExternalBrowser(Constants.githubIssueLink);
|
||||||
}
|
}
|
||||||
} catch (error, stackTrace) {
|
} catch (error, stackTrace) {
|
||||||
locator.get<Logger>().e(
|
error.logError(stackTrace: stackTrace);
|
||||||
'Error caught in onGithubTapped',
|
}
|
||||||
error,
|
}
|
||||||
stackTrace,
|
|
||||||
|
Future<void> onExportFavoritesTapped() async {
|
||||||
|
final List<int> allFavorites = context.read<FavCubit>().state.favIds;
|
||||||
|
|
||||||
|
if (allFavorites.isEmpty) {
|
||||||
|
showSnackBar(content: "You don't have any favorite item.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await FlutterClipboard.copy(
|
||||||
|
allFavorites.join('\n'),
|
||||||
|
).whenComplete(HapticFeedback.selectionClick);
|
||||||
|
showSnackBar(content: 'Ids of favorites have been copied to clipboard.');
|
||||||
|
} catch (error, stackTrace) {
|
||||||
|
error.logError(stackTrace: stackTrace);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void showClearFavoritesDialog() {
|
||||||
|
showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (BuildContext context) {
|
||||||
|
return AlertDialog(
|
||||||
|
title: const Text('Remove all favorites?'),
|
||||||
|
content: const Text(
|
||||||
|
'''This will not effect favorites saved in your Hacker News account.''',
|
||||||
|
),
|
||||||
|
actions: <Widget>[
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context),
|
||||||
|
child: const Text(
|
||||||
|
'Cancel',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
TextButton(
|
||||||
|
onPressed: () {
|
||||||
|
Navigator.pop(context);
|
||||||
|
try {
|
||||||
|
context.read<FavCubit>().removeAll();
|
||||||
|
showSnackBar(content: 'All favorites have been removed.');
|
||||||
|
} catch (error, stackTrace) {
|
||||||
|
error.logError(stackTrace: stackTrace);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
child: const Text(
|
||||||
|
'Confirm',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Palette.red,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
name: hacki
|
name: hacki
|
||||||
description: A Hacker News reader.
|
description: A Hacker News reader.
|
||||||
version: 1.2.5+98
|
version: 1.3.0+99
|
||||||
publish_to: none
|
publish_to: none
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
|
Reference in New Issue
Block a user