mirror of
https://github.com/ReVanced/revanced-manager.git
synced 2025-05-20 07:56:47 +08:00
Compare commits
5 Commits
v1.19.0-de
...
v1.19.0-de
Author | SHA1 | Date | |
---|---|---|---|
6d6fae1ecd | |||
6d866d4424 | |||
f4dea6e58c | |||
c72d10ac85 | |||
3e696d6847 |
@ -30,7 +30,8 @@ class InstallerView extends StatelessWidget {
|
||||
bottom: model.isPatching,
|
||||
child: Scaffold(
|
||||
floatingActionButton: Visibility(
|
||||
visible: !model.isPatching && !model.hasErrors,
|
||||
visible:
|
||||
!model.isPatching && !model.hasErrors && !model.isInstalling,
|
||||
child: HapticFloatingActionButtonExtended(
|
||||
label: Text(
|
||||
model.isInstalled
|
||||
|
@ -37,6 +37,7 @@ class InstallerViewModel extends BaseViewModel {
|
||||
String headerLogs = '';
|
||||
bool isRooted = false;
|
||||
bool isPatching = true;
|
||||
bool isInstalling = false;
|
||||
bool isInstalled = false;
|
||||
bool hasErrors = false;
|
||||
bool isCanceled = false;
|
||||
@ -437,6 +438,7 @@ class InstallerViewModel extends BaseViewModel {
|
||||
}
|
||||
|
||||
Future<void> installResult(BuildContext context, bool installAsRoot) async {
|
||||
isInstalling = true;
|
||||
try {
|
||||
_app.isRooted = installAsRoot;
|
||||
if (headerLogs != 'Installing...') {
|
||||
@ -486,6 +488,7 @@ class InstallerViewModel extends BaseViewModel {
|
||||
print(e);
|
||||
}
|
||||
}
|
||||
isInstalling = false;
|
||||
}
|
||||
|
||||
void exportResult() {
|
||||
|
@ -1,6 +1,5 @@
|
||||
// ignore_for_file: use_build_context_synchronously
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:language_code/language_code.dart';
|
||||
import 'package:revanced_manager/app/app.locator.dart';
|
||||
@ -35,8 +34,9 @@ class SUpdateLanguage extends BaseViewModel {
|
||||
}
|
||||
|
||||
Future<void> showLanguagesDialog(BuildContext parentContext) {
|
||||
final ValueNotifier<String> selectedLanguageCode =
|
||||
ValueNotifier(LocaleSettings.currentLocale.languageCode);
|
||||
final ValueNotifier<String> selectedLanguageCode = ValueNotifier(
|
||||
'${LocaleSettings.currentLocale.languageCode}-${LocaleSettings.currentLocale.countryCode}',
|
||||
);
|
||||
// initLang();
|
||||
|
||||
// Return a dialog with list for each language supported by the application.
|
||||
@ -55,30 +55,24 @@ class SUpdateLanguage extends BaseViewModel {
|
||||
child: ListBody(
|
||||
children: AppLocale.values.map(
|
||||
(locale) {
|
||||
LanguageCodes? languageCode;
|
||||
Text? languageNativeName;
|
||||
|
||||
try {
|
||||
languageCode =
|
||||
LanguageCodes.fromCode(locale.languageCode);
|
||||
} catch (e) {
|
||||
if (kDebugMode) {
|
||||
print(e);
|
||||
}
|
||||
}
|
||||
if (languageCode != null) {
|
||||
languageNativeName = Text(languageCode.nativeName);
|
||||
}
|
||||
final LanguageCodes languageCode = LanguageCodes.fromCode(
|
||||
'${locale.languageCode}_${locale.countryCode}',
|
||||
orElse: () => LanguageCodes.fromCode(locale.languageCode),
|
||||
);
|
||||
|
||||
return RadioListTile(
|
||||
title: Text(
|
||||
languageCode?.englishName ?? locale.languageCode,
|
||||
languageCode.englishName,
|
||||
),
|
||||
subtitle: languageNativeName,
|
||||
value: locale.languageCode == selectedLanguageCode.value,
|
||||
subtitle: Text(
|
||||
'${languageCode.nativeName} (${locale.languageCode}${locale.countryCode != null ? '-${locale.countryCode}' : ''})',
|
||||
),
|
||||
value: '${locale.languageCode}-${locale.countryCode}' ==
|
||||
selectedLanguageCode.value,
|
||||
groupValue: true,
|
||||
onChanged: (value) {
|
||||
selectedLanguageCode.value = locale.languageCode;
|
||||
selectedLanguageCode.value =
|
||||
'${locale.languageCode}-${locale.countryCode}';
|
||||
},
|
||||
);
|
||||
},
|
||||
|
@ -110,7 +110,7 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
|
||||
Text(
|
||||
t.suggested(
|
||||
version: widget.suggestedVersion.isEmpty
|
||||
? Text(t.appSelectorCard.anyVersion)
|
||||
? t.appSelectorCard.anyVersion
|
||||
: 'v${widget.suggestedVersion}',
|
||||
),
|
||||
),
|
||||
|
@ -562,10 +562,11 @@ packages:
|
||||
language_code:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: language_code
|
||||
sha256: ca1e026cc5d4ceeeb03beb73c6fc695ff091e00cec76e089394a365917a37909
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
path: "."
|
||||
ref: "21b71892d1ce07fb8ea51ac2b474e435360fb6f7"
|
||||
resolved-ref: "21b71892d1ce07fb8ea51ac2b474e435360fb6f7"
|
||||
url: "https://github.com/Ushie/language_code"
|
||||
source: git
|
||||
version: "0.4.0"
|
||||
leak_tracker:
|
||||
dependency: transitive
|
||||
|
@ -4,7 +4,7 @@ homepage: https://github.com/ReVanced/revanced-manager
|
||||
|
||||
publish_to: 'none'
|
||||
|
||||
version: 1.19.0-dev.15+101900015
|
||||
version: 1.19.0-dev.17+101900017
|
||||
|
||||
environment:
|
||||
sdk: '>=3.0.0 <4.0.0'
|
||||
@ -41,7 +41,10 @@ dependencies:
|
||||
injectable: ^2.1.1
|
||||
intl: ^0.18.0
|
||||
json_annotation: ^4.8.1
|
||||
language_code: ^0.4.0
|
||||
language_code:
|
||||
git:
|
||||
url: https://github.com/Ushie/language_code
|
||||
ref: 21b71892d1ce07fb8ea51ac2b474e435360fb6f7 # Branch: feat/add-Filipino, Upstream PR: https://github.com/lamnhan066/language_code/pull/1
|
||||
logcat:
|
||||
git:
|
||||
url: https://github.com/BenjaminHalko/logcat
|
||||
|
Reference in New Issue
Block a user