mirror of
https://github.com/wgh136/pixes.git
synced 2025-09-27 04:57:23 +00:00
improve ui
This commit is contained in:
@@ -1,6 +1,9 @@
|
||||
import 'package:flutter/material.dart' as md;
|
||||
|
||||
typedef MdIcons = md.Icons;
|
||||
typedef MdTheme = md.Theme;
|
||||
typedef MdThemeData = md.ThemeData;
|
||||
typedef MdColorScheme = md.ColorScheme;
|
||||
|
||||
class ColorScheme {
|
||||
static md.ColorScheme of(md.BuildContext context) {
|
||||
|
@@ -3,6 +3,7 @@ import "dart:ui";
|
||||
import "package:fluent_ui/fluent_ui.dart";
|
||||
import "package:flutter/services.dart";
|
||||
import "package:pixes/appdata.dart";
|
||||
import "package:pixes/components/md.dart";
|
||||
import "package:pixes/components/message.dart";
|
||||
import "package:pixes/foundation/app.dart";
|
||||
import "package:pixes/foundation/log.dart";
|
||||
@@ -99,7 +100,21 @@ class MyApp extends StatelessWidget {
|
||||
throw "widget is null";
|
||||
}
|
||||
|
||||
return OverlayWidget(child);
|
||||
return MdTheme(
|
||||
data: MdThemeData.from(
|
||||
colorScheme: MdColorScheme.fromSeed(
|
||||
seedColor: FluentTheme.of(context).accentColor,
|
||||
brightness: FluentTheme.of(context).brightness,
|
||||
),
|
||||
useMaterial3: true
|
||||
),
|
||||
child: DefaultTextStyle.merge(
|
||||
style: TextStyle(
|
||||
fontFamily: App.isWindows ? 'font' : null,
|
||||
),
|
||||
child: OverlayWidget(child),
|
||||
),
|
||||
);
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
@@ -173,7 +173,7 @@ class Illust {
|
||||
final int restrict;
|
||||
final IllustAuthor author;
|
||||
final List<Tag> tags;
|
||||
final String createDate;
|
||||
final DateTime createDate;
|
||||
final int pageCount;
|
||||
final int width;
|
||||
final int height;
|
||||
@@ -220,7 +220,7 @@ class Illust {
|
||||
tags = (json['tags'] as List)
|
||||
.map((e) => Tag(e['name'], e['translated_name']))
|
||||
.toList(),
|
||||
createDate = json['create_date'],
|
||||
createDate = DateTime.parse(json['create_date']),
|
||||
pageCount = json['page_count'],
|
||||
width = json['width'],
|
||||
height = json['height'],
|
||||
|
@@ -314,7 +314,12 @@ class _BottomBarState extends State<_BottomBar> with TickerProviderStateMixin{
|
||||
buildStats(),
|
||||
buildTags(),
|
||||
buildMoreActions(),
|
||||
SelectableText("${"Artwork ID".tl}: ${widget.illust.id}\n${"Artist ID".tl}: ${widget.illust.author.id}", style: TextStyle(color: ColorScheme.of(context).outline),).paddingLeft(4),
|
||||
SelectableText(
|
||||
"${"Artwork ID".tl}: ${widget.illust.id}\n"
|
||||
"${"Artist ID".tl}: ${widget.illust.author.id}\n"
|
||||
"${widget.illust.createDate.toString().split('.').first}",
|
||||
style: TextStyle(color: ColorScheme.of(context).outline),)
|
||||
.paddingLeft(4),
|
||||
SizedBox(height: 8 + context.padding.bottom,)
|
||||
],
|
||||
),
|
||||
|
@@ -2,7 +2,6 @@ import "dart:async";
|
||||
|
||||
import "package:fluent_ui/fluent_ui.dart";
|
||||
import "package:flutter/foundation.dart";
|
||||
import "package:flutter/material.dart" as md;
|
||||
import "package:pixes/appdata.dart";
|
||||
import "package:pixes/components/md.dart";
|
||||
import "package:pixes/foundation/app.dart";
|
||||
@@ -79,14 +78,7 @@ class _MainPageState extends State<MainPage> with WindowListener {
|
||||
content: LoginPage(() => setState(() {})),
|
||||
);
|
||||
}
|
||||
return md.Theme(
|
||||
data: md.ThemeData.from(
|
||||
useMaterial3: true,
|
||||
colorScheme: md.ColorScheme.fromSeed(
|
||||
seedColor: FluentTheme.of(context).accentColor.withOpacity(1),
|
||||
brightness: FluentTheme.of(context).brightness,
|
||||
)),
|
||||
child: DefaultSelectionStyle.merge(
|
||||
return DefaultSelectionStyle.merge(
|
||||
selectionColor: FluentTheme.of(context).selectionColor.withOpacity(0.4),
|
||||
child: NavigationView(
|
||||
appBar: buildAppBar(context, navigatorKey),
|
||||
@@ -163,7 +155,7 @@ class _MainPageState extends State<MainPage> with WindowListener {
|
||||
builder: (context) => const RecommendationPage()),
|
||||
),
|
||||
))),
|
||||
));
|
||||
);
|
||||
}
|
||||
|
||||
static final pageBuilders = <Widget Function()>[
|
||||
|
@@ -410,7 +410,7 @@ ${"Some keywords will be replaced by the following rule:".tl}
|
||||
\${index} -> ${"Index of the image in the artwork".tl}
|
||||
\${ext} -> ${"File extension".tl}
|
||||
\${AI} -> ${"Replace with 'AI' if the work was generated by AI, otherwise replace with blank".tl}
|
||||
\${tag{*}} -> ${"Replace with * if the work have tag *, otherwise replace with blank.".tl}
|
||||
\${tag(*)} -> ${"Replace with * if the work have tag *, otherwise replace with blank.".tl}
|
||||
|
||||
${"Multiple path separators will be automatically replaced with a single".tl}
|
||||
""";
|
||||
|
Reference in New Issue
Block a user