Skip to content

Commit 32e92cf

Browse files
omeritzicsomeritzics
committed
Begin moving to Slang
1 parent 7a31427 commit 32e92cf

44 files changed

Lines changed: 499 additions & 530 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lib/app_sources/apkcombo.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:simple_localization/simple_localization.dart';
1+
import 'package:updatium/services/slang-converter.dart';
22
import 'package:html/parser.dart' show parse;
33
import 'package:updatium/providers/source_provider.dart';
44
import 'package:updatium/providers/source_provider.dart' as source_provider;
@@ -7,7 +7,7 @@ import 'package:updatium/providers/logs_provider.dart';
77
class APKCombo extends AppSource {
88
APKCombo() {
99
hosts = ['apkcombo.com'];
10-
name = tr('apkcombo');
10+
name = t('apkcombo');
1111
showReleaseDateAsVersionToggle = true;
1212
}
1313

‎lib/app_sources/apkmirror.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'dart:io';
22

3-
import 'package:simple_localization/simple_localization.dart';
3+
import 'package:updatium/services/slang-converter.dart';
44
import 'package:html/parser.dart';
55
import 'package:http/http.dart';
66
import 'package:updatium/providers/source_provider.dart';
@@ -10,7 +10,7 @@ import 'package:updatium/providers/settings_provider.dart';
1010
class APKMirror extends AppSource {
1111
APKMirror() {
1212
hosts = ['apkmirror.com'];
13-
name = tr('apkmirror');
13+
name = t('apkmirror');
1414
enforceTrackOnly = false;
1515
showReleaseDateAsVersionToggle = true;
1616
additionalSourceAppSpecificSettingFormItems = [];

‎lib/app_sources/apkpure.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'dart:convert';
22

33
import 'package:device_info_plus/device_info_plus.dart';
4-
import 'package:simple_localization/simple_localization.dart';
4+
import 'package:updatium/services/slang-converter.dart';
55
import 'package:updatium/providers/source_provider.dart';
66

77
extension Unique<E, Id> on List<E> {
@@ -16,7 +16,7 @@ extension Unique<E, Id> on List<E> {
1616
class APKPure extends AppSource {
1717
APKPure() {
1818
hosts = ['apkpure.net', 'apkpure.com'];
19-
name = tr('apkpure');
19+
name = t('apkpure');
2020
allowSubDomains = true;
2121
naiveStandardVersionDetection = true;
2222
showReleaseDateAsVersionToggle = true;

‎lib/app_sources/aptoide.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import 'dart:convert';
22

3-
import 'package:simple_localization/simple_localization.dart';
3+
import 'package:updatium/services/slang-converter.dart';
44
import 'package:updatium/providers/source_provider.dart';
55

66
class Aptoide extends AppSource {
77
Aptoide() {
88
hosts = ['aptoide.com'];
9-
name = tr('aptoide');
9+
name = t('aptoide');
1010
allowSubDomains = true;
1111
naiveStandardVersionDetection = true;
1212
showReleaseDateAsVersionToggle = true;
@@ -61,7 +61,7 @@ class Aptoide extends AppSource {
6161
Map<String, dynamic> additionalSettings,
6262
) async {
6363
var appDetails = await getAppDetailsJSON(standardUrl, additionalSettings);
64-
String appName = appDetails['name'] ?? tr('app');
64+
String appName = appDetails['name'] ?? t('app');
6565
String author = appDetails['developer']?['name'] ?? name;
6666
String? dateStr = appDetails['updated'];
6767
String? version = appDetails['file']?['vername'];

‎lib/app_sources/bitbucket.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ import 'package:updatium/providers/source_provider.dart';
77
import 'package:updatium/providers/source_provider.dart' as source_provider;
88
import 'package:updatium/providers/settings_provider.dart';
99
import 'package:updatium/components/generated_form.dart';
10-
import 'package:simple_localization/simple_localization.dart';
10+
import 'package:updatium/services/slang-converter.dart';
1111
import 'package:url_launcher/url_launcher_string.dart';
1212

1313
class Bitbucket extends AppSource {
1414
Bitbucket({bool hostChanged = false}) {
15-
name = tr('bitbucket');
15+
name = t('bitbucket');
1616
hosts = ['bitbucket.org'];
1717
canSearch = true;
1818
showReleaseDateAsVersionToggle = true;
1919
this.hostChanged = hostChanged;
2020
openSource = true;
2121
sourceConfigSettingFormItems = [
2222
GeneratedFormTextField(
23-
tr('bitbucketAPITokenLabel'),
24-
label: tr('bitbucketAPITokenLabel'),
23+
t('bitbucketAPITokenLabel'),
24+
label: t('bitbucketAPITokenLabel'),
2525
hint: 'email@example.com:token',
2626
password: true,
2727
required: false,
@@ -35,7 +35,7 @@ class Bitbucket extends AppSource {
3535
);
3636
},
3737
child: Text(
38-
tr('about'),
38+
t('about'),
3939
style: const TextStyle(
4040
decoration: TextDecoration.underline,
4141
fontSize: 12,
@@ -102,7 +102,7 @@ class Bitbucket extends AppSource {
102102
var fullName = element['full_name'] as String?;
103103
var name = element['name'] as String? ?? '';
104104
var description =
105-
element['description'] as String? ?? tr('noDescription');
105+
element['description'] as String? ?? t('noDescription');
106106
if (fullName != null) {
107107
results['https://${hosts[0]}/$fullName'] = [name, description];
108108
}

‎lib/app_sources/codeberg.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import 'package:simple_localization/simple_localization.dart';
1+
import 'package:updatium/services/slang-converter.dart';
22
import 'package:updatium/app_sources/github.dart';
33
import 'package:updatium/providers/source_provider.dart';
44

55
class Codeberg extends AppSource {
66
GitHub gh = GitHub(hostChanged: true);
77
Codeberg() {
8-
name = tr('codeberg');
8+
name = t('codeberg');
99
hosts = ['codeberg.org'];
1010
additionalSourceAppSpecificSettingFormItems =
1111
gh.additionalSourceAppSpecificSettingFormItems;

‎lib/app_sources/directAPKLink.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:simple_localization/simple_localization.dart';
1+
import 'package:updatium/services/slang-converter.dart';
22
import 'package:updatium/app_sources/html.dart';
33
import 'package:updatium/components/generated_form.dart';
44
import 'package:updatium/providers/source_provider.dart';
@@ -7,7 +7,7 @@ import 'package:updatium/providers/source_provider.dart' as source_provider;
77
class DirectAPKLink extends AppSource {
88
HTML html = HTML();
99
DirectAPKLink() {
10-
name = tr('directAPKLink');
10+
name = t('directAPKLink');
1111
additionalSourceAppSpecificSettingFormItems = [
1212
...html.additionalSourceAppSpecificSettingFormItems.where(
1313
(element) => element
@@ -18,10 +18,10 @@ class DirectAPKLink extends AppSource {
1818
GeneratedFormDropdown(
1919
'defaultPseudoVersioningMethod',
2020
[
21-
MapEntry('partialAPKHash', tr('partialAPKHash')),
21+
MapEntry('partialAPKHash', t('partialAPKHash')),
2222
MapEntry('ETag', 'ETag'),
2323
],
24-
label: tr('defaultPseudoVersioningMethod'),
24+
label: t('defaultPseudoVersioningMethod'),
2525
defaultValue: 'partialAPKHash',
2626
),
2727
],

‎lib/app_sources/fdroid.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'dart:convert';
22

3-
import 'package:simple_localization/simple_localization.dart';
3+
import 'package:updatium/services/slang-converter.dart';
44
import 'package:html/parser.dart';
55
import 'package:http/http.dart';
66
import 'package:updatium/app_sources/github.dart';
@@ -11,15 +11,15 @@ import 'package:updatium/providers/source_provider.dart';
1111
class FDroid extends AppSource {
1212
FDroid() {
1313
hosts = ['f-droid.org'];
14-
name = tr('fdroid');
14+
name = t('fdroid');
1515
naiveStandardVersionDetection = true;
1616
canSearch = true;
1717
openSource = true;
1818
additionalSourceAppSpecificSettingFormItems = [
1919
[
2020
GeneratedFormTextField(
2121
'filterVersionsByRegEx',
22-
label: tr('filterVersionsByRegEx'),
22+
label: t('filterVersionsByRegEx'),
2323
required: false,
2424
additionalValidators: [
2525
(value) {
@@ -155,7 +155,7 @@ class FDroid extends AppSource {
155155
urlsWithDescriptions[url] = [
156156
e.querySelector('.package-name')?.text.trim() ?? '',
157157
e.querySelector('.package-summary')?.text.trim() ??
158-
tr('noDescription'),
158+
t('noDescription'),
159159
];
160160
}
161161
});

‎lib/app_sources/fdroidrepo.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import 'package:simple_localization/simple_localization.dart';
1+
import 'package:updatium/services/slang-converter.dart';
22
import 'package:html/parser.dart';
33
import 'package:http/http.dart';
44
import 'package:updatium/components/generated_form.dart';
55
import 'package:updatium/providers/source_provider.dart';
66

77
class FDroidRepo extends AppSource {
88
FDroidRepo() {
9-
name = tr('fdroidThirdPartyRepo');
9+
name = t('fdroidThirdPartyRepo');
1010
canSearch = true;
1111
includeAdditionalOptsInMainSearch = true;
1212
neverAutoSelect = true;
@@ -16,8 +16,8 @@ class FDroidRepo extends AppSource {
1616
[
1717
GeneratedFormTextField(
1818
'appIdOrName',
19-
label: tr('appIdOrName'),
20-
hint: tr('reposHaveMultipleApps'),
19+
label: t('appIdOrName'),
20+
hint: t('reposHaveMultipleApps'),
2121
required: true,
2222
),
2323
],
@@ -170,7 +170,7 @@ class FDroidRepo extends AppSource {
170170
bool trySelectingSuggestedVersionCode =
171171
additionalSettings['trySelectingSuggestedVersionCode'];
172172
if (appIdOrName == null) {
173-
throw UpdatiumError(tr('appWithIdOrNameNotFound'));
173+
throw UpdatiumError(t('appWithIdOrNameNotFound'));
174174
}
175175
additionalSettings['appIdOrName'] = appIdOrName;
176176
var res = await sourceRequestWithURLVariants(
@@ -194,7 +194,7 @@ class FDroidRepo extends AppSource {
194194
}).toList();
195195
}
196196
if (foundApps.isEmpty) {
197-
throw UpdatiumError(tr('appWithIdOrNameNotFound'));
197+
throw UpdatiumError(t('appWithIdOrNameNotFound'));
198198
}
199199
var authorName = body.querySelector('repo')?.attributes['name'] ?? name;
200200
String appId = foundApps[0].attributes['id']!;

‎lib/app_sources/gitea.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import 'package:updatium/providers/source_provider.dart';
77
import 'package:updatium/providers/source_provider.dart' as source_provider;
88
import 'package:updatium/providers/settings_provider.dart';
99
import 'package:updatium/components/generated_form.dart';
10-
import 'package:simple_localization/simple_localization.dart';
10+
import 'package:updatium/services/slang-converter.dart';
1111
import 'package:url_launcher/url_launcher_string.dart';
1212

1313
class Gitea extends AppSource {
1414
Gitea({bool hostChanged = false}) {
15-
name = tr('gitea');
15+
name = t('gitea');
1616
hosts = ['gitea.com'];
1717
canSearch = true;
1818
showReleaseDateAsVersionToggle = true;
@@ -21,8 +21,8 @@ class Gitea extends AppSource {
2121
openSource = true;
2222
sourceConfigSettingFormItems = [
2323
GeneratedFormTextField(
24-
tr('giteaTokenLabel'),
25-
label: tr('giteaTokenLabel'),
24+
t('giteaTokenLabel'),
25+
label: t('giteaTokenLabel'),
2626
password: true,
2727
required: false,
2828
belowWidgets: [
@@ -35,7 +35,7 @@ class Gitea extends AppSource {
3535
);
3636
},
3737
child: Text(
38-
tr('about'),
38+
t('about'),
3939
style: const TextStyle(
4040
decoration: TextDecoration.underline,
4141
fontSize: 12,
@@ -106,7 +106,7 @@ class Gitea extends AppSource {
106106
var fullName = element['full_name'] as String?;
107107
var name = element['name'] as String? ?? '';
108108
var description =
109-
element['description'] as String? ?? tr('noDescription');
109+
element['description'] as String? ?? t('noDescription');
110110
if (fullName != null) {
111111
results['https://${hosts[0]}/$fullName'] = [name, description];
112112
}

0 commit comments

Comments
 (0)