mirror of
				https://github.com/ImranR98/Obtainium.git
				synced 2025-10-31 21:43:29 +01:00 
			
		
		
		
	Compare commits
	
		
			34 Commits
		
	
	
		
			v0.9.4-bet
			...
			v0.9.11-be
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 3b449d0982 | ||
|  | 1863f55372 | ||
|  | 0c4b8ac79d | ||
|  | e287087753 | ||
|  | 82bcc46d42 | ||
|  | 1f26188ec6 | ||
|  | 794c3e1a81 | ||
|  | 16369b4adf | ||
|  | 8f16f745be | ||
|  | 8ddeb3d776 | ||
|  | 21cf9c98d9 | ||
|  | 358f910d19 | ||
|  | 7a3d74bd05 | ||
|  | 6f27f64699 | ||
|  | 3341fecb68 | ||
|  | d3bce63ca4 | ||
|  | 8aa8b6b698 | ||
|  | 3d6c9bbf98 | ||
|  | 7af0a8628c | ||
|  | 4573ce6bcf | ||
|  | e29d38fa32 | ||
|  | dc82431235 | ||
|  | 424b0028bf | ||
|  | 46fba9e0a4 | ||
|  | b40be7569b | ||
|  | a173be11eb | ||
|  | 0c97b25d99 | ||
|  | f836fd20d8 | ||
|  | 2f6917592d | ||
|  | b864fef3ad | ||
|  | 8e487592b3 | ||
|  | e9a44746a5 | ||
|  | 9123737bf3 | ||
|  | 01fa9a2e96 | 
| @@ -51,4 +51,7 @@ | |||||||
|     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> |     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> | ||||||
|     <uses-permission android:name="android.permission.WAKE_LOCK"/> |     <uses-permission android:name="android.permission.WAKE_LOCK"/> | ||||||
|     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/> |     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/> | ||||||
|  |     <uses-permission | ||||||
|  |         android:name="android.permission.WRITE_EXTERNAL_STORAGE" | ||||||
|  |         android:maxSdkVersion="28"/> | ||||||
| </manifest> | </manifest> | ||||||
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 8.1 KiB | 
| @@ -209,6 +209,8 @@ | |||||||
|     "addCategory": "Kategorie hinzufügen", |     "addCategory": "Kategorie hinzufügen", | ||||||
|     "label": "Bezeichnung", |     "label": "Bezeichnung", | ||||||
|     "language": "Sprache", |     "language": "Sprache", | ||||||
|  |     "storagePermissionDenied": "Storage permission denied", | ||||||
|  |     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.", | ||||||
|     "tooManyRequestsTryAgainInMinutes": { |     "tooManyRequestsTryAgainInMinutes": { | ||||||
|         "one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut", |         "one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut", | ||||||
|         "other": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minuten erneut" |         "other": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minuten erneut" | ||||||
|   | |||||||
| @@ -209,6 +209,8 @@ | |||||||
|     "addCategory": "Add Category", |     "addCategory": "Add Category", | ||||||
|     "label": "Label", |     "label": "Label", | ||||||
|     "language": "Language", |     "language": "Language", | ||||||
|  |     "storagePermissionDenied": "Storage permission denied", | ||||||
|  |     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.", | ||||||
|     "tooManyRequestsTryAgainInMinutes": { |     "tooManyRequestsTryAgainInMinutes": { | ||||||
|         "one": "Too many requests (rate limited) - try again in {} minute", |         "one": "Too many requests (rate limited) - try again in {} minute", | ||||||
|         "other": "Too many requests (rate limited) - try again in {} minutes" |         "other": "Too many requests (rate limited) - try again in {} minutes" | ||||||
|   | |||||||
| @@ -13,10 +13,10 @@ | |||||||
|     "and": "és", |     "and": "és", | ||||||
|     "startedBgUpdateTask": "Háttérfrissítés ellenőrzési feladat elindítva", |     "startedBgUpdateTask": "Háttérfrissítés ellenőrzési feladat elindítva", | ||||||
|     "bgUpdateIgnoreAfterIs": "Háttérfrissítés ignoreAfter a következő: {}", |     "bgUpdateIgnoreAfterIs": "Háttérfrissítés ignoreAfter a következő: {}", | ||||||
|     "startedActualBGUpdateCheck": "Elkezdődött a tényleges BG frissítés ellenőrzése", |     "startedActualBGUpdateCheck": "Elkezdődött a tényleges háttérfrissítés ellenőrzése", | ||||||
|     "bgUpdateTaskFinished": "A háttérfrissítés ellenőrzési feladat befejeződött", |     "bgUpdateTaskFinished": "A háttérfrissítés ellenőrzési feladat befejeződött", | ||||||
|     "firstRun": "Ez az Obtainium első futása", |     "firstRun": "Ez az Obtainium első futása", | ||||||
|     "settingUpdateCheckIntervalTo": "A frissítési intervallum beállítása a erre: {}", |     "settingUpdateCheckIntervalTo": "A frissítési intervallum beállítása erre: {}", | ||||||
|     "githubPATLabel": "GitHub személyes hozzáférési token (megnöveli a díjkorlátot)", |     "githubPATLabel": "GitHub személyes hozzáférési token (megnöveli a díjkorlátot)", | ||||||
|     "githubPATHint": "A PAT-nak a következő formátumban kell lennie: felhasználónév:token", |     "githubPATHint": "A PAT-nak a következő formátumban kell lennie: felhasználónév:token", | ||||||
|     "githubPATFormat": "felhasználónév:token", |     "githubPATFormat": "felhasználónév:token", | ||||||
| @@ -28,13 +28,13 @@ | |||||||
|     "noDescription": "Nincs leírás", |     "noDescription": "Nincs leírás", | ||||||
|     "cancel": "Mégse", |     "cancel": "Mégse", | ||||||
|     "continue": "Tovább", |     "continue": "Tovább", | ||||||
|     "requiredInBrackets": "(Kötlező)", |     "requiredInBrackets": "(Kötelező)", | ||||||
|     "dropdownNoOptsError": "HIBA: A LEDOBÁST LEGALÁBB EGY OPCIÓBAN KELL RENDELNI", |     "dropdownNoOptsError": "HIBA: A LEDOBÁST LEGALÁBB EGY OPCIÓHOZ KELL RENDELNI", | ||||||
|     "colour": "Szín", |     "colour": "Szín", | ||||||
|     "githubStarredRepos": "GitHub Csillagozott Repo-k", |     "githubStarredRepos": "GitHub Csillagos Repo-k", | ||||||
|     "uname": "Felh.név", |     "uname": "Felh.név", | ||||||
|     "wrongArgNum": "Rossz számú argumentumot adott meg", |     "wrongArgNum": "Rossz számú argumentumot adott meg", | ||||||
|     "xIsTrackOnly": "{} csak nyomon követhető", |     "xIsTrackOnly": "A(z) {} csak nyomkövethető", | ||||||
|     "source": "Forrás", |     "source": "Forrás", | ||||||
|     "app": "App", |     "app": "App", | ||||||
|     "appsFromSourceAreTrackOnly": "Az ebből a forrásból származó alkalmazások 'Csak nyomon követhetőek'.", |     "appsFromSourceAreTrackOnly": "Az ebből a forrásból származó alkalmazások 'Csak nyomon követhetőek'.", | ||||||
| @@ -56,25 +56,25 @@ | |||||||
|     "appsString": "Appok", |     "appsString": "Appok", | ||||||
|     "noApps": "Nincs App", |     "noApps": "Nincs App", | ||||||
|     "noAppsForFilter": "Nincsenek appok a szűrőhöz", |     "noAppsForFilter": "Nincsenek appok a szűrőhöz", | ||||||
|     "byX": "By {}", |     "byX": "{} által", | ||||||
|     "percentProgress": "Folyamat: {}%", |     "percentProgress": "Folyamat: {}%", | ||||||
|     "pleaseWait": "Kis türelmet", |     "pleaseWait": "Kis türelmet", | ||||||
|     "updateAvailable": "Frissítés elérhető", |     "updateAvailable": "Frissítés érhető el", | ||||||
|     "estimateInBracketsShort": "(Becsült)", |     "estimateInBracketsShort": "(Becsült)", | ||||||
|     "notInstalled": "Nem telepített", |     "notInstalled": "Nem telepített", | ||||||
|     "estimateInBrackets": "(Becslés)", |     "estimateInBrackets": "(Becslés)", | ||||||
|     "selectAll": "Mindet kiválaszt", |     "selectAll": "Mindet kiválaszt", | ||||||
|     "deselectN": "Törölje {} kijelölését", |     "deselectN": "Törölje {} kijelölését", | ||||||
|     "xWillBeRemovedButRemainInstalled": "{} el lesz távolítva az Obtainiumból, de továbbra is telepítve marad az eszközön.", |     "xWillBeRemovedButRemainInstalled": "A(z) {} el lesz távolítva az Obtainiumból, de továbbra is telepítve marad az eszközön.", | ||||||
|     "removeSelectedAppsQuestion": "Eltávolítja a kiválasztott appokat?", |     "removeSelectedAppsQuestion": "Eltávolítja a kiválasztott appokat?", | ||||||
|     "removeSelectedApps": "Távolítsa el a kiválasztott appokat", |     "removeSelectedApps": "Távolítsa el a kiválasztott appokat", | ||||||
|     "updateX": "Frissítés: {}", |     "updateX": "Frissítés: {}", | ||||||
|     "installX": "Telepítés {}", |     "installX": "Telepítés: {}", | ||||||
|     "markXTrackOnlyAsUpdated": "Jelölje meg: {}\n(Csak nyomon követhető)\nas Frissítve", |     "markXTrackOnlyAsUpdated": "Jelölje meg: {}\n(Csak nyomon követhető)\nmint Frissített", | ||||||
|     "changeX": "Változás {}", |     "changeX": "Változás {}", | ||||||
|     "installUpdateApps": "Appok telepítése/frissítése", |     "installUpdateApps": "Appok telepítése/frissítése", | ||||||
|     "installUpdateSelectedApps": "Telepítse/frissítse a kiválasztott appokat", |     "installUpdateSelectedApps": "Telepítse/frissítse a kiválasztott appokat", | ||||||
|     "onlyWorksWithNonEVDApps": "Csak azoknál az alkalmazásoknál működik, amelyek telepítési állapota nem észlelhető automatikusan (nem gyakori).", |     "onlyWorksWithNonEVDApps": "Csak azoknál az alkalmazásoknál működik, amelyek telepítési állapota nem észlelhető autom. (nem gyakori).", | ||||||
|     "markXSelectedAppsAsUpdated": "Megjelöl {} kiválasztott alkalmazást frissítettként?", |     "markXSelectedAppsAsUpdated": "Megjelöl {} kiválasztott alkalmazást frissítettként?", | ||||||
|     "no": "Nem", |     "no": "Nem", | ||||||
|     "yes": "Igen", |     "yes": "Igen", | ||||||
| @@ -86,8 +86,8 @@ | |||||||
|     "shareSelectedAppURLs": "Ossza meg a kiválasztott app URL címeit", |     "shareSelectedAppURLs": "Ossza meg a kiválasztott app URL címeit", | ||||||
|     "resetInstallStatus": "Telepítési állapot visszaállítása", |     "resetInstallStatus": "Telepítési állapot visszaállítása", | ||||||
|     "more": "További", |     "more": "További", | ||||||
|     "removeOutdatedFilter": "Távolítsa el az elavult alkalmazásszűrőt", |     "removeOutdatedFilter": "Távolítsa el az elavult app szűrőt", | ||||||
|     "showOutdatedOnly": "Csak az elavult alkalmazások megjelenítése", |     "showOutdatedOnly": "Csak az elavult appok megjelenítése", | ||||||
|     "filter": "Szűrő", |     "filter": "Szűrő", | ||||||
|     "filterActive": "Szűrő *", |     "filterActive": "Szűrő *", | ||||||
|     "filterApps": "Appok szűrése", |     "filterApps": "Appok szűrése", | ||||||
| @@ -118,7 +118,7 @@ | |||||||
|     "selectURLs": "Kiválasztott URL-ek", |     "selectURLs": "Kiválasztott URL-ek", | ||||||
|     "pick": "Válasszon", |     "pick": "Válasszon", | ||||||
|     "theme": "Téma", |     "theme": "Téma", | ||||||
|     "dark": "Söét", |     "dark": "Sötét", | ||||||
|     "light": "Világos", |     "light": "Világos", | ||||||
|     "followSystem": "Rendszer szerint", |     "followSystem": "Rendszer szerint", | ||||||
|     "obtainium": "Obtainium", |     "obtainium": "Obtainium", | ||||||
| @@ -126,11 +126,11 @@ | |||||||
|     "appSortBy": "App rendezés...", |     "appSortBy": "App rendezés...", | ||||||
|     "authorName": "Szerző/Név", |     "authorName": "Szerző/Név", | ||||||
|     "nameAuthor": "Név/Szerző", |     "nameAuthor": "Név/Szerző", | ||||||
|     "asAdded": "Mint hozzáadott", |     "asAdded": "Mint Hozzáadott", | ||||||
|     "appSortOrder": "Appok rendezése", |     "appSortOrder": "Appok rendezése", | ||||||
|     "ascending": "Emelkedő", |     "ascending": "Emelkedő", | ||||||
|     "descending": "Csökkenő", |     "descending": "Csökkenő", | ||||||
|     "bgUpdateCheckInterval": "Háttérfrissítés ellenőrzési időköz", |     "bgUpdateCheckInterval": "Háttérfrissítés ellenőrzés időköze", | ||||||
|     "neverManualOnly": "Soha – csak manuális", |     "neverManualOnly": "Soha – csak manuális", | ||||||
|     "appearance": "Megjelenés", |     "appearance": "Megjelenés", | ||||||
|     "showWebInAppView": "Forrás megjelenítése az Appok nézetben", |     "showWebInAppView": "Forrás megjelenítése az Appok nézetben", | ||||||
| @@ -145,7 +145,7 @@ | |||||||
|     "appNotFound": "App nem található", |     "appNotFound": "App nem található", | ||||||
|     "obtainiumExportHyphenatedLowercase": "obtainium-export", |     "obtainiumExportHyphenatedLowercase": "obtainium-export", | ||||||
|     "pickAnAPK": "Válasszon egy APK-t", |     "pickAnAPK": "Válasszon egy APK-t", | ||||||
|     "appHasMoreThanOnePackage": "{} egynél több csomaggal rendelkezik:", |     "appHasMoreThanOnePackage": "A(z) {} egynél több csomaggal rendelkezik:", | ||||||
|     "deviceSupportsXArch": "Eszköze támogatja a {} CPU architektúrát.", |     "deviceSupportsXArch": "Eszköze támogatja a {} CPU architektúrát.", | ||||||
|     "deviceSupportsFollowingArchs": "Az eszköze a következő CPU architektúrákat támogatja:", |     "deviceSupportsFollowingArchs": "Az eszköze a következő CPU architektúrákat támogatja:", | ||||||
|     "warning": "Figyelem", |     "warning": "Figyelem", | ||||||
| @@ -153,16 +153,16 @@ | |||||||
|     "updatesAvailable": "Frissítések érhetők el", |     "updatesAvailable": "Frissítések érhetők el", | ||||||
|     "updatesAvailableNotifDescription": "Értesíti a felhasználót, hogy frissítések állnak rendelkezésre egy vagy több, az Obtainium által nyomon követett alkalmazáshoz", |     "updatesAvailableNotifDescription": "Értesíti a felhasználót, hogy frissítések állnak rendelkezésre egy vagy több, az Obtainium által nyomon követett alkalmazáshoz", | ||||||
|     "noNewUpdates": "Nincsenek új frissítések.", |     "noNewUpdates": "Nincsenek új frissítések.", | ||||||
|     "xHasAnUpdate": "{} frissítést kapott.", |     "xHasAnUpdate": "A(z) {} frissítést kapott.", | ||||||
|     "appsUpdated": "Alkalmazások frissítve", |     "appsUpdated": "Alkalmazások frissítve", | ||||||
|     "appsUpdatedNotifDescription": "Értesíti a felhasználót, hogy egy vagy több app frissítése történt a háttérben", |     "appsUpdatedNotifDescription": "Értesíti a felhasználót, hogy egy/több app frissítése megtörtént a háttérben", | ||||||
|     "xWasUpdatedToY": "{} frissítve a következőre: {}.", |     "xWasUpdatedToY": "{} frissítve a következőre: {}.", | ||||||
|     "errorCheckingUpdates": "Hiba a frissítések keresésekor", |     "errorCheckingUpdates": "Hiba a frissítések keresésekor", | ||||||
|     "errorCheckingUpdatesNotifDescription": "Értesítés, amely akkor jelenik meg, ha a háttérbeli frissítések ellenőrzése sikertelen", |     "errorCheckingUpdatesNotifDescription": "Értesítés, amely akkor jelenik meg, ha a háttérbeli frissítések ellenőrzése sikertelen", | ||||||
|     "appsRemoved": "Alkalmazások eltávolítva", |     "appsRemoved": "Alkalmazások eltávolítva", | ||||||
|     "appsRemovedNotifDescription": "Értesíti a felhasználót egy vagy több alkalmazás eltávolításáról a betöltésük során fellépő hibák miatt", |     "appsRemovedNotifDescription": "Értesíti a felhasználót egy vagy több alkalmazás eltávolításáról a betöltésük során fellépő hibák miatt", | ||||||
|     "xWasRemovedDueToErrorY": "A(z) {} a következő hiba miatt lett eltávolítva: {}", |     "xWasRemovedDueToErrorY": "A(z) {} a következő hiba miatt lett eltávolítva: {}", | ||||||
|     "completeAppInstallation": "Teljes alkalmazástelepítés", |     "completeAppInstallation": "Teljes app telepítés", | ||||||
|     "obtainiumMustBeOpenToInstallApps": "Az Obtainiumnak megnyitva kell lennie az alkalmazások telepítéséhez", |     "obtainiumMustBeOpenToInstallApps": "Az Obtainiumnak megnyitva kell lennie az alkalmazások telepítéséhez", | ||||||
|     "completeAppInstallationNotifDescription": "Megkéri a felhasználót, hogy térjen vissza az Obtainiumhoz, hogy befejezze az alkalmazás telepítését", |     "completeAppInstallationNotifDescription": "Megkéri a felhasználót, hogy térjen vissza az Obtainiumhoz, hogy befejezze az alkalmazás telepítését", | ||||||
|     "checkingForUpdates": "Frissítések keresése", |     "checkingForUpdates": "Frissítések keresése", | ||||||
| @@ -184,31 +184,32 @@ | |||||||
|     "appIdOrName": "App ID vagy név", |     "appIdOrName": "App ID vagy név", | ||||||
|     "appWithIdOrNameNotFound": "Nem található app ezzel az azonosítóval vagy névvel", |     "appWithIdOrNameNotFound": "Nem található app ezzel az azonosítóval vagy névvel", | ||||||
|     "reposHaveMultipleApps": "A repók több alkalmazást is tartalmazhatnak", |     "reposHaveMultipleApps": "A repók több alkalmazást is tartalmazhatnak", | ||||||
|     "fdroidThirdPartyRepo": "F-Droid Harmadik fél Repo", |     "fdroidThirdPartyRepo": "F-Droid Harmadik-fél Repo", | ||||||
|     "steam": "Steam", |     "steam": "Steam", | ||||||
|     "steamMobile": "Steam Mobile", |     "steamMobile": "Steam Mobile", | ||||||
|     "steamChat": "Steam Chat", |     "steamChat": "Steam Chat", | ||||||
|     "install": "Install", |     "install": "Telepít", | ||||||
|     "markInstalled": "Mark Installed", |     "markInstalled": "Telepítettnek jelöl", | ||||||
|     "update": "Update", |     "update": "Frissít", | ||||||
|     "markUpdated": "Mark Updated", |     "markUpdated": "Frissítettnek jelöl", | ||||||
|     "additionalOptions": "Additional Options", |     "additionalOptions": "További lehetőségek", | ||||||
|     "disableVersionDetection": "Disable Version Detection", |     "disableVersionDetection": "Verzióérzékelés letiltása", | ||||||
|     "noVersionDetectionExplanation": "This option should only be used for Apps where version detection does not work correctly.", |     "noVersionDetectionExplanation": "Ezt a beállítást csak olyan alkalmazásoknál szabad használni, ahol a verzióérzékelés nem működik megfelelően.", | ||||||
|     "downloadingX": "Downloading {}", |     "downloadingX": "{} letöltés", | ||||||
|     "downloadNotifDescription": "Notifies the user of the progress in downloading an App", |     "downloadNotifDescription": "Értesíti a felhasználót az app letöltésének előrehaladásáról", | ||||||
|     "noAPKFound": "No APK found", |     "noAPKFound": "Nem található APK", | ||||||
|     "noVersionDetection": "No version detection", |     "noVersionDetection": "Nincs verzió érzékelés", | ||||||
|     "categorize": "Categorize", |     "categorize": "Kategorizálás", | ||||||
|     "categories": "Categories", |     "categories": "Kategóriák", | ||||||
|     "category": "Category", |     "category": "Kategória", | ||||||
|     "noCategory": "No Category", |     "noCategory": "Nincs kategória", | ||||||
|     "noCategories": "No Categories", |     "deleteCategoryQuestion": "Törli a kategóriát?", | ||||||
|     "deleteCategoriesQuestion": "Delete Categories?", |     "categoryDeleteWarning": "A(z) {} összes app kategorizálatlan állapotba kerül.", | ||||||
|     "categoryDeleteWarning": "All Apps in deleted categories will be set to uncategorized.", |     "addCategory": "Új kategória", | ||||||
|     "addCategory": "Add Category", |     "label": "Címke", | ||||||
|     "label": "Label", |  | ||||||
|     "language": "Language", |     "language": "Language", | ||||||
|  |     "storagePermissionDenied": "Storage permission denied", | ||||||
|  |     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.", | ||||||
|     "tooManyRequestsTryAgainInMinutes": { |     "tooManyRequestsTryAgainInMinutes": { | ||||||
|         "one": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva", |         "one": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva", | ||||||
|         "other": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva" |         "other": "Túl sok kérés (korlátozott arány) – próbálja újra {} perc múlva" | ||||||
|   | |||||||
| @@ -16,8 +16,8 @@ | |||||||
|     "startedActualBGUpdateCheck": "Avviato il controllo effettivo degli aggiornamenti in background", |     "startedActualBGUpdateCheck": "Avviato il controllo effettivo degli aggiornamenti in background", | ||||||
|     "bgUpdateTaskFinished": "Terminata l'attività di controllo degli aggiornamenti in background", |     "bgUpdateTaskFinished": "Terminata l'attività di controllo degli aggiornamenti in background", | ||||||
|     "firstRun": "Questo è il primo avvio di sempre di Obtainium", |     "firstRun": "Questo è il primo avvio di sempre di Obtainium", | ||||||
|     "settingUpdateCheckIntervalTo": "Imposta l'intervallo di aggiornamento a {}", |     "settingUpdateCheckIntervalTo": "Fissato intervallo di aggiornamento a {}", | ||||||
|     "githubPATLabel": "GitHub Personal Access Token (aumenta il limite di traffico)", |     "githubPATLabel": "GitHub Personal Access Token (diminuisce limite di traffico)", | ||||||
|     "githubPATHint": "PAT deve seguire questo formato: username:token", |     "githubPATHint": "PAT deve seguire questo formato: username:token", | ||||||
|     "githubPATFormat": "username:token", |     "githubPATFormat": "username:token", | ||||||
|     "githubPATLinkText": "Informazioni su GitHub PAT", |     "githubPATLinkText": "Informazioni su GitHub PAT", | ||||||
| @@ -31,18 +31,18 @@ | |||||||
|     "requiredInBrackets": "(richiesto)", |     "requiredInBrackets": "(richiesto)", | ||||||
|     "dropdownNoOptsError": "ERRORE: LA TENDINA DEVE AVERE ALMENO UN'OPZIONE", |     "dropdownNoOptsError": "ERRORE: LA TENDINA DEVE AVERE ALMENO UN'OPZIONE", | ||||||
|     "colour": "Colore", |     "colour": "Colore", | ||||||
|     "githubStarredRepos": "i repository stellati da GitHub", |     "githubStarredRepos": "repository stellati da GitHub", | ||||||
|     "uname": "Username", |     "uname": "Username", | ||||||
|     "wrongArgNum": "Numero di argomenti forniti errato", |     "wrongArgNum": "Numero di argomenti forniti errato", | ||||||
|     "xIsTrackOnly": "{} è Solo-Monitoraggio", |     "xIsTrackOnly": "{} è in modalità Solo-Monitoraggio", | ||||||
|     "source": "Fonte", |     "source": "Fonte", | ||||||
|     "app": "App", |     "app": "App", | ||||||
|     "appsFromSourceAreTrackOnly": "Le App da questa fonte sono in modalità 'Solo-Monitoraggio'.", |     "appsFromSourceAreTrackOnly": "Le App da questa fonte sono in modalità 'Solo-Monitoraggio'.", | ||||||
|     "youPickedTrackOnly": "Hai selezionato l'opzione 'Solo-Monitoraggio'.", |     "youPickedTrackOnly": "È stata selezionata l'opzione 'Solo-Monitoraggio'.", | ||||||
|     "trackOnlyAppDescription": "L'App sarà monitorata per gli aggiornamenti, ma Obtainium non sarà in grado di scaricarli o di installarli.", |     "trackOnlyAppDescription": "L'App sarà monitorata per gli aggiornamenti, ma Obtainium non sarà in grado di scaricarli o di installarli.", | ||||||
|     "cancelled": "Annullato", |     "cancelled": "Annullato", | ||||||
|     "appAlreadyAdded": "App già aggiunta", |     "appAlreadyAdded": "App già aggiunta", | ||||||
|     "alreadyUpToDateQuestion": "App già aggiornata?", |     "alreadyUpToDateQuestion": "L'App è già aggiornata?", | ||||||
|     "addApp": "Aggiungi App", |     "addApp": "Aggiungi App", | ||||||
|     "appSourceURL": "URL della fonte dell'App", |     "appSourceURL": "URL della fonte dell'App", | ||||||
|     "error": "Errore", |     "error": "Errore", | ||||||
| @@ -60,20 +60,20 @@ | |||||||
|     "percentProgress": "Progresso: {}%", |     "percentProgress": "Progresso: {}%", | ||||||
|     "pleaseWait": "Attendere prego", |     "pleaseWait": "Attendere prego", | ||||||
|     "updateAvailable": "Aggiornamento disponibile", |     "updateAvailable": "Aggiornamento disponibile", | ||||||
|     "estimateInBracketsShort": "(Prev.)", |     "estimateInBracketsShort": "(prev.)", | ||||||
|     "notInstalled": "Non installato", |     "notInstalled": "Non installato", | ||||||
|     "estimateInBrackets": "(Previsto)", |     "estimateInBrackets": "(previsto)", | ||||||
|     "selectAll": "Seleziona tutto", |     "selectAll": "Seleziona tutto", | ||||||
|     "deselectN": "Deseleziona {}", |     "deselectN": "Deseleziona {}", | ||||||
|     "xWillBeRemovedButRemainInstalled": "{} sarà rimosso da Obtainium ma resterà installato sul dispositivo.", |     "xWillBeRemovedButRemainInstalled": "Verà effettuata la rimozione di {}, ma non la disinstallazione.", | ||||||
|     "removeSelectedAppsQuestion": "Rimuovere le App selezionate?", |     "removeSelectedAppsQuestion": "Rimuovere le App selezionate?", | ||||||
|     "removeSelectedApps": "Rimuovi le App selezionate", |     "removeSelectedApps": "Rimuovi le App selezionate", | ||||||
|     "updateX": "Aggiorna {}", |     "updateX": "Aggiorna {}", | ||||||
|     "installX": "Installa {}", |     "installX": "Installa {}", | ||||||
|     "markXTrackOnlyAsUpdated": "Contrassegna {}\n(Solo-Monitoraggio)\ncome aggiornato", |     "markXTrackOnlyAsUpdated": "Contrassegna {}\n(Solo-Monitoraggio)\ncome aggiornato", | ||||||
|     "changeX": "modifica {}", |     "changeX": "Modifica {}", | ||||||
|     "installUpdateApps": "Installa/Aggiorna le App", |     "installUpdateApps": "Installa/Aggiorna App", | ||||||
|     "installUpdateSelectedApps": "Installa/Aggiornale le App selezionate", |     "installUpdateSelectedApps": "Installa/Aggiorna le App selezionate", | ||||||
|     "onlyWorksWithNonEVDApps": "Funziona solo per le App il cui stato d'installazione non può essere rilevato automaticamente (inconsueto).", |     "onlyWorksWithNonEVDApps": "Funziona solo per le App il cui stato d'installazione non può essere rilevato automaticamente (inconsueto).", | ||||||
|     "markXSelectedAppsAsUpdated": "Contrassegnare le {} App selezionate come aggiornate?", |     "markXSelectedAppsAsUpdated": "Contrassegnare le {} App selezionate come aggiornate?", | ||||||
|     "no": "No", |     "no": "No", | ||||||
| @@ -95,7 +95,7 @@ | |||||||
|     "author": "Autore", |     "author": "Autore", | ||||||
|     "upToDateApps": "App aggiornate", |     "upToDateApps": "App aggiornate", | ||||||
|     "nonInstalledApps": "App non installate", |     "nonInstalledApps": "App non installate", | ||||||
|     "importExport": "Importa/Esporta", |     "importExport": "Importa - Esporta", | ||||||
|     "settings": "Impostazioni", |     "settings": "Impostazioni", | ||||||
|     "exportedTo": "Esportato in {}", |     "exportedTo": "Esportato in {}", | ||||||
|     "obtainiumExport": "Esporta da Obtainium", |     "obtainiumExport": "Esporta da Obtainium", | ||||||
| @@ -134,7 +134,7 @@ | |||||||
|     "neverManualOnly": "Mai - Solo manuale", |     "neverManualOnly": "Mai - Solo manuale", | ||||||
|     "appearance": "Aspetto", |     "appearance": "Aspetto", | ||||||
|     "showWebInAppView": "Mostra pagina web dell'App se selezionata", |     "showWebInAppView": "Mostra pagina web dell'App se selezionata", | ||||||
|     "pinUpdates": "Fissa in alto gli aggiornamenti disponibili", |     "pinUpdates": "Fissa aggiornamenti disponibili in alto", | ||||||
|     "updates": "Aggiornamenti", |     "updates": "Aggiornamenti", | ||||||
|     "sourceSpecific": "Specifiche per la fonte", |     "sourceSpecific": "Specifiche per la fonte", | ||||||
|     "appSource": "Sorgente dell'App", |     "appSource": "Sorgente dell'App", | ||||||
| @@ -146,21 +146,21 @@ | |||||||
|     "obtainiumExportHyphenatedLowercase": "esportazione-obtainium", |     "obtainiumExportHyphenatedLowercase": "esportazione-obtainium", | ||||||
|     "pickAnAPK": "Seleziona un APK", |     "pickAnAPK": "Seleziona un APK", | ||||||
|     "appHasMoreThanOnePackage": "{} offre più di un pacchetto:", |     "appHasMoreThanOnePackage": "{} offre più di un pacchetto:", | ||||||
|     "deviceSupportsXArch": "Il tuo dispositivo supporta l'architettura {} della CPU.", |     "deviceSupportsXArch": "Il dispositivo in uso supporta l'architettura {} della CPU.", | ||||||
|     "deviceSupportsFollowingArchs": "Il tuo dispositivo supporta le seguenti architetture della CPU:", |     "deviceSupportsFollowingArchs": "Il dispositivo in uso supporta le seguenti architetture della CPU:", | ||||||
|     "warning": "Attenzione", |     "warning": "Attenzione", | ||||||
|     "sourceIsXButPackageFromYPrompt": "L'origine dell'App è '{}' ma il pacchetto della release proviene da '{}'. Continuare?", |     "sourceIsXButPackageFromYPrompt": "L'origine dell'App è '{}' ma il pacchetto della release proviene da '{}'. Continuare?", | ||||||
|     "updatesAvailable": "Aggiornamenti disponibili", |     "updatesAvailable": "Aggiornamenti disponibili", | ||||||
|     "updatesAvailableNotifDescription": "Avvisa l'utente che sono disponibili gli aggiornamenti di una o più App monitorate da Obtainium", |     "updatesAvailableNotifDescription": "Notifica all'utente che sono disponibili gli aggiornamenti di una o più App monitorate da Obtainium", | ||||||
|     "noNewUpdates": "Nessun nuovo aggiornamento.", |     "noNewUpdates": "Nessun nuovo aggiornamento.", | ||||||
|     "xHasAnUpdate": "{} è stato aggiornato.", |     "xHasAnUpdate": "Aggiornamento disponibile per {}", | ||||||
|     "appsUpdated": "App aggiornate", |     "appsUpdated": "App aggiornate", | ||||||
|     "appsUpdatedNotifDescription": "Avvisa l'utente che una o più App sono state aggiornate in background", |     "appsUpdatedNotifDescription": "Notifica all'utente che una o più App sono state aggiornate in background", | ||||||
|     "xWasUpdatedToY": "{} è stato aggiornato a {}.", |     "xWasUpdatedToY": "{} è stato aggiornato a {}.", | ||||||
|     "errorCheckingUpdates": "Controllo degli errori per gli aggiornamenti", |     "errorCheckingUpdates": "Controllo degli errori per gli aggiornamenti", | ||||||
|     "errorCheckingUpdatesNotifDescription": "Una notifica che mostra quando il controllo degli aggiornamenti in background fallisce", |     "errorCheckingUpdatesNotifDescription": "Una notifica che mostra quando il controllo degli aggiornamenti in background fallisce", | ||||||
|     "appsRemoved": "App rimosse", |     "appsRemoved": "App rimosse", | ||||||
|     "appsRemovedNotifDescription": "Avvisa l'utente che una o più App sono state rimosse a causa di errori durante il caricamento", |     "appsRemovedNotifDescription": "Notifica all'utente che una o più App sono state rimosse a causa di errori durante il caricamento", | ||||||
|     "xWasRemovedDueToErrorY": "{} è stata rimosso a causa di questo errore: {}", |     "xWasRemovedDueToErrorY": "{} è stata rimosso a causa di questo errore: {}", | ||||||
|     "completeAppInstallation": "Completa l'installazione dell'App", |     "completeAppInstallation": "Completa l'installazione dell'App", | ||||||
|     "obtainiumMustBeOpenToInstallApps": "Obtainium deve essere aperto per poter installare le App", |     "obtainiumMustBeOpenToInstallApps": "Obtainium deve essere aperto per poter installare le App", | ||||||
| @@ -178,7 +178,7 @@ | |||||||
|     "installedVersionX": "Versione installata: {}", |     "installedVersionX": "Versione installata: {}", | ||||||
|     "lastUpdateCheckX": "Ultimo controllo degli aggiornamenti: {}", |     "lastUpdateCheckX": "Ultimo controllo degli aggiornamenti: {}", | ||||||
|     "remove": "Rimuovi", |     "remove": "Rimuovi", | ||||||
|     "removeAppQuestion": "Rimuovere App?", |     "removeAppQuestion": "Rimuovere l'App?", | ||||||
|     "yesMarkUpdated": "Sì, contrassegna come aggiornato", |     "yesMarkUpdated": "Sì, contrassegna come aggiornato", | ||||||
|     "fdroid": "F-Droid", |     "fdroid": "F-Droid", | ||||||
|     "appIdOrName": "ID o nome dell'App", |     "appIdOrName": "ID o nome dell'App", | ||||||
| @@ -188,38 +188,40 @@ | |||||||
|     "steam": "Steam", |     "steam": "Steam", | ||||||
|     "steamMobile": "Steam Mobile", |     "steamMobile": "Steam Mobile", | ||||||
|     "steamChat": "Steam Chat", |     "steamChat": "Steam Chat", | ||||||
|     "install": "Install", |     "install": "Installa", | ||||||
|     "markInstalled": "Mark Installed", |     "markInstalled": "Contrassegna come installato", | ||||||
|     "update": "Update", |     "update": "Aggiorna", | ||||||
|     "markUpdated": "Mark Updated", |     "markUpdated": "Contrassegna come aggiornato", | ||||||
|     "additionalOptions": "Additional Options", |     "additionalOptions": "Opzioni aggiuntive", | ||||||
|     "disableVersionDetection": "Disable Version Detection", |     "disableVersionDetection": "Disattiva il rilevamento della versione", | ||||||
|     "noVersionDetectionExplanation": "This option should only be used for Apps where version detection does not work correctly.", |     "noVersionDetectionExplanation": "Questa opzione dovrebbe essere usata solo per le App la cui versione non viene rilevata correttamente.", | ||||||
|     "downloadingX": "Downloading {}", |     "downloadingX": "Scaricamento di {} in corso", | ||||||
|     "downloadNotifDescription": "Notifies the user of the progress in downloading an App", |     "downloadNotifDescription": "Notifica all'utente lo stato di avanzamento del download di un'App", | ||||||
|     "noAPKFound": "No APK found", |     "noAPKFound": "Nessun APK trovato", | ||||||
|     "noVersionDetection": "No version detection", |     "noVersionDetection": "Disattiva rilevamento di versione", | ||||||
|     "categorize": "Categorize", |     "categorize": "Aggiungi a categoria", | ||||||
|     "categories": "Categories", |     "categories": "Categorie", | ||||||
|     "category": "Category", |     "category": "Categoria", | ||||||
|     "noCategory": "No Category", |     "noCategory": "Nessuna categoria", | ||||||
|     "noCategories": "No Categories", |     "noCategories": "Nessuna categoria", | ||||||
|     "deleteCategoriesQuestion": "Delete Categories?", |     "deleteCategoriesQuestion": "Eliminare le categorie?", | ||||||
|     "categoryDeleteWarning": "All Apps in deleted categories will be set to uncategorized.", |     "categoryDeleteWarning": "Tutte le App nelle categorie eliminate saranno impostate come non categorizzate.", | ||||||
|     "addCategory": "Add Category", |     "addCategory": "Aggiungi categoria", | ||||||
|     "label": "Label", |     "label": "Etichetta", | ||||||
|     "language": "Language", |     "language": "Lingua", | ||||||
|  |     "storagePermissionDenied": "Storage permission denied", | ||||||
|  |     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.", | ||||||
|     "tooManyRequestsTryAgainInMinutes": { |     "tooManyRequestsTryAgainInMinutes": { | ||||||
|         "one": "Troppe richieste (traffico limitato) - riprova tra {} minuto", |         "one": "Troppe richieste (traffico limitato) - riprova tra {} minuto", | ||||||
|         "other": "Troppe richieste (traffico limitato) - riprova tra {} minuti" |         "other": "Troppe richieste (traffico limitato) - riprova tra {} minuti" | ||||||
|     }, |     }, | ||||||
|     "bgUpdateGotErrorRetryInMinutes": { |     "bgUpdateGotErrorRetryInMinutes": { | ||||||
|         "one": "Il controllo degli aggiornamenti in background ha incontrato un {}, ricontrollo tra {} minuto", |         "one": "Il controllo degli aggiornamenti in background ha incontrato un {}, nuovo tentativo tra {} minuto", | ||||||
|         "other": "Il controllo degli aggiornamenti in background ha incontrato un {}, ricontrollo tra {} minuti" |         "other": "Il controllo degli aggiornamenti in background ha incontrato un {}, nuovo tentativo tra {} minuti" | ||||||
|     }, |     }, | ||||||
|     "bgCheckFoundUpdatesWillNotifyIfNeeded": { |     "bgCheckFoundUpdatesWillNotifyIfNeeded": { | ||||||
|         "one": "Il controllo degli aggiornamenti in background ha trovato {} aggiornamento - avviserà l'utento se necessario", |         "one": "Il controllo degli aggiornamenti in background ha trovato {} aggiornamento - notificherà l'utente se necessario", | ||||||
|         "other": "Il controllo degli aggiornamenti in background ha trovato {} aggiornamenti - avviserà l'utento se necessario" |         "other": "Il controllo degli aggiornamenti in background ha trovato {} aggiornamenti - notificherà l'utente se necessario" | ||||||
|     }, |     }, | ||||||
|     "apps": { |     "apps": { | ||||||
|         "one": "{} App", |         "one": "{} App", | ||||||
|   | |||||||
| @@ -209,6 +209,8 @@ | |||||||
|     "addCategory": "カテゴリを追加", |     "addCategory": "カテゴリを追加", | ||||||
|     "label": "ラベル", |     "label": "ラベル", | ||||||
|     "language": "言語", |     "language": "言語", | ||||||
|  |     "storagePermissionDenied": "Storage permission denied", | ||||||
|  |     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.", | ||||||
|     "tooManyRequestsTryAgainInMinutes": { |     "tooManyRequestsTryAgainInMinutes": { | ||||||
|         "one": "リクエストが多すぎます(レート制限)- {}分後に再試行してください", |         "one": "リクエストが多すぎます(レート制限)- {}分後に再試行してください", | ||||||
|         "other": "リクエストが多すぎます(レート制限)- {}分後に再試行してください" |         "other": "リクエストが多すぎます(レート制限)- {}分後に再試行してください" | ||||||
|   | |||||||
| @@ -209,6 +209,8 @@ | |||||||
|     "addCategory": "Add Category", |     "addCategory": "Add Category", | ||||||
|     "label": "Label", |     "label": "Label", | ||||||
|     "language": "Language", |     "language": "Language", | ||||||
|  |     "storagePermissionDenied": "Storage permission denied", | ||||||
|  |     "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.", | ||||||
|     "tooManyRequestsTryAgainInMinutes": { |     "tooManyRequestsTryAgainInMinutes": { | ||||||
|         "one": "请求过多 (API 限制) - 在 {} 分钟后重试", |         "one": "请求过多 (API 限制) - 在 {} 分钟后重试", | ||||||
|         "other": "请求过多 (API 限制) - 在 {} 分钟后重试" |         "other": "请求过多 (API 限制) - 在 {} 分钟后重试" | ||||||
|   | |||||||
| @@ -46,7 +46,7 @@ class APKMirror extends AppSource { | |||||||
|       } |       } | ||||||
|       return APKDetails(version, [], getAppNames(standardUrl)); |       return APKDetails(version, [], getAppNames(standardUrl)); | ||||||
|     } else { |     } else { | ||||||
|       throw NoReleasesError(); |       throw getObtainiumHttpError(res); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -54,7 +54,7 @@ class FDroid extends AppSource { | |||||||
|       return APKDetails(latestVersion, apkUrls, |       return APKDetails(latestVersion, apkUrls, | ||||||
|           AppNames(name, Uri.parse(standardUrl).pathSegments.last)); |           AppNames(name, Uri.parse(standardUrl).pathSegments.last)); | ||||||
|     } else { |     } else { | ||||||
|       throw NoReleasesError(); |       throw getObtainiumHttpError(res); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -80,7 +80,7 @@ class FDroidRepo extends AppSource { | |||||||
|           .toList(); |           .toList(); | ||||||
|       return APKDetails(latestVersion, apkUrls, AppNames(authorName, appName)); |       return APKDetails(latestVersion, apkUrls, AppNames(authorName, appName)); | ||||||
|     } else { |     } else { | ||||||
|       throw NoReleasesError(); |       throw getObtainiumHttpError(res); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -59,7 +59,7 @@ class GitLab extends AppSource { | |||||||
|       } |       } | ||||||
|       return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl)); |       return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl)); | ||||||
|     } else { |     } else { | ||||||
|       throw NoReleasesError(); |       throw getObtainiumHttpError(res); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -43,7 +43,7 @@ class Mullvad extends AppSource { | |||||||
|           ['https://mullvad.net/download/app/apk/latest'], |           ['https://mullvad.net/download/app/apk/latest'], | ||||||
|           AppNames(name, 'Mullvad-VPN')); |           AppNames(name, 'Mullvad-VPN')); | ||||||
|     } else { |     } else { | ||||||
|       throw NoReleasesError(); |       throw getObtainiumHttpError(res); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ class Signal extends AppSource { | |||||||
|       } |       } | ||||||
|       return APKDetails(version, apkUrls, AppNames(name, 'Signal')); |       return APKDetails(version, apkUrls, AppNames(name, 'Signal')); | ||||||
|     } else { |     } else { | ||||||
|       throw NoReleasesError(); |       throw getObtainiumHttpError(res); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -57,7 +57,7 @@ class SourceForge extends AppSource { | |||||||
|           AppNames( |           AppNames( | ||||||
|               name, standardUrl.substring(standardUrl.lastIndexOf('/') + 1))); |               name, standardUrl.substring(standardUrl.lastIndexOf('/') + 1))); | ||||||
|     } else { |     } else { | ||||||
|       throw NoReleasesError(); |       throw getObtainiumHttpError(res); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -54,7 +54,7 @@ class SteamMobile extends AppSource { | |||||||
|       var apkUrls = [links[0]]; |       var apkUrls = [links[0]]; | ||||||
|       return APKDetails(version, apkUrls, AppNames(name, apks[apkNamePrefix]!)); |       return APKDetails(version, apkUrls, AppNames(name, apks[apkNamePrefix]!)); | ||||||
|     } else { |     } else { | ||||||
|       throw NoReleasesError(); |       throw getObtainiumHttpError(res); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -91,6 +91,7 @@ class GeneratedFormTagInput extends GeneratedFormItem { | |||||||
|   late bool singleSelect; |   late bool singleSelect; | ||||||
|   late WrapAlignment alignment; |   late WrapAlignment alignment; | ||||||
|   late String emptyMessage; |   late String emptyMessage; | ||||||
|  |   late bool showLabelWhenNotEmpty; | ||||||
|   GeneratedFormTagInput(String key, |   GeneratedFormTagInput(String key, | ||||||
|       {String label = 'Input', |       {String label = 'Input', | ||||||
|       List<Widget> belowWidgets = const [], |       List<Widget> belowWidgets = const [], | ||||||
| @@ -100,7 +101,8 @@ class GeneratedFormTagInput extends GeneratedFormItem { | |||||||
|       this.deleteConfirmationMessage, |       this.deleteConfirmationMessage, | ||||||
|       this.singleSelect = false, |       this.singleSelect = false, | ||||||
|       this.alignment = WrapAlignment.start, |       this.alignment = WrapAlignment.start, | ||||||
|       this.emptyMessage = 'Input'}) |       this.emptyMessage = 'Input', | ||||||
|  |       this.showLabelWhenNotEmpty = true}) | ||||||
|       : super(key, |       : super(key, | ||||||
|             label: label, |             label: label, | ||||||
|             belowWidgets: belowWidgets, |             belowWidgets: belowWidgets, | ||||||
| @@ -140,11 +142,11 @@ class _GeneratedFormState extends State<GeneratedForm> { | |||||||
|     for (int r = 0; r < widget.items.length; r++) { |     for (int r = 0; r < widget.items.length; r++) { | ||||||
|       for (int i = 0; i < widget.items[r].length; i++) { |       for (int i = 0; i < widget.items[r].length; i++) { | ||||||
|         if (formInputs[r][i] is TextFormField) { |         if (formInputs[r][i] is TextFormField) { | ||||||
|           valid = valid && |           var fieldState = | ||||||
|               ((formInputs[r][i].key as GlobalKey<FormFieldState>) |               (formInputs[r][i].key as GlobalKey<FormFieldState>).currentState; | ||||||
|                       .currentState |           if (fieldState != null) { | ||||||
|                       ?.isValid ?? |             valid = valid && fieldState.isValid; | ||||||
|                   false); |           } | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
| @@ -259,8 +261,30 @@ class _GeneratedFormState extends State<GeneratedForm> { | |||||||
|             ], |             ], | ||||||
|           ); |           ); | ||||||
|         } else if (widget.items[r][e] is GeneratedFormTagInput) { |         } else if (widget.items[r][e] is GeneratedFormTagInput) { | ||||||
|           formInputs[r][e] = Wrap( |           formInputs[r][e] = | ||||||
|             alignment: (widget.items[r][e] as GeneratedFormTagInput).alignment, |               Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [ | ||||||
|  |             if ((values[widget.items[r][e].key] | ||||||
|  |                             as Map<String, MapEntry<int, bool>>?) | ||||||
|  |                         ?.isNotEmpty == | ||||||
|  |                     true && | ||||||
|  |                 (widget.items[r][e] as GeneratedFormTagInput) | ||||||
|  |                     .showLabelWhenNotEmpty) | ||||||
|  |               Column( | ||||||
|  |                 crossAxisAlignment: | ||||||
|  |                     (widget.items[r][e] as GeneratedFormTagInput).alignment == | ||||||
|  |                             WrapAlignment.center | ||||||
|  |                         ? CrossAxisAlignment.center | ||||||
|  |                         : CrossAxisAlignment.stretch, | ||||||
|  |                 children: [ | ||||||
|  |                   Text(widget.items[r][e].label), | ||||||
|  |                   const SizedBox( | ||||||
|  |                     height: 8, | ||||||
|  |                   ), | ||||||
|  |                 ], | ||||||
|  |               ), | ||||||
|  |             Wrap( | ||||||
|  |               alignment: | ||||||
|  |                   (widget.items[r][e] as GeneratedFormTagInput).alignment, | ||||||
|               crossAxisAlignment: WrapCrossAlignment.center, |               crossAxisAlignment: WrapCrossAlignment.center, | ||||||
|               children: [ |               children: [ | ||||||
|                 (values[widget.items[r][e].key] |                 (values[widget.items[r][e].key] | ||||||
| @@ -270,7 +294,6 @@ class _GeneratedFormState extends State<GeneratedForm> { | |||||||
|                     ? Text( |                     ? Text( | ||||||
|                         (widget.items[r][e] as GeneratedFormTagInput) |                         (widget.items[r][e] as GeneratedFormTagInput) | ||||||
|                             .emptyMessage, |                             .emptyMessage, | ||||||
|                       style: const TextStyle(fontWeight: FontWeight.bold), |  | ||||||
|                       ) |                       ) | ||||||
|                     : const SizedBox.shrink(), |                     : const SizedBox.shrink(), | ||||||
|                 ...(values[widget.items[r][e].key] |                 ...(values[widget.items[r][e].key] | ||||||
| @@ -295,20 +318,24 @@ class _GeneratedFormState extends State<GeneratedForm> { | |||||||
|                                                 MapEntry<int, bool>>)[e2.key]! |                                                 MapEntry<int, bool>>)[e2.key]! | ||||||
|                                             .key, |                                             .key, | ||||||
|                                         value); |                                         value); | ||||||
|                               if ((widget.items[r][e] as GeneratedFormTagInput) |                                 if ((widget.items[r][e] | ||||||
|  |                                             as GeneratedFormTagInput) | ||||||
|                                         .singleSelect && |                                         .singleSelect && | ||||||
|                                     value == true) { |                                     value == true) { | ||||||
|                                 for (var key in (values[widget.items[r][e].key] |                                   for (var key in (values[ | ||||||
|  |                                               widget.items[r][e].key] | ||||||
|                                           as Map<String, MapEntry<int, bool>>) |                                           as Map<String, MapEntry<int, bool>>) | ||||||
|                                       .keys) { |                                       .keys) { | ||||||
|                                     if (key != e2.key) { |                                     if (key != e2.key) { | ||||||
|                                       (values[widget.items[r][e].key] as Map< |                                       (values[widget.items[r][e].key] as Map< | ||||||
|                                               String, |                                               String, | ||||||
|                                         MapEntry<int, |                                               MapEntry<int, bool>>)[key] = | ||||||
|                                             bool>>)[key] = MapEntry( |                                           MapEntry( | ||||||
|                                         (values[widget.items[r][e].key] as Map< |                                               (values[widget.items[r][e].key] | ||||||
|  |                                                       as Map< | ||||||
|                                                           String, |                                                           String, | ||||||
|                                                 MapEntry<int, bool>>)[key]! |                                                           MapEntry<int, | ||||||
|  |                                                               bool>>)[key]! | ||||||
|                                                   .key, |                                                   .key, | ||||||
|                                               false); |                                               false); | ||||||
|                                     } |                                     } | ||||||
| @@ -389,8 +416,9 @@ class _GeneratedFormState extends State<GeneratedForm> { | |||||||
|                               var temp = values[widget.items[r][e].key] |                               var temp = values[widget.items[r][e].key] | ||||||
|                                   as Map<String, MapEntry<int, bool>>?; |                                   as Map<String, MapEntry<int, bool>>?; | ||||||
|                               temp ??= {}; |                               temp ??= {}; | ||||||
|                             var singleSelect = |                               if (temp[label] == null) { | ||||||
|                                 (widget.items[r][e] as GeneratedFormTagInput) |                                 var singleSelect = (widget.items[r][e] | ||||||
|  |                                         as GeneratedFormTagInput) | ||||||
|                                     .singleSelect; |                                     .singleSelect; | ||||||
|                                 var someSelected = temp.entries |                                 var someSelected = temp.entries | ||||||
|                                     .where((element) => element.value.value) |                                     .where((element) => element.value.value) | ||||||
| @@ -400,6 +428,7 @@ class _GeneratedFormState extends State<GeneratedForm> { | |||||||
|                                     !(someSelected && singleSelect)); |                                     !(someSelected && singleSelect)); | ||||||
|                                 values[widget.items[r][e].key] = temp; |                                 values[widget.items[r][e].key] = temp; | ||||||
|                                 someValueChanged(); |                                 someValueChanged(); | ||||||
|  |                               } | ||||||
|                             }); |                             }); | ||||||
|                           } |                           } | ||||||
|                         }); |                         }); | ||||||
| @@ -409,7 +438,8 @@ class _GeneratedFormState extends State<GeneratedForm> { | |||||||
|                       tooltip: tr('add'), |                       tooltip: tr('add'), | ||||||
|                     )), |                     )), | ||||||
|               ], |               ], | ||||||
|           ); |             ) | ||||||
|  |           ]); | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -9,12 +9,16 @@ class GeneratedFormModal extends StatefulWidget { | |||||||
|       required this.title, |       required this.title, | ||||||
|       required this.items, |       required this.items, | ||||||
|       this.initValid = false, |       this.initValid = false, | ||||||
|       this.message = ''}); |       this.message = '', | ||||||
|  |       this.additionalWidgets = const [], | ||||||
|  |       this.singleNullReturnButton}); | ||||||
|  |  | ||||||
|   final String title; |   final String title; | ||||||
|   final String message; |   final String message; | ||||||
|   final List<List<GeneratedFormItem>> items; |   final List<List<GeneratedFormItem>> items; | ||||||
|   final bool initValid; |   final bool initValid; | ||||||
|  |   final List<Widget> additionalWidgets; | ||||||
|  |   final String? singleNullReturnButton; | ||||||
|  |  | ||||||
|   @override |   @override | ||||||
|   State<GeneratedFormModal> createState() => _GeneratedFormModalState(); |   State<GeneratedFormModal> createState() => _GeneratedFormModalState(); | ||||||
| @@ -54,15 +58,19 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> { | |||||||
|                   this.valid = valid; |                   this.valid = valid; | ||||||
|                 }); |                 }); | ||||||
|               } |               } | ||||||
|             }) |             }), | ||||||
|  |         if (widget.additionalWidgets.isNotEmpty) ...widget.additionalWidgets | ||||||
|       ]), |       ]), | ||||||
|       actions: [ |       actions: [ | ||||||
|         TextButton( |         TextButton( | ||||||
|             onPressed: () { |             onPressed: () { | ||||||
|               Navigator.of(context).pop(null); |               Navigator.of(context).pop(null); | ||||||
|             }, |             }, | ||||||
|             child: Text(tr('cancel'))), |             child: Text(widget.singleNullReturnButton == null | ||||||
|         TextButton( |                 ? tr('cancel') | ||||||
|  |                 : widget.singleNullReturnButton!)), | ||||||
|  |         widget.singleNullReturnButton == null | ||||||
|  |             ? TextButton( | ||||||
|                 onPressed: !valid |                 onPressed: !valid | ||||||
|                     ? null |                     ? null | ||||||
|                     : () { |                     : () { | ||||||
| @@ -72,6 +80,7 @@ class _GeneratedFormModalState extends State<GeneratedFormModal> { | |||||||
|                         } |                         } | ||||||
|                       }, |                       }, | ||||||
|                 child: Text(tr('continue'))) |                 child: Text(tr('continue'))) | ||||||
|  |             : const SizedBox.shrink() | ||||||
|       ], |       ], | ||||||
|     ); |     ); | ||||||
|   } |   } | ||||||
|   | |||||||
| @@ -13,13 +13,10 @@ class ObtainiumError { | |||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
| class RateLimitError { | class RateLimitError extends ObtainiumError { | ||||||
|   late int remainingMinutes; |   late int remainingMinutes; | ||||||
|   RateLimitError(this.remainingMinutes); |   RateLimitError(this.remainingMinutes) | ||||||
|  |       : super(plural('tooManyRequestsTryAgainInMinutes', remainingMinutes)); | ||||||
|   @override |  | ||||||
|   String toString() => |  | ||||||
|       plural('tooManyRequestsTryAgainInMinutes', remainingMinutes); |  | ||||||
| } | } | ||||||
|  |  | ||||||
| class InvalidURLError extends ObtainiumError { | class InvalidURLError extends ObtainiumError { | ||||||
|   | |||||||
| @@ -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.9.4'; | const String currentVersion = '0.9.11'; | ||||||
| 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 | ||||||
|  |  | ||||||
|   | |||||||
| @@ -8,6 +8,7 @@ import 'package:obtainium/custom_errors.dart'; | |||||||
| import 'package:obtainium/main.dart'; | import 'package:obtainium/main.dart'; | ||||||
| import 'package:obtainium/pages/app.dart'; | import 'package:obtainium/pages/app.dart'; | ||||||
| import 'package:obtainium/pages/import_export.dart'; | import 'package:obtainium/pages/import_export.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:obtainium/providers/settings_provider.dart'; | ||||||
| import 'package:obtainium/providers/source_provider.dart'; | import 'package:obtainium/providers/source_provider.dart'; | ||||||
| @@ -29,6 +30,7 @@ class _AddAppPageState extends State<AddAppPage> { | |||||||
|   AppSource? pickedSource; |   AppSource? pickedSource; | ||||||
|   Map<String, dynamic> additionalSettings = {}; |   Map<String, dynamic> additionalSettings = {}; | ||||||
|   bool additionalSettingsValid = true; |   bool additionalSettingsValid = true; | ||||||
|  |   List<String> pickedCategories = []; | ||||||
|  |  | ||||||
|   @override |   @override | ||||||
|   Widget build(BuildContext context) { |   Widget build(BuildContext context) { | ||||||
| @@ -37,7 +39,8 @@ class _AddAppPageState extends State<AddAppPage> { | |||||||
|  |  | ||||||
|     changeUserInput(String input, bool valid, bool isBuilding) { |     changeUserInput(String input, bool valid, bool isBuilding) { | ||||||
|       userInput = input; |       userInput = input; | ||||||
|       fn() { |       if (!isBuilding) { | ||||||
|  |         setState(() { | ||||||
|           var source = valid ? sourceProvider.getSource(userInput) : null; |           var source = valid ? sourceProvider.getSource(userInput) : null; | ||||||
|           if (pickedSource.runtimeType != source.runtimeType) { |           if (pickedSource.runtimeType != source.runtimeType) { | ||||||
|             pickedSource = source; |             pickedSource = source; | ||||||
| @@ -49,13 +52,6 @@ class _AddAppPageState extends State<AddAppPage> { | |||||||
|                 ? !sourceProvider.ifRequiredAppSpecificSettingsExist(source) |                 ? !sourceProvider.ifRequiredAppSpecificSettingsExist(source) | ||||||
|                 : true; |                 : true; | ||||||
|           } |           } | ||||||
|       } |  | ||||||
|  |  | ||||||
|       if (isBuilding) { |  | ||||||
|         fn(); |  | ||||||
|       } else { |  | ||||||
|         setState(() { |  | ||||||
|           fn(); |  | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
| @@ -131,6 +127,7 @@ class _AddAppPageState extends State<AddAppPage> { | |||||||
|           if (app.additionalSettings['trackOnly'] == true) { |           if (app.additionalSettings['trackOnly'] == true) { | ||||||
|             app.installedVersion = app.latestVersion; |             app.installedVersion = app.latestVersion; | ||||||
|           } |           } | ||||||
|  |           app.categories = pickedCategories; | ||||||
|           await appsProvider.saveApps([app]); |           await appsProvider.saveApps([app]); | ||||||
|  |  | ||||||
|           return app; |           return app; | ||||||
| @@ -238,7 +235,9 @@ class _AddAppPageState extends State<AddAppPage> { | |||||||
|                                     ] |                                     ] | ||||||
|                                   ], |                                   ], | ||||||
|                                   onValueChanges: (values, valid, isBuilding) { |                                   onValueChanges: (values, valid, isBuilding) { | ||||||
|                                     if (values.isNotEmpty && valid) { |                                     if (values.isNotEmpty && | ||||||
|  |                                         valid && | ||||||
|  |                                         !isBuilding) { | ||||||
|                                       setState(() { |                                       setState(() { | ||||||
|                                         searchQuery = |                                         searchQuery = | ||||||
|                                             values['searchSomeSources']!.trim(); |                                             values['searchSomeSources']!.trim(); | ||||||
| @@ -289,7 +288,7 @@ class _AddAppPageState extends State<AddAppPage> { | |||||||
|                                           if (selectedUrls != null && |                                           if (selectedUrls != null && | ||||||
|                                               selectedUrls.isNotEmpty) { |                                               selectedUrls.isNotEmpty) { | ||||||
|                                             changeUserInput( |                                             changeUserInput( | ||||||
|                                                 selectedUrls[0], true, true); |                                                 selectedUrls[0], true, false); | ||||||
|                                             addApp(resetUserInputAfter: true); |                                             addApp(resetUserInputAfter: true); | ||||||
|                                           } |                                           } | ||||||
|                                         }).catchError((e) { |                                         }).catchError((e) { | ||||||
| @@ -299,9 +298,7 @@ class _AddAppPageState extends State<AddAppPage> { | |||||||
|                                 child: Text(tr('search'))) |                                 child: Text(tr('search'))) | ||||||
|                           ], |                           ], | ||||||
|                         ), |                         ), | ||||||
|                       if (pickedSource != null && |                       if (pickedSource != null) | ||||||
|                           (pickedSource! |  | ||||||
|                               .combinedAppSpecificSettingFormItems.isNotEmpty)) |  | ||||||
|                         Column( |                         Column( | ||||||
|                           crossAxisAlignment: CrossAxisAlignment.stretch, |                           crossAxisAlignment: CrossAxisAlignment.stretch, | ||||||
|                           children: [ |                           children: [ | ||||||
| @@ -328,6 +325,18 @@ class _AddAppPageState extends State<AddAppPage> { | |||||||
|                                     }); |                                     }); | ||||||
|                                   } |                                   } | ||||||
|                                 }), |                                 }), | ||||||
|  |                             Column( | ||||||
|  |                               children: [ | ||||||
|  |                                 const SizedBox( | ||||||
|  |                                   height: 16, | ||||||
|  |                                 ), | ||||||
|  |                                 CategoryEditorSelector( | ||||||
|  |                                     alignment: WrapAlignment.start, | ||||||
|  |                                     onSelected: (categories) { | ||||||
|  |                                       pickedCategories = categories; | ||||||
|  |                                     }), | ||||||
|  |                               ], | ||||||
|  |                             ), | ||||||
|                           ], |                           ], | ||||||
|                         ) |                         ) | ||||||
|                       else |                       else | ||||||
|   | |||||||
| @@ -1,7 +1,6 @@ | |||||||
| import 'package:easy_localization/easy_localization.dart'; | import 'package:easy_localization/easy_localization.dart'; | ||||||
| import 'package:flutter/material.dart'; | import 'package:flutter/material.dart'; | ||||||
| import 'package:flutter/services.dart'; | import 'package:flutter/services.dart'; | ||||||
| import 'package:obtainium/components/generated_form.dart'; |  | ||||||
| import 'package:obtainium/components/generated_form_modal.dart'; | import 'package:obtainium/components/generated_form_modal.dart'; | ||||||
| import 'package:obtainium/custom_errors.dart'; | import 'package:obtainium/custom_errors.dart'; | ||||||
| import 'package:obtainium/main.dart'; | import 'package:obtainium/main.dart'; | ||||||
| @@ -35,7 +34,6 @@ class _AppPageState extends State<AppPage> { | |||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     var categories = settingsProvider.categories; |  | ||||||
|     var sourceProvider = SourceProvider(); |     var sourceProvider = SourceProvider(); | ||||||
|     AppInMemory? app = appsProvider.apps[widget.appId]; |     AppInMemory? app = appsProvider.apps[widget.appId]; | ||||||
|     var source = app != null ? sourceProvider.getSource(app.app.url) : null; |     var source = app != null ? sourceProvider.getSource(app.app.url) : null; | ||||||
| @@ -44,6 +42,106 @@ class _AppPageState extends State<AppPage> { | |||||||
|       getUpdate(app.app.id); |       getUpdate(app.app.id); | ||||||
|     } |     } | ||||||
|     var trackOnly = app?.app.additionalSettings['trackOnly'] == true; |     var trackOnly = app?.app.additionalSettings['trackOnly'] == true; | ||||||
|  |  | ||||||
|  |     var infoColumn = Column( | ||||||
|  |       mainAxisAlignment: MainAxisAlignment.center, | ||||||
|  |       crossAxisAlignment: CrossAxisAlignment.stretch, | ||||||
|  |       children: [ | ||||||
|  |         GestureDetector( | ||||||
|  |             onTap: () { | ||||||
|  |               if (app?.app.url != null) { | ||||||
|  |                 launchUrlString(app?.app.url ?? '', | ||||||
|  |                     mode: LaunchMode.externalApplication); | ||||||
|  |               } | ||||||
|  |             }, | ||||||
|  |             child: Text( | ||||||
|  |               app?.app.url ?? '', | ||||||
|  |               textAlign: TextAlign.center, | ||||||
|  |               style: const TextStyle( | ||||||
|  |                   decoration: TextDecoration.underline, | ||||||
|  |                   fontStyle: FontStyle.italic, | ||||||
|  |                   fontSize: 12), | ||||||
|  |             )), | ||||||
|  |         const SizedBox( | ||||||
|  |           height: 32, | ||||||
|  |         ), | ||||||
|  |         Text( | ||||||
|  |           tr('latestVersionX', args: [app?.app.latestVersion ?? tr('unknown')]), | ||||||
|  |           textAlign: TextAlign.center, | ||||||
|  |           style: Theme.of(context).textTheme.bodyLarge, | ||||||
|  |         ), | ||||||
|  |         Text( | ||||||
|  |           '${tr('installedVersionX', args: [ | ||||||
|  |                 app?.app.installedVersion ?? tr('none') | ||||||
|  |               ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [ | ||||||
|  |                   tr('app') | ||||||
|  |                 ])}' : ''}', | ||||||
|  |           textAlign: TextAlign.center, | ||||||
|  |           style: Theme.of(context).textTheme.bodyLarge, | ||||||
|  |         ), | ||||||
|  |         const SizedBox( | ||||||
|  |           height: 32, | ||||||
|  |         ), | ||||||
|  |         Text( | ||||||
|  |           tr('lastUpdateCheckX', args: [ | ||||||
|  |             app?.app.lastUpdateCheck == null | ||||||
|  |                 ? tr('never') | ||||||
|  |                 : '\n${app?.app.lastUpdateCheck?.toLocal()}' | ||||||
|  |           ]), | ||||||
|  |           textAlign: TextAlign.center, | ||||||
|  |           style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12), | ||||||
|  |         ), | ||||||
|  |         const SizedBox( | ||||||
|  |           height: 48, | ||||||
|  |         ), | ||||||
|  |         CategoryEditorSelector( | ||||||
|  |             alignment: WrapAlignment.center, | ||||||
|  |             preselected: | ||||||
|  |                 app?.app.categories != null ? app!.app.categories.toSet() : {}, | ||||||
|  |             onSelected: (categories) { | ||||||
|  |               if (app != null) { | ||||||
|  |                 app.app.categories = categories; | ||||||
|  |                 appsProvider.saveApps([app.app]); | ||||||
|  |               } | ||||||
|  |             }), | ||||||
|  |       ], | ||||||
|  |     ); | ||||||
|  |  | ||||||
|  |     var fullInfoColumn = Column( | ||||||
|  |       mainAxisAlignment: MainAxisAlignment.center, | ||||||
|  |       crossAxisAlignment: CrossAxisAlignment.stretch, | ||||||
|  |       children: [ | ||||||
|  |         const SizedBox(height: 150), | ||||||
|  |         app?.installedInfo != null | ||||||
|  |             ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [ | ||||||
|  |                 Image.memory( | ||||||
|  |                   app!.installedInfo!.icon!, | ||||||
|  |                   height: 150, | ||||||
|  |                   gaplessPlayback: true, | ||||||
|  |                 ) | ||||||
|  |               ]) | ||||||
|  |             : Container(), | ||||||
|  |         const SizedBox( | ||||||
|  |           height: 25, | ||||||
|  |         ), | ||||||
|  |         Text( | ||||||
|  |           app?.installedInfo?.name ?? app?.app.name ?? tr('app'), | ||||||
|  |           textAlign: TextAlign.center, | ||||||
|  |           style: Theme.of(context).textTheme.displayLarge, | ||||||
|  |         ), | ||||||
|  |         Text( | ||||||
|  |           tr('byX', args: [app?.app.author ?? tr('unknown')]), | ||||||
|  |           textAlign: TextAlign.center, | ||||||
|  |           style: Theme.of(context).textTheme.headlineMedium, | ||||||
|  |         ), | ||||||
|  |         const SizedBox( | ||||||
|  |           height: 32, | ||||||
|  |         ), | ||||||
|  |         infoColumn, | ||||||
|  |         const SizedBox(height: 150) | ||||||
|  |       ], | ||||||
|  |     ); | ||||||
|  |  | ||||||
|     return Scaffold( |     return Scaffold( | ||||||
|       appBar: settingsProvider.showAppWebpage ? AppBar() : null, |       appBar: settingsProvider.showAppWebpage ? AppBar() : null, | ||||||
|       backgroundColor: Theme.of(context).colorScheme.surface, |       backgroundColor: Theme.of(context).colorScheme.surface, | ||||||
| @@ -72,105 +170,8 @@ class _AppPageState extends State<AppPage> { | |||||||
|                   : Container() |                   : Container() | ||||||
|               : CustomScrollView( |               : CustomScrollView( | ||||||
|                   slivers: [ |                   slivers: [ | ||||||
|                     SliverFillRemaining( |                     SliverToBoxAdapter( | ||||||
|                         child: Column( |                         child: Column(children: [fullInfoColumn])), | ||||||
|                       mainAxisAlignment: MainAxisAlignment.center, |  | ||||||
|                       crossAxisAlignment: CrossAxisAlignment.stretch, |  | ||||||
|                       children: [ |  | ||||||
|                         app?.installedInfo != null |  | ||||||
|                             ? Row( |  | ||||||
|                                 mainAxisAlignment: MainAxisAlignment.center, |  | ||||||
|                                 children: [ |  | ||||||
|                                     Image.memory( |  | ||||||
|                                       app!.installedInfo!.icon!, |  | ||||||
|                                       height: 150, |  | ||||||
|                                       gaplessPlayback: true, |  | ||||||
|                                     ) |  | ||||||
|                                   ]) |  | ||||||
|                             : Container(), |  | ||||||
|                         const SizedBox( |  | ||||||
|                           height: 25, |  | ||||||
|                         ), |  | ||||||
|                         Text( |  | ||||||
|                           app?.installedInfo?.name ?? |  | ||||||
|                               app?.app.name ?? |  | ||||||
|                               tr('app'), |  | ||||||
|                           textAlign: TextAlign.center, |  | ||||||
|                           style: Theme.of(context).textTheme.displayLarge, |  | ||||||
|                         ), |  | ||||||
|                         Text( |  | ||||||
|                           tr('byX', args: [app?.app.author ?? tr('unknown')]), |  | ||||||
|                           textAlign: TextAlign.center, |  | ||||||
|                           style: Theme.of(context).textTheme.headlineMedium, |  | ||||||
|                         ), |  | ||||||
|                         const SizedBox( |  | ||||||
|                           height: 32, |  | ||||||
|                         ), |  | ||||||
|                         GestureDetector( |  | ||||||
|                             onTap: () { |  | ||||||
|                               if (app?.app.url != null) { |  | ||||||
|                                 launchUrlString(app?.app.url ?? '', |  | ||||||
|                                     mode: LaunchMode.externalApplication); |  | ||||||
|                               } |  | ||||||
|                             }, |  | ||||||
|                             child: Text( |  | ||||||
|                               app?.app.url ?? '', |  | ||||||
|                               textAlign: TextAlign.center, |  | ||||||
|                               style: const TextStyle( |  | ||||||
|                                   decoration: TextDecoration.underline, |  | ||||||
|                                   fontStyle: FontStyle.italic, |  | ||||||
|                                   fontSize: 12), |  | ||||||
|                             )), |  | ||||||
|                         const SizedBox( |  | ||||||
|                           height: 32, |  | ||||||
|                         ), |  | ||||||
|                         Text( |  | ||||||
|                           tr('latestVersionX', |  | ||||||
|                               args: [app?.app.latestVersion ?? tr('unknown')]), |  | ||||||
|                           textAlign: TextAlign.center, |  | ||||||
|                           style: Theme.of(context).textTheme.bodyLarge, |  | ||||||
|                         ), |  | ||||||
|                         Text( |  | ||||||
|                           '${tr('installedVersionX', args: [ |  | ||||||
|                                 app?.app.installedVersion ?? tr('none') |  | ||||||
|                               ])}${trackOnly ? ' ${tr('estimateInBrackets')}\n\n${tr('xIsTrackOnly', args: [ |  | ||||||
|                                   tr('app') |  | ||||||
|                                 ])}' : ''}', |  | ||||||
|                           textAlign: TextAlign.center, |  | ||||||
|                           style: Theme.of(context).textTheme.bodyLarge, |  | ||||||
|                         ), |  | ||||||
|                         const SizedBox( |  | ||||||
|                           height: 32, |  | ||||||
|                         ), |  | ||||||
|                         Text( |  | ||||||
|                           tr('lastUpdateCheckX', args: [ |  | ||||||
|                             app?.app.lastUpdateCheck == null |  | ||||||
|                                 ? tr('never') |  | ||||||
|                                 : '\n${app?.app.lastUpdateCheck?.toLocal()}' |  | ||||||
|                           ]), |  | ||||||
|                           textAlign: TextAlign.center, |  | ||||||
|                           style: const TextStyle( |  | ||||||
|                               fontStyle: FontStyle.italic, fontSize: 12), |  | ||||||
|                         ), |  | ||||||
|                         const SizedBox( |  | ||||||
|                           height: 48, |  | ||||||
|                         ), |  | ||||||
|                         CategoryEditorSelector( |  | ||||||
|                             alignment: WrapAlignment.center, |  | ||||||
|                             singleSelect: true, |  | ||||||
|                             preselected: app?.app.category != null |  | ||||||
|                                 ? {app!.app.category!} |  | ||||||
|                                 : {}, |  | ||||||
|                             onSelected: (categories) { |  | ||||||
|                               if (app != null) { |  | ||||||
|                                 app.app.category = categories.isNotEmpty |  | ||||||
|                                     ? categories[0] |  | ||||||
|                                     : null; |  | ||||||
|                                 appsProvider.saveApps([app.app]); |  | ||||||
|                               } |  | ||||||
|                             }) |  | ||||||
|                       ], |  | ||||||
|                     )), |  | ||||||
|                   ], |                   ], | ||||||
|                 ), |                 ), | ||||||
|           onRefresh: () async { |           onRefresh: () async { | ||||||
| @@ -289,6 +290,31 @@ class _AppPageState extends State<AppPage> { | |||||||
|                                     }, |                                     }, | ||||||
|                               tooltip: tr('additionalOptions'), |                               tooltip: tr('additionalOptions'), | ||||||
|                               icon: const Icon(Icons.settings)), |                               icon: const Icon(Icons.settings)), | ||||||
|  |                         if (app != null && settingsProvider.showAppWebpage) | ||||||
|  |                           IconButton( | ||||||
|  |                               onPressed: () { | ||||||
|  |                                 showDialog( | ||||||
|  |                                     context: context, | ||||||
|  |                                     builder: (BuildContext ctx) { | ||||||
|  |                                       return AlertDialog( | ||||||
|  |                                         scrollable: true, | ||||||
|  |                                         content: infoColumn, | ||||||
|  |                                         title: Text( | ||||||
|  |                                             '${app.app.name} ${tr('byX', args: [ | ||||||
|  |                                               app.app.author | ||||||
|  |                                             ])}'), | ||||||
|  |                                         actions: [ | ||||||
|  |                                           TextButton( | ||||||
|  |                                               onPressed: () { | ||||||
|  |                                                 Navigator.of(context).pop(); | ||||||
|  |                                               }, | ||||||
|  |                                               child: Text(tr('continue'))) | ||||||
|  |                                         ], | ||||||
|  |                                       ); | ||||||
|  |                                     }); | ||||||
|  |                               }, | ||||||
|  |                               icon: const Icon(Icons.more_horiz), | ||||||
|  |                               tooltip: tr('more')), | ||||||
|                         const SizedBox(width: 16.0), |                         const SizedBox(width: 16.0), | ||||||
|                         Expanded( |                         Expanded( | ||||||
|                             child: ElevatedButton( |                             child: ElevatedButton( | ||||||
|   | |||||||
| @@ -7,6 +7,7 @@ import 'package:obtainium/components/generated_form_modal.dart'; | |||||||
| import 'package:obtainium/custom_errors.dart'; | import 'package:obtainium/custom_errors.dart'; | ||||||
| import 'package:obtainium/main.dart'; | import 'package:obtainium/main.dart'; | ||||||
| import 'package:obtainium/pages/app.dart'; | import 'package:obtainium/pages/app.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:obtainium/providers/settings_provider.dart'; | ||||||
| import 'package:obtainium/providers/source_provider.dart'; | import 'package:obtainium/providers/source_provider.dart'; | ||||||
| @@ -22,7 +23,8 @@ class AppsPage extends StatefulWidget { | |||||||
| } | } | ||||||
|  |  | ||||||
| class AppsPageState extends State<AppsPage> { | class AppsPageState extends State<AppsPage> { | ||||||
|   AppsFilter? filter; |   AppsFilter filter = AppsFilter(); | ||||||
|  |   final AppsFilter neutralFilter = AppsFilter(); | ||||||
|   var updatesOnlyFilter = |   var updatesOnlyFilter = | ||||||
|       AppsFilter(includeUptodate: false, includeNonInstalled: false); |       AppsFilter(includeUptodate: false, includeNonInstalled: false); | ||||||
|   Set<App> selectedApps = {}; |   Set<App> selectedApps = {}; | ||||||
| @@ -54,7 +56,7 @@ class AppsPageState extends State<AppsPage> { | |||||||
|     var settingsProvider = context.watch<SettingsProvider>(); |     var settingsProvider = context.watch<SettingsProvider>(); | ||||||
|     var sortedApps = appsProvider.apps.values.toList(); |     var sortedApps = appsProvider.apps.values.toList(); | ||||||
|     var currentFilterIsUpdatesOnly = |     var currentFilterIsUpdatesOnly = | ||||||
|         filter?.isIdenticalTo(updatesOnlyFilter) ?? false; |         filter.isIdenticalTo(updatesOnlyFilter, settingsProvider); | ||||||
|  |  | ||||||
|     selectedApps = selectedApps |     selectedApps = selectedApps | ||||||
|         .where((element) => sortedApps.map((e) => e.app).contains(element)) |         .where((element) => sortedApps.map((e) => e.app).contains(element)) | ||||||
| @@ -70,22 +72,20 @@ class AppsPageState extends State<AppsPage> { | |||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     if (filter != null) { |  | ||||||
|     sortedApps = sortedApps.where((app) { |     sortedApps = sortedApps.where((app) { | ||||||
|       if (app.app.installedVersion == app.app.latestVersion && |       if (app.app.installedVersion == app.app.latestVersion && | ||||||
|             !(filter!.includeUptodate)) { |           !(filter.includeUptodate)) { | ||||||
|         return false; |         return false; | ||||||
|       } |       } | ||||||
|         if (app.app.installedVersion == null && |       if (app.app.installedVersion == null && !(filter.includeNonInstalled)) { | ||||||
|             !(filter!.includeNonInstalled)) { |  | ||||||
|         return false; |         return false; | ||||||
|       } |       } | ||||||
|         if (filter!.nameFilter.isNotEmpty || filter!.authorFilter.isNotEmpty) { |       if (filter.nameFilter.isNotEmpty || filter.authorFilter.isNotEmpty) { | ||||||
|           List<String> nameTokens = filter!.nameFilter |         List<String> nameTokens = filter.nameFilter | ||||||
|             .split(' ') |             .split(' ') | ||||||
|             .where((element) => element.trim().isNotEmpty) |             .where((element) => element.trim().isNotEmpty) | ||||||
|             .toList(); |             .toList(); | ||||||
|           List<String> authorTokens = filter!.authorFilter |         List<String> authorTokens = filter.authorFilter | ||||||
|             .split(' ') |             .split(' ') | ||||||
|             .where((element) => element.trim().isNotEmpty) |             .where((element) => element.trim().isNotEmpty) | ||||||
|             .toList(); |             .toList(); | ||||||
| @@ -102,13 +102,14 @@ class AppsPageState extends State<AppsPage> { | |||||||
|           } |           } | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|         if (filter!.categoryFilter.isNotEmpty && |       if (filter.categoryFilter.isNotEmpty && | ||||||
|             filter!.categoryFilter != app.app.category) { |           filter.categoryFilter | ||||||
|  |               .intersection(app.app.categories.toSet()) | ||||||
|  |               .isEmpty) { | ||||||
|         return false; |         return false; | ||||||
|       } |       } | ||||||
|       return true; |       return true; | ||||||
|     }).toList(); |     }).toList(); | ||||||
|     } |  | ||||||
|  |  | ||||||
|     sortedApps.sort((a, b) { |     sortedApps.sort((a, b) { | ||||||
|       var nameA = a.installedInfo?.name ?? a.app.name; |       var nameA = a.installedInfo?.name ?? a.app.name; | ||||||
| @@ -226,14 +227,21 @@ class AppsPageState extends State<AppsPage> { | |||||||
|               String? changesUrl = SourceProvider() |               String? changesUrl = SourceProvider() | ||||||
|                   .getSource(sortedApps[index].app.url) |                   .getSource(sortedApps[index].app.url) | ||||||
|                   .changeLogPageFromStandardUrl(sortedApps[index].app.url); |                   .changeLogPageFromStandardUrl(sortedApps[index].app.url); | ||||||
|  |               var transparent = const Color.fromARGB(0, 0, 0, 0).value; | ||||||
|               return Container( |               return Container( | ||||||
|                   decoration: BoxDecoration( |                   decoration: BoxDecoration( | ||||||
|                       border: Border.symmetric( |                       border: Border.symmetric( | ||||||
|                           vertical: BorderSide( |                           vertical: BorderSide( | ||||||
|                               width: 3, |                               width: 4, | ||||||
|                               color: Color(settingsProvider.categories[ |                               color: Color( | ||||||
|                                       sortedApps[index].app.category] ?? |                                   sortedApps[index].app.categories.isNotEmpty | ||||||
|                                   const Color.fromARGB(0, 0, 0, 0).value)))), |                                       ? settingsProvider.categories[ | ||||||
|  |                                               sortedApps[index] | ||||||
|  |                                                   .app | ||||||
|  |                                                   .categories | ||||||
|  |                                                   .first] ?? | ||||||
|  |                                           transparent | ||||||
|  |                                       : transparent)))), | ||||||
|                   child: ListTile( |                   child: ListTile( | ||||||
|                     tileColor: sortedApps[index].app.pinned |                     tileColor: sortedApps[index].app.pinned | ||||||
|                         ? Colors.grey.withOpacity(0.1) |                         ? Colors.grey.withOpacity(0.1) | ||||||
| @@ -339,7 +347,20 @@ class AppsPageState extends State<AppsPage> { | |||||||
|       persistentFooterButtons: [ |       persistentFooterButtons: [ | ||||||
|         Row( |         Row( | ||||||
|           children: [ |           children: [ | ||||||
|             IconButton( |             selectedApps.isEmpty | ||||||
|  |                 ? IconButton( | ||||||
|  |                     visualDensity: VisualDensity.compact, | ||||||
|  |                     onPressed: () { | ||||||
|  |                       selectThese(sortedApps.map((e) => e.app).toList()); | ||||||
|  |                     }, | ||||||
|  |                     icon: Icon( | ||||||
|  |                       Icons.select_all_outlined, | ||||||
|  |                       color: Theme.of(context).colorScheme.primary, | ||||||
|  |                     ), | ||||||
|  |                     tooltip: tr('selectAll')) | ||||||
|  |                 : TextButton.icon( | ||||||
|  |                     style: | ||||||
|  |                         const ButtonStyle(visualDensity: VisualDensity.compact), | ||||||
|                     onPressed: () { |                     onPressed: () { | ||||||
|                       selectedApps.isEmpty |                       selectedApps.isEmpty | ||||||
|                           ? selectThese(sortedApps.map((e) => e.app).toList()) |                           ? selectThese(sortedApps.map((e) => e.app).toList()) | ||||||
| @@ -351,9 +372,7 @@ class AppsPageState extends State<AppsPage> { | |||||||
|                           : Icons.deselect_outlined, |                           : Icons.deselect_outlined, | ||||||
|                       color: Theme.of(context).colorScheme.primary, |                       color: Theme.of(context).colorScheme.primary, | ||||||
|                     ), |                     ), | ||||||
|                 tooltip: selectedApps.isEmpty |                     label: Text(selectedApps.length.toString())), | ||||||
|                     ? tr('selectAll') |  | ||||||
|                     : tr('deselectN', args: [selectedApps.length.toString()])), |  | ||||||
|             const VerticalDivider(), |             const VerticalDivider(), | ||||||
|             Expanded( |             Expanded( | ||||||
|                 child: Row( |                 child: Row( | ||||||
| @@ -486,6 +505,73 @@ class AppsPageState extends State<AppsPage> { | |||||||
|                     icon: const Icon( |                     icon: const Icon( | ||||||
|                       Icons.file_download_outlined, |                       Icons.file_download_outlined, | ||||||
|                     )), |                     )), | ||||||
|  |                 selectedApps.isEmpty | ||||||
|  |                     ? const SizedBox() | ||||||
|  |                     : IconButton( | ||||||
|  |                         visualDensity: VisualDensity.compact, | ||||||
|  |                         onPressed: () async { | ||||||
|  |                           try { | ||||||
|  |                             Set<String>? preselected; | ||||||
|  |                             var showPrompt = false; | ||||||
|  |                             for (var element in selectedApps) { | ||||||
|  |                               var currentCats = element.categories.toSet(); | ||||||
|  |                               if (preselected == null) { | ||||||
|  |                                 preselected = currentCats; | ||||||
|  |                               } else { | ||||||
|  |                                 if (!settingsProvider.setEqual( | ||||||
|  |                                     currentCats, preselected)) { | ||||||
|  |                                   showPrompt = true; | ||||||
|  |                                   break; | ||||||
|  |                                 } | ||||||
|  |                               } | ||||||
|  |                             } | ||||||
|  |                             var cont = true; | ||||||
|  |                             if (showPrompt) { | ||||||
|  |                               cont = await showDialog<Map<String, dynamic>?>( | ||||||
|  |                                       context: context, | ||||||
|  |                                       builder: (BuildContext ctx) { | ||||||
|  |                                         return GeneratedFormModal( | ||||||
|  |                                           title: tr('categorize'), | ||||||
|  |                                           items: const [], | ||||||
|  |                                           initValid: true, | ||||||
|  |                                           message: | ||||||
|  |                                               tr('selectedCategorizeWarning'), | ||||||
|  |                                         ); | ||||||
|  |                                       }) != | ||||||
|  |                                   null; | ||||||
|  |                             } | ||||||
|  |                             if (cont) { | ||||||
|  |                               await showDialog<Map<String, dynamic>?>( | ||||||
|  |                                   context: context, | ||||||
|  |                                   builder: (BuildContext ctx) { | ||||||
|  |                                     return GeneratedFormModal( | ||||||
|  |                                       title: tr('categorize'), | ||||||
|  |                                       items: const [], | ||||||
|  |                                       initValid: true, | ||||||
|  |                                       singleNullReturnButton: tr('continue'), | ||||||
|  |                                       additionalWidgets: [ | ||||||
|  |                                         CategoryEditorSelector( | ||||||
|  |                                           preselected: preselected ?? {}, | ||||||
|  |                                           showLabelWhenNotEmpty: false, | ||||||
|  |                                           onSelected: (categories) { | ||||||
|  |                                             appsProvider | ||||||
|  |                                                 .saveApps(selectedApps.map((e) { | ||||||
|  |                                               e.categories = categories; | ||||||
|  |                                               return e; | ||||||
|  |                                             }).toList()); | ||||||
|  |                                           }, | ||||||
|  |                                         ) | ||||||
|  |                                       ], | ||||||
|  |                                     ); | ||||||
|  |                                   }); | ||||||
|  |                             } | ||||||
|  |                           } catch (err) { | ||||||
|  |                             showError(err, context); | ||||||
|  |                           } | ||||||
|  |                         }, | ||||||
|  |                         tooltip: tr('categorize'), | ||||||
|  |                         icon: const Icon(Icons.category_outlined), | ||||||
|  |                       ), | ||||||
|                 selectedApps.isEmpty |                 selectedApps.isEmpty | ||||||
|                     ? const SizedBox() |                     ? const SizedBox() | ||||||
|                     : IconButton( |                     : IconButton( | ||||||
| @@ -663,7 +749,7 @@ class AppsPageState extends State<AppsPage> { | |||||||
|               onPressed: () { |               onPressed: () { | ||||||
|                 setState(() { |                 setState(() { | ||||||
|                   if (currentFilterIsUpdatesOnly) { |                   if (currentFilterIsUpdatesOnly) { | ||||||
|                     filter = null; |                     filter = AppsFilter(); | ||||||
|                   } else { |                   } else { | ||||||
|                     filter = updatesOnlyFilter; |                     filter = updatesOnlyFilter; | ||||||
|                   } |                   } | ||||||
| @@ -682,10 +768,15 @@ class AppsPageState extends State<AppsPage> { | |||||||
|             appsProvider.apps.isEmpty |             appsProvider.apps.isEmpty | ||||||
|                 ? const SizedBox() |                 ? const SizedBox() | ||||||
|                 : TextButton.icon( |                 : TextButton.icon( | ||||||
|  |                     style: | ||||||
|  |                         const ButtonStyle(visualDensity: VisualDensity.compact), | ||||||
|                     label: Text( |                     label: Text( | ||||||
|                       filter == null ? tr('filter') : tr('filterActive'), |                       filter.isIdenticalTo(neutralFilter, settingsProvider) | ||||||
|  |                           ? tr('filter') | ||||||
|  |                           : tr('filterActive'), | ||||||
|                       style: TextStyle( |                       style: TextStyle( | ||||||
|                           fontWeight: filter == null |                           fontWeight: filter.isIdenticalTo( | ||||||
|  |                                   neutralFilter, settingsProvider) | ||||||
|                               ? FontWeight.normal |                               ? FontWeight.normal | ||||||
|                               : FontWeight.bold), |                               : FontWeight.bold), | ||||||
|                     ), |                     ), | ||||||
| @@ -693,10 +784,9 @@ class AppsPageState extends State<AppsPage> { | |||||||
|                       showDialog<Map<String, dynamic>?>( |                       showDialog<Map<String, dynamic>?>( | ||||||
|                           context: context, |                           context: context, | ||||||
|                           builder: (BuildContext ctx) { |                           builder: (BuildContext ctx) { | ||||||
|                             var vals = filter == null |                             var vals = filter.toFormValuesMap(); | ||||||
|                                 ? AppsFilter().toValuesMap() |  | ||||||
|                                 : filter!.toValuesMap(); |  | ||||||
|                             return GeneratedFormModal( |                             return GeneratedFormModal( | ||||||
|  |                               initValid: true, | ||||||
|                               title: tr('filterApps'), |                               title: tr('filterApps'), | ||||||
|                               items: [ |                               items: [ | ||||||
|                                 [ |                                 [ | ||||||
| @@ -718,19 +808,24 @@ class AppsPageState extends State<AppsPage> { | |||||||
|                                   GeneratedFormSwitch('nonInstalledApps', |                                   GeneratedFormSwitch('nonInstalledApps', | ||||||
|                                       label: tr('nonInstalledApps'), |                                       label: tr('nonInstalledApps'), | ||||||
|                                       defaultValue: vals['nonInstalledApps']) |                                       defaultValue: vals['nonInstalledApps']) | ||||||
|                                   ], |  | ||||||
|                                   [ |  | ||||||
|                                     settingsProvider.getCategoryFormItem( |  | ||||||
|                                         initCategory: vals['category'] ?? '') |  | ||||||
|                                 ] |                                 ] | ||||||
|                                 ]); |                               ], | ||||||
|  |                               additionalWidgets: [ | ||||||
|  |                                 const SizedBox( | ||||||
|  |                                   height: 16, | ||||||
|  |                                 ), | ||||||
|  |                                 CategoryEditorSelector( | ||||||
|  |                                   preselected: filter.categoryFilter, | ||||||
|  |                                   onSelected: (categories) { | ||||||
|  |                                     filter.categoryFilter = categories.toSet(); | ||||||
|  |                                   }, | ||||||
|  |                                 ) | ||||||
|  |                               ], | ||||||
|  |                             ); | ||||||
|                           }).then((values) { |                           }).then((values) { | ||||||
|                         if (values != null) { |                         if (values != null) { | ||||||
|                           setState(() { |                           setState(() { | ||||||
|                             filter = AppsFilter.fromValuesMap(values); |                             filter.setFormValuesFromMap(values); | ||||||
|                             if (AppsFilter().isIdenticalTo(filter!)) { |  | ||||||
|                               filter = null; |  | ||||||
|                             } |  | ||||||
|                           }); |                           }); | ||||||
|                         } |                         } | ||||||
|                       }); |                       }); | ||||||
| @@ -748,37 +843,35 @@ class AppsFilter { | |||||||
|   late String authorFilter; |   late String authorFilter; | ||||||
|   late bool includeUptodate; |   late bool includeUptodate; | ||||||
|   late bool includeNonInstalled; |   late bool includeNonInstalled; | ||||||
|   late String categoryFilter; |   late Set<String> categoryFilter; | ||||||
|  |  | ||||||
|   AppsFilter( |   AppsFilter( | ||||||
|       {this.nameFilter = '', |       {this.nameFilter = '', | ||||||
|       this.authorFilter = '', |       this.authorFilter = '', | ||||||
|       this.includeUptodate = true, |       this.includeUptodate = true, | ||||||
|       this.includeNonInstalled = true, |       this.includeNonInstalled = true, | ||||||
|       this.categoryFilter = ''}); |       this.categoryFilter = const {}}); | ||||||
|  |  | ||||||
|   Map<String, dynamic> toValuesMap() { |   Map<String, dynamic> toFormValuesMap() { | ||||||
|     return { |     return { | ||||||
|       'appName': nameFilter, |       'appName': nameFilter, | ||||||
|       'author': authorFilter, |       'author': authorFilter, | ||||||
|       'upToDateApps': includeUptodate, |       'upToDateApps': includeUptodate, | ||||||
|       'nonInstalledApps': includeNonInstalled, |       'nonInstalledApps': includeNonInstalled | ||||||
|       'category': categoryFilter |  | ||||||
|     }; |     }; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   AppsFilter.fromValuesMap(Map<String, dynamic> values) { |   setFormValuesFromMap(Map<String, dynamic> values) { | ||||||
|     nameFilter = values['appName']!; |     nameFilter = values['appName']!; | ||||||
|     authorFilter = values['author']!; |     authorFilter = values['author']!; | ||||||
|     includeUptodate = values['upToDateApps']; |     includeUptodate = values['upToDateApps']; | ||||||
|     includeNonInstalled = values['nonInstalledApps']; |     includeNonInstalled = values['nonInstalledApps']; | ||||||
|     categoryFilter = values['category']!; |  | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   bool isIdenticalTo(AppsFilter other) => |   bool isIdenticalTo(AppsFilter other, SettingsProvider settingsProvider) => | ||||||
|       authorFilter.trim() == other.authorFilter.trim() && |       authorFilter.trim() == other.authorFilter.trim() && | ||||||
|       nameFilter.trim() == other.nameFilter.trim() && |       nameFilter.trim() == other.nameFilter.trim() && | ||||||
|       includeUptodate == other.includeUptodate && |       includeUptodate == other.includeUptodate && | ||||||
|       includeNonInstalled == other.includeNonInstalled && |       includeNonInstalled == other.includeNonInstalled && | ||||||
|       categoryFilter.trim() == other.categoryFilter.trim(); |       settingsProvider.setEqual(categoryFilter, other.categoryFilter); | ||||||
| } | } | ||||||
|   | |||||||
| @@ -66,6 +66,8 @@ class _ImportExportPageState extends State<ImportExportPage> { | |||||||
|                                             showError( |                                             showError( | ||||||
|                                                 tr('exportedTo', args: [path]), |                                                 tr('exportedTo', args: [path]), | ||||||
|                                                 context); |                                                 context); | ||||||
|  |                                           }).catchError((e) { | ||||||
|  |                                             showError(e, context); | ||||||
|                                           }); |                                           }); | ||||||
|                                         }, |                                         }, | ||||||
|                                   child: Text(tr('obtainiumExport')))), |                                   child: Text(tr('obtainiumExport')))), | ||||||
| @@ -338,7 +340,9 @@ class _ImportExportPageState extends State<ImportExportPage> { | |||||||
|                                             ? null |                                             ? null | ||||||
|                                             : () { |                                             : () { | ||||||
|                                                 () async { |                                                 () async { | ||||||
|                                                   var values = await showDialog( |                                                   var values = await showDialog< | ||||||
|  |                                                           Map<String, | ||||||
|  |                                                               dynamic>?>( | ||||||
|                                                       context: context, |                                                       context: context, | ||||||
|                                                       builder: |                                                       builder: | ||||||
|                                                           (BuildContext ctx) { |                                                           (BuildContext ctx) { | ||||||
| @@ -365,7 +369,10 @@ class _ImportExportPageState extends State<ImportExportPage> { | |||||||
|                                                     var urlsWithDescriptions = |                                                     var urlsWithDescriptions = | ||||||
|                                                         await source |                                                         await source | ||||||
|                                                             .getUrlsWithDescriptions( |                                                             .getUrlsWithDescriptions( | ||||||
|                                                                 values); |                                                                 values.values | ||||||
|  |                                                                     .map((e) => | ||||||
|  |                                                                         e.toString()) | ||||||
|  |                                                                     .toList()); | ||||||
|                                                     var selectedUrls = |                                                     var selectedUrls = | ||||||
|                                                         await showDialog< |                                                         await showDialog< | ||||||
|                                                                 List<String>?>( |                                                                 List<String>?>( | ||||||
|   | |||||||
| @@ -185,7 +185,7 @@ class _SettingsPageState extends State<SettingsPage> { | |||||||
|               return [e]; |               return [e]; | ||||||
|             }).toList(), |             }).toList(), | ||||||
|             onValueChanges: (values, valid, isBuilding) { |             onValueChanges: (values, valid, isBuilding) { | ||||||
|               if (valid) { |               if (valid && !isBuilding) { | ||||||
|                 values.forEach((key, value) { |                 values.forEach((key, value) { | ||||||
|                   settingsProvider.setSettingString(key, value); |                   settingsProvider.setSettingString(key, value); | ||||||
|                 }); |                 }); | ||||||
| @@ -286,7 +286,9 @@ class _SettingsPageState extends State<SettingsPage> { | |||||||
|                                   color: Theme.of(context).colorScheme.primary), |                                   color: Theme.of(context).colorScheme.primary), | ||||||
|                             ), |                             ), | ||||||
|                             height16, |                             height16, | ||||||
|                             const CategoryEditorSelector() |                             const CategoryEditorSelector( | ||||||
|  |                               showLabelWhenNotEmpty: false, | ||||||
|  |                             ) | ||||||
|                           ], |                           ], | ||||||
|                         ))), |                         ))), | ||||||
|           SliverToBoxAdapter( |           SliverToBoxAdapter( | ||||||
| @@ -407,12 +409,14 @@ class CategoryEditorSelector extends StatefulWidget { | |||||||
|   final bool singleSelect; |   final bool singleSelect; | ||||||
|   final Set<String> preselected; |   final Set<String> preselected; | ||||||
|   final WrapAlignment alignment; |   final WrapAlignment alignment; | ||||||
|  |   final bool showLabelWhenNotEmpty; | ||||||
|   const CategoryEditorSelector( |   const CategoryEditorSelector( | ||||||
|       {super.key, |       {super.key, | ||||||
|       this.onSelected, |       this.onSelected, | ||||||
|       this.singleSelect = false, |       this.singleSelect = false, | ||||||
|       this.preselected = const {}, |       this.preselected = const {}, | ||||||
|       this.alignment = WrapAlignment.start}); |       this.alignment = WrapAlignment.start, | ||||||
|  |       this.showLabelWhenNotEmpty = true}); | ||||||
|  |  | ||||||
|   @override |   @override | ||||||
|   State<CategoryEditorSelector> createState() => _CategoryEditorSelectorState(); |   State<CategoryEditorSelector> createState() => _CategoryEditorSelectorState(); | ||||||
| @@ -432,14 +436,15 @@ class _CategoryEditorSelectorState extends State<CategoryEditorSelector> { | |||||||
|         items: [ |         items: [ | ||||||
|           [ |           [ | ||||||
|             GeneratedFormTagInput('categories', |             GeneratedFormTagInput('categories', | ||||||
|                 label: tr('category'), |                 label: tr('categories'), | ||||||
|                 emptyMessage: tr('noCategories'), |                 emptyMessage: tr('noCategories'), | ||||||
|                 defaultValue: storedValues, |                 defaultValue: storedValues, | ||||||
|                 alignment: widget.alignment, |                 alignment: widget.alignment, | ||||||
|                 deleteConfirmationMessage: MapEntry( |                 deleteConfirmationMessage: MapEntry( | ||||||
|                     tr('deleteCategoriesQuestion'), |                     tr('deleteCategoriesQuestion'), | ||||||
|                     tr('categoryDeleteWarning')), |                     tr('categoryDeleteWarning')), | ||||||
|                 singleSelect: widget.singleSelect) |                 singleSelect: widget.singleSelect, | ||||||
|  |                 showLabelWhenNotEmpty: widget.showLabelWhenNotEmpty) | ||||||
|           ] |           ] | ||||||
|         ], |         ], | ||||||
|         onValueChanges: ((values, valid, isBuilding) { |         onValueChanges: ((values, valid, isBuilding) { | ||||||
|   | |||||||
| @@ -17,6 +17,7 @@ import 'package:obtainium/providers/logs_provider.dart'; | |||||||
| import 'package:obtainium/providers/notifications_provider.dart'; | import 'package:obtainium/providers/notifications_provider.dart'; | ||||||
| import 'package:obtainium/providers/settings_provider.dart'; | import 'package:obtainium/providers/settings_provider.dart'; | ||||||
| import 'package:package_archive_info/package_archive_info.dart'; | import 'package:package_archive_info/package_archive_info.dart'; | ||||||
|  | import 'package:permission_handler/permission_handler.dart'; | ||||||
| import 'package:provider/provider.dart'; | import 'package:provider/provider.dart'; | ||||||
| import 'package:path_provider/path_provider.dart'; | import 'package:path_provider/path_provider.dart'; | ||||||
| import 'package:flutter_fgbg/flutter_fgbg.dart'; | import 'package:flutter_fgbg/flutter_fgbg.dart'; | ||||||
| @@ -706,6 +707,14 @@ class AppsProvider with ChangeNotifier { | |||||||
|       exportDir = await getExternalStorageDirectory(); |       exportDir = await getExternalStorageDirectory(); | ||||||
|       path = exportDir!.path; |       path = exportDir!.path; | ||||||
|     } |     } | ||||||
|  |     if ((await DeviceInfoPlugin().androidInfo).version.sdkInt <= 28) { | ||||||
|  |       if (await Permission.storage.isDenied) { | ||||||
|  |         await Permission.storage.request(); | ||||||
|  |       } | ||||||
|  |       if (await Permission.storage.isDenied) { | ||||||
|  |         throw ObtainiumError(tr('storagePermissionDenied')); | ||||||
|  |       } | ||||||
|  |     } | ||||||
|     File export = File( |     File export = File( | ||||||
|         '${exportDir.path}/${tr('obtainiumExportHyphenatedLowercase')}-${DateTime.now().millisecondsSinceEpoch}.json'); |         '${exportDir.path}/${tr('obtainiumExportHyphenatedLowercase')}-${DateTime.now().millisecondsSinceEpoch}.json'); | ||||||
|     export.writeAsStringSync( |     export.writeAsStringSync( | ||||||
|   | |||||||
| @@ -157,15 +157,6 @@ class SettingsProvider with ChangeNotifier { | |||||||
|     notifyListeners(); |     notifyListeners(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   getCategoryFormItem({String initCategory = ''}) => GeneratedFormDropdown( |  | ||||||
|       'category', |  | ||||||
|       label: tr('category'), |  | ||||||
|       [ |  | ||||||
|         MapEntry('', tr('noCategory')), |  | ||||||
|         ...categories.entries.map((e) => MapEntry(e.key, e.key)).toList() |  | ||||||
|       ], |  | ||||||
|       defaultValue: initCategory); |  | ||||||
|  |  | ||||||
|   String? get forcedLocale { |   String? get forcedLocale { | ||||||
|     var fl = prefs?.getString('forcedLocale'); |     var fl = prefs?.getString('forcedLocale'); | ||||||
|     return supportedLocales |     return supportedLocales | ||||||
| @@ -185,4 +176,7 @@ class SettingsProvider with ChangeNotifier { | |||||||
|     } |     } | ||||||
|     notifyListeners(); |     notifyListeners(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |   bool setEqual(Set<String> a, Set<String> b) => | ||||||
|  |       a.length == b.length && a.union(b).length == a.length; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -48,7 +48,7 @@ class App { | |||||||
|   late Map<String, dynamic> additionalSettings; |   late Map<String, dynamic> additionalSettings; | ||||||
|   late DateTime? lastUpdateCheck; |   late DateTime? lastUpdateCheck; | ||||||
|   bool pinned = false; |   bool pinned = false; | ||||||
|   String? category; |   List<String> categories; | ||||||
|   App( |   App( | ||||||
|       this.id, |       this.id, | ||||||
|       this.url, |       this.url, | ||||||
| @@ -61,7 +61,7 @@ class App { | |||||||
|       this.additionalSettings, |       this.additionalSettings, | ||||||
|       this.lastUpdateCheck, |       this.lastUpdateCheck, | ||||||
|       this.pinned, |       this.pinned, | ||||||
|       {this.category}); |       {this.categories = const []}); | ||||||
|  |  | ||||||
|   @override |   @override | ||||||
|   String toString() { |   String toString() { | ||||||
| @@ -103,6 +103,12 @@ class App { | |||||||
|             item.ensureType(additionalSettings[item.key]); |             item.ensureType(additionalSettings[item.key]); | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|  |     int preferredApkIndex = json['preferredApkIndex'] == null | ||||||
|  |         ? 0 | ||||||
|  |         : json['preferredApkIndex'] as int; | ||||||
|  |     if (preferredApkIndex < 0) { | ||||||
|  |       preferredApkIndex = 0; | ||||||
|  |     } | ||||||
|     return App( |     return App( | ||||||
|         json['id'] as String, |         json['id'] as String, | ||||||
|         json['url'] as String, |         json['url'] as String, | ||||||
| @@ -115,15 +121,19 @@ class App { | |||||||
|         json['apkUrls'] == null |         json['apkUrls'] == null | ||||||
|             ? [] |             ? [] | ||||||
|             : List<String>.from(jsonDecode(json['apkUrls'])), |             : List<String>.from(jsonDecode(json['apkUrls'])), | ||||||
|         json['preferredApkIndex'] == null |         preferredApkIndex, | ||||||
|             ? 0 |  | ||||||
|             : json['preferredApkIndex'] as int, |  | ||||||
|         additionalSettings, |         additionalSettings, | ||||||
|         json['lastUpdateCheck'] == null |         json['lastUpdateCheck'] == null | ||||||
|             ? null |             ? null | ||||||
|             : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']), |             : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']), | ||||||
|         json['pinned'] ?? false, |         json['pinned'] ?? false, | ||||||
|         category: json['category']); |         categories: json['categories'] != null | ||||||
|  |             ? (json['categories'] as List<dynamic>) | ||||||
|  |                 .map((e) => e.toString()) | ||||||
|  |                 .toList() | ||||||
|  |             : json['category'] != null | ||||||
|  |                 ? [json['category'] as String] | ||||||
|  |                 : []); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   Map<String, dynamic> toJson() => { |   Map<String, dynamic> toJson() => { | ||||||
| @@ -138,7 +148,7 @@ class App { | |||||||
|         'additionalSettings': jsonEncode(additionalSettings), |         'additionalSettings': jsonEncode(additionalSettings), | ||||||
|         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch, |         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch, | ||||||
|         'pinned': pinned, |         'pinned': pinned, | ||||||
|         'category': category |         'categories': categories | ||||||
|       }; |       }; | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -331,13 +341,13 @@ class SourceProvider { | |||||||
|       {App? currentApp, |       {App? currentApp, | ||||||
|       bool trackOnlyOverride = false, |       bool trackOnlyOverride = false, | ||||||
|       noVersionDetectionOverride = false}) async { |       noVersionDetectionOverride = false}) async { | ||||||
|     if (trackOnlyOverride) { |     if (trackOnlyOverride || source.enforceTrackOnly) { | ||||||
|       additionalSettings['trackOnly'] = true; |       additionalSettings['trackOnly'] = true; | ||||||
|     } |     } | ||||||
|     if (noVersionDetectionOverride) { |     if (noVersionDetectionOverride) { | ||||||
|       additionalSettings['noVersionDetection'] = true; |       additionalSettings['noVersionDetection'] = true; | ||||||
|     } |     } | ||||||
|     var trackOnly = currentApp?.additionalSettings['trackOnly'] == true; |     var trackOnly = additionalSettings['trackOnly'] == true; | ||||||
|     String standardUrl = source.standardizeURL(preStandardizeUrl(url)); |     String standardUrl = source.standardizeURL(preStandardizeUrl(url)); | ||||||
|     APKDetails apk = |     APKDetails apk = | ||||||
|         await source.getLatestAPKDetails(standardUrl, additionalSettings); |         await source.getLatestAPKDetails(standardUrl, additionalSettings); | ||||||
| @@ -360,11 +370,11 @@ class SourceProvider { | |||||||
|         currentApp?.installedVersion, |         currentApp?.installedVersion, | ||||||
|         apkVersion, |         apkVersion, | ||||||
|         apk.apkUrls, |         apk.apkUrls, | ||||||
|         apk.apkUrls.length - 1, |         apk.apkUrls.length - 1 >= 0 ? apk.apkUrls.length - 1 : 0, | ||||||
|         additionalSettings, |         additionalSettings, | ||||||
|         DateTime.now(), |         DateTime.now(), | ||||||
|         currentApp?.pinned ?? false, |         currentApp?.pinned ?? false, | ||||||
|         category: currentApp?.category); |         categories: currentApp?.categories ?? const []); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   // Returns errors in [results, errors] instead of throwing them |   // Returns errors in [results, errors] instead of throwing them | ||||||
|   | |||||||
| @@ -739,14 +739,14 @@ packages: | |||||||
|       name: webview_flutter |       name: webview_flutter | ||||||
|       url: "https://pub.dartlang.org" |       url: "https://pub.dartlang.org" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "4.0.0" |     version: "4.0.1" | ||||||
|   webview_flutter_android: |   webview_flutter_android: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|       name: webview_flutter_android |       name: webview_flutter_android | ||||||
|       url: "https://pub.dartlang.org" |       url: "https://pub.dartlang.org" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "3.0.0" |     version: "3.1.1" | ||||||
|   webview_flutter_platform_interface: |   webview_flutter_platform_interface: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
| @@ -760,7 +760,7 @@ packages: | |||||||
|       name: webview_flutter_wkwebview |       name: webview_flutter_wkwebview | ||||||
|       url: "https://pub.dartlang.org" |       url: "https://pub.dartlang.org" | ||||||
|     source: hosted |     source: hosted | ||||||
|     version: "3.0.0" |     version: "3.0.1" | ||||||
|   win32: |   win32: | ||||||
|     dependency: transitive |     dependency: transitive | ||||||
|     description: |     description: | ||||||
|   | |||||||
| @@ -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.9.4+92 # When changing this, update the tag in main() accordingly | version: 0.9.11+101 # 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' | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user