Skip to content

Commit

Permalink
add text length in card
Browse files Browse the repository at this point in the history
  • Loading branch information
Notsfsssf committed Sep 1, 2024
1 parent b213cea commit bce79bd
Show file tree
Hide file tree
Showing 9 changed files with 364 additions and 285 deletions.
16 changes: 8 additions & 8 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -116,26 +116,26 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/webview_flutter_wkwebview/ios"

SPEC CHECKSUMS:
audio_session: 4f3e461722055d21515cf3261b64c973c062f345
audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207
device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0
FMDB: 728731dd336af3936ce00f91d9d8495f5718a0e6
image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
in_app_purchase_storekit: 0e4b3c2e43ba1e1281f4f46dd71b0593ce529892
image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
in_app_purchase_storekit: 8c3b0b3eb1b0f04efbff401c3de6266d4258d433
just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
receive_sharing_intent: df9c334dc9feadcbd3266e5cb49c8443405e1c9f
share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36
webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1

PODFILE CHECKSUM: 3d4560dfd92eabd6be8bf4fff6ae87fa5f5b1faa

Expand Down
2 changes: 1 addition & 1 deletion ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Flutter
import MobileCoreServices
import Photos

@UIApplicationMain
@main
@objc class AppDelegate: FlutterAppDelegate {
override func application(
_ application: UIApplication,
Expand Down
1 change: 0 additions & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import 'dart:io';

import 'package:bot_toast/bot_toast.dart';
import 'package:dynamic_color/dynamic_color.dart';
import 'package:flex_seed_scheme/flex_seed_scheme.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
Expand Down
17 changes: 14 additions & 3 deletions lib/page/history/history_store.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ mixin _$HistoryState {
List<IllustPersist> get data => throw _privateConstructorUsedError;
String get word => throw _privateConstructorUsedError;

@JsonKey(ignore: true)
/// Create a copy of HistoryState
/// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
$HistoryStateCopyWith<HistoryState> get copyWith =>
throw _privateConstructorUsedError;
}
Expand All @@ -43,6 +45,8 @@ class _$HistoryStateCopyWithImpl<$Res, $Val extends HistoryState>
// ignore: unused_field
final $Res Function($Val) _then;

/// Create a copy of HistoryState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({
Expand Down Expand Up @@ -81,6 +85,8 @@ class __$$HistoryStateImplCopyWithImpl<$Res>
_$HistoryStateImpl _value, $Res Function(_$HistoryStateImpl) _then)
: super(_value, _then);

/// Create a copy of HistoryState
/// with the given fields replaced by the non-null parameter values.
@pragma('vm:prefer-inline')
@override
$Res call({
Expand Down Expand Up @@ -136,7 +142,9 @@ class _$HistoryStateImpl implements _HistoryState {
int get hashCode => Object.hash(
runtimeType, const DeepCollectionEquality().hash(_data), word);

@JsonKey(ignore: true)
/// Create a copy of HistoryState
/// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@override
@pragma('vm:prefer-inline')
_$$HistoryStateImplCopyWith<_$HistoryStateImpl> get copyWith =>
Expand All @@ -152,8 +160,11 @@ abstract class _HistoryState implements HistoryState {
List<IllustPersist> get data;
@override
String get word;

/// Create a copy of HistoryState
/// with the given fields replaced by the non-null parameter values.
@override
@JsonKey(ignore: true)
@JsonKey(includeFromJson: false, includeToJson: false)
_$$HistoryStateImplCopyWith<_$HistoryStateImpl> get copyWith =>
throw _privateConstructorUsedError;
}
49 changes: 39 additions & 10 deletions lib/page/novel/component/novel_lighting_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,45 @@ class _NovelLightingListState extends State<NovelLightingList> {
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 8.0),
child: Text(
novel.user.name,
maxLines: 1,
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(
color: Theme.of(context)
.colorScheme
.secondary),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
novel.user.name,
maxLines: 1,
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(
color: Theme.of(context)
.colorScheme
.secondary),
),
Padding(
padding: EdgeInsets.only(left: 8),
child: Row(
children: [
Icon(
Icons.article,
size: 12,
color: Theme.of(context)
.textTheme
.labelSmall!
.color,
),
SizedBox(
width: 2,
),
Text(
'${novel.textLength}',
style: Theme.of(context)
.textTheme
.labelSmall,
)
],
),
),
],
),
),
Padding(
Expand Down
49 changes: 39 additions & 10 deletions lib/page/novel/recom/novel_recom_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,45 @@ class _NovelRecomPageState extends State<NovelRecomPage>
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 8.0),
child: Text(
novel.user.name,
maxLines: 1,
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(
color: Theme.of(context)
.colorScheme
.secondary),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
novel.user.name,
maxLines: 1,
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(
color: Theme.of(context)
.colorScheme
.secondary),
),
Padding(
padding: EdgeInsets.only(left: 8),
child: Row(
children: [
Icon(
Icons.article,
size: 12,
color: Theme.of(context)
.textTheme
.labelSmall!
.color,
),
SizedBox(
width: 2,
),
Text(
'${novel.textLength}',
style: Theme.of(context)
.textTheme
.labelSmall,
)
],
),
),
],
),
),
Padding(
Expand Down
7 changes: 3 additions & 4 deletions lib/store/mute_store.dart
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,10 @@ abstract class _MuteStoreBase with Store {
final banIllust = await banIllustIdProvider.getAllAccount();
final banUser = await banUserIdProvider.getAllAccount();
final banTag = await banTagProvider.getAllAccount();
banTags.map((e) => e.toJson()).toList();
var entity = {
"banillustid": banillusts,
"banuserid": banUserIds,
"bantag": banTags
"banillustid": banIllust,
"banuserid": banUser,
"bantag": banTag
};
final exportJson = jsonEncode(entity);
LPrinter.d("exportJson:$exportJson");
Expand Down
Loading

0 comments on commit bce79bd

Please sign in to comment.