Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: incorrect strings and logics #1619

Merged
merged 4 commits into from
Jan 11, 2024
Merged

fix: incorrect strings and logics #1619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70f80c7
fix: incorrect strings and logics
TheAabedKhan Jan 4, 2024
b6039c8
Merge branch 'dev' into logic-issues
TheAabedKhan Jan 10, 2024
51d71bc
fix: use same casing while comparing repo
TheAabedKhan Jan 10, 2024
41d99c5
refactor: default repo names are lowercase already
TheAabedKhan Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/services/manager_api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions lib/services/revanced_api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/views/contributors/contributors_viewmodel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 1 addition & 2 deletions lib/ui/views/home/home_viewmodel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
5 changes: 4 additions & 1 deletion lib/ui/views/settings/settingsFragment/settings_manage_api_url.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
),
Expand Down
25 changes: 15 additions & 10 deletions lib/ui/views/settings/settingsFragment/settings_manage_sources.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
),
Expand All @@ -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],
),
),
Expand All @@ -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],
),
),
Expand All @@ -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],
),
),
Expand All @@ -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],
),
),
Expand Down