Skip to content

Commit

Permalink
Fix: 主题颜色调整
Browse files Browse the repository at this point in the history
  • Loading branch information
honjow committed Jul 22, 2021
1 parent 0159b91 commit 9bab646
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
6 changes: 3 additions & 3 deletions lib/const/theme_colors.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class EhDynamicColors {
static const EhDynamicColor itemBackground = EhDynamicColor(
color: Color.fromARGB(255, 255, 255, 255),
darkColor: Color.fromARGB(255, 30, 30, 30),
darkGrayColor: Color.fromARGB(255, 30, 30, 30),
darkGrayColor: Color.fromARGB(255, 32, 32, 32),
);
}

Expand Down Expand Up @@ -165,7 +165,7 @@ class ThemeColors {
/// 深色灰黑
static CupertinoThemeData darkGrayTheme = CupertinoThemeData(
brightness: Brightness.dark,
scaffoldBackgroundColor: const Color.fromARGB(255, 30, 30, 30),
scaffoldBackgroundColor: const Color.fromARGB(255, 20, 20, 20),
barBackgroundColor: navigationBarBackgroundGray,
textTheme: ehTextTheme,
);
Expand Down Expand Up @@ -243,7 +243,7 @@ class ThemeColors {
debugLabel: 'navigationBarBackgroundGray',
// color: Color.fromARGB(230, 35, 35, 35),
color: Color.fromARGB(200, 249, 249, 249),
darkColor: Color.fromARGB(200, 35, 35, 35),
darkColor: Color.fromARGB(200, 25, 25, 25),
// color: Color.fromARGB(222, 186, 27, 27),
// darkColor: Color.fromARGB(230, 21, 212, 75),
);
Expand Down
16 changes: 10 additions & 6 deletions lib/route/navigator_util.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import 'package:fehviewer/pages/tab/view/search_page_new.dart';
import 'package:fehviewer/route/routes.dart';
import 'package:fehviewer/utils/logger.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';

Expand Down Expand Up @@ -178,12 +179,15 @@ class NavigatorUtil {
static Future<void> goGalleryViewPage(int index, String gid) async {
// logger.d('goGalleryViewPage $index');
// 命名路由方式
// await Get.toNamed(EHRoutes.galleryView, arguments: index);
await Get.toNamed(EHRoutes.galleryViewExt,
arguments: ViewRepository(
index: index,
loadType: LoadType.network,
));
if (!kDebugMode) {
await Get.toNamed(EHRoutes.galleryView, arguments: index);
} else {
await Get.toNamed(EHRoutes.galleryViewExt,
arguments: ViewRepository(
index: index,
loadType: LoadType.network,
));
}
}

static Future<void> goGalleryViewPageFile(
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: fehviewer

publish_to: 'none' # Remove this line if you wish to publish to pub.dev

version: 1.1.20+248
version: 1.1.20+250

environment:
sdk: '>=2.13.0 <3.0.0'
Expand Down

0 comments on commit 9bab646

Please sign in to comment.