Skip to content

Commit

Permalink
theme: change black theme color
Browse files Browse the repository at this point in the history
  • Loading branch information
violet-dev committed Jan 16, 2022
1 parent de69b9b commit fda4c56
Show file tree
Hide file tree
Showing 19 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ void main() async {
scaffoldBackgroundColor:
Settings.themeBlack && Settings.themeWhat ? Colors.black : null,
dialogBackgroundColor: Settings.themeBlack && Settings.themeWhat
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: null,
cardColor: Settings.themeBlack && Settings.themeWhat
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: null,
),
themedWidgetBuilder: (context, theme) {
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/after_loading/afterloading_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class AfterLoadingPageState extends State<AfterLoadingPage> {
Widget result = Theme(
data: Theme.of(context).copyWith(
canvasColor: Settings.themeWhat && Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: null,
),
child: BottomNavigationBar(
Expand All @@ -64,7 +64,7 @@ class AfterLoadingPageState extends State<AfterLoadingPage> {
fixedColor: Settings.majorColor,
unselectedItemColor: Settings.themeWhat ? Colors.white : Colors.black,
backgroundColor: Settings.themeWhat && Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: null,
currentIndex: _currentPage,
onTap: (index) {
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/article_info/article_info_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ class ArticleInfoPage extends StatelessWidget {
return Container(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Color(0xFF353535)
: Colors.grey.shade200,
padding: EdgeInsets.only(top: 0, bottom: Variables.bottomBarHeight),
child: Card(
elevation: 5,
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Color(0xFF353535)
: Colors.grey.shade200,
child: SizedBox(
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/artist_info/article_list_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class _ArticleListPageState extends State<ArticleListPage> {
elevation: 5,
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Color(0xFF353535)
: Colors.grey.shade100,
child: SizedBox(
Expand Down Expand Up @@ -110,7 +110,7 @@ class _ArticleListPageState extends State<ArticleListPage> {
child: Card(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Color(0xFF353535)
: Colors.grey.shade100,
shape: RoundedRectangleBorder(
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/artist_info/artist_info_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ class _ArtistInfoPageState extends State<ArtistInfoPage> {
return Container(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Color(0xFF353535)
: Colors.grey.shade100,
child: Padding(
Expand All @@ -361,7 +361,7 @@ class _ArtistInfoPageState extends State<ArtistInfoPage> {
elevation: 5,
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Color(0xFF353535)
: Colors.grey.shade100,
child: SizedBox(
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/artist_info/search_type2.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class SearchType2 extends StatelessWidget {
child: Card(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Color(0xFF353535)
: Colors.grey.shade100,
child: SizedBox(
Expand Down
12 changes: 6 additions & 6 deletions lib/pages/bookmark/bookmark_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class _BookmarkPageState extends State<BookmarkPage>
heroTag: 'speed-dial-hero-tag',
backgroundColor: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.grey.shade800
: Colors.white,
foregroundColor: Settings.majorColor,
Expand Down Expand Up @@ -164,7 +164,7 @@ class _BookmarkPageState extends State<BookmarkPage>
color: Settings.majorColor),
backgroundColor: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.grey.shade800
: Colors.white,
label: Translations.of(context).trans('editorder'),
Expand All @@ -174,7 +174,7 @@ class _BookmarkPageState extends State<BookmarkPage>
),
labelBackgroundColor: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.grey.shade800
: Colors.white,
onTap: () {
Expand All @@ -186,7 +186,7 @@ class _BookmarkPageState extends State<BookmarkPage>
child: Icon(MdiIcons.group, color: Settings.majorColor),
backgroundColor: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.grey.shade800
: Colors.white,
label: Translations.of(context).trans('newgroup'),
Expand All @@ -196,7 +196,7 @@ class _BookmarkPageState extends State<BookmarkPage>
),
labelBackgroundColor: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.grey.shade800
: Colors.white,
onTap: () async {
Expand Down Expand Up @@ -283,7 +283,7 @@ class _BookmarkPageState extends State<BookmarkPage>
child: Material(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.black38
: Colors.white,
child: reorder
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/bookmark/group/group_article_list_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ class _GroupArticleListPageState extends State<GroupArticleListPage> {
child: Card(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Color(0xFF353535)
: Colors.grey.shade100,
shape: RoundedRectangleBorder(
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/bookmark/group/group_artist_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class _GroupArtistListState extends State<GroupArtistList>
child: Card(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Color(0xFF353535)
: Colors.grey.shade100,
shape: RoundedRectangleBorder(
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/download/download_item_menu.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class DownloadImageMenu extends StatelessWidget {
Card(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Color(0xFF353535)
: Colors.grey.shade100,
child: SizedBox(
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/download/download_item_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ class _DownloadItemWidgetState extends State<DownloadItemWidget>
? BoxDecoration(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.grey.shade800
: Colors.white70,
borderRadius: BorderRadius.all(Radius.circular(5)),
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/download/download_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class _DownloadPageState extends State<DownloadPage>
Material(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.grey.shade900.withOpacity(0.4)
: Colors.grey.shade200.withOpacity(0.4),
child: ListTile(
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/main/main_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ class _MainPage2State extends State<MainPage2>
? null
: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.black26
: Colors.white,
child: !Settings.themeFlat
Expand All @@ -746,7 +746,7 @@ class _MainPage2State extends State<MainPage2>
child: Material(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.black38
: Colors.white,
child: Padding(
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/search/search_bar_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class _SearchBarPageState extends State<SearchBarPage>
return Container(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.grey.shade900
: Colors.white,
padding:
Expand All @@ -122,7 +122,7 @@ class _SearchBarPageState extends State<SearchBarPage>
elevation: 100,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(4)),
color: Settings.themeBlack ? const Color(0xFF0F0F0F) : null,
color: Settings.themeBlack ? const Color(0xFF141414) : null,
child: Material(
child: Container(
child: Column(
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/search/search_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ class _SearchPageState extends State<SearchPage>
Material(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.grey.shade900.withOpacity(0.4)
: Colors.grey.shade200.withOpacity(0.4),
child: ListTile(
Expand Down Expand Up @@ -478,7 +478,7 @@ class _SearchPageState extends State<SearchPage>
child: Card(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Color(0xFF353535)
: Colors.grey.shade100,
shape: RoundedRectangleBorder(
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/search/search_type.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class SearchType extends StatelessWidget {
child: Card(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: const Color(0xFF353535)
: Colors.grey.shade100,
child: Container(
Expand Down
10 changes: 5 additions & 5 deletions lib/pages/settings/settings_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ class _SettingsPageState extends State<SettingsPage>
child: Material(
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.black38
: Colors.white,
child: Column(children: items),
Expand Down Expand Up @@ -367,10 +367,10 @@ class _SettingsPageState extends State<SettingsPage>
: null,
dialogBackgroundColor:
Settings.themeBlack && Settings.themeWhat
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: null,
cardColor: Settings.themeBlack && Settings.themeWhat
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: null,
),
);
Expand Down Expand Up @@ -398,10 +398,10 @@ class _SettingsPageState extends State<SettingsPage>
: null,
dialogBackgroundColor:
Settings.themeBlack && Settings.themeWhat
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: null,
cardColor: Settings.themeBlack && Settings.themeWhat
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: null,
),
);
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/viewer/viewer_gallery.dart
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class _ViewerGalleryState extends State<ViewerGallery> {
bottomRight: Radius.circular(10.0)),
color: Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Color(0xFF353535)
: Colors.grey.shade100,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/article_item/article_list_item_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ class BodyWidget extends StatelessWidget {
color: data.showDetail
? Settings.themeWhat
? Settings.themeBlack
? const Color(0xFF0F0F0F)
? const Color(0xFF141414)
: Colors.grey.shade800
: Colors.white70
: Colors.grey.withOpacity(0.3),
Expand Down

0 comments on commit fda4c56

Please sign in to comment.