mirror of
https://github.com/revanced/revanced-manager
synced 2024-05-14 13:56:57 +02:00
fix: Incorrect strings and logics (#1619)
This commit is contained in:
parent
0d45fe4a97
commit
4f22e88e42
@ -52,12 +52,12 @@ class ManagerAPI {
|
||||
String? integrationsVersion = '';
|
||||
|
||||
bool isDefaultPatchesRepo() {
|
||||
return getPatchesRepo().toLowerCase() == 'revanced/revanced-patches';
|
||||
return getPatchesRepo().toLowerCase() == defaultPatchesRepo;
|
||||
}
|
||||
|
||||
bool isDefaultIntegrationsRepo() {
|
||||
return getIntegrationsRepo().toLowerCase() ==
|
||||
'revanced/revanced-integrations';
|
||||
defaultIntegrationsRepo;
|
||||
}
|
||||
|
||||
Future<void> initialize() async {
|
||||
|
@ -32,7 +32,7 @@ class RevancedAPI {
|
||||
final response = await _dio.get('/contributors');
|
||||
final List<dynamic> repositories = response.data['repositories'];
|
||||
for (final Map<String, dynamic> repo in repositories) {
|
||||
final String name = repo['name'];
|
||||
final String name = repo['name'].toLowerCase();
|
||||
contributors[name] = repo['contributors'];
|
||||
}
|
||||
} on Exception catch (e) {
|
||||
@ -54,7 +54,7 @@ class RevancedAPI {
|
||||
final List<dynamic> tools = response.data['tools'];
|
||||
return tools.firstWhereOrNull(
|
||||
(t) =>
|
||||
t['repository'] == repoName &&
|
||||
(t['repository'] as String).toLowerCase() == repoName.toLowerCase() &&
|
||||
(t['name'] as String).endsWith(extension),
|
||||
);
|
||||
} on Exception catch (e) {
|
||||
|
@ -14,9 +14,9 @@ class ContributorsViewModel extends BaseViewModel {
|
||||
final Map<String, List<dynamic>> contributors =
|
||||
await _managerAPI.getContributors();
|
||||
patcherContributors = contributors[_managerAPI.defaultPatcherRepo] ?? [];
|
||||
patchesContributors = contributors[_managerAPI.getPatchesRepo()] ?? [];
|
||||
patchesContributors = contributors[_managerAPI.getPatchesRepo().toLowerCase()] ?? [];
|
||||
integrationsContributors =
|
||||
contributors[_managerAPI.getIntegrationsRepo()] ?? [];
|
||||
contributors[_managerAPI.getIntegrationsRepo().toLowerCase()] ?? [];
|
||||
cliContributors = contributors[_managerAPI.defaultCliRepo] ?? [];
|
||||
managerContributors = contributors[_managerAPI.defaultManagerRepo] ?? [];
|
||||
notifyListeners();
|
||||
|
@ -40,12 +40,11 @@ class HomeViewModel extends BaseViewModel {
|
||||
Future<void> initialize(BuildContext context) async {
|
||||
_managerAPI.rePatchedSavedApps().then((_) => _getPatchedApps());
|
||||
|
||||
_latestManagerVersion = await _managerAPI.getLatestManagerVersion();
|
||||
if (!_managerAPI.getPatchesConsent()) {
|
||||
await showPatchesConsent(context);
|
||||
}
|
||||
|
||||
_latestManagerVersion = await _managerAPI.getLatestManagerVersion();
|
||||
|
||||
await _patcherAPI.initialize();
|
||||
|
||||
await flutterLocalNotificationsPlugin.initialize(
|
||||
|
@ -43,7 +43,10 @@ class SManageApiUrl extends BaseViewModel {
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
),
|
||||
border: const OutlineInputBorder(),
|
||||
labelText: I18nText('settingsView.selectApiURL').toString(),
|
||||
labelText: FlutterI18n.translate(
|
||||
context,
|
||||
'settingsView.selectApiURL',
|
||||
),
|
||||
hintText: apiUrl,
|
||||
),
|
||||
),
|
||||
|
@ -58,9 +58,10 @@ class SManageSources extends BaseViewModel {
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
),
|
||||
border: const OutlineInputBorder(),
|
||||
labelText: I18nText(
|
||||
labelText: FlutterI18n.translate(
|
||||
context,
|
||||
'settingsView.hostRepositoryLabel',
|
||||
).toString(),
|
||||
),
|
||||
hintText: hostRepository,
|
||||
),
|
||||
),
|
||||
@ -76,9 +77,10 @@ class SManageSources extends BaseViewModel {
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
),
|
||||
border: const OutlineInputBorder(),
|
||||
labelText: I18nText(
|
||||
labelText: FlutterI18n.translate(
|
||||
context,
|
||||
'settingsView.orgPatchesLabel',
|
||||
).toString(),
|
||||
),
|
||||
hintText: patchesRepo.split('/')[0],
|
||||
),
|
||||
),
|
||||
@ -94,9 +96,10 @@ class SManageSources extends BaseViewModel {
|
||||
color: Colors.transparent,
|
||||
),
|
||||
border: const OutlineInputBorder(),
|
||||
labelText: I18nText(
|
||||
labelText: FlutterI18n.translate(
|
||||
context,
|
||||
'settingsView.sourcesPatchesLabel',
|
||||
).toString(),
|
||||
),
|
||||
hintText: patchesRepo.split('/')[1],
|
||||
),
|
||||
),
|
||||
@ -112,9 +115,10 @@ class SManageSources extends BaseViewModel {
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
),
|
||||
border: const OutlineInputBorder(),
|
||||
labelText: I18nText(
|
||||
labelText: FlutterI18n.translate(
|
||||
context,
|
||||
'settingsView.orgIntegrationsLabel',
|
||||
).toString(),
|
||||
),
|
||||
hintText: integrationsRepo.split('/')[0],
|
||||
),
|
||||
),
|
||||
@ -130,9 +134,10 @@ class SManageSources extends BaseViewModel {
|
||||
color: Colors.transparent,
|
||||
),
|
||||
border: const OutlineInputBorder(),
|
||||
labelText: I18nText(
|
||||
labelText: FlutterI18n.translate(
|
||||
context,
|
||||
'settingsView.sourcesIntegrationsLabel',
|
||||
).toString(),
|
||||
),
|
||||
hintText: integrationsRepo.split('/')[1],
|
||||
),
|
||||
),
|
||||
|
Loading…
Reference in New Issue
Block a user