Compare commits

...

22 Commits

Author SHA1 Message Date
6b999b0a0c build: bump version to v0.0.39 2022-11-02 00:06:29 +03:00
b00d2d16d4 feat: simplify logging (#305)
Co-authored-by: Ushie <ushiekane@gmail.com>
2022-11-02 00:02:51 +03:00
97d4da568b fix: allow tapping on patch card when experimental switch is enabled (#464) 2022-11-02 00:02:33 +03:00
e563049f6a build: bump version to v0.0.38 2022-11-01 19:04:23 +03:00
cc00d0dc08 bump: kotlin gradle plugin (#461) 2022-11-01 19:03:26 +03:00
2a220c3984 fix: custom sources. 2022-11-01 19:03:30 +05:30
1d440d25be fix: dont select all patches if experimental toggle is off. 2022-11-01 15:36:06 +05:30
ba5234e850 feat: experimental settings to allow patch on any app version. 2022-11-01 15:26:15 +05:30
293f7150f1 build: bump version to v0.0.37 2022-10-31 00:59:57 +03:00
41b1cec8d3 feat: move to new API domain 2022-10-31 00:57:12 +03:00
c129c1eeae build: bump version to v0.0.36
totally didnt forget to bump last night
2022-10-20 10:08:33 +03:00
caa9694543 feat: improve explanation of update being unusable 2022-10-20 00:15:48 +03:00
ac79765372 fix: keystore name typo. 2022-10-19 18:55:27 +05:30
39500f054d feat: disable sentry for time being. 2022-10-19 18:53:13 +05:30
f2d5cc91db Merge branch 'flutter' of https://github.com/revanced/revanced-manager into flutter 2022-10-19 16:33:00 +05:30
84a788fd9e feat: toast for disabled updates. 2022-10-19 16:32:54 +05:30
3778bfe1b5 feat(installer): remove restriction of Share APK, closes #410 (#412)
Share APK has a requirement of needing to install the patched app before sharing, this PR removes that as I see no reason for this restriction
2022-10-18 16:16:04 +03:00
63b2d8e0bd build: remove create env step from actions. 2022-10-17 21:51:18 +05:30
e7490b8d75 refactor: disable sentry for now. 2022-10-17 21:39:46 +05:30
2e050d06e8 feat: remove firebase. (#405)
* feat: remove firebase.

* build: remove firebase config.
2022-10-17 20:24:47 +05:30
5fd1154039 build: bump version to 0.0.34 2022-10-17 19:53:46 +05:30
39401a78ec refactor: disable firebase for now. 2022-10-17 19:52:47 +05:30
21 changed files with 245 additions and 280 deletions

View File

View File

@ -19,11 +19,6 @@ jobs:
- uses: subosito/flutter-action@v1
with:
channel: 'stable'
- uses: SpicyPizza/create-envfile@v1
with:
envkey_sentryDSN: ${{ secrets.SENTRY_DSN }}
envkey_apiKey: ${{ secrets.API_KEY }}
envkey_appId: ${{ secrets.APP_ID }}
- name: Set up Flutter
run: flutter pub get
- name: Generate files with Builder

3
.gitignore vendored
View File

@ -136,6 +136,3 @@ app.*.map.json
Firebase related
.firebase
# Environment variables
android/app/google-services.json

View File

@ -180,7 +180,7 @@ class MainActivity : FlutterActivity() {
patcher.addPatches(patches)
patcher.executePatches().forEach { (patch, res) ->
if (res.isSuccess) {
val msg = "[success] $patch"
val msg = "Applied $patch"
handler.post {
installerChannel.invokeMethod(
"update",
@ -193,7 +193,7 @@ class MainActivity : FlutterActivity() {
}
return@forEach
}
val msg = "[error] $patch:" + res.exceptionOrNull()!!.printStackTrace()
val msg = "$patch failed.\nError:\n" + res.exceptionOrNull()!!.printStackTrace()
handler.post {
installerChannel.invokeMethod(
"update",

View File

@ -1,6 +1,6 @@
buildscript {
ext.cronetVersion = '102.5005.125'
ext.kotlin_version = '1.7.10'
ext.kotlin_version = '1.7.20'
repositories {
google()
mavenCentral()

View File

@ -16,6 +16,7 @@
"patchedSubtitle": "Patched Applications",
"updatesAvailable": "Updates available",
"noUpdates": "No updates available",
"WIP": "Work In Progress",
"noInstallations": "No patched applications installed",
"installed": "Installed",
"updateDialogTitle": "Update Manager",
@ -26,7 +27,8 @@
"installingMessage": "Installing update...",
"errorDownloadMessage": "Unable to download update",
"errorInstallMessage": "Unable to install update",
"noConnection": "No internet connection"
"noConnection": "No internet connection",
"updatesDisabled": "Updating a patched app is currently disabled. Repatch the app again."
},
"applicationItem": {
"patchButton": "Patch",
@ -82,7 +84,8 @@
"patchItem": {
"unsupportedWarningButton": "Warning",
"unsupportedDialogTitle": "Warning",
"unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nCurrent supported versions:\n{supportedVersions}"
"unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nCurrent supported versions:\n{supportedVersions}",
"unsupportedPatchVersion": "Patch is not supported for this app version. Enable experimental toggle in settings to proceed."
},
"installerView": {
"widgetTitle": "Installer",
@ -130,12 +133,13 @@
"apiURLLabel": "API URL",
"apiURLHint": "Configure your custom API URL",
"selectApiURL": "Select URL",
"experimentalPatchesLabel": "Experimental Patch support",
"experimentalPatchesHint": "Enable to use unsupported patches in any app version",
"enabledExperimentalPatches": "Experimental patches enabled",
"aboutLabel": "About",
"snackbarMessage": "Copied to clipboard",
"sentryLabel": "Sentry Logging",
"sentryHint": "Send anonymous logs to help us improve ReVanced Manager",
"firebaseCrashlyticsLabel": "Firebase Crashlytics",
"firebaseCrashlyticsHint": "Send anonymous crash reports to help us improve ReVanced Manager",
"restartAppForChanges": "Restart the app to apply changes",
"deleteKeystoreLabel": "Delete keystore",
"deleteKeystoreHint": "Delete the keystore used to sign the app",

View File

@ -1,63 +0,0 @@
// File generated by FlutterFire CLI.
// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members
import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
import 'package:flutter/foundation.dart'
show defaultTargetPlatform, kIsWeb, TargetPlatform;
import 'package:flutter_dotenv/flutter_dotenv.dart';
/// Default [FirebaseOptions] for use with your Firebase apps.
///
/// Example:
/// ```dart
/// import 'firebase_options.dart';
/// // ...
/// await Firebase.initializeApp(
/// options: DefaultFirebaseOptions.currentPlatform,
/// );
/// ```
class DefaultFirebaseOptions {
static FirebaseOptions get currentPlatform {
if (kIsWeb) {
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for web - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
}
switch (defaultTargetPlatform) {
case TargetPlatform.android:
return android;
case TargetPlatform.iOS:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for ios - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
case TargetPlatform.macOS:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for macos - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
case TargetPlatform.windows:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for windows - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
case TargetPlatform.linux:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for linux - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
default:
throw UnsupportedError(
'DefaultFirebaseOptions are not supported for this platform.',
);
}
}
static FirebaseOptions android = FirebaseOptions(
apiKey: dotenv.env['apiKey'] ?? '',
appId: dotenv.env['appId'] ?? '',
messagingSenderId: '1006104807752',
projectId: 'revanced-manager',
storageBucket: 'revanced-manager.appspot.com',
);
}

View File

@ -1,4 +1,3 @@
import 'package:firebase_crashlytics/firebase_crashlytics.dart';
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
@ -12,62 +11,43 @@ import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
import 'package:stacked_themes/stacked_themes.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:timezone/data/latest.dart' as tz;
import 'package:firebase_core/firebase_core.dart';
import 'firebase_options.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
Future main() async {
await dotenv.load(fileName: ".env");
await ThemeManager.initialise();
await setupLocator();
WidgetsFlutterBinding.ensureInitialized();
await locator<ManagerAPI>().initialize();
String apiUrl = locator<ManagerAPI>().getApiUrl();
await locator<RevancedAPI>().initialize(apiUrl);
bool isSentryEnabled = locator<ManagerAPI>().isSentryEnabled();
bool isCrashlyticsEnabled = locator<ManagerAPI>().isCrashlyticsEnabled();
// Remove this section if you are building from source and don't have firebase config
if (isCrashlyticsEnabled) {
await Firebase.initializeApp(
options: DefaultFirebaseOptions.currentPlatform,
);
Firebase.app().setAutomaticDataCollectionEnabled(true);
} else {
await Firebase.initializeApp(
options: DefaultFirebaseOptions.currentPlatform,
);
Firebase.app().setAutomaticDataCollectionEnabled(false);
}
// bool isSentryEnabled = locator<ManagerAPI>().isSentryEnabled();
locator<GithubAPI>().initialize();
await locator<PatcherAPI>().initialize();
tz.initializeTimeZones();
// Remove this section if you are building from source and don't have sentry configured
await SentryFlutter.init(
(options) {
options
..dsn = isSentryEnabled ? dotenv.env['sentryDSN'] : ''
..environment = 'alpha'
..release = '0.1'
..tracesSampleRate = 1.0
..anrEnabled = true
..enableOutOfMemoryTracking = true
..sampleRate = isSentryEnabled ? 1.0 : 0.0
..beforeSend = (event, hint) {
if (isSentryEnabled) {
return event;
} else {
return null;
}
} as BeforeSendCallback?;
},
appRunner: () {
if (isCrashlyticsEnabled) {
FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterError;
}
runApp(const MyApp());
},
);
// await SentryFlutter.init(
// (options) {
// options
// ..dsn = isSentryEnabled ? '' : ''
// ..environment = 'alpha'
// ..release = '0.1'
// ..tracesSampleRate = 1.0
// ..anrEnabled = true
// ..enableOutOfMemoryTracking = true
// ..sampleRate = isSentryEnabled ? 1.0 : 0.0
// ..beforeSend = (event, hint) {
// if (isSentryEnabled) {
// return event;
// } else {
// return null;
// }
// } as BeforeSendCallback?;
// },
// appRunner: () {
// runApp(const MyApp());
// },
// );
runApp(const MyApp());
}
class MyApp extends StatelessWidget {

View File

@ -5,9 +5,7 @@ import 'package:dio/dio.dart';
import 'package:dio_http_cache_lts/dio_http_cache_lts.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:injectable/injectable.dart';
import 'package:native_dio_client/native_dio_client.dart';
import 'package:revanced_manager/models/patch.dart';
import 'package:revanced_manager/utils/check_for_gms.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:sentry_dio/sentry_dio.dart';
@ -32,20 +30,10 @@ class GithubAPI {
void initialize() async {
try {
bool isGMSInstalled = await checkForGMS();
_dio = Dio(BaseOptions(
baseUrl: 'https://api.github.com',
));
if (!isGMSInstalled) {
_dio = Dio(BaseOptions(
baseUrl: 'https://api.github.com',
));
print('GitHub API: Using default engine + $isGMSInstalled');
} else {
_dio = Dio(BaseOptions(
baseUrl: 'https://api.github.com',
))
..httpClientAdapter = NativeAdapter();
print('ReVanced API: Using CronetEngine + $isGMSInstalled');
}
_dio.interceptors.add(_dioCacheManager.interceptor);
_dio.addSentry(
captureFailedRequests: true,

View File

@ -20,7 +20,7 @@ class ManagerAPI {
final String patcherRepo = 'revanced-patcher';
final String cliRepo = 'revanced-cli';
late SharedPreferences _prefs;
String defaultApiUrl = 'https://releases.rvcd.win/';
String defaultApiUrl = 'https://releases.revanced.app/';
String defaultPatcherRepo = 'revanced/revanced-patcher';
String defaultPatchesRepo = 'revanced/revanced-patches';
String defaultIntegrationsRepo = 'revanced/revanced-integrations';
@ -82,20 +82,20 @@ class ManagerAPI {
await _prefs.setBool('useDarkTheme', value);
}
bool isSentryEnabled() {
return _prefs.getBool('sentryEnabled') ?? true;
// bool isSentryEnabled() {
// return _prefs.getBool('sentryEnabled') ?? true;
// }
// Future<void> setSentryStatus(bool value) async {
// await _prefs.setBool('sentryEnabled', value);
// }
bool areExperimentalPatchesEnabled() {
return _prefs.getBool('experimentalPatchesEnabled') ?? false;
}
Future<void> setSentryStatus(bool value) async {
await _prefs.setBool('sentryEnabled', value);
}
bool isCrashlyticsEnabled() {
return _prefs.getBool('crashlyticsEnabled') ?? true;
}
Future<void> setCrashlyticsStatus(bool value) async {
await _prefs.setBool('crashlyticsEnabled', value);
Future<void> enableExperimentalPatchesStatus(bool value) async {
await _prefs.setBool('experimentalPatchesEnabled', value);
}
Future<void> deleteTempFolder() async {
@ -107,7 +107,7 @@ class ManagerAPI {
Future<void> deleteKeystore() async {
final File keystore = File(
'/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-keystore.keystore');
'/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-manager.keystore');
if (await keystore.exists()) {
await keystore.delete();
}

View File

@ -67,20 +67,20 @@ class HomeView extends StatelessWidget {
const SizedBox(height: 8),
Row(
children: <Widget>[
DashboardChip(
label: I18nText('homeView.updatesAvailable'),
isSelected: model.showUpdatableApps,
onSelected: (value) {
model.toggleUpdatableApps(true);
},
),
const SizedBox(width: 10),
DashboardChip(
label: I18nText('homeView.installed'),
isSelected: !model.showUpdatableApps,
onSelected: (value) {
model.toggleUpdatableApps(false);
},
),
const SizedBox(width: 10),
DashboardChip(
label: I18nText('homeView.updatesAvailable'),
isSelected: model.showUpdatableApps,
onSelected: (value) {
model.toggleUpdatableApps(true);
},
)
],
),

View File

@ -29,7 +29,7 @@ class HomeViewModel extends BaseViewModel {
final Toast _toast = locator<Toast>();
final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
DateTime? _lastUpdate;
bool showUpdatableApps = true;
bool showUpdatableApps = false;
List<PatchedApplication> patchedInstalledApps = [];
List<PatchedApplication> patchedUpdatableApps = [];
@ -143,6 +143,10 @@ class HomeViewModel extends BaseViewModel {
}
}
void updatesAreDisabled() {
_toast.show('homeView.updatesDisabled');
}
Future<void> showUpdateConfirmationDialog(BuildContext parentContext) async {
return showDialog(
context: parentContext,

View File

@ -219,9 +219,7 @@ class InstallerViewModel extends BaseViewModel {
void shareResult() {
try {
if (isInstalled) {
_patcherAPI.sharePatchedFile(_app.name, _app.version);
}
_patcherAPI.sharePatchedFile(_app.name, _app.version);
} on Exception catch (e, s) {
Sentry.captureException(e, stackTrace: s);
}

View File

@ -61,9 +61,16 @@ class PatchesSelectorViewModel extends BaseViewModel {
void selectAllPatches(bool isSelected) {
selectedPatches.clear();
if (isSelected) {
if (isSelected && _managerAPI.areExperimentalPatchesEnabled() == false) {
selectedPatches
.addAll(patches.where((element) => isPatchSupported(element)));
}
if (isSelected && _managerAPI.areExperimentalPatchesEnabled()) {
selectedPatches.addAll(patches);
}
notifyListeners();
}

View File

@ -136,6 +136,23 @@ class SettingsView extends StatelessWidget {
subtitle: 'settingsView.sourcesLabelHint',
onTap: () => model.showSourcesDialog(context),
),
CustomSwitchTile(
padding: const EdgeInsets.symmetric(horizontal: 20.0),
title: I18nText(
'settingsView.experimentalPatchesLabel',
child: const Text(
'',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
subtitle:
I18nText('settingsView.experimentalPatchesHint'),
value: model.areExperimentalPatchesEnabled(),
onTap: (value) =>
model.useExperimentalPatches(value)),
ListTile(
contentPadding:
const EdgeInsets.symmetric(horizontal: 20.0),
@ -187,46 +204,28 @@ class SettingsView extends StatelessWidget {
],
),
_settingsDivider,
SettingsSection(
title: 'settingsView.logsSectionTitle',
children: <Widget>[
CustomSwitchTile(
padding: const EdgeInsets.symmetric(horizontal: 20.0),
title: I18nText(
'settingsView.sentryLabel',
child: const Text(
'',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
subtitle: I18nText('settingsView.sentryHint'),
value: model.isSentryEnabled(),
onTap: (value) => model.useSentry(value),
),
const SizedBox(height: 20.0),
CustomSwitchTile(
padding: const EdgeInsets.symmetric(horizontal: 20.0),
title: I18nText(
'settingsView.firebaseCrashlyticsLabel',
child: const Text(
'',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
subtitle:
I18nText('settingsView.firebaseCrashlyticsHint'),
value: model.isCrashlyticsEnabled(),
onTap: (value) => model.useCrashlytics(value),
),
],
),
_settingsDivider,
// SettingsSection(
// title: 'settingsView.logsSectionTitle',
// children: <Widget>[
// CustomSwitchTile(
// padding: const EdgeInsets.symmetric(horizontal: 20.0),
// title: I18nText(
// 'settingsView.sentryLabel',
// child: const Text(
// '',
// style: TextStyle(
// fontSize: 20,
// fontWeight: FontWeight.w500,
// ),
// ),
// ),
// subtitle: I18nText('settingsView.sentryHint'),
// value: model.isSentryEnabled(),
// onTap: (value) => model.useSentry(value),
// ),
// ],
// ),
// _settingsDivider,
SettingsSection(
title: 'settingsView.infoSectionTitle',
children: <Widget>[

View File

@ -315,25 +315,23 @@ class SettingsViewModel extends BaseViewModel {
);
}
// disable sentry using switch boolean
// bool isSentryEnabled() {
// return _managerAPI.isSentryEnabled();
// }
bool isSentryEnabled() {
return _managerAPI.isSentryEnabled();
// void useSentry(bool value) {
// _managerAPI.setSentryStatus(value);
// _toast.showBottom('settingsView.restartAppForChanges');
// notifyListeners();
// }
bool areExperimentalPatchesEnabled() {
return _managerAPI.areExperimentalPatchesEnabled();
}
void useSentry(bool value) {
_managerAPI.setSentryStatus(value);
_toast.showBottom('settingsView.restartAppForChanges');
notifyListeners();
}
bool isCrashlyticsEnabled() {
return _managerAPI.isCrashlyticsEnabled();
}
void useCrashlytics(bool value) {
_managerAPI.setCrashlyticsStatus(value);
_toast.showBottom('settingsView.restartAppForChanges');
void useExperimentalPatches(bool value) {
_managerAPI.enableExperimentalPatchesStatus(value);
_toast.showBottom('settingsView.enabledExperimentalPatches');
notifyListeners();
}

View File

@ -14,50 +14,74 @@ class AvailableUpdatesCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
return apps.isEmpty
? CustomCard(
child: Center(
child: Column(
children: <Widget>[
Icon(
size: 40,
Icons.update_disabled,
color: Theme.of(context).colorScheme.secondary,
),
const SizedBox(height: 16),
I18nText(
'homeView.noUpdates',
child: Text(
'',
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.subtitle1!.copyWith(
color: Theme.of(context).colorScheme.secondary,
),
),
)
],
),
return CustomCard(
child: Center(
child: Column(
children: <Widget>[
Icon(
size: 40,
Icons.update_disabled,
color: Theme.of(context).colorScheme.secondary,
),
)
: ListView(
shrinkWrap: true,
padding: EdgeInsets.zero,
physics: const NeverScrollableScrollPhysics(),
children: apps
.map((app) => ApplicationItem(
icon: app.icon,
name: app.name,
patchDate: app.patchDate,
changelog: app.changelog,
isUpdatableApp: true,
//TODO: Find a better way to do update functionality
onPressed: () {}
// () =>
// locator<HomeViewModel>().navigateToPatcher(
// app,
// ),
))
.toList(),
);
const SizedBox(height: 16),
I18nText(
'homeView.WIP',
child: Text(
'',
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.subtitle1!.copyWith(
color: Theme.of(context).colorScheme.secondary,
),
),
)
],
),
),
);
// return apps.isEmpty
// ? CustomCard(
// child: Center(
// child: Column(
// children: <Widget>[
// Icon(
// size: 40,
// Icons.update_disabled,
// color: Theme.of(context).colorScheme.secondary,
// ),
// const SizedBox(height: 16),
// I18nText(
// 'homeView.noUpdates',
// child: Text(
// '',
// textAlign: TextAlign.center,
// style: Theme.of(context).textTheme.subtitle1!.copyWith(
// color: Theme.of(context).colorScheme.secondary,
// ),
// ),
// )
// ],
// ),
// ),
// )
// : ListView(
// shrinkWrap: true,
// padding: EdgeInsets.zero,
// physics: const NeverScrollableScrollPhysics(),
// children: apps
// .map((app) => ApplicationItem(
// icon: app.icon,
// name: app.name,
// patchDate: app.patchDate,
// changelog: app.changelog,
// isUpdatableApp: true,
// //TODO: Find a better way to do update functionality
// onPressed: () {}
// // () =>
// // locator<HomeViewModel>().navigateToPatcher(
// // app,
// // ),
// ))
// .toList(),
// );
}
}

View File

@ -1,5 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/services/manager_api.dart';
import 'package:revanced_manager/services/toast.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
@ -15,6 +18,8 @@ class PatchItem extends StatefulWidget {
bool isSelected;
final Function(bool) onChanged;
final Widget? child;
final toast = locator<Toast>();
final _managerAPI = locator<ManagerAPI>();
PatchItem(
{Key? key,
@ -40,8 +45,23 @@ class _PatchItemState extends State<PatchItem> {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 4.0),
child: CustomCard(
backgroundColor: widget.isUnsupported &&
widget._managerAPI.areExperimentalPatchesEnabled() == false
? Theme.of(context).colorScheme.brightness == Brightness.light
? Colors.grey[400]
: Colors.grey[700]
: null,
onTap: () {
setState(() => widget.isSelected = !widget.isSelected);
setState(() {
if (widget.isUnsupported &&
!widget._managerAPI.areExperimentalPatchesEnabled()
) {
widget.isSelected = false;
widget.toast.showBottom('patchItem.unsupportedPatchVersion');
} else {
widget.isSelected = !widget.isSelected;
}
});
widget.onChanged(widget.isSelected);
},
child: Column(
@ -83,7 +103,9 @@ class _PatchItemState extends State<PatchItem> {
overflow: TextOverflow.visible,
style: TextStyle(
fontSize: 14,
color: Theme.of(context).colorScheme.onSecondaryContainer,
color: Theme.of(context)
.colorScheme
.onSecondaryContainer,
),
),
],
@ -101,7 +123,17 @@ class _PatchItemState extends State<PatchItem> {
color: Theme.of(context).colorScheme.primary,
),
onChanged: (newValue) {
setState(() => widget.isSelected = newValue!);
setState(() {
if (widget.isUnsupported &&
!widget._managerAPI.areExperimentalPatchesEnabled()
) {
widget.isSelected = false;
widget.toast
.showBottom('patchItem.unsupportedPatchVersion');
} else {
widget.isSelected = newValue!;
}
});
widget.onChanged(widget.isSelected);
},
),

View File

@ -110,7 +110,7 @@ class _ApplicationItemState extends State<ApplicationItem>
children: <Widget>[
CustomMaterialButton(
label: widget.isUpdatableApp
? I18nText('applicationItem.infoButton')
? I18nText('applicationItem.patchButton')
: I18nText('applicationItem.infoButton'),
onPressed: widget.onPressed,
),

View File

@ -5,22 +5,25 @@ class CustomCard extends StatelessWidget {
final Widget child;
final Function()? onTap;
final EdgeInsetsGeometry? padding;
final Color? backgroundColor;
const CustomCard({
Key? key,
this.isFilled = true,
required this.child,
this.onTap,
this.padding,
}) : super(key: key);
const CustomCard(
{Key? key,
this.isFilled = true,
required this.child,
this.onTap,
this.padding,
this.backgroundColor})
: super(key: key);
@override
Widget build(BuildContext context) {
return Material(
type: isFilled ? MaterialType.card : MaterialType.transparency,
color: isFilled
? Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.4)
: Colors.transparent,
? backgroundColor?.withOpacity(0.4) ??
Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.4)
: backgroundColor ?? Colors.transparent,
borderRadius: BorderRadius.circular(16),
child: InkWell(
onTap: onTap,

View File

@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
publish_to: 'none'
version: 0.0.33+33
version: 0.0.39+39
environment:
sdk: ">=2.17.5 <3.0.0"
@ -73,8 +73,6 @@ dependencies:
url_launcher: ^6.1.5
wakelock: ^0.6.2
sentry_dio: ^6.12.2
firebase_core: ^1.24.0
firebase_crashlytics: ^2.9.0
flutter_dotenv: ^5.0.2
dev_dependencies:
@ -92,3 +90,4 @@ flutter:
uses-material-design: true
assets:
- assets/i18n/
- .env