Compare commits

...

34 Commits

Author SHA1 Message Date
Imran Remtulla
e093fc28b0 Merge pull request #685 from ImranR98/dev
Make page transition animation optional (#683), Add reverse transition animation toggle (#683), Fix text alignment + visibility on app page (#680), Attempt at more resilient XAPK installs (#682)
2023-07-16 12:06:56 -04:00
Imran Remtulla
579bc94847 Attempt at more resilient XAPK installs (#682) 2023-07-16 12:05:43 -04:00
Imran Remtulla
53dba06cc3 Fix text alignment + visibility on app page (#680) 2023-07-16 11:52:18 -04:00
Imran Remtulla
1c390a7f04 Add reverse transition animation toggle (#683) 2023-07-16 11:41:02 -04:00
Imran Remtulla
6b16857186 Make page transition animation optional (#683) 2023-07-16 11:36:49 -04:00
Imran Remtulla
785bba1f45 Merge pull request #679 from ImranR98/dev
Don't auto-capitalize names (#669)
2023-07-15 19:36:26 -04:00
Imran Remtulla
3befcbc16d Don't auto-capitalize names (#669) 2023-07-15 19:35:40 -04:00
Imran Remtulla
be300608a9 Merge pull request #678 from ImranR98/dev
Make transition animation directional (#675), Fix missing update button bug (perform full load on foreground)
2023-07-15 19:23:49 -04:00
Imran Remtulla
f05902925d Increment version 2023-07-15 19:23:00 -04:00
Imran Remtulla
d32e7acc8f Fix missing update button bug (perform full load on foreground) 2023-07-15 19:20:17 -04:00
Imran Remtulla
fda9e6195a Make transition animation directional (#675) 2023-07-15 18:54:53 -04:00
Imran Remtulla
b5d91adb21 Merge pull request #677 from ImranR98/dev
Improve App load performance (#579)
2023-07-15 18:21:03 -04:00
Imran Remtulla
1b52cb6233 Merge pull request #676 from Daviteusz/weblate-obtainium-translate
locale(pl): Update Polish translation
2023-07-15 18:20:44 -04:00
Imran Remtulla
5669634b44 Merge pull request #673 from gidano/main
Update hu.json
2023-07-15 18:20:25 -04:00
Imran Remtulla
d6bb365cf1 Merge pull request #671 from bluefly000/japanese-translation
Update ja.json
2023-07-15 18:20:05 -04:00
Imran Remtulla
53b7cfb9bf Merge pull request #667 from TangyWrecker/main
Update ru.json
2023-07-15 18:19:52 -04:00
Imran Remtulla
2558c851c0 Improve App load performance (#579) 2023-07-15 18:18:35 -04:00
Weblate
a8aa63daa3 locale(pl): Update Polish translation
Co-authored-by: Daviteusz <imefiu3@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
2023-07-15 23:53:20 +02:00
gidano
d587e9f708 Update hu.json 2023-07-15 13:21:58 +02:00
Tangy Wrecker
e2a8f40e3e Update ru.json
Updated, fix and added \n for ru
2023-07-15 08:49:35 +03:00
bluefly000
1cc4241fac Update ja.json 2023-07-15 14:47:27 +09:00
bluefly000
bb98dfe0b3 Update ja.json 2023-07-15 14:09:13 +09:00
Tangy Wrecker
6395dd820b Update ru.json
Fix
2023-07-15 07:38:34 +03:00
Tangy Wrecker
e909c03356 Update ru.json 2023-07-15 07:10:46 +03:00
Imran Remtulla
6a3278432d Merge pull request #666 from ImranR98/dev
Add better GitLab APK discover when API key set (#3 and duplicates #41, #282, partly #356)
2023-07-14 23:56:27 -04:00
Imran Remtulla
81c51970aa Merge remote-tracking branch 'origin/main' into dev 2023-07-14 23:54:17 -04:00
Imran Remtulla
7f9d431b9b Merge pull request #664 from TangyWrecker/main
Update ru.json
2023-07-14 23:54:03 -04:00
Imran Remtulla
360591ebb9 Add better GitLab APK discover when API key set (#3) 2023-07-14 23:53:28 -04:00
Tangy Wrecker
814ff2c2e5 Update ru.json
fix and update
2023-07-15 06:32:08 +03:00
Imran Remtulla
f74df57400 Merge pull request #663 from ImranR98/dev
- Add auto-remove on uninstall option (#656)
- Add option to auto-select the highest version code APK for F-Droid Third-Party Repos (#658)
- Toggle to disable update check on detail page (#659)
- Refresh-on-foreground bugfix
- String capitalization consistency
2023-07-14 22:00:04 -04:00
Imran Remtulla
6b29a0f0f3 Update Packages, increment version 2023-07-14 21:56:57 -04:00
Imran Remtulla
2a58ee8729 Toggle to disable update check on detail page (#659), string capitalization consistency 2023-07-14 21:53:50 -04:00
Imran Remtulla
41d9edcf83 Auto-select version code for F-Droid Third-Party Repos (#658) 2023-07-14 21:36:42 -04:00
Imran Remtulla
3ec33a1c77 Add auto-remove option (#656) + on-foreground bugfix 2023-07-14 21:09:20 -04:00
22 changed files with 399 additions and 136 deletions

View File

@@ -229,11 +229,16 @@
"dontShowTrackOnlyWarnings": "Warnung für 'Nur Nachverfolgen' nicht anzeigen", "dontShowTrackOnlyWarnings": "Warnung für 'Nur Nachverfolgen' nicht anzeigen",
"dontShowAPKOriginWarnings": "Warnung für APK-Herkunft nicht anzeigen", "dontShowAPKOriginWarnings": "Warnung für APK-Herkunft nicht anzeigen",
"moveNonInstalledAppsToBottom": "Nicht installierte Apps ans Ende der Apps Ansicht verschieben", "moveNonInstalledAppsToBottom": "Nicht installierte Apps ans Ende der Apps Ansicht verschieben",
"gitlabPATLabel": "GitLab Personal Access Token (Aktiviert Suche)", "gitlabPATLabel": "GitLab Personal Access Token\n(Aktiviert Suche and Better APK Discovery)",
"about": "Über", "about": "Über",
"requiresCredentialsInSettings": "Benötigt zusätzliche Anmeldedaten (in den Einstellungen)", "requiresCredentialsInSettings": "Benötigt zusätzliche Anmeldedaten (in den Einstellungen)",
"checkOnStart": "Überprüfe einmalig beim Start", "checkOnStart": "Überprüfe einmalig beim Start",
"tryInferAppIdFromCode": "Try inferring App ID from source code", "tryInferAppIdFromCode": "Try inferring App ID from source code",
"removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
"pickHighestVersionCode": "Auto-select highest version code APK",
"checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
"disablePageTransitions": "Disable page transition animations",
"reversePageTransitions": "Reverse page transition animations",
"removeAppQuestion": { "removeAppQuestion": {
"one": "App entfernen?", "one": "App entfernen?",
"other": "Apps entfernen?" "other": "Apps entfernen?"

View File

@@ -121,7 +121,7 @@
"followSystem": "Follow System", "followSystem": "Follow System",
"obtainium": "Obtainium", "obtainium": "Obtainium",
"materialYou": "Material You", "materialYou": "Material You",
"useBlackTheme": "Use Pure Black Dark Theme", "useBlackTheme": "Use pure black dark theme",
"appSortBy": "App Sort By", "appSortBy": "App Sort By",
"authorName": "Author/Name", "authorName": "Author/Name",
"nameAuthor": "Name/Author", "nameAuthor": "Name/Author",
@@ -132,8 +132,8 @@
"bgUpdateCheckInterval": "Background Update Checking Interval", "bgUpdateCheckInterval": "Background Update Checking Interval",
"neverManualOnly": "Never - Manual Only", "neverManualOnly": "Never - Manual Only",
"appearance": "Appearance", "appearance": "Appearance",
"showWebInAppView": "Show Source Webpage in App View", "showWebInAppView": "Show Source webpage in App view",
"pinUpdates": "Pin Updates to Top of Apps View", "pinUpdates": "Pin updates to top of Apps view",
"updates": "Updates", "updates": "Updates",
"sourceSpecific": "Source-Specific", "sourceSpecific": "Source-Specific",
"appSource": "App Source", "appSource": "App Source",
@@ -226,14 +226,19 @@
"autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible", "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
"overrideSource": "Override Source", "overrideSource": "Override Source",
"dontShowAgain": "Don't show this again", "dontShowAgain": "Don't show this again",
"dontShowTrackOnlyWarnings": "Don't Show 'Track-Only' Warnings", "dontShowTrackOnlyWarnings": "Don't show 'Track-Only' warnings",
"dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings", "dontShowAPKOriginWarnings": "Don't show APK origin warnings",
"moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View", "moveNonInstalledAppsToBottom": "Move non-installed Apps to bottom of Apps view",
"gitlabPATLabel": "GitLab Personal Access Token (Enables Search)", "gitlabPATLabel": "GitLab Personal Access Token\n(Enables Search and Better APK Discovery)",
"about": "About", "about": "About",
"requiresCredentialsInSettings": "This needs additional credentials (in Settings)", "requiresCredentialsInSettings": "This needs additional credentials (in Settings)",
"checkOnStart": "Check Once on Start", "checkOnStart": "Check for updates on startup",
"tryInferAppIdFromCode": "Try inferring App ID from source code", "tryInferAppIdFromCode": "Try inferring App ID from source code",
"removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
"pickHighestVersionCode": "Auto-select highest version code APK",
"checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
"disablePageTransitions": "Disable page transition animations",
"reversePageTransitions": "Reverse page transition animations",
"removeAppQuestion": { "removeAppQuestion": {
"one": "Remove App?", "one": "Remove App?",
"other": "Remove Apps?" "other": "Remove Apps?"

View File

@@ -228,12 +228,17 @@
"dontShowAgain": "No mostrar de nuevo", "dontShowAgain": "No mostrar de nuevo",
"dontShowTrackOnlyWarnings": "No mostrar avisos de 'Solo Seguimiento'", "dontShowTrackOnlyWarnings": "No mostrar avisos de 'Solo Seguimiento'",
"dontShowAPKOriginWarnings": "No mostrar avisos de las fuentes de las APks", "dontShowAPKOriginWarnings": "No mostrar avisos de las fuentes de las APks",
"moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View", "moveNonInstalledAppsToBottom": "Move non-installed Apps to bottom of Apps view",
"gitlabPATLabel": "GitLab Personal Access Token (Enables Search)", "gitlabPATLabel": "GitLab Personal Access Token\n(Enables Search and Better APK Discovery)",
"about": "About", "about": "About",
"requiresCredentialsInSettings": "This needs additional credentials (in Settings)", "requiresCredentialsInSettings": "This needs additional credentials (in Settings)",
"checkOnStart": "Check Once on Start", "checkOnStart": "Check for updates on startup",
"tryInferAppIdFromCode": "Try inferring App ID from source code", "tryInferAppIdFromCode": "Try inferring App ID from source code",
"removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
"pickHighestVersionCode": "Auto-select highest version code APK",
"checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
"disablePageTransitions": "Disable page transition animations",
"reversePageTransitions": "Reverse page transition animations",
"removeAppQuestion": { "removeAppQuestion": {
"one": "¿Eliminar Aplicación?", "one": "¿Eliminar Aplicación?",
"other": "¿Eliminar Aplicaciones?" "other": "¿Eliminar Aplicaciones?"

View File

@@ -229,11 +229,16 @@
"dontShowTrackOnlyWarnings": "هشدار 'فقط ردیابی' را نشان ندهید", "dontShowTrackOnlyWarnings": "هشدار 'فقط ردیابی' را نشان ندهید",
"dontShowAPKOriginWarnings": "هشدارهای منبع APK را نشان ندهید", "dontShowAPKOriginWarnings": "هشدارهای منبع APK را نشان ندهید",
"moveNonInstalledAppsToBottom": "برنامه های نصب نشده را به نمای پایین برنامه ها منتقل کنید", "moveNonInstalledAppsToBottom": "برنامه های نصب نشده را به نمای پایین برنامه ها منتقل کنید",
"gitlabPATLabel": "رمز دسترسی شخصی GitLab (جستجو را فعال می کند)", "gitlabPATLabel": "رمز دسترسی شخصی GitLab\n(جستجو را فعال می کند and Better APK Discovery)",
"about": "درباره", "about": "درباره",
"requiresCredentialsInSettings": "این به اعتبارنامه های اضافی نیاز دارد (در تنظیمات)", "requiresCredentialsInSettings": "این به اعتبارنامه های اضافی نیاز دارد (در تنظیمات)",
"checkOnStart": "بررسی در شروع", "checkOnStart": "بررسی در شروع",
"tryInferAppIdFromCode": "شناسه برنامه را از کد منبع استنباط کنید", "tryInferAppIdFromCode": "شناسه برنامه را از کد منبع استنباط کنید",
"removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
"pickHighestVersionCode": "Auto-select highest version code APK",
"checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
"disablePageTransitions": "Disable page transition animations",
"reversePageTransitions": "Reverse page transition animations",
"removeAppQuestion": { "removeAppQuestion": {
"one": "برنامه حذف شود؟", "one": "برنامه حذف شود؟",
"other": "برنامه ها حذف شوند؟" "other": "برنامه ها حذف شوند؟"

View File

@@ -121,7 +121,7 @@
"followSystem": "Suivre le système", "followSystem": "Suivre le système",
"obtainium": "Obtainium", "obtainium": "Obtainium",
"materialYou": "Material You", "materialYou": "Material You",
"useBlackTheme": "Use Pure Black Dark Theme", "useBlackTheme": "Use pure black dark theme",
"appSortBy": "Applications triées par", "appSortBy": "Applications triées par",
"authorName": "Auteur/Nom", "authorName": "Auteur/Nom",
"nameAuthor": "Nom/Auteur", "nameAuthor": "Nom/Auteur",
@@ -227,13 +227,18 @@
"overrideSource": "Override Source", "overrideSource": "Override Source",
"dontShowAgain": "Don't show this again", "dontShowAgain": "Don't show this again",
"dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning", "dontShowTrackOnlyWarnings": "Don't Show the 'Track-Only' Warning",
"dontShowAPKOriginWarnings": "Don't Show APK Origin Warnings", "dontShowAPKOriginWarnings": "Don't show APK origin warnings",
"moveNonInstalledAppsToBottom": "Move Non-Installed Apps to Bottom of Apps View", "moveNonInstalledAppsToBottom": "Move non-installed Apps to bottom of Apps view",
"gitlabPATLabel": "GitLab Personal Access Token (Enables Search)", "gitlabPATLabel": "GitLab Personal Access Token\n(Enables Search and Better APK Discovery)",
"about": "About", "about": "About",
"requiresCredentialsInSettings": "This needs additional credentials (in Settings)", "requiresCredentialsInSettings": "This needs additional credentials (in Settings)",
"checkOnStart": "Check Once on Start", "checkOnStart": "Check for updates on startup",
"tryInferAppIdFromCode": "Try inferring App ID from source code", "tryInferAppIdFromCode": "Try inferring App ID from source code",
"removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
"pickHighestVersionCode": "Auto-select highest version code APK",
"checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
"disablePageTransitions": "Disable page transition animations",
"reversePageTransitions": "Reverse page transition animations",
"removeAppQuestion": { "removeAppQuestion": {
"one": "Supprimer l'application ?", "one": "Supprimer l'application ?",
"other": "Supprimer les applications ?" "other": "Supprimer les applications ?"

View File

@@ -228,11 +228,16 @@
"dontShowTrackOnlyWarnings": "Ne jelenítsen meg 'Csak nyomon követés' figyelmeztetést", "dontShowTrackOnlyWarnings": "Ne jelenítsen meg 'Csak nyomon követés' figyelmeztetést",
"dontShowAPKOriginWarnings": "Ne jelenítsen meg az APK eredetére vonatkozó figyelmeztetéseket", "dontShowAPKOriginWarnings": "Ne jelenítsen meg az APK eredetére vonatkozó figyelmeztetéseket",
"moveNonInstalledAppsToBottom": "Helyezze át a nem telepített appokat az App nézet aljára", "moveNonInstalledAppsToBottom": "Helyezze át a nem telepített appokat az App nézet aljára",
"gitlabPATLabel": "GitLab Personal Access Token (Engedélyezi a Keresést)", "gitlabPATLabel": "GitLab Personal Access Token\n(Engedélyezi a Keresést and Better APK Discovery)",
"about": "Rólunk", "about": "Rólunk",
"requiresCredentialsInSettings": "Ehhez további hitelesítő adatokra van szükség (a Beállításokban)", "requiresCredentialsInSettings": "Ehhez további hitelesítő adatokra van szükség (a Beállításokban)",
"checkOnStart": "Egyszer az indításkor", "checkOnStart": "Egyszer az indításkor",
"tryInferAppIdFromCode": "Próbálja kikövetkeztetni az app azonosítót a forráskódból", "tryInferAppIdFromCode": "Próbálja kikövetkeztetni az app azonosítót a forráskódból",
"removeOnExternalUninstall": "A külsőleg eltávolított appok auto. eltávolítása",
"pickHighestVersionCode": "A legmagasabb verziószámú APK auto. kiválasztása",
"checkUpdateOnDetailPage": "Frissítések keresése az app részleteit tartalmazó oldal megnyitásakor",
"disablePageTransitions": "Disable page transition animations",
"reversePageTransitions": "Reverse page transition animations",
"removeAppQuestion": { "removeAppQuestion": {
"one": "Eltávolítja az alkalmazást?", "one": "Eltávolítja az alkalmazást?",
"other": "Eltávolítja az alkalmazást?" "other": "Eltávolítja az alkalmazást?"

View File

@@ -229,11 +229,16 @@
"dontShowTrackOnlyWarnings": "Non mostrare gli avvisi 'Solo-Monitoraggio'", "dontShowTrackOnlyWarnings": "Non mostrare gli avvisi 'Solo-Monitoraggio'",
"dontShowAPKOriginWarnings": "Non mostrare gli avvisi di origine dell'APK", "dontShowAPKOriginWarnings": "Non mostrare gli avvisi di origine dell'APK",
"moveNonInstalledAppsToBottom": "Sposta le app non installate in fondo alla lista", "moveNonInstalledAppsToBottom": "Sposta le app non installate in fondo alla lista",
"gitlabPATLabel": "GitLab Personal Access Token (attiva la ricerca)", "gitlabPATLabel": "GitLab Personal Access Token\n(attiva la ricerca and Better APK Discovery)",
"about": "Informazioni", "about": "Informazioni",
"requiresCredentialsInSettings": "Servono credenziali aggiuntive (in Impostazioni)", "requiresCredentialsInSettings": "Servono credenziali aggiuntive (in Impostazioni)",
"checkOnStart": "Controlla una volta all'avvio", "checkOnStart": "Controlla una volta all'avvio",
"tryInferAppIdFromCode": "Prova a dedurre l'ID dell'app dal codice sorgente", "tryInferAppIdFromCode": "Prova a dedurre l'ID dell'app dal codice sorgente",
"removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
"pickHighestVersionCode": "Auto-select highest version code APK",
"checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
"disablePageTransitions": "Disable page transition animations",
"reversePageTransitions": "Reverse page transition animations",
"removeAppQuestion": { "removeAppQuestion": {
"one": "Rimuovere l'app?", "one": "Rimuovere l'app?",
"other": "Rimuovere le app?" "other": "Rimuovere le app?"

View File

@@ -135,7 +135,7 @@
"showWebInAppView": "アプリページにソースのWebページを表示する", "showWebInAppView": "アプリページにソースのWebページを表示する",
"pinUpdates": "アップデートがあるアプリをトップに固定する", "pinUpdates": "アップデートがあるアプリをトップに固定する",
"updates": "アップデート", "updates": "アップデート",
"sourceSpecific": "Github アクセストークン", "sourceSpecific": "ソース別の設定",
"appSource": "アプリのソース", "appSource": "アプリのソース",
"noLogs": "ログはありません", "noLogs": "ログはありません",
"appLogs": "アプリのログ", "appLogs": "アプリのログ",
@@ -227,13 +227,18 @@
"overrideSource": "ソースの上書き", "overrideSource": "ソースの上書き",
"dontShowAgain": "二度と表示しない", "dontShowAgain": "二度と表示しない",
"dontShowTrackOnlyWarnings": "「追跡のみ」の警告を表示しない", "dontShowTrackOnlyWarnings": "「追跡のみ」の警告を表示しない",
"dontShowAPKOriginWarnings": "APK Originの警告を表示しない", "dontShowAPKOriginWarnings": "APKのダウンロード元の警告を表示しない",
"moveNonInstalledAppsToBottom": "未インストールのアプリをアプリ一覧の下部に移動させる", "moveNonInstalledAppsToBottom": "未インストールのアプリをアプリ一覧の下部に移動させる",
"gitlabPATLabel": "GitLab パーソナルアクセストークン (検索有効化する)", "gitlabPATLabel": "GitLab パーソナルアクセストークン\n(検索とより良いAPK検出の有効化)",
"about": "概要", "about": "概要",
"requiresCredentialsInSettings": "これには追加の認証が必要です (設定にて)", "requiresCredentialsInSettings": "これには追加の認証が必要です (設定にて)",
"checkOnStart": "Check Once on Start", "checkOnStart": "起動時にアップデートを確認する",
"tryInferAppIdFromCode": "Try inferring App ID from source code", "tryInferAppIdFromCode": "ソースコードからApp IDを推測する",
"removeOnExternalUninstall": "外部でアンインストールされたアプリを自動的に削除する",
"pickHighestVersionCode": "最も高いバージョンコードのAPKを自動的に選択する",
"checkUpdateOnDetailPage": "アプリの詳細ページを開く際にアップデートを確認する",
"disablePageTransitions": "Disable page transition animations",
"reversePageTransitions": "Reverse page transition animations",
"removeAppQuestion": { "removeAppQuestion": {
"one": "アプリを削除しますか?", "one": "アプリを削除しますか?",
"other": "アプリを削除しますか?" "other": "アプリを削除しますか?"

View File

@@ -25,8 +25,8 @@
"bgUpdateTaskFinished": "Zakończono zadanie sprawdzania aktualizacji w tle", "bgUpdateTaskFinished": "Zakończono zadanie sprawdzania aktualizacji w tle",
"firstRun": "Jest to pierwsze uruchomienie Obtainium", "firstRun": "Jest to pierwsze uruchomienie Obtainium",
"settingUpdateCheckIntervalTo": "Ustawianie interwału aktualizacji na {}", "settingUpdateCheckIntervalTo": "Ustawianie interwału aktualizacji na {}",
"githubPATLabel": "Osobisty Token Dostępu GitHub (zwiększa limit zapytań)", "githubPATLabel": "Osobisty token dostępu GitHub (zwiększa limit zapytań)",
"githubPATHint": "Wymagany format OTD: użytkownik:token", "githubPATHint": "Wymagany format: użytkownik:token",
"githubPATFormat": "użytkownik:token", "githubPATFormat": "użytkownik:token",
"includePrereleases": "Uwzględnij wersje wstępne", "includePrereleases": "Uwzględnij wersje wstępne",
"fallbackToOlderReleases": "Powracaj do starszych wersji", "fallbackToOlderReleases": "Powracaj do starszych wersji",
@@ -233,11 +233,16 @@
"dontShowTrackOnlyWarnings": "Nie wyświetlaj ostrzeżeń „Tylko obserwowana”", "dontShowTrackOnlyWarnings": "Nie wyświetlaj ostrzeżeń „Tylko obserwowana”",
"dontShowAPKOriginWarnings": "Nie pokazuj ostrzeżeń o pochodzeniu APK", "dontShowAPKOriginWarnings": "Nie pokazuj ostrzeżeń o pochodzeniu APK",
"moveNonInstalledAppsToBottom": "Przenieś niezainstalowane aplikacje na dół widoku aplikacji", "moveNonInstalledAppsToBottom": "Przenieś niezainstalowane aplikacje na dół widoku aplikacji",
"gitlabPATLabel": "Osobisty Token Dostępu GitLab (umożliwia wyszukiwanie)", "gitlabPATLabel": "Osobisty token dostępu GitLab\n(Umożliwia wyszukiwanie i lepsze wykrywanie APK)",
"about": "Więcej informacji", "about": "Więcej informacji",
"requiresCredentialsInSettings": "Wymaga to dodatkowych poświadczeń (w Ustawieniach)", "requiresCredentialsInSettings": "Wymaga to dodatkowych poświadczeń (w Ustawieniach)",
"checkOnStart": "Sprawdź raz przy starcie", "checkOnStart": "Sprawdź aktualizacje przy uruchomieniu",
"tryInferAppIdFromCode": "Spróbuj wywnioskować identyfikator aplikacji z kodu źródłowego", "tryInferAppIdFromCode": "Spróbuj wywnioskować identyfikator aplikacji z kodu źródłowego",
"removeOnExternalUninstall": "Automatyczne usuń odinstalowane zewnętrznie aplikacje",
"pickHighestVersionCode": "Automatycznie wybierz najwyższy kod wersji APK",
"checkUpdateOnDetailPage": "Sprawdzaj aktualizacje podczas otwierania strony szczegółów aplikacji",
"disablePageTransitions": "Disable page transition animations",
"reversePageTransitions": "Reverse page transition animations",
"removeAppQuestion": { "removeAppQuestion": {
"one": "Usunąć aplikację?", "one": "Usunąć aplikację?",
"other": "Usunąć aplikacje?" "other": "Usunąć aplikacje?"

View File

@@ -7,7 +7,7 @@
"appIdMismatch": "ID загруженного пакета не совпадает с существующим ID приложения", "appIdMismatch": "ID загруженного пакета не совпадает с существующим ID приложения",
"functionNotImplemented": "Этот класс не реализовал эту функцию", "functionNotImplemented": "Этот класс не реализовал эту функцию",
"placeholder": "Заполнитель", "placeholder": "Заполнитель",
"someErrors": "Произошли некоторые ошибки", "someErrors": "Возникли некоторые ошибки",
"unexpectedError": "Неожиданная ошибка", "unexpectedError": "Неожиданная ошибка",
"ok": "Окей", "ok": "Окей",
"and": "и", "and": "и",
@@ -22,7 +22,7 @@
"githubPATFormat": "имя_пользователя:токен", "githubPATFormat": "имя_пользователя:токен",
"includePrereleases": "Включить предварительные релизы", "includePrereleases": "Включить предварительные релизы",
"fallbackToOlderReleases": "Откатиться к более старым версиям", "fallbackToOlderReleases": "Откатиться к более старым версиям",
"filterReleaseTitlesByRegEx": "Фильтровать заголовки релизов с помощью регулярного выражения", "filterReleaseTitlesByRegEx": "Фильтровать заголовки релизов\nс помощью регулярного выражения",
"invalidRegEx": "Неверное регулярное выражение", "invalidRegEx": "Неверное регулярное выражение",
"noDescription": "Нет описания", "noDescription": "Нет описания",
"cancel": "Отмена", "cancel": "Отмена",
@@ -33,7 +33,7 @@
"githubStarredRepos": "Помеченные звездочкой репозитории на GitHub", "githubStarredRepos": "Помеченные звездочкой репозитории на GitHub",
"uname": "Имя пользователя", "uname": "Имя пользователя",
"wrongArgNum": "Неправильное количество предоставленных аргументов", "wrongArgNum": "Неправильное количество предоставленных аргументов",
"xIsTrackOnly": "{} является приложением только для отслеживания", "xIsTrackOnly": "{} только для отслеживания",
"source": "Источник", "source": "Источник",
"app": "Приложение", "app": "Приложение",
"appsFromSourceAreTrackOnly": "Приложения из этого источника являются 'только для отслеживания'.", "appsFromSourceAreTrackOnly": "Приложения из этого источника являются 'только для отслеживания'.",
@@ -100,7 +100,7 @@
"invalidInput": "Неверный ввод", "invalidInput": "Неверный ввод",
"importedX": "Импортировано {}", "importedX": "Импортировано {}",
"obtainiumImport": "Импорт в Obtainium", "obtainiumImport": "Импорт в Obtainium",
"importFromURLList": "Импорт из списка URL-адреса", "importFromURLList": "Импорт из списка URL-адресов",
"searchQuery": "Поисковый запрос", "searchQuery": "Поисковый запрос",
"appURLList": "Список URL приложений", "appURLList": "Список URL приложений",
"line": "Строка", "line": "Строка",
@@ -121,7 +121,7 @@
"followSystem": "Следовать системе", "followSystem": "Следовать системе",
"obtainium": "Obtainium", "obtainium": "Obtainium",
"materialYou": "Material You", "materialYou": "Material You",
"useBlackTheme": "Использовать темную тему", "useBlackTheme": "Использовать чёрную тему",
"appSortBy": "Сортировка приложений по", "appSortBy": "Сортировка приложений по",
"authorName": "Автор/Название", "authorName": "Автор/Название",
"nameAuthor": "Название/Автор", "nameAuthor": "Название/Автор",
@@ -132,7 +132,7 @@
"bgUpdateCheckInterval": "Интервал проверки обновлений в фоновом режиме", "bgUpdateCheckInterval": "Интервал проверки обновлений в фоновом режиме",
"neverManualOnly": "Никогда - Только вручную", "neverManualOnly": "Никогда - Только вручную",
"appearance": "Внешний вид", "appearance": "Внешний вид",
"showWebInAppView": "Показывать веб-страницу источника в представлении приложения", "showWebInAppView": "Показывать исходную веб-страницу в представлении приложения",
"pinUpdates": "Закрепить обновления сверху списка приложений", "pinUpdates": "Закрепить обновления сверху списка приложений",
"updates": "Обновления", "updates": "Обновления",
"sourceSpecific": "Специфика источника", "sourceSpecific": "Специфика источника",
@@ -183,7 +183,7 @@
"appId": "ID приложения", "appId": "ID приложения",
"appWithIdOrNameNotFound": "Приложение с таким ID или названием не было найдено", "appWithIdOrNameNotFound": "Приложение с таким ID или названием не было найдено",
"reposHaveMultipleApps": "В хранилище может быть несколько приложений", "reposHaveMultipleApps": "В хранилище может быть несколько приложений",
"fdroidThirdPartyRepo": "Хранилище F-Droid сторонних разработчиков", "fdroidThirdPartyRepo": "Репозитории F-Droid сторонних разработчиков",
"steam": "Steam", "steam": "Steam",
"steamMobile": "Steam Mobile", "steamMobile": "Steam Mobile",
"steamChat": "Steam Chat", "steamChat": "Steam Chat",
@@ -211,7 +211,7 @@
"copiedToClipboard": "Скопировано в буфер обмена", "copiedToClipboard": "Скопировано в буфер обмена",
"storagePermissionDenied": "Отказано в доступе к хранилищу", "storagePermissionDenied": "Отказано в доступе к хранилищу",
"selectedCategorizeWarning": "Это заменит все текущие настройки категорий для выбранных приложений.", "selectedCategorizeWarning": "Это заменит все текущие настройки категорий для выбранных приложений.",
"filterAPKsByRegEx": "Фильтровать APK-файлы с помощью регулярного выражения", "filterAPKsByRegEx": "Фильтровать APK-файлы с помощью\nрегулярного выражения",
"removeFromObtainium": "Удалить из Obtainium", "removeFromObtainium": "Удалить из Obtainium",
"uninstallFromDevice": "Удалить с устройства", "uninstallFromDevice": "Удалить с устройства",
"onlyWorksWithNonVersionDetectApps": "Работает только для приложений с отключенным определением версии.", "onlyWorksWithNonVersionDetectApps": "Работает только для приложений с отключенным определением версии.",
@@ -219,7 +219,7 @@
"releaseDateAsVersionExplanation": "Этот параметр следует использовать только для приложений, в которых определение версии не работает правильно, но имеется дата выпуска.", "releaseDateAsVersionExplanation": "Этот параметр следует использовать только для приложений, в которых определение версии не работает правильно, но имеется дата выпуска.",
"changes": "Изменения", "changes": "Изменения",
"releaseDate": "Дата выпуска", "releaseDate": "Дата выпуска",
"importFromURLsInFile": "Импортировать из URL-адресов в файл (например, OPML)", "importFromURLsInFile": "Импорт из URL-адресов в файле (например, OPML)",
"versionDetection": "Определение версии", "versionDetection": "Определение версии",
"standardVersionDetection": "Стандартное определение версии", "standardVersionDetection": "Стандартное определение версии",
"groupByCategory": "Группировать по категориям", "groupByCategory": "Группировать по категориям",
@@ -229,11 +229,16 @@
"dontShowTrackOnlyWarnings": "Не показывать предупреждения о только отслеживаемых приложениях", "dontShowTrackOnlyWarnings": "Не показывать предупреждения о только отслеживаемых приложениях",
"dontShowAPKOriginWarnings": "Не показывать предупреждения об источнике APK-файлов", "dontShowAPKOriginWarnings": "Не показывать предупреждения об источнике APK-файлов",
"moveNonInstalledAppsToBottom": "Переместить неустановленные приложения вниз списка", "moveNonInstalledAppsToBottom": "Переместить неустановленные приложения вниз списка",
"gitlabPATLabel": "Персональный токен доступа GitLab (Включает поиск)", "gitlabPATLabel": "Персональный токен доступа GitLab\n(Включает поиск и улучшает обнаружение APK)",
"about": "О приложении", "about": "О приложении",
"requiresCredentialsInSettings": "Для этого требуются дополнительные учетные данные (в настройках)", "requiresCredentialsInSettings": "Для этого требуются дополнительные учетные данные (в настройках)",
"checkOnStart": "Проверить один раз при запуске", "checkOnStart": "Проверять наличие обновлений при запуске",
"tryInferAppIdFromCode": "Попытаться определить ID приложения из исходного кода", "tryInferAppIdFromCode": "Попытаться определить ID приложения из исходного кода",
"removeOnExternalUninstall": "Автоматически убирать из списка удаленные извне приложения",
"pickHighestVersionCode": "Автовыбор кода наивысшей версии APK",
"checkUpdateOnDetailPage": "Проверять наличие обновлений при открытии страницы представления приложения",
"disablePageTransitions": "Disable page transition animations",
"reversePageTransitions": "Reverse page transition animations",
"removeAppQuestion": { "removeAppQuestion": {
"one": "Удалить приложение?", "one": "Удалить приложение?",
"other": "Удалить приложения?" "other": "Удалить приложения?"
@@ -255,8 +260,8 @@
"other": "{} Приложений" "other": "{} Приложений"
}, },
"url": { "url": {
"one": "{} Ссылка", "one": "{} URL-адрес",
"other": "{} Ссылки" "other": "{} URL-адреса"
}, },
"minute": { "minute": {
"one": "{} Минута", "one": "{} Минута",
@@ -275,11 +280,11 @@
"other": "Очищено {n} журналов (до = {before}, после = {after})" "other": "Очищено {n} журналов (до = {before}, после = {after})"
}, },
"xAndNMoreUpdatesAvailable": { "xAndNMoreUpdatesAvailable": {
"one": "У {} и еще 1 приложения есть обновления.", "one": "У {} и еще 1 приложения есть обновление.",
"other": "{} and {} more apps have updates." "other": "У {} и ещё {} приложений есть обновления."
}, },
"xAndNMoreUpdatesInstalled": { "xAndNMoreUpdatesInstalled": {
"one": "{} and 1 more app were updated.", "one": "{} и еще 1 приложение были обновлены.",
"other": "У {} и еще {} приложений есть обновления." "other": "{} и еще {} приложений были обновлены."
} }
} }

View File

@@ -229,11 +229,16 @@
"dontShowTrackOnlyWarnings": "不显示“仅追踪”模式警告", "dontShowTrackOnlyWarnings": "不显示“仅追踪”模式警告",
"dontShowAPKOriginWarnings": "不显示 APK 文件来源警告", "dontShowAPKOriginWarnings": "不显示 APK 文件来源警告",
"moveNonInstalledAppsToBottom": "将未安装应用置底", "moveNonInstalledAppsToBottom": "将未安装应用置底",
"gitlabPATLabel": "GitLab 个人访问令牌(用于搜索应用)", "gitlabPATLabel": "GitLab 个人访问令牌\n(用于搜索应用 and Better APK Discovery",
"about": "相关文档", "about": "相关文档",
"requiresCredentialsInSettings": "此功能需要额外的凭据(在“设置”中添加)", "requiresCredentialsInSettings": "此功能需要额外的凭据(在“设置”中添加)",
"checkOnStart": "启动时进行一次检查", "checkOnStart": "启动时进行一次检查",
"tryInferAppIdFromCode": "尝试从源代码推断应用 ID", "tryInferAppIdFromCode": "尝试从源代码推断应用 ID",
"removeOnExternalUninstall": "Automatically remove externally uninstalled Apps",
"pickHighestVersionCode": "Auto-select highest version code APK",
"checkUpdateOnDetailPage": "Check for updates on opening an App detail page",
"disablePageTransitions": "Disable page transition animations",
"reversePageTransitions": "Reverse page transition animations",
"removeAppQuestion": { "removeAppQuestion": {
"one": "是否删除应用?", "one": "是否删除应用?",
"other": "是否删除应用?" "other": "是否删除应用?"

View File

@@ -14,6 +14,10 @@ class FDroidRepo extends AppSource {
label: tr('appIdOrName'), label: tr('appIdOrName'),
hint: tr('reposHaveMultipleApps'), hint: tr('reposHaveMultipleApps'),
required: true) required: true)
],
[
GeneratedFormSwitch('pickHighestVersionCode',
label: tr('pickHighestVersionCode'), defaultValue: false)
] ]
]; ];
} }
@@ -24,6 +28,7 @@ class FDroidRepo extends AppSource {
Map<String, dynamic> additionalSettings, Map<String, dynamic> additionalSettings,
) async { ) async {
String? appIdOrName = additionalSettings['appIdOrName']; String? appIdOrName = additionalSettings['appIdOrName'];
bool pickHighestVersionCode = additionalSettings['pickHighestVersionCode'];
if (appIdOrName == null) { if (appIdOrName == null) {
throw NoReleasesError(); throw NoReleasesError();
} }
@@ -62,10 +67,19 @@ class FDroidRepo extends AppSource {
if (latestVersion == null) { if (latestVersion == null) {
throw NoVersionError(); throw NoVersionError();
} }
List<String> apkUrls = releases var latestVersionReleases = releases
.where((element) => .where((element) =>
element.querySelector('version')?.innerHtml == latestVersion && element.querySelector('version')?.innerHtml == latestVersion &&
element.querySelector('apkname') != null) element.querySelector('apkname') != null)
.toList();
if (latestVersionReleases.length > 1 && pickHighestVersionCode) {
latestVersionReleases.sort((e1, e2) {
return int.parse(e2.querySelector('versioncode')!.innerHtml)
.compareTo(int.parse(e1.querySelector('versioncode')!.innerHtml));
});
latestVersionReleases = [latestVersionReleases[0]];
}
List<String> apkUrls = latestVersionReleases
.map((e) => '$standardUrl/${e.querySelector('apkname')!.innerHtml}') .map((e) => '$standardUrl/${e.querySelector('apkname')!.innerHtml}')
.toList(); .toList();
return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls), return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),

View File

@@ -102,11 +102,53 @@ class GitLab extends AppSource {
) async { ) async {
bool fallbackToOlderReleases = bool fallbackToOlderReleases =
additionalSettings['fallbackToOlderReleases'] == true; additionalSettings['fallbackToOlderReleases'] == true;
String? PAT = await getPATIfAny();
Iterable<APKDetails> apkDetailsList = [];
if (PAT != null) {
var names = GitHub().getAppNames(standardUrl);
Response res = await sourceRequest(
'https://$host/api/v4/projects/${names.author}%2F${names.name}/releases?private_token=$PAT');
if (res.statusCode != 200) {
throw getObtainiumHttpError(res);
}
var json = jsonDecode(res.body) as List<dynamic>;
apkDetailsList = json.map((e) {
var apkUrlsFromAssets = (e['assets']?['links'] as List<dynamic>? ?? [])
.map((e) {
return (e['direct_asset_url'] ?? e['url'] ?? '') as String;
})
.where((s) => s.isNotEmpty)
.toList();
List<String> uploadedAPKsFromDescription =
((e['description'] ?? '') as String)
.split('](')
.join('\n')
.split('.apk)')
.join('.apk\n')
.split('\n')
.where((s) => s.startsWith('/uploads/') && s.endsWith('apk'))
.map((s) => '$standardUrl$s')
.toList();
var apkUrlsSet = apkUrlsFromAssets.toSet();
apkUrlsSet.addAll(uploadedAPKsFromDescription);
var releaseDateString = e['released_at'] ?? e['created_at'];
DateTime? releaseDate = releaseDateString != null
? DateTime.parse(releaseDateString)
: null;
return APKDetails(
e['tag_name'] ?? e['name'],
getApkUrlsFromUrls(apkUrlsSet.toList()),
GitHub().getAppNames(standardUrl),
releaseDate: releaseDate);
});
} else {
Response res = await sourceRequest('$standardUrl/-/tags?format=atom'); Response res = await sourceRequest('$standardUrl/-/tags?format=atom');
if (res.statusCode == 200) { if (res.statusCode != 200) {
throw getObtainiumHttpError(res);
}
var standardUri = Uri.parse(standardUrl); var standardUri = Uri.parse(standardUrl);
var parsedHtml = parse(res.body); var parsedHtml = parse(res.body);
var apkDetailsList = parsedHtml.querySelectorAll('entry').map((entry) { apkDetailsList = parsedHtml.querySelectorAll('entry').map((entry) {
var entryContent = parse( var entryContent = parse(
parseFragment(entry.querySelector('content')!.innerHtml).text); parseFragment(entry.querySelector('content')!.innerHtml).text);
var apkUrls = [ var apkUrls = [
@@ -124,7 +166,6 @@ class GitLab extends AppSource {
.where((element) => Uri.parse(element).host != '') .where((element) => Uri.parse(element).host != '')
.toList() .toList()
]; ];
var entryId = entry.querySelector('id')?.innerHtml; var entryId = entry.querySelector('id')?.innerHtml;
var version = var version =
entryId == null ? null : Uri.parse(entryId).pathSegments.last; entryId == null ? null : Uri.parse(entryId).pathSegments.last;
@@ -139,6 +180,7 @@ class GitLab extends AppSource {
GitHub().getAppNames(standardUrl), GitHub().getAppNames(standardUrl),
releaseDate: releaseDate); releaseDate: releaseDate);
}); });
}
if (apkDetailsList.isEmpty) { if (apkDetailsList.isEmpty) {
throw NoReleasesError(); throw NoReleasesError();
} }
@@ -152,8 +194,5 @@ class GitLab extends AppSource {
} }
} }
return apkDetailsList.first; return apkDetailsList.first;
} else {
throw getObtainiumHttpError(res);
}
} }
} }

View File

@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
// ignore: implementation_imports // ignore: implementation_imports
import 'package:easy_localization/src/localization.dart'; import 'package:easy_localization/src/localization.dart';
const String currentVersion = '0.13.14'; const String currentVersion = '0.13.18';
const String currentReleaseTag = const String currentReleaseTag =
'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES 'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
@@ -226,9 +226,9 @@ class _ObtainiumState extends State<Obtainium> {
if (!supportedLocales if (!supportedLocales
.map((e) => e.key.languageCode) .map((e) => e.key.languageCode)
.contains(context.locale.languageCode) || .contains(context.locale.languageCode) ||
settingsProvider.forcedLocale == null && (settingsProvider.forcedLocale == null &&
context.deviceLocale.languageCode != context.deviceLocale.languageCode !=
context.locale.languageCode) { context.locale.languageCode)) {
settingsProvider.resetLocaleSafe(context); settingsProvider.resetLocaleSafe(context);
} }
// Register the background update task according to the user's setting // Register the background update task according to the user's setting

View File

@@ -44,7 +44,10 @@ class _AppPageState extends State<AppPage> {
? sourceProvider.getSource(app.app.url, ? sourceProvider.getSource(app.app.url,
overrideSource: app.app.overrideSource) overrideSource: app.app.overrideSource)
: null; : null;
if (!areDownloadsRunning && prevApp == null && app != null) { if (!areDownloadsRunning &&
prevApp == null &&
app != null &&
settingsProvider.checkUpdateOnDetailPage) {
prevApp = app; prevApp = app;
getUpdate(app.app.id); getUpdate(app.app.id);
} }
@@ -54,6 +57,11 @@ class _AppPageState extends State<AppPage> {
app?.app.additionalSettings['versionDetection'] == app?.app.additionalSettings['versionDetection'] ==
'standardVersionDetection'; 'standardVersionDetection';
bool installedVersionIsEstimate = trackOnly ||
(app?.app.installedVersion != null &&
app?.app.additionalSettings['versionDetection'] ==
'noVersionDetection');
getInfoColumn() => Column( getInfoColumn() => Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -89,9 +97,7 @@ class _AppPageState extends State<AppPage> {
app?.app.latestVersion ?? tr('unknown') app?.app.latestVersion ?? tr('unknown')
])}\n${tr('installedVersionX', args: [ ])}\n${tr('installedVersionX', args: [
app?.app.installedVersion ?? tr('none') app?.app.installedVersion ?? tr('none')
])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [ ])}${installedVersionIsEstimate ? '\n${tr('estimateInBrackets')}' : ''}',
tr('app')
])}' : ''}',
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: Theme.of(context).textTheme.bodyLarge!, style: Theme.of(context).textTheme.bodyLarge!,
), ),
@@ -102,11 +108,14 @@ class _AppPageState extends State<AppPage> {
Column( Column(
children: [ children: [
const SizedBox( const SizedBox(
height: 4, height: 16,
), ),
Text( Text(
tr('noVersionDetection'), '${trackOnly ? '${tr('xIsTrackOnly', args: [
tr('app')
])}\n' : ''}${tr('noVersionDetection')}',
style: Theme.of(context).textTheme.labelSmall, style: Theme.of(context).textTheme.labelSmall,
textAlign: TextAlign.center,
) )
], ],
), ),

View File

@@ -7,6 +7,7 @@ import 'package:obtainium/pages/apps.dart';
import 'package:obtainium/pages/import_export.dart'; import 'package:obtainium/pages/import_export.dart';
import 'package:obtainium/pages/settings.dart'; import 'package:obtainium/pages/settings.dart';
import 'package:obtainium/providers/apps_provider.dart'; import 'package:obtainium/providers/apps_provider.dart';
import 'package:obtainium/providers/settings_provider.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class HomePage extends StatefulWidget { class HomePage extends StatefulWidget {
@@ -26,6 +27,7 @@ class NavigationPageItem {
class _HomePageState extends State<HomePage> { class _HomePageState extends State<HomePage> {
List<int> selectedIndexHistory = []; List<int> selectedIndexHistory = [];
bool isReversing = false;
int prevAppCount = -1; int prevAppCount = -1;
bool prevIsLoading = true; bool prevIsLoading = true;
@@ -41,8 +43,18 @@ class _HomePageState extends State<HomePage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
AppsProvider appsProvider = context.watch<AppsProvider>(); AppsProvider appsProvider = context.watch<AppsProvider>();
SettingsProvider settingsProvider = context.watch<SettingsProvider>();
setIsReversing(int targetIndex) {
bool reversing = selectedIndexHistory.isNotEmpty &&
selectedIndexHistory.last > targetIndex;
setState(() {
isReversing = reversing;
});
}
switchToPage(int index) async { switchToPage(int index) async {
setIsReversing(index);
if (index == 0) { if (index == 0) {
while ((pages[0].widget.key as GlobalKey<AppsPageState>).currentState != while ((pages[0].widget.key as GlobalKey<AppsPageState>).currentState !=
null) { null) {
@@ -79,6 +91,12 @@ class _HomePageState extends State<HomePage> {
child: Scaffold( child: Scaffold(
backgroundColor: Theme.of(context).colorScheme.surface, backgroundColor: Theme.of(context).colorScheme.surface,
body: PageTransitionSwitcher( body: PageTransitionSwitcher(
duration: Duration(
milliseconds:
settingsProvider.disablePageTransitions ? 0 : 300),
reverse: settingsProvider.reversePageTransitions
? !isReversing
: isReversing,
transitionBuilder: ( transitionBuilder: (
Widget child, Widget child,
Animation<double> animation, Animation<double> animation,
@@ -104,13 +122,16 @@ class _HomePageState extends State<HomePage> {
.toList(), .toList(),
onDestinationSelected: (int index) async { onDestinationSelected: (int index) async {
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
await switchToPage(index); switchToPage(index);
}, },
selectedIndex: selectedIndex:
selectedIndexHistory.isEmpty ? 0 : selectedIndexHistory.last, selectedIndexHistory.isEmpty ? 0 : selectedIndexHistory.last,
), ),
), ),
onWillPop: () async { onWillPop: () async {
setIsReversing(selectedIndexHistory.length >= 2
? selectedIndexHistory.reversed.toList()[1]
: 0);
if (selectedIndexHistory.isNotEmpty) { if (selectedIndexHistory.isNotEmpty) {
setState(() { setState(() {
selectedIndexHistory.removeLast(); selectedIndexHistory.removeLast();

View File

@@ -240,6 +240,21 @@ class _SettingsPageState extends State<SettingsPage> {
}) })
], ],
), ),
height16,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: Text(tr('checkUpdateOnDetailPage'))),
Switch(
value: settingsProvider
.checkUpdateOnDetailPage,
onChanged: (value) {
settingsProvider.checkUpdateOnDetailPage =
value;
})
],
),
height32, height32,
Text( Text(
tr('sourceSpecific'), tr('sourceSpecific'),
@@ -322,6 +337,22 @@ class _SettingsPageState extends State<SettingsPage> {
], ],
), ),
height16, height16,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child:
Text(tr('removeOnExternalUninstall'))),
Switch(
value: settingsProvider
.removeOnExternalUninstall,
onChanged: (value) {
settingsProvider
.removeOnExternalUninstall = value;
})
],
),
height16,
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@@ -365,6 +396,36 @@ class _SettingsPageState extends State<SettingsPage> {
}) })
], ],
), ),
height16,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: Text(tr('disablePageTransitions'))),
Switch(
value:
settingsProvider.disablePageTransitions,
onChanged: (value) {
settingsProvider.disablePageTransitions =
value;
})
],
),
height16,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: Text(tr('reversePageTransitions'))),
Switch(
value:
settingsProvider.reversePageTransitions,
onChanged: (value) {
settingsProvider.reversePageTransitions =
value;
})
],
),
height32, height32,
Text( Text(
tr('categories'), tr('categories'),

View File

@@ -117,7 +117,7 @@ class AppsProvider with ChangeNotifier {
foregroundStream = FGBGEvents.stream.asBroadcastStream(); foregroundStream = FGBGEvents.stream.asBroadcastStream();
foregroundSubscription = foregroundStream?.listen((event) async { foregroundSubscription = foregroundStream?.listen((event) async {
isForeground = event == FGBGType.foreground; isForeground = event == FGBGType.foreground;
if (isForeground) await refreshInstallStatuses(); if (isForeground) await loadApps();
}); });
() async { () async {
var cacheDirs = await getExternalCacheDirectories(); var cacheDirs = await getExternalCacheDirectories();
@@ -335,24 +335,39 @@ class AppsProvider with ChangeNotifier {
} }
Future<void> unzipFile(String filePath, String destinationPath) async { Future<void> unzipFile(String filePath, String destinationPath) async {
await ZipFile.extractToDirectory(zipFile: File(filePath), destinationDir: Directory(destinationPath)); await ZipFile.extractToDirectory(
zipFile: File(filePath), destinationDir: Directory(destinationPath));
} }
Future<void> installXApkDir(DownloadedXApkDir dir, Future<void> installXApkDir(DownloadedXApkDir dir,
{bool silent = false}) async { {bool silent = false}) async {
// We don't know which APKs in an XAPK are supported by the user's device
// So we try installing all of them and assume success if at least one installed
// If 0 APKs installed, throw the first install error encountered
try { try {
var somethingInstalled = false; var somethingInstalled = false;
for (var file in dir.extracted.listSync(recursive: true, followLinks: false).whereType<File>()) { var firstError = null;
for (var file in dir.extracted
.listSync(recursive: true, followLinks: false)
.whereType<File>()) {
if (file.path.toLowerCase().endsWith('.apk')) { if (file.path.toLowerCase().endsWith('.apk')) {
try {
somethingInstalled = somethingInstalled || somethingInstalled = somethingInstalled ||
await installApk(DownloadedApk(dir.appId, file), silent: silent); await installApk(DownloadedApk(dir.appId, file),
silent: silent);
} catch (e) {
logs.add(
'Could not install APK from XAPK \'${file.path}\': ${e.toString()}');
firstError ??= e;
} }
else if (file.path.toLowerCase().endsWith('.obb')) { } else if (file.path.toLowerCase().endsWith('.obb')) {
await moveObbFile(file, dir.appId); await moveObbFile(file, dir.appId);
} }
} }
if (somethingInstalled) { if (somethingInstalled) {
dir.file.delete(recursive: true); dir.file.delete(recursive: true);
} else if (firstError) {
throw firstError;
} }
} finally { } finally {
dir.extracted.delete(recursive: true); dir.extracted.delete(recursive: true);
@@ -723,21 +738,12 @@ class AppsProvider with ChangeNotifier {
notifyListeners(); notifyListeners();
var sp = SourceProvider(); var sp = SourceProvider();
List<List<String>> errors = []; List<List<String>> errors = [];
List<FileSystemEntity> newApps = (await getAppsDir()) List<App?> newApps = (await getAppsDir()) // Parse Apps from JSON
.listSync() .listSync()
.where((item) => item.path.toLowerCase().endsWith('.json')) .where((item) => item.path.toLowerCase().endsWith('.json'))
.toList(); .map((e) {
for (var e in newApps) {
try { try {
var app = App.fromJson(jsonDecode(File(e.path).readAsStringSync())); return App.fromJson(jsonDecode(File(e.path).readAsStringSync()));
try {
var info = await getInstalledInfo(app.id);
sp.getSource(app.url, overrideSource: app.overrideSource);
apps[app.id] = AppInMemory(app, null, info);
notifyListeners();
} catch (e) {
errors.add([app.id, app.finalName, e.toString()]);
}
} catch (err) { } catch (err) {
if (err is FormatException) { if (err is FormatException) {
logs.add('Corrupt JSON when loading App (will be ignored): $e'); logs.add('Corrupt JSON when loading App (will be ignored): $e');
@@ -746,19 +752,36 @@ class AppsProvider with ChangeNotifier {
rethrow; rethrow;
} }
} }
}).toList();
for (var app in newApps) {
// Put Apps into memory to list them (fast)
if (app != null) {
try {
sp.getSource(app.url, overrideSource: app.overrideSource);
apps.update(
app.id,
(value) =>
AppInMemory(app, value.downloadProgress, value.installedInfo),
ifAbsent: () => AppInMemory(app, null, null));
} catch (e) {
errors.add([app.id, app.finalName, e.toString()]);
} }
}
}
notifyListeners();
if (errors.isNotEmpty) { if (errors.isNotEmpty) {
removeApps(errors.map((e) => e[0]).toList()); removeApps(errors.map((e) => e[0]).toList());
NotificationsProvider().notify( NotificationsProvider().notify(
AppsRemovedNotification(errors.map((e) => [e[1], e[2]]).toList())); AppsRemovedNotification(errors.map((e) => [e[1], e[2]]).toList()));
} }
loadingApps = false;
notifyListeners();
refreshInstallStatuses();
}
Future<void> refreshInstallStatuses() async {
if (await doesInstalledAppsPluginWork()) { if (await doesInstalledAppsPluginWork()) {
for (var app in apps.values) {
// Check install status for each App (slow)
apps[app.app.id]?.installedInfo = await getInstalledInfo(app.app.id);
notifyListeners();
}
// Reconcile version differences
List<App> modifiedApps = []; List<App> modifiedApps = [];
for (var app in apps.values) { for (var app in apps.values) {
var moddedApp = var moddedApp =
@@ -769,9 +792,24 @@ class AppsProvider with ChangeNotifier {
} }
if (modifiedApps.isNotEmpty) { if (modifiedApps.isNotEmpty) {
await saveApps(modifiedApps, attemptToCorrectInstallStatus: false); await saveApps(modifiedApps, attemptToCorrectInstallStatus: false);
var removedAppIds = modifiedApps
.where((a) => a.installedVersion == null)
.map((e) => e.id)
.toList();
// After reconciliation, delete externally uninstalled Apps if needed
if (removedAppIds.isNotEmpty) {
var settingsProvider = SettingsProvider();
await settingsProvider.initializeSettings();
if (settingsProvider.removeOnExternalUninstall) {
await removeApps(removedAppIds);
} }
} }
} }
}
loadingApps = false;
notifyListeners();
}
Future<void> saveApps(List<App> apps, Future<void> saveApps(List<App> apps,
{bool attemptToCorrectInstallStatus = true, {bool attemptToCorrectInstallStatus = true,

View File

@@ -273,4 +273,40 @@ class SettingsProvider with ChangeNotifier {
context.deleteSaveLocale(); context.deleteSaveLocale();
} }
} }
bool get removeOnExternalUninstall {
return prefs?.getBool('removeOnExternalUninstall') ?? false;
}
set removeOnExternalUninstall(bool show) {
prefs?.setBool('removeOnExternalUninstall', show);
notifyListeners();
}
bool get checkUpdateOnDetailPage {
return prefs?.getBool('checkUpdateOnDetailPage') ?? true;
}
set checkUpdateOnDetailPage(bool show) {
prefs?.setBool('checkUpdateOnDetailPage', show);
notifyListeners();
}
bool get disablePageTransitions {
return prefs?.getBool('disablePageTransitions') ?? false;
}
set disablePageTransitions(bool show) {
prefs?.setBool('disablePageTransitions', show);
notifyListeners();
}
bool get reversePageTransitions {
return prefs?.getBool('reversePageTransitions') ?? false;
}
set reversePageTransitions(bool show) {
prefs?.setBool('reversePageTransitions', show);
notifyListeners();
}
} }

View File

@@ -594,9 +594,7 @@ class SourceProvider {
} }
String apkVersion = apk.version.replaceAll('/', '-'); String apkVersion = apk.version.replaceAll('/', '-');
var name = currentApp != null ? currentApp.name.trim() : ''; var name = currentApp != null ? currentApp.name.trim() : '';
name = name.isNotEmpty name = name.isNotEmpty ? name : apk.names.name;
? name
: apk.names.name[0].toUpperCase() + apk.names.name.substring(1);
return App( return App(
currentApp?.id ?? currentApp?.id ??
((!source.appIdInferIsOptional || ((!source.appIdInferIsOptional ||
@@ -606,7 +604,7 @@ class SourceProvider {
: null) ?? : null) ??
generateTempID(standardUrl, additionalSettings), generateTempID(standardUrl, additionalSettings),
standardUrl, standardUrl,
apk.names.author[0].toUpperCase() + apk.names.author.substring(1), apk.names.author,
name, name,
currentApp?.installedVersion, currentApp?.installedVersion,
apkVersion, apkVersion,

View File

@@ -402,10 +402,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: markdown name: markdown
sha256: "8e332924094383133cee218b676871f42db2514f1f6ac617b6cf6152a7faab8e" sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "7.1.0" version: "7.1.1"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
@@ -490,10 +490,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: path_provider_foundation name: path_provider_foundation
sha256: "1995d88ec2948dac43edf8fe58eb434d35d22a2940ecee1a9fefcd62beee6eb3" sha256: "916731ccbdce44d545414dd9961f26ba5fbaa74bcbb55237d8e65a623a8c7297"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.2.3" version: "2.2.4"
path_provider_linux: path_provider_linux:
dependency: transitive dependency: transitive
description: description:
@@ -522,34 +522,34 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: permission_handler name: permission_handler
sha256: "415af30ba76a84faccfe1eb251fe1e4fdc790f876924c65ad7d6ed7a1404bcd6" sha256: "63e5216aae014a72fe9579ccd027323395ce7a98271d9defa9d57320d001af81"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "10.4.2" version: "10.4.3"
permission_handler_android: permission_handler_android:
dependency: transitive dependency: transitive
description: description:
name: permission_handler_android name: permission_handler_android
sha256: "3b61f3da3b1c83bc3fb6a2b431e8dab01d0e5b45f6a3d9c7609770ec88b2a89e" sha256: c0c9754479a4c4b1c1f3862ddc11930c9b3f03bef2816bb4ea6eed1e13551d6f
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "10.3.0" version: "10.3.2"
permission_handler_apple: permission_handler_apple:
dependency: transitive dependency: transitive
description: description:
name: permission_handler_apple name: permission_handler_apple
sha256: "7a187b671a39919462af2b5e813148365b71a615979165a119868d667fe90c03" sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "9.1.3" version: "9.1.4"
permission_handler_platform_interface: permission_handler_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: permission_handler_platform_interface name: permission_handler_platform_interface
sha256: "463a07cb7cc6c758a7a1c7da36ce666bb80a0b4b5e92df0fa36872e0ed456993" sha256: "7c6b1500385dd1d2ca61bb89e2488ca178e274a69144d26bbd65e33eae7c02a9"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.11.1" version: "3.11.3"
permission_handler_windows: permission_handler_windows:
dependency: transitive dependency: transitive
description: description:
@@ -590,14 +590,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.7.3" version: "3.7.3"
process:
dependency: transitive
description:
name: process
sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
url: "https://pub.dev"
source: hosted
version: "4.2.4"
provider: provider:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -642,10 +634,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_foundation name: shared_preferences_foundation
sha256: b046999bf0ff58f04c364491bb803dcfa8f42e47b19c75478f53d323684a8cc1 sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.3.1" version: "2.3.2"
shared_preferences_linux: shared_preferences_linux:
dependency: transitive dependency: transitive
description: description:
@@ -807,10 +799,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: url_launcher_macos name: url_launcher_macos
sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e" sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.5" version: "3.0.6"
url_launcher_platform_interface: url_launcher_platform_interface:
dependency: transitive dependency: transitive
description: description:
@@ -863,26 +855,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: webview_flutter_android name: webview_flutter_android
sha256: "1c93e96f3069bacdc734fad6b7e1d3a480fd516a3ae5b8858becf7f07515a2f3" sha256: "27ad6a99c4b2d5e1ffd2b993a10f738b6b4979f139b4d64c34ac511595fcd748"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.8.2" version: "3.9.0"
webview_flutter_platform_interface: webview_flutter_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: webview_flutter_platform_interface name: webview_flutter_platform_interface
sha256: "656e2aeaef318900fffd21468b6ddc7958c7092a642f0e7220bac328b70d4a81" sha256: "564ef378cafc1a0e29f1d76ce175ef517a0a6115875dff7b43fccbef2b0aeb30"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.3.1" version: "2.4.0"
webview_flutter_wkwebview: webview_flutter_wkwebview:
dependency: transitive dependency: transitive
description: description:
name: webview_flutter_wkwebview name: webview_flutter_wkwebview
sha256: a8d7e8b4be2a79e83b70235369971ec97d14df4cdbb40d305a8eeae67d8e6432 sha256: "369fdf6160944a7db660ff15fa048c2bd681b09557907beaef1f95e8557d21dc"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.6.2" version: "3.7.0"
win32: win32:
dependency: transitive dependency: transitive
description: description:
@@ -903,10 +895,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: xdg_directories name: xdg_directories
sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1 sha256: e0b1147eec179d3911f1f19b59206448f78195ca1d20514134e10641b7d7fbff
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.0.0" version: "1.0.1"
xml: xml:
dependency: transitive dependency: transitive
description: description:

View File

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 0.13.14+178 # When changing this, update the tag in main() accordingly version: 0.13.18+182 # When changing this, update the tag in main() accordingly
environment: environment:
sdk: '>=2.18.2 <3.0.0' sdk: '>=2.18.2 <3.0.0'