Skip to content

Commit 524f1f1

Browse files
Robert-StackflowRobert-Stackflow
committed
Import UI/UX
1 parent b3ff9b7 commit 524f1f1

File tree

61 files changed

+517
-572
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+517
-572
lines changed

‎lib/Screens/Backup/cloud_service_screen.dart‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import 'package:flutter/material.dart';
2727
import 'package:group_button/group_button.dart';
2828
import 'package:lucide_icons/lucide_icons.dart';
2929

30-
import '../../TokenUtils/Cloud/cloud_service.dart';
3130
import '../../Utils/utils.dart';
3231
import '../../generated/l10n.dart';
3332
import '../Setting/base_setting_screen.dart';
@@ -72,11 +71,7 @@ class _CloudServiceScreenState extends State<CloudServiceScreen>
7271
showBack: widget.showBack,
7372
titleLeftMargin: widget.showBack ? 5 : 15,
7473
onTapBack: () {
75-
if (ResponsiveUtil.isLandscape()) {
76-
chewieProvider.dialogNavigatorState?.popPage();
77-
} else {
78-
Navigator.pop(context);
79-
}
74+
DialogNavigatorHelper.responsivePopPage();
8075
},
8176
overrideBody: _buildBody(),
8277
desktopActions: [

‎lib/Screens/Lock/database_decrypt_screen.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ class DatabaseDecryptScreenState extends State<DatabaseDecryptScreen>
265265
children: [
266266
const Spacer(),
267267
Text(S.current.decryptDatabasePassword,
268-
style: Theme.of(context).textTheme.titleLarge),
268+
style: ChewieTheme.titleLarge),
269269
const SizedBox(height: 30),
270270
Container(
271271
constraints: const BoxConstraints(maxWidth: 400),
@@ -344,7 +344,7 @@ class DatabaseDecryptScreenState extends State<DatabaseDecryptScreen>
344344
child: Text(
345345
S.current.loadSqlcipherFailed,
346346
textAlign: TextAlign.center,
347-
style: Theme.of(context).textTheme.titleLarge,
347+
style: ChewieTheme.titleLarge,
348348
),
349349
),
350350
const SizedBox(height: 30),
@@ -354,7 +354,7 @@ class DatabaseDecryptScreenState extends State<DatabaseDecryptScreen>
354354
child: Text(
355355
S.current.loadSqlcipherFailedMessage,
356356
textAlign: TextAlign.center,
357-
style: Theme.of(context).textTheme.titleMedium,
357+
style: ChewieTheme.titleMedium,
358358
),
359359
),
360360
),

‎lib/Screens/Lock/pin_change_screen.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class PinChangeScreenState extends State<PinChangeScreen> {
100100
const SizedBox(height: 50),
101101
Text(
102102
_notifier.gestureText,
103-
style: Theme.of(context).textTheme.titleMedium,
103+
style: ChewieTheme.titleMedium,
104104
),
105105
const SizedBox(height: 30),
106106
GestureUnlockIndicator(

‎lib/Screens/Lock/pin_verify_screen.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class PinVerifyScreenState extends State<PinVerifyScreen>
193193
const SizedBox(height: 50),
194194
Text(
195195
_notifier.gestureText,
196-
style: Theme.of(context).textTheme.titleMedium,
196+
style: ChewieTheme.titleMedium,
197197
),
198198
const SizedBox(height: 30),
199199
Flexible(

‎lib/Screens/Setting/about_setting_screen.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,23 +183,23 @@ class _AboutSettingScreenState extends State<AboutSettingScreen>
183183
alignment: Alignment.center,
184184
child: Text(
185185
appName,
186-
style: Theme.of(context).textTheme.titleLarge,
186+
style: ChewieTheme.titleLarge,
187187
),
188188
),
189189
Container(
190190
margin: const EdgeInsets.only(top: 3),
191191
alignment: Alignment.center,
192192
child: Text(
193193
versionDetail,
194-
style: Theme.of(context).textTheme.bodySmall,
194+
style: ChewieTheme.bodySmall,
195195
),
196196
),
197197
Container(
198198
margin: const EdgeInsets.only(top: 3),
199199
alignment: Alignment.center,
200200
child: Text(
201201
S.current.licenseDetail(appLicense),
202-
style: Theme.of(context).textTheme.bodySmall,
202+
style: ChewieTheme.bodySmall,
203203
),
204204
),
205205
];

‎lib/Screens/Setting/backup_log_screen.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class BackupLogItemState extends State<BackupLogItem> {
250250
padding: const EdgeInsets.symmetric(
251251
horizontal: 6, vertical: 2),
252252
text: widget.log.lastStatusItem.labelShort,
253-
textStyle: Theme.of(context).textTheme.labelSmall?.apply(
253+
textStyle: ChewieTheme.labelSmall?.apply(
254254
color: Colors.white,
255255
fontSizeDelta: widget.isOverlay ? 0 : 1),
256256
background: widget.log.lastStatus.color,
@@ -263,7 +263,7 @@ class BackupLogItemState extends State<BackupLogItem> {
263263
? Icons.keyboard_arrow_up_rounded
264264
: Icons.keyboard_arrow_down_rounded,
265265
size: 16,
266-
color: Theme.of(context).textTheme.labelSmall?.color),
266+
color: ChewieTheme.labelSmall?.color),
267267
onTap: () {
268268
setState(() {
269269
expanded = !expanded;

‎lib/Screens/Setting/egg_screen.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class _EggScreenState extends State<EggScreen> with TickerProviderStateMixin {
117117
horizontal: 10, vertical: 10),
118118
child: CustomHtmlWidget(
119119
content: S.current.eggEssay,
120-
style: Theme.of(context).textTheme.bodyLarge,
120+
style: ChewieTheme.bodyLarge,
121121
),
122122
),
123123
),

‎lib/Screens/Setting/select_font_screen.dart‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@ class _SelectFontScreenState extends State<SelectFontScreen>
4444
showBack: true,
4545
padding: widget.padding,
4646
onTapBack: () {
47-
if (ResponsiveUtil.isLandscape()) {
48-
chewieProvider.dialogNavigatorState?.popPage();
49-
} else {
50-
Navigator.pop(context);
51-
}
47+
DialogNavigatorHelper.responsivePopPage();
5248
},
5349
children: [
5450
CaptionItem(

‎lib/Screens/Setting/select_theme_screen.dart‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@ class _SelectThemeScreenState extends State<SelectThemeScreen>
4444
showBack: true,
4545
padding: widget.padding,
4646
onTapBack: () {
47-
if (ResponsiveUtil.isLandscape()) {
48-
chewieProvider.dialogNavigatorState?.popPage();
49-
} else {
50-
Navigator.pop(context);
51-
}
47+
DialogNavigatorHelper.responsivePopPage();
5248
},
5349
children: [
5450
CaptionItem(

‎lib/Screens/Setting/setting_general_screen.dart‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ class GeneralSettingScreenState extends State<GeneralSettingScreen>
6161
String _cacheSize = "";
6262
String _logSize = "";
6363
bool inAppBrowser = ChewieHiveUtil.getBool(ChewieHiveUtil.inappWebviewKey);
64+
Locale? _lastLocale;
65+
66+
late SelectionItemModel<int> _currentTrayOption;
6467

6568
@override
6669
void initState() {
@@ -69,6 +72,7 @@ class GeneralSettingScreenState extends State<GeneralSettingScreen>
6972
fetchReleases(false);
7073
getLogSize();
7174
filterLocale();
75+
_currentTrayOption = getTrayOption();
7276
}
7377

7478
refreshLauchAtStartup() {
@@ -78,6 +82,17 @@ class GeneralSettingScreenState extends State<GeneralSettingScreen>
7882
});
7983
}
8084

85+
@override
86+
void didChangeDependencies() {
87+
super.didChangeDependencies();
88+
final currentLocale = Localizations.localeOf(context);
89+
if (_lastLocale != currentLocale) {
90+
_lastLocale = currentLocale;
91+
_currentTrayOption = getTrayOption();
92+
setState(() {});
93+
}
94+
}
95+
8196
@override
8297
@override
8398
Widget build(BuildContext context) {
@@ -245,11 +260,7 @@ class GeneralSettingScreenState extends State<GeneralSettingScreen>
245260
SelectionItemModel(S.current.exitApp, 1),
246261
],
247262
hint: S.current.chooseCloseWindowOption,
248-
selected: SelectionItemModel(
249-
enableMinimizeToTray
250-
? S.current.minimizeToTray
251-
: S.current.exitApp,
252-
enableMinimizeToTray ? 0 : 1),
263+
selected: _currentTrayOption,
253264
onChanged: (item) {
254265
if (item?.value == 0) {
255266
setState(() {
@@ -284,6 +295,13 @@ class GeneralSettingScreenState extends State<GeneralSettingScreen>
284295
);
285296
}
286297

298+
SelectionItemModel<int> getTrayOption() {
299+
return SelectionItemModel(
300+
enableMinimizeToTray ? S.current.minimizeToTray : S.current.exitApp,
301+
enableMinimizeToTray ? 0 : 1,
302+
);
303+
}
304+
287305
_mobileSettings() {
288306
return SearchableCaptionItem(
289307
title: S.current.mobileSetting,

0 commit comments

Comments
 (0)