ReVanced/revanced-manager
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager.git synced 2025-06-12 12:47:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: major theming overhual, fix light theme.

Browse Source
This commit is contained in:
Aunali321
2022-08-12 15:12:43 +05:30
parent 458f7925b2
commit 4d3ea65d7f
18 changed files with 144 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ui/views/app_selector/app_selector_view.dart
View File

@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/theme.dart';
import 'package:revanced_manager/ui/widgets/installed_app_item.dart';
import 'package:revanced_manager/ui/widgets/search_bar.dart';
import 'package:stacked/stacked.dart';
import 'package:revanced_manager/ui/views/app_selector/app_selector_viewmodel.dart';
import 'package:stacked_themes/stacked_themes.dart';
class AppSelectorView extends StatefulWidget {
const AppSelectorView({Key? key}) : super(key: key);
@ -19,7 +19,6 @@ class _AppSelectorViewState extends State<AppSelectorView> {
@override
Widget build(BuildContext context) {
bool isDark = getThemeManager(context).isDarkMode;
return ViewModelBuilder<AppSelectorViewModel>.reactive(
disposeViewModel: false,
onModelReady: (model) => model.initialise(),
@ -34,12 +33,12 @@ class _AppSelectorViewState extends State<AppSelectorView> {
children: [
SearchBar(
fillColor:
isDark ? Colors.blueGrey[700] : Colors.grey[400],
isDark ? const Color(0xff1B222B) : Colors.grey[200],
hintText: FlutterI18n.translate(
context,
'appSelectorView.searchBarHint',
),
hintTextColor: isDark ? Colors.white : Colors.grey[800],
hintTextColor: Theme.of(context).colorScheme.tertiary,
onQueryChanged: (searchQuery) {
setState(() {
query = searchQuery;
@ -53,9 +52,9 @@ class _AppSelectorViewState extends State<AppSelectorView> {
],
)
: query.isEmpty || query.length < 2
? const Center(
? Center(
child: CircularProgressIndicator(
color: Color(0xff7792BA),
color: Theme.of(context).colorScheme.secondary,
),
)
: Center(

20
lib/ui/views/home/home_view.dart
View File

@ -1,19 +1,18 @@
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:revanced_manager/theme.dart';
import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/available_updates_card.dart';
import 'package:revanced_manager/ui/widgets/installed_apps_card.dart';
import 'package:revanced_manager/ui/widgets/latest_commit_card.dart';
import 'package:stacked/stacked.dart';
import 'package:stacked_themes/stacked_themes.dart';
class HomeView extends StatelessWidget {
const HomeView({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
bool isDark = getThemeManager(context).isDarkMode;
return ViewModelBuilder.reactive(
viewModelBuilder: () => HomeViewModel(),
builder: (context, model, child) => Scaffold(
@ -49,31 +48,36 @@ class HomeView extends StatelessWidget {
child: Text(
'',
style: GoogleFonts.inter(
fontSize: 18,
fontSize: 20,
color: isDark
? const Color(0xffD1E1FA)
: const Color(0xff384E6E),
),
),
),
const SizedBox(height: 10),
LatestCommitCard(
color: isDark ? const Color(0xff1B222B) : Colors.grey[350],
),
color: Theme.of(context).colorScheme.primary),
const SizedBox(height: 14),
I18nText(
'homeView.patchedSubtitle',
child: Text(
'',
style: GoogleFonts.inter(
fontSize: 18,
fontSize: 20,
color: isDark
? const Color(0xffD1E1FA)
: const Color(0xff384E6E),
),
),
),
const SizedBox(height: 14),
AvailableUpdatesCard(
color: isDark ? const Color(0xff1B222B) : Colors.grey[350],
color: Theme.of(context).colorScheme.primary,
),
const SizedBox(height: 15),
InstalledAppsCard(
color: isDark ? const Color(0xff1B222B) : Colors.grey[350],
color: Theme.of(context).colorScheme.primary,
),
],
),

9
lib/ui/views/patcher/patcher_view.dart
View File

@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/theme.dart';
import 'package:revanced_manager/ui/widgets/app_selector_card.dart';
import 'package:revanced_manager/ui/widgets/patch_selector_card.dart';
import 'package:stacked/stacked.dart';
import 'package:stacked_themes/stacked_themes.dart';
import 'patcher_viewmodel.dart';
@ -14,7 +14,6 @@ class PatcherView extends StatelessWidget {
@override
Widget build(BuildContext context) {
bool isDark = getThemeManager(context).isDarkMode;
return ViewModelBuilder<PatcherViewModel>.reactive(
disposeViewModel: false,
viewModelBuilder: () => locator<PatcherViewModel>(),
@ -25,7 +24,7 @@ class PatcherView extends StatelessWidget {
onPressed: () => {},
label: I18nText('patcherView.fabButton'),
icon: const Icon(Icons.build),
backgroundColor: const Color(0xff7792BA),
backgroundColor: Theme.of(context).colorScheme.secondary,
foregroundColor: Colors.white,
),
),
@ -49,7 +48,7 @@ class PatcherView extends StatelessWidget {
const SizedBox(height: 23),
AppSelectorCard(
onPressed: model.navigateToAppSelector,
color: isDark ? const Color(0xff1B222B) : Colors.grey[350],
color: Theme.of(context).colorScheme.primary,
),
const SizedBox(height: 16),
Opacity(
@ -58,7 +57,7 @@ class PatcherView extends StatelessWidget {
: (model.dimPatchCard ? 0.75 : 1),
child: PatchSelectorCard(
onPressed: model.navigateToPatchesSelector,
color: isDark ? const Color(0xff1B222B) : Colors.grey[350],
color: Theme.of(context).colorScheme.primary,
),
),
],

11
lib/ui/views/patches_selector/patches_selector_view.dart
View File

@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/theme.dart';
import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/patch_item.dart';
import 'package:revanced_manager/ui/widgets/search_bar.dart';
import 'package:stacked/stacked.dart';
import 'package:stacked_themes/stacked_themes.dart';
class PatchesSelectorView extends StatefulWidget {
const PatchesSelectorView({Key? key}) : super(key: key);
@ -20,7 +20,6 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
@override
Widget build(BuildContext context) {
bool isDark = getThemeManager(context).isDarkMode;
return ViewModelBuilder<PatchesSelectorViewModel>.reactive(
disposeViewModel: false,
onModelReady: (model) => model.initialise(),
@ -35,12 +34,12 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
children: [
SearchBar(
fillColor:
isDark ? Colors.blueGrey[700] : Colors.grey[400],
isDark ? const Color(0xff1B222B) : Colors.grey[200],
hintText: FlutterI18n.translate(
context,
'patchesSelectorView.searchBarHint',
),
hintTextColor: isDark ? Colors.white : Colors.grey[800],
hintTextColor: Theme.of(context).colorScheme.tertiary,
onQueryChanged: (searchQuery) {
setState(() {
query = searchQuery;
@ -70,9 +69,9 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
),
],
)
: const Center(
: Center(
child: CircularProgressIndicator(
color: Color(0xff7792BA),
color: Theme.of(context).colorScheme.secondary,
),
),
),

5
lib/ui/views/settings/settings_view.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:revanced_manager/theme.dart';
import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
import 'package:stacked/stacked.dart';
import 'package:stacked_themes/stacked_themes.dart';
@ -28,9 +29,9 @@ class SettingsView extends StatelessWidget {
title: I18nText('settingsView.themeLabel'),
subtitle: I18nText('settingsView.themeHint'),
trailing: Switch(
value: model.isDarkMode,
value: isDark,
onChanged: (value) {
model.isDarkMode = value;
isDark = value;
getThemeManager(context).toggleDarkLightTheme();
},
),

1
lib/ui/views/settings/settings_viewmodel.dart
View File

@ -1,7 +1,6 @@
import 'package:stacked/stacked.dart';
class SettingsViewModel extends BaseViewModel {
bool isDarkMode = true;
void setLanguage(String language) {
notifyListeners();
}