diff --git a/assets/data/meta.json b/assets/data/meta.json index b498693e3..aeed25acd 100644 --- a/assets/data/meta.json +++ b/assets/data/meta.json @@ -1,5 +1,5 @@ { "GameVersion": "4.30", "GameBuildNumber": 11414359, - "GeneratedDate": "2023-07-15" + "GeneratedDate": "2023-08-15" } \ No newline at end of file diff --git a/assets/data/patronsBackup.json b/assets/data/patronsBackup.json index f47892553..01c86f593 100644 --- a/assets/data/patronsBackup.json +++ b/assets/data/patronsBackup.json @@ -23,30 +23,24 @@ "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/48CFDD47C31B9CA61068EAF6762E9932.png", "url": "https://assistantapps.com" }, - { - "name": "Josh Goodall", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/7A4B566FDC15C707F001B142F835BAA5.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/7A4B566FDC15C707F001B142F835BAA5.png", - "url": "https://assistantapps.com" - }, { "name": "Miked", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/F1B99D864863A4B973E1CC17FEBBCB22.png", "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F1B99D864863A4B973E1CC17FEBBCB22.png", "url": "https://assistantapps.com" }, - { - "name": "Zig Justice", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/678B05CAC113685E13841EDA3A55EC5D.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/678B05CAC113685E13841EDA3A55EC5D.png", - "url": "https://assistantapps.com" - }, { "name": "Robert J. Grasmuck", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/7BC69DFF9073C4095CDFF66E3FF59F73.png", "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/7BC69DFF9073C4095CDFF66E3FF59F73.png", "url": "https://assistantapps.com" }, + { + "name": "Zig Justice", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/678B05CAC113685E13841EDA3A55EC5D.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/678B05CAC113685E13841EDA3A55EC5D.png", + "url": "https://assistantapps.com" + }, { "name": "cyberpunk2350", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/2710524A9D208523926238EA123749E9.png", @@ -77,6 +71,12 @@ "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/9D164DB8AB45EC2616D52CA92EEE2CBF.png", "url": "https://assistantapps.com" }, + { + "name": "evanjpw", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/DD21247329CC4E7DCE5B2F8F58C1D8CE.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/DD21247329CC4E7DCE5B2F8F58C1D8CE.png", + "url": "https://assistantapps.com" + }, { "name": "christopher perkins", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/FA9FE210914BA3B97BA99F05F233924D.png", @@ -89,48 +89,48 @@ "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/D5D8C41865D8A28075F8BFD30E93BFA2.png", "url": "https://assistantapps.com" }, - { - "name": "evanjpw", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/DD21247329CC4E7DCE5B2F8F58C1D8CE.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/DD21247329CC4E7DCE5B2F8F58C1D8CE.png", - "url": "https://assistantapps.com" - }, { "name": "chrisagiddings", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/AD2DB07A3A0A976AAC85AA5B0FF4E898.png", "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/AD2DB07A3A0A976AAC85AA5B0FF4E898.png", "url": "https://assistantapps.com" }, - { - "name": "David Peak", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/AFA3F203725DBBC1E45C83BB120A86A4.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/AFA3F203725DBBC1E45C83BB120A86A4.png", - "url": "https://assistantapps.com" - }, { "name": "Red Goat", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/1965C7A4B88091DE50A9CB8E29A531C8.png", "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/1965C7A4B88091DE50A9CB8E29A531C8.png", "url": "https://assistantapps.com" }, - { - "name": "Casey Brownell", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/FE4ACF19CFB2B7229E394F9F30C45860.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/FE4ACF19CFB2B7229E394F9F30C45860.png", - "url": "https://assistantapps.com" - }, { "name": "Tristan Ancelet", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/D994924AA5EF51C5BDFBFBDAC12A04FF.png", "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/D994924AA5EF51C5BDFBFBDAC12A04FF.png", "url": "https://assistantapps.com" }, + { + "name": "David Peak", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/AFA3F203725DBBC1E45C83BB120A86A4.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/AFA3F203725DBBC1E45C83BB120A86A4.png", + "url": "https://assistantapps.com" + }, + { + "name": "Casey Brownell", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/FE4ACF19CFB2B7229E394F9F30C45860.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/FE4ACF19CFB2B7229E394F9F30C45860.png", + "url": "https://assistantapps.com" + }, { "name": "David Stevenson", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/75D2741AA463E5BA847AEF218CE53E16.png", "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/75D2741AA463E5BA847AEF218CE53E16.png", "url": "https://assistantapps.com" }, + { + "name": "Reven", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/6195C08519C9C2A6658DC97551AA81B1.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/6195C08519C9C2A6658DC97551AA81B1.png", + "url": "https://assistantapps.com" + }, { "name": "Ian Walsh", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/38A82DB4765603CF6B81F0CD5ADFD44C.png", @@ -144,9 +144,9 @@ "url": "https://assistantapps.com" }, { - "name": "Reven", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/6195C08519C9C2A6658DC97551AA81B1.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/6195C08519C9C2A6658DC97551AA81B1.png", + "name": "CaptainSteve", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/62621285565C1858B5B1A3E9E7A42D9B.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/62621285565C1858B5B1A3E9E7A42D9B.png", "url": "https://assistantapps.com" }, { @@ -155,12 +155,6 @@ "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/04035D051898F471873F7EC6C4925791.png", "url": "https://assistantapps.com" }, - { - "name": "CaptainSteve", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/62621285565C1858B5B1A3E9E7A42D9B.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/62621285565C1858B5B1A3E9E7A42D9B.png", - "url": "https://assistantapps.com" - }, { "name": "Kianfu", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/9FD2B5D3D7502689C6A023306A1597CA.png", @@ -185,12 +179,6 @@ "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/B9CCF5AB9D710ACD53A4D39B0D5AEE3B.png", "url": "https://assistantapps.com" }, - { - "name": "Gregory F. Hogg", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/5F5291FC7D01BA7255B77A0B9647DD04.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/5F5291FC7D01BA7255B77A0B9647DD04.png", - "url": "https://assistantapps.com" - }, { "name": "Jason Rich", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/3EDB6BDFBDD09DD4DEB0DEB2CEC87C04.png", @@ -209,18 +197,6 @@ "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/7E4A8CDEB3F3702F32B1DCCD7BD11A1E.png", "url": "https://assistantapps.com" }, - { - "name": "Doobs", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/C29444C0F1A2AE6FAC7050E9E9F72127.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/C29444C0F1A2AE6FAC7050E9E9F72127.png", - "url": "https://assistantapps.com" - }, - { - "name": "Astra-the-Lost", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/5761F92FC7129B588133D31BD74BEAC8.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/5761F92FC7129B588133D31BD74BEAC8.png", - "url": "https://assistantapps.com" - }, { "name": "Arshad Omari", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/E11801B102017D5D9D5CFD8FB53957A6.png", @@ -228,27 +204,21 @@ "url": "https://assistantapps.com" }, { - "name": "MightyChicken", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/F5340B555E6426381124C31489E7A1E5.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F5340B555E6426381124C31489E7A1E5.png", - "url": "https://assistantapps.com" - }, - { - "name": "Stephanie Parsons", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/B4C1E8292B23811594B9F7D50B43C10A.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/B4C1E8292B23811594B9F7D50B43C10A.png", + "name": "Gregory F. Hogg", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/5F5291FC7D01BA7255B77A0B9647DD04.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/5F5291FC7D01BA7255B77A0B9647DD04.png", "url": "https://assistantapps.com" }, { - "name": "Joshua A Mcfelea", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/3EF8ECE9F567A9D4ACF7D010B2B7A1AF.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/3EF8ECE9F567A9D4ACF7D010B2B7A1AF.png", + "name": "Astra-the-Lost", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/5761F92FC7129B588133D31BD74BEAC8.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/5761F92FC7129B588133D31BD74BEAC8.png", "url": "https://assistantapps.com" }, { - "name": "Galactic Monkeh", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/4422CEA6F012C8F338994799459CF3A8.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/4422CEA6F012C8F338994799459CF3A8.png", + "name": "Stephanie Parsons", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/B4C1E8292B23811594B9F7D50B43C10A.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/B4C1E8292B23811594B9F7D50B43C10A.png", "url": "https://assistantapps.com" }, { @@ -263,12 +233,30 @@ "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/DD1C7D1D53DF36A2EE6BEE497DFA5F59.png", "url": "https://assistantapps.com" }, + { + "name": "MightyChicken", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/F5340B555E6426381124C31489E7A1E5.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/F5340B555E6426381124C31489E7A1E5.png", + "url": "https://assistantapps.com" + }, { "name": "Jon Asbach", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/DD4CB964575A418C656220D225983AE1.png", "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/DD4CB964575A418C656220D225983AE1.png", "url": "https://assistantapps.com" }, + { + "name": "Galactic Monkeh", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/4422CEA6F012C8F338994799459CF3A8.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/4422CEA6F012C8F338994799459CF3A8.png", + "url": "https://assistantapps.com" + }, + { + "name": "HeavyCreamerScoop ", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/7DE7E9FF63CDF91BC5E0E323B2CECA17.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/7DE7E9FF63CDF91BC5E0E323B2CECA17.png", + "url": "https://assistantapps.com" + }, { "name": "Nick", "imageUrl": "https://cdn-usr.assistantapps.com/patreon/1290AD2AC8E1EB7EF8A40B17D0561DC3.png", @@ -276,9 +264,21 @@ "url": "https://assistantapps.com" }, { - "name": "Arcadie", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/7B48FDA94614713E7E91CB53CCAF1552.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/7B48FDA94614713E7E91CB53CCAF1552.png", + "name": "April Gunter", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/74B8D5A6AC9A72876BFAF89489E3CACB.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/74B8D5A6AC9A72876BFAF89489E3CACB.png", + "url": "https://assistantapps.com" + }, + { + "name": "AdventureswithDread", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/56D3A9ED7D93F8119E978D7C45D0EA12.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/56D3A9ED7D93F8119E978D7C45D0EA12.png", + "url": "https://assistantapps.com" + }, + { + "name": "MEOGI", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/931F9C05676AC1EAA21F3B68FEE879F9.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/931F9C05676AC1EAA21F3B68FEE879F9.png", "url": "https://assistantapps.com" }, { @@ -294,15 +294,21 @@ "url": "https://assistantapps.com" }, { - "name": "Michael", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/0D384F053F82CA35CF6A495F65E05E36.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/0D384F053F82CA35CF6A495F65E05E36.png", + "name": "Palis Airuta", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/48F55AF63BF651EA9264F22310E716C5.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/48F55AF63BF651EA9264F22310E716C5.png", "url": "https://assistantapps.com" }, { - "name": "HeavyCreamerScoop ", - "imageUrl": "https://cdn-usr.assistantapps.com/patreon/7DE7E9FF63CDF91BC5E0E323B2CECA17.png", - "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/7DE7E9FF63CDF91BC5E0E323B2CECA17.png", + "name": "RedHenchie", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/1E4AD056B0985198E467AF0B6D779D1C.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/1E4AD056B0985198E467AF0B6D779D1C.png", + "url": "https://assistantapps.com" + }, + { + "name": "AF1", + "imageUrl": "https://cdn-usr.assistantapps.com/patreon/8F4BECB7F5BAEA128B8D284DC28EB4EF.png", + "thumbnailUrl": "https://cdn-usr.assistantapps.com/patreon/8F4BECB7F5BAEA128B8D284DC28EB4EF.png", "url": "https://assistantapps.com" } ] \ No newline at end of file diff --git a/assets/images/building/272.png b/assets/images/building/272.png index f3ca5c5af..2f1283909 100644 Binary files a/assets/images/building/272.png and b/assets/images/building/272.png differ diff --git a/assets/lang/language.af.json b/assets/lang/language.af.json index 4dab509fc..065344baa 100644 --- a/assets/lang/language.af.json +++ b/assets/lang/language.af.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "F31D61B10A82E7D16724737934158091" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "2252A9C9B1EF132B82E12A8DC510309E" } \ No newline at end of file diff --git a/assets/lang/language.ar.json b/assets/lang/language.ar.json index a0478c618..77444d951 100644 --- a/assets/lang/language.ar.json +++ b/assets/lang/language.ar.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "C4A5FC1C76F4AC93253AE76A0C686CF5" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "5AAB8CA6FD387F2AF125C4BDBA0D2413" } \ No newline at end of file diff --git a/assets/lang/language.cs.json b/assets/lang/language.cs.json index bed1dcc35..b0aab7fc2 100644 --- a/assets/lang/language.cs.json +++ b/assets/lang/language.cs.json @@ -425,50 +425,51 @@ "twitchCampaignNum": "Twitch Kampaň {0}", "milestones": "Úspěchy", "viewGuildMissions": "Zobrazit mise Guildy", - "twitchDrop": "Twitch Drop", - "quicksilverCompanion": "Quicksilver Synthesis Companion", - "mergeInventoryQuantities": "Merge inventory quantities", + "twitchDrop": "Twitch Odměna", + "quicksilverCompanion": "Pomocník Quicksilver Syntézy", + "mergeInventoryQuantities": "Sloučit množství v inventáři ", "shareForceLanguage": "přinutit jazyk", "shareIncludeName": "zahrnout jméno", "copyToClipboard": "zkopírovat do schránky", "shareOpenLink": "otevřít odkaz", - "starshipScrap": "Starship scrap", + "starshipScrap": "Šrotování hvězdných lodí", "starshipScrapAny": "jakýkoli", "xClass": "třída", - "viewPostOnline": "View post online", + "viewPostOnline": "Zobrazit příspěvek online", "noItemsRecorded": "nezaznamenané žádné předměty ", "speculation": "spekulace", "daysSinceLastUpdate": "dní od posledního aktualizace", "daysUntilAnniversary": "dní do výrocí", "daysPerUpdate": "průměrné dny pro aktualizací ", - "updateCouldBeOnDateBasedOnAverageDays": "Next update could be on {0} based on average days since last update {1}", - "basedOnTheLastXUpdates": "based on the last {0} updates", + "updateCouldBeOnDateBasedOnAverageDays": "Následující aktualizace může nastat {0} na základě průměru dnů od poslední aktualizace {1}", + "basedOnTheLastXUpdates": "na základě posledních {0} aktualizací", "updateName": "jméno aktualizace ", "updateDateReleased": "datum vydání", "updateDaysSincePreviousUpdate": "dní od poslední aktualizace ", - "shareOpenMenu": "Open share menu", + "shareOpenMenu": "Zobrazit možnosti sdílení", "syncDocumentationNotice": "Tato stránka nemůže být synchronizovana s tvojí uloženou hrou. Klikni zde pro bližší informace.", "syncSelectLocationToSaveFile": "Prosím vyber místo pro uložení souboru", "addedInUpdate": "Přidáno v rozšíření ", - "suggestALink": "Suggest a Link", + "suggestALink": "Navrhnout Odkaz", "creatureHarvestKill": "Zabij", - "creatureHarvestHarvest": "Harvest", - "galacticAddressPlanetIndex": "Planet index", - "stepNum": "Step {0}", - "downloadNomNom": "Download and run NomNom", - "downloadFromGithub": "Download from Github", - "nomNomStep2": "Open up the menu in NomNom", - "nomNomStep3": "Select the inventory to sync and generate the code", - "nomNomStep4": "Enter the code into the app", - "syncWithNomNom": "Sync with NomNom save editor", - "syncWithNomNomDesc": "Transfer your in game inventory", - "instructions": "Instructions", - "nomNomCollaboration": "NomNom collaboration", - "nomNomCollaborationDesc": "Sync your in game inventory with the app through the NomNom save editor!\nOnly available for PC", - "portalCodeCopied": "Portal code copied!", - "randomPortal": "Random Portal", - "forceNumberOfColumns": "Force number of columns", - "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", - "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "C93F82768D0973C66CE8B6F954E4410D" + "creatureHarvestHarvest": "Sklizeň", + "galacticAddressPlanetIndex": "Index planety", + "stepNum": "Krok {0}", + "downloadNomNom": "Stáhni a spusť NomNom", + "downloadFromGithub": "Stáhnout z Github", + "nomNomStep2": "Otevři menu v NomNom", + "nomNomStep3": "Zvol inventář k synchronizaci a vygeneruj kód", + "nomNomStep4": "Vlož kód do aplikace", + "syncWithNomNom": "Synchronizace pomocí NomNom save editoru.", + "syncWithNomNomDesc": "Přidej inventář ze své hry", + "instructions": "Instrukce ", + "nomNomCollaboration": "NomNom kolaborace", + "nomNomCollaborationDesc": "Synchronizuj si svůj herní inventář s aplikací pomocí NomNom save editoru! Dostupné pouze pro PC", + "portalCodeCopied": "Kód portálu zkopírován!", + "randomPortal": "Náhodný Portál", + "forceNumberOfColumns": "Vnucený počet sloupců", + "allItemsListUseCompactTiles": "Seznam všech předmětů: Použít Kompaktní Dlaždice", + "tapAndHoldToDrag": "Stiskni a podrž předmět k přesunutí a změně pořadí", + "copiedToClipboard": "Copied to clipboard", + "hashCode": "A0F7558F4DE2D1D6FF38E11A211FA8E1" } \ No newline at end of file diff --git a/assets/lang/language.de.json b/assets/lang/language.de.json index 70fd7ca97..bf3f3b38e 100644 --- a/assets/lang/language.de.json +++ b/assets/lang/language.de.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Anzahl von Spalten erzwingen", "allItemsListUseCompactTiles": "Auflistung aller Kacheln: Vereinfachte Ansicht", "tapAndHoldToDrag": "Drücke und halte eine Kachel, um diese zu verschieben und die Reihenfolge zu ändern", - "hashCode": "27F056E4E4374946C033C183066C1E3C" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "2CAF1474A473ED196E70F844CD262145" } \ No newline at end of file diff --git a/assets/lang/language.en.json b/assets/lang/language.en.json index 12e7ce0cb..131843c8c 100644 --- a/assets/lang/language.en.json +++ b/assets/lang/language.en.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "218E2F099781E5D948CFA29411C32A27" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "1300A374981838664E20D55F2556EB31" } \ No newline at end of file diff --git a/assets/lang/language.es.json b/assets/lang/language.es.json index 3af9a7e31..d92afb312 100644 --- a/assets/lang/language.es.json +++ b/assets/lang/language.es.json @@ -427,7 +427,7 @@ "viewGuildMissions": "Good good", "twitchDrop": "Drop de Twitch", "quicksilverCompanion": "Quicksilver Synthesis Companion", - "mergeInventoryQuantities": "Merge inventory quantities", + "mergeInventoryQuantities": "Agrupar objetos del inventario", "shareForceLanguage": "Forzar Idioma", "shareIncludeName": "Incluir nombre", "copyToClipboard": "Copiar al portapapeles", @@ -453,9 +453,9 @@ "suggestALink": "Sugiere un link", "creatureHarvestKill": "Matar", "creatureHarvestHarvest": "Recolectar", - "galacticAddressPlanetIndex": "Planet index", - "stepNum": "Step {0}", - "downloadNomNom": "Download and run NomNom", + "galacticAddressPlanetIndex": "Índice planetario", + "stepNum": "Paso {0}", + "downloadNomNom": "Descargar y ejecutar NomNom", "downloadFromGithub": "Descargar desde GitHub", "nomNomStep2": "Abre el menú en NomNom", "nomNomStep3": "Seleccione el inventario para sincronizar y generar el código", @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Forzar el numero de columnas ", "allItemsListUseCompactTiles": "Todos los objetos en lista: Usar Títulos Compacto", "tapAndHoldToDrag": "Mantén pulsado un objeto para arrastrarlo y cambiar el orden ", - "hashCode": "F37A660688CB9BFDC66FEC45CBFC7C65" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "A433AA81DF2F7127745B63C86249654A" } \ No newline at end of file diff --git a/assets/lang/language.fr.json b/assets/lang/language.fr.json index dcfce1ed8..317e8f73a 100644 --- a/assets/lang/language.fr.json +++ b/assets/lang/language.fr.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Changer nombre de colonnes", "allItemsListUseCompactTiles": "Liste générale des objets: organisation compacte ", "tapAndHoldToDrag": "Touchez et tirez un objet pour changer l’ordre", - "hashCode": "B9AE87A9418320CCC56A1D4E7A7A14DC" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "140FAE197AD3D744CE0620D4A213EBC8" } \ No newline at end of file diff --git a/assets/lang/language.hu.json b/assets/lang/language.hu.json index 346950d4b..91fe5606c 100644 --- a/assets/lang/language.hu.json +++ b/assets/lang/language.hu.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Körözések oszlopa", "allItemsListUseCompactTiles": "Összes elem lista: Tömörített nézet", "tapAndHoldToDrag": "Nyomjon rá és húzzon el egy elemet, hogy megváltoztassa a sorrendet.", - "hashCode": "3FC9C3022D6F07870D89E5AC82EC2B6A" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "D1BD35BA904D8304DF7197ACD2EB24C3" } \ No newline at end of file diff --git a/assets/lang/language.id.json b/assets/lang/language.id.json index 88a14d68a..2639941d1 100644 --- a/assets/lang/language.id.json +++ b/assets/lang/language.id.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "AE3B2190093195EA2565A82A04066194" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "63093AE6D4FC349F0FB5A5AE6BF6E876" } \ No newline at end of file diff --git a/assets/lang/language.it.json b/assets/lang/language.it.json index 920c05b4f..c74aba907 100644 --- a/assets/lang/language.it.json +++ b/assets/lang/language.it.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Imposta il numero di colonne", "allItemsListUseCompactTiles": "Tutti gli oggetti: stile compatto ", "tapAndHoldToDrag": "Displamato quando un utente va a modificare la propria homepage, consente loro di sapere come trascinare gli articoli nel suo ordine desiderato", - "hashCode": "C1EC909F396C72826E5E66156A51AA7A" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "2F8E2E5C1730D4972B3A22FB3D070EBA" } \ No newline at end of file diff --git a/assets/lang/language.ja.json b/assets/lang/language.ja.json index 6418b3b1b..1ff6f96de 100644 --- a/assets/lang/language.ja.json +++ b/assets/lang/language.ja.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "3F83E4B03ABCF3EEF5D0D45AA48A4D24" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "7291101888609B38F516E53F3B5D2078" } \ No newline at end of file diff --git a/assets/lang/language.ms.json b/assets/lang/language.ms.json index 0ebda3a88..5abebc93d 100644 --- a/assets/lang/language.ms.json +++ b/assets/lang/language.ms.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "03464929FB26A2FD3E4ED0DD26E95A60" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "25B3C73D9A2D6F4D9E29F26AABF32444" } \ No newline at end of file diff --git a/assets/lang/language.nl.json b/assets/lang/language.nl.json index a36a66618..af8813f06 100644 --- a/assets/lang/language.nl.json +++ b/assets/lang/language.nl.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "B73CDE85AF73B11A9C326F69F04707D4" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "F0FEBB34DD3CA2C4474E5589D7857490" } \ No newline at end of file diff --git a/assets/lang/language.no.json b/assets/lang/language.no.json index 6c1c82917..12bf4f65d 100644 --- a/assets/lang/language.no.json +++ b/assets/lang/language.no.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "EFDCAB1CFA25EC0ECECC7DEA862B3011" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "2674650C4CAE300BFFB818D4B9AC134F" } \ No newline at end of file diff --git a/assets/lang/language.ph.json b/assets/lang/language.ph.json index 6ee178435..8be3b6dba 100644 --- a/assets/lang/language.ph.json +++ b/assets/lang/language.ph.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "EE692B552DCE1BE5082F70D83A976CE1" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "4FC4AC850CD930F39281EC9AEF5A2900" } \ No newline at end of file diff --git a/assets/lang/language.pl.json b/assets/lang/language.pl.json index ca315ec80..40a23dd2f 100644 --- a/assets/lang/language.pl.json +++ b/assets/lang/language.pl.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Wymuś liczbę kolumn", "allItemsListUseCompactTiles": "Lista wszystkich przedmiotów: Użyj kompaktowych kafelków", "tapAndHoldToDrag": "Naciśnij i przytrzymaj przedmiot aby go przenieść i zmienić kolejność.", - "hashCode": "161D33B1DD5B61993B7AB2C5121896F1" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "774EAE4FDCF3A6DC3596CEF83323C909" } \ No newline at end of file diff --git a/assets/lang/language.pt-br.json b/assets/lang/language.pt-br.json index 3bae1f1a3..d1d767c5e 100644 --- a/assets/lang/language.pt-br.json +++ b/assets/lang/language.pt-br.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Forçar número de colunas", "allItemsListUseCompactTiles": "Lista de todos os itens: Usar Mosaico Compacto", "tapAndHoldToDrag": "Aperte e segure no item para mudar sua ordem ", - "hashCode": "0ABB695D5D88D27DC9A7373904AD00C6" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "566C4C0CEE6A25526865CF034700FE8F" } \ No newline at end of file diff --git a/assets/lang/language.pt.json b/assets/lang/language.pt.json index fc0617725..3175ca55a 100644 --- a/assets/lang/language.pt.json +++ b/assets/lang/language.pt.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "AF2D90346D0EF89A79A86A7B97F05ABC" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "0A23B90D8AE1367FDB73046006AB8818" } \ No newline at end of file diff --git a/assets/lang/language.ro.json b/assets/lang/language.ro.json index 2de0c2ce8..8780e2524 100644 --- a/assets/lang/language.ro.json +++ b/assets/lang/language.ro.json @@ -111,7 +111,7 @@ "searchOptions": "Opțiuni de căutare", "searchResults": "Rezultate de căutare", "updateAvailable": "Actualizare disponibilă", - "googlePlay": "Google Play", + "googlePlay": "Google Play ", "appStore": "App Store", "blueprintCost": "Cost plan", "cookingValue": "Valoare gătire", @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "924FDE007F217842F55CB88A562FA81A" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "8909AB5F16FB5E9E48E39A8A010CC6A3" } \ No newline at end of file diff --git a/assets/lang/language.ru.json b/assets/lang/language.ru.json index 1877125ea..19793139c 100644 --- a/assets/lang/language.ru.json +++ b/assets/lang/language.ru.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Количество столбцов ", "allItemsListUseCompactTiles": "Список всех элементов: использовать компактные плитки", "tapAndHoldToDrag": "Нажмите и удерживайте для перемещения ", - "hashCode": "4F0E6B6A5610D3283A1ACFD987C92EAE" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "893B29A2C98FB4A6EA37536357BFAE73" } \ No newline at end of file diff --git a/assets/lang/language.tl.json b/assets/lang/language.tl.json index 12e7ce0cb..131843c8c 100644 --- a/assets/lang/language.tl.json +++ b/assets/lang/language.tl.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "218E2F099781E5D948CFA29411C32A27" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "1300A374981838664E20D55F2556EB31" } \ No newline at end of file diff --git a/assets/lang/language.tr.json b/assets/lang/language.tr.json index d4d96998e..8a0b2ecb4 100644 --- a/assets/lang/language.tr.json +++ b/assets/lang/language.tr.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "8A6D30A730722E6FD06D9A345DE47723" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "427A318E80F625A93AB1889EE65AA140" } \ No newline at end of file diff --git a/assets/lang/language.ur.json b/assets/lang/language.ur.json index d354e4dac..0fbabfee5 100644 --- a/assets/lang/language.ur.json +++ b/assets/lang/language.ur.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "305BC7710F3D987DAECD1C3FA8DE14E7" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "DBF16DDD79703D91E841FBEC103A9BB5" } \ No newline at end of file diff --git a/assets/lang/language.vi-vn.json b/assets/lang/language.vi-vn.json index 5b8f54cc8..6afae31f3 100644 --- a/assets/lang/language.vi-vn.json +++ b/assets/lang/language.vi-vn.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "CFFB749932799C377C3CB74E17B57E72" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "7BA683C93C9C055B1515DC9DB4FBAE04" } \ No newline at end of file diff --git a/assets/lang/language.zh-hans.json b/assets/lang/language.zh-hans.json index 277e34ec1..9b9ee429f 100644 --- a/assets/lang/language.zh-hans.json +++ b/assets/lang/language.zh-hans.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "每行显示的模块数", "allItemsListUseCompactTiles": "全物品列表:使用简洁视图", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "4E91252518EE5E9FAF9803CA2B3A7A0F" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "E12E6B64896181058527196A0CC3D96D" } \ No newline at end of file diff --git a/assets/lang/language.zh-hant.json b/assets/lang/language.zh-hant.json index 98de7aefb..c8cf7fd46 100644 --- a/assets/lang/language.zh-hant.json +++ b/assets/lang/language.zh-hant.json @@ -470,5 +470,6 @@ "forceNumberOfColumns": "Force number of columns", "allItemsListUseCompactTiles": "All items list: Use Compact Tiles", "tapAndHoldToDrag": "Tap and hold item to drag and change order", - "hashCode": "871C304D62D3D1266D8BC6EBD5A8ED66" + "copiedToClipboard": "Copied to clipboard", + "hashCode": "C4063DA7586FE2306DFA78B25A9CABFF" } \ No newline at end of file diff --git a/installers/assistantNMS.iss b/installers/assistantNMS.iss index b713b5a63..7d2a0bb19 100644 --- a/installers/assistantNMS.iss +++ b/installers/assistantNMS.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Assistant for No Man's Sky" -#define MyAppVersion "2.15.0" +#define MyAppVersion "2.16.0" #define MyAppPublisher "AssistantApps" #define MyAppURL "https://nmsassistant.com/" #define MyAppExeName "assistantnms_app.exe" diff --git a/lib/assistant_apps_settings.dart b/lib/assistant_apps_settings.dart index 39997921b..32364c021 100644 --- a/lib/assistant_apps_settings.dart +++ b/lib/assistant_apps_settings.dart @@ -1,3 +1,3 @@ const assistantAppsApiUrl = 'https://api.assistantapps.com'; const assistantAppsAppGuid = '589405b4-e40f-4cd9-b793-6bf37944ee09'; -const currentWhatIsNewGuid = '71ded2c9-4c01-4008-8866-c869f722c19f'; +const currentWhatIsNewGuid = '07c28633-80c6-4e6d-8257-048b62ca1b82'; diff --git a/lib/components/adaptive/home_page_app_bar.dart b/lib/components/adaptive/home_page_app_bar.dart index 8b33fd319..4d06da9a1 100644 --- a/lib/components/adaptive/home_page_app_bar.dart +++ b/lib/components/adaptive/home_page_app_bar.dart @@ -1,7 +1,9 @@ import 'package:assistantapps_flutter_common/assistantapps_flutter_common.dart'; import 'package:flutter/cupertino.dart' show ObstructingPreferredSizeWidget; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import '../../constants/nms_external_urls.dart'; import '../../constants/routes.dart'; class HomePageAppBar extends StatelessWidget @@ -27,6 +29,24 @@ class HomePageAppBar extends StatelessWidget @override Widget build(BuildContext context) { List localActions = actions ?? List.empty(growable: true); + if (isWindows) { + localActions.add(ActionItem( + icon: Icons.share, + onPressed: () { + Clipboard.setData( + const ClipboardData(text: NmsExternalUrls.assistantNMSWebsite), + ); + getSnackbar().showSnackbar( + context, + LocaleKey.copiedToClipboard, + description: NmsExternalUrls.assistantNMSWebsite, + onNegative: () async { + await getNavigation().pop(context); + }, + ); + }, + )); + } localActions.add(ActionItem( icon: Icons.settings, onPressed: () async => await getNavigation().navigateAsync( diff --git a/lib/components/tilePresenters/hello_games_tile_presenter.dart b/lib/components/tilePresenters/hello_games_tile_presenter.dart index ea58da6ac..447f04da4 100644 --- a/lib/components/tilePresenters/hello_games_tile_presenter.dart +++ b/lib/components/tilePresenters/hello_games_tile_presenter.dart @@ -13,7 +13,12 @@ Widget releaseNoteTilePresenter(BuildContext context, ReleaseNote release, text: 'PC', backgroundColor: Colors.red[400]!, )); + platformChips.add(getBaseWidget().appChip( + text: 'Mac', + backgroundColor: Colors.red[400]!, + )); } + if (release.isMac) {} if (release.isPs4) { platformChips.add(getBaseWidget().appChip( text: 'PS4', @@ -60,31 +65,37 @@ Widget releaseNoteTilePresenter(BuildContext context, ReleaseNote release, */ return GestureDetector( - child: Card( - child: Column( - children: [ - Padding( - padding: const EdgeInsets.only(top: 4, right: 4, left: 4), - child: Text( - release.name, - textAlign: TextAlign.center, - style: const TextStyle(fontSize: 20), - ), + child: Padding( + padding: const EdgeInsets.only(left: 8, right: 8, bottom: 4), + child: Card( + child: Padding( + padding: const EdgeInsets.only(top: 4, bottom: 8), + child: Column( + children: [ + Padding( + padding: const EdgeInsets.only(top: 4, right: 4, left: 4), + child: Text( + release.name, + textAlign: TextAlign.center, + style: const TextStyle(fontSize: 20), + ), + ), + Padding( + padding: const EdgeInsets.only(top: 4, right: 4, left: 4), + child: Text( + release.description, + maxLines: NMSUIConstants.ReleaseNotesDescripNumLines, + overflow: TextOverflow.ellipsis, + textAlign: TextAlign.center, + style: const TextStyle(fontSize: 16), + ), + ), + Wrap(children: platformChips, spacing: 6), + ], ), - Padding( - padding: const EdgeInsets.only(top: 4, right: 4, left: 4), - child: Text( - release.description, - maxLines: NMSUIConstants.ReleaseNotesDescripNumLines, - overflow: TextOverflow.ellipsis, - textAlign: TextAlign.center, - style: const TextStyle(fontSize: 16), - ), - ), - Wrap(children: platformChips), - ], + ), + margin: const EdgeInsets.all(4), ), - margin: const EdgeInsets.all(4), ), onTap: () => launchExternalURL(release.link), ); @@ -98,37 +109,45 @@ Widget newsItemTilePresenter(BuildContext context, NewsItem newsItem, imagePath: '${getPath().imageAssetPathPrefix}/defaultNews.jpg'), ); return GestureDetector( - child: Card( - child: Column( - children: [ - image, - Padding( - padding: const EdgeInsets.only(top: 4, right: 4, left: 4), - child: Text( - newsItem.name, - textAlign: TextAlign.center, - style: const TextStyle(fontSize: 20), + child: Padding( + padding: const EdgeInsets.all(8), + child: Card( + semanticContainer: true, + clipBehavior: Clip.antiAliasWithSaveLayer, + child: Column( + children: [ + image, + Padding( + padding: const EdgeInsets.only(top: 4, right: 4, left: 4), + child: Text( + newsItem.name, + textAlign: TextAlign.center, + style: const TextStyle(fontSize: 20), + ), ), - ), - Padding( - padding: const EdgeInsets.only(top: 4, right: 4, left: 4), - child: Text( - newsItem.date, - textAlign: TextAlign.center, - style: const TextStyle(fontSize: 14), + Padding( + padding: const EdgeInsets.only(top: 4, right: 4, left: 4), + child: Text( + newsItem.date, + textAlign: TextAlign.center, + style: const TextStyle(fontSize: 14), + ), ), - ), - Padding( - padding: const EdgeInsets.all(8), - child: Text( - newsItem.description, - textAlign: TextAlign.center, - style: const TextStyle(fontSize: 16), + Padding( + padding: const EdgeInsets.all(8), + child: Text( + newsItem.description, + textAlign: TextAlign.center, + style: const TextStyle(fontSize: 16), + ), ), - ), - ], + ], + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10.0), + ), + margin: const EdgeInsets.all(4), ), - margin: const EdgeInsets.all(4), ), onTap: () => launchExternalURL(newsItem.link), ); diff --git a/lib/constants/app_available_languages.dart b/lib/constants/app_available_languages.dart index cde2dfa07..d17928136 100644 --- a/lib/constants/app_available_languages.dart +++ b/lib/constants/app_available_languages.dart @@ -4,23 +4,23 @@ import 'package:assistantapps_flutter_common/assistantapps_flutter_common.dart'; List supportedLanguageMaps = [ LocalizationMap(LocaleKey.english, 'en', 'gb', percentageComplete: 100), LocalizationMap(LocaleKey.dutch, 'nl', 'nl', percentageComplete: 68), - LocalizationMap(LocaleKey.german, 'de', 'de', percentageComplete: 100), - LocalizationMap(LocaleKey.french, 'fr', 'fr', percentageComplete: 100), - LocalizationMap(LocaleKey.italian, 'it', 'it', percentageComplete: 100), - LocalizationMap(LocaleKey.russian, 'ru', 'ru', percentageComplete: 100), - LocalizationMap(LocaleKey.polish, 'pl', 'pl', percentageComplete: 100), + LocalizationMap(LocaleKey.german, 'de', 'de', percentageComplete: 99), + LocalizationMap(LocaleKey.french, 'fr', 'fr', percentageComplete: 99), + LocalizationMap(LocaleKey.italian, 'it', 'it', percentageComplete: 99), + LocalizationMap(LocaleKey.russian, 'ru', 'ru', percentageComplete: 99), + LocalizationMap(LocaleKey.polish, 'pl', 'pl', percentageComplete: 99), LocalizationMap(LocaleKey.brazilianPortuguese, 'pt-br', 'br', percentageComplete: 99), LocalizationMap(LocaleKey.portuguese, 'pt', 'pt', percentageComplete: 24), - LocalizationMap(LocaleKey.norwegian, 'no', 'no', percentageComplete: 80), + LocalizationMap(LocaleKey.norwegian, 'no', 'no', percentageComplete: 79), LocalizationMap(LocaleKey.romanian, 'ro', 'ro', percentageComplete: 38), - LocalizationMap(LocaleKey.spanish, 'es', 'es', percentageComplete: 98), - LocalizationMap(LocaleKey.czech, 'cs', 'cz', percentageComplete: 93), + LocalizationMap(LocaleKey.spanish, 'es', 'es', percentageComplete: 99), + LocalizationMap(LocaleKey.czech, 'cs', 'cz', percentageComplete: 99), LocalizationMap(LocaleKey.turkish, 'tr', 'tr', percentageComplete: 89), - LocalizationMap(LocaleKey.hungarian, 'hu', 'hu', percentageComplete: 100), + LocalizationMap(LocaleKey.hungarian, 'hu', 'hu', percentageComplete: 99), LocalizationMap(LocaleKey.simplifiedChinese, 'zh-hans', 'cn', percentageComplete: 99), LocalizationMap(LocaleKey.traditionalChinese, 'zh-hant', 'cn', percentageComplete: 48), LocalizationMap(LocaleKey.arabic, 'ar', 'ae', percentageComplete: 11), - LocalizationMap(LocaleKey.vietnamese, 'vi-vn', 'vn', percentageComplete: 89), + LocalizationMap(LocaleKey.vietnamese, 'vi-vn', 'vn', percentageComplete: 88), LocalizationMap(LocaleKey.urdu, 'ur', 'pk', percentageComplete: 6), LocalizationMap(LocaleKey.filipino, 'ph', 'ph', percentageComplete: 0), LocalizationMap(LocaleKey.indonesian, 'id', 'id', percentageComplete: 87), diff --git a/lib/contracts/helloGames/release_note.dart b/lib/contracts/helloGames/release_note.dart index eb62ab5b4..65dbace56 100644 --- a/lib/contracts/helloGames/release_note.dart +++ b/lib/contracts/helloGames/release_note.dart @@ -16,6 +16,7 @@ class ReleaseNote { bool isXb1; bool isXbsx; bool isNsw; + bool isMac; ReleaseNote({ required this.name, @@ -27,6 +28,7 @@ class ReleaseNote { required this.isXb1, required this.isXbsx, required this.isNsw, + required this.isMac, }); factory ReleaseNote.fromRawJson(String str) => @@ -42,5 +44,6 @@ class ReleaseNote { isXb1: readBoolSafe(json, 'isXb1'), isXbsx: readBoolSafe(json, 'isXbsx'), isNsw: readBoolSafe(json, 'isNsw'), + isMac: readBoolSafe(json, 'isMac'), ); } diff --git a/lib/contracts/misc/custom_menu.dart b/lib/contracts/misc/custom_menu.dart index 953d3722e..fe73a4f30 100644 --- a/lib/contracts/misc/custom_menu.dart +++ b/lib/contracts/misc/custom_menu.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import '../../constants/app_image.dart'; import '../../constants/routes.dart'; import '../../redux/modules/setting/drawer_settings_view_model.dart'; +import '../enum/homepage_type.dart'; class CustomMenu { Widget icon; @@ -99,7 +100,10 @@ List getMenuOptionsSection1( } List getMenuOptionsSection2( - BuildContext context, DrawerSettingsViewModel vm, Color drawerIconColour) { + BuildContext context, + DrawerSettingsViewModel vm, + Color drawerIconColour, +) { // Widget localGetFromIcon(IconData icon) => CorrectlySizedImageFromIcon( icon: icon, colour: drawerIconColour, maxSize: imageSize); @@ -121,7 +125,7 @@ List getMenuOptionsSection2( drawerIcon: const ListTileImage(partialPath: AppImage.catalogue), title: LocaleKey.catalogue, navigateToNamed: Routes.cataloguePage, - hideInDrawer: true, + hideInDrawer: vm.homepageType == HomepageType.catalogue, ), CustomMenu( icon: const ListTileImage( @@ -131,7 +135,7 @@ List getMenuOptionsSection2( drawerIcon: const ListTileImage(partialPath: 'drawer/crafted.png'), title: LocaleKey.allItems, navigateToNamed: Routes.allItemsPage, - hideInDrawer: true, + hideInDrawer: vm.homepageType == HomepageType.allItemsList, ), CustomMenu( icon: localGetFromIcon(Icons.military_tech_rounded), @@ -141,12 +145,6 @@ List getMenuOptionsSection2( title: LocaleKey.communitySpotlight, navigateToNamed: Routes.communitySpotlight, ), - CustomMenu( - icon: localGetFromIcon(Icons.radio), - drawerIcon: localGetDrawerFromIcon(Icons.radio), - title: LocaleKey.nmsfm, - navigateToNamed: Routes.nmsfmPage, - ) ]; } @@ -246,6 +244,12 @@ List getMenuOptionsSection3( title: LocaleKey.milestones, navigateToNamed: Routes.factionPage, ), + CustomMenu( + icon: localGetFromIcon(Icons.radio), + drawerIcon: localGetDrawerFromIcon(Icons.radio), + title: LocaleKey.nmsfm, + navigateToNamed: Routes.nmsfmPage, + ), CustomMenu( icon: const ListTileImage(partialPath: AppImage.timer, size: imageSize), drawerIcon: const ListTileImage(partialPath: AppImage.timer), diff --git a/lib/env/app_version_num.dart b/lib/env/app_version_num.dart index 1d940ebb7..6dc223f2c 100644 --- a/lib/env/app_version_num.dart +++ b/lib/env/app_version_num.dart @@ -1,3 +1,3 @@ -const appsBuildNum = 315; -const appsBuildName = '2.15.0'; -const appsCommit = 'ceaefb9aa6d818ec9c07a5adbcfad7b0e40e5337'; \ No newline at end of file +const appsBuildNum = 316; +const appsBuildName = '2.16.0'; +const appsCommit = 'ed74cb2532c480cd60998e0737d7e07be5aa6307'; \ No newline at end of file diff --git a/lib/redux/modules/setting/custom_menu_view_model.dart b/lib/redux/modules/setting/custom_menu_view_model.dart index a204211f7..dea06d6a3 100644 --- a/lib/redux/modules/setting/custom_menu_view_model.dart +++ b/lib/redux/modules/setting/custom_menu_view_model.dart @@ -1,6 +1,7 @@ import 'package:assistantapps_flutter_common/assistantapps_flutter_common.dart'; import 'package:redux/redux.dart'; +import '../../../contracts/enum/homepage_type.dart'; import '../../../contracts/redux/app_state.dart'; import 'actions.dart'; import 'drawer_settings_view_model.dart'; @@ -12,6 +13,7 @@ class CustomMenuSettingsViewModel { final bool dontShowSpoilerAlert; final bool showFestiveBackground; final int customColumnCount; + final HomepageType homepageType; final void Function(List) setCustomMenuOrder; CustomMenuSettingsViewModel({ @@ -20,6 +22,7 @@ class CustomMenuSettingsViewModel { required this.dontShowSpoilerAlert, required this.showFestiveBackground, required this.customColumnCount, + required this.homepageType, required this.setCustomMenuOrder, }); @@ -30,6 +33,7 @@ class CustomMenuSettingsViewModel { dontShowSpoilerAlert: getDontShowSpoilerAlert(store.state), showFestiveBackground: getShowFestiveBackground(store.state), customColumnCount: getCustomHomePageColumnCount(store.state), + homepageType: getHomepageType(store.state), setCustomMenuOrder: (List newOrder) => store.dispatch( SetCustomMenuOrder(newOrder), ), @@ -38,5 +42,6 @@ class CustomMenuSettingsViewModel { DrawerSettingsViewModel toDrawerViewModel() => DrawerSettingsViewModel( isPatron: isPatron, dontShowSpoilerAlert: dontShowSpoilerAlert, + homepageType: homepageType, ); } diff --git a/lib/redux/modules/setting/drawer_settings_view_model.dart b/lib/redux/modules/setting/drawer_settings_view_model.dart index 260601380..8f1c6d17c 100644 --- a/lib/redux/modules/setting/drawer_settings_view_model.dart +++ b/lib/redux/modules/setting/drawer_settings_view_model.dart @@ -1,20 +1,24 @@ import 'package:redux/redux.dart'; +import '../../../contracts/enum/homepage_type.dart'; import '../../../contracts/redux/app_state.dart'; import 'selector.dart'; class DrawerSettingsViewModel { final bool dontShowSpoilerAlert; final bool isPatron; + final HomepageType homepageType; DrawerSettingsViewModel({ required this.dontShowSpoilerAlert, required this.isPatron, + required this.homepageType, }); static DrawerSettingsViewModel fromStore(Store store) => DrawerSettingsViewModel( dontShowSpoilerAlert: getDontShowSpoilerAlert(store.state), isPatron: getIsPatron(store.state), + homepageType: getHomepageType(store.state), ); } diff --git a/pubspec.lock b/pubspec.lock index f9b56f6ae..e64130eaf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -102,10 +102,10 @@ packages: description: path: "." ref: HEAD - resolved-ref: "0d40ac90888f8b18dd8e739fcbb0b22c26127aa4" + resolved-ref: "28d488c2d35b5de7f0262635f35b98f92c516c13" url: "https://github.com/AssistantApps/Flutter.Common.git" source: git - version: "0.2.42" + version: "0.2.45" async: dependency: transitive description: @@ -1026,18 +1026,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "586678f20e112219ed0f73215f01bcdf1d769824ba2ebae45ad918a9bfde9bdb" + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.5.0" material_segmented_control: dependency: transitive description: @@ -1657,10 +1657,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" time_formatter: dependency: transitive description: @@ -1830,6 +1830,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.3.3" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" web_socket_channel: dependency: transitive description: @@ -1879,5 +1887,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.1.0-15.0.dev <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.7.0" diff --git a/pubspec.yaml b/pubspec.yaml index 7db8c0193..e7b117bfb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: assistantnms_app description: Assistant for No Man's Sky homepage: https://nmsassistant.com # author: Kurt Lourens -version: 2.15.0+315 # dart scripts\version_num_script.dart +version: 2.16.0+316 # dart scripts\version_num_script.dart publish_to: 'none' environment: @@ -97,7 +97,7 @@ flutter_icons: ## flutter pub run flutter_launcher_icons:main msix_config: # https://pub.dev/documentation/msix/latest/ display_name: Assistant for No Man's Sky publisher_display_name: AssistantApps - msix_version: 2.15.0.0 + msix_version: 2.16.0.0 identity_name: notSureIfSecret publisher: notSureIfSecret logo_path: './assets/images/fullSizeIcon.png' diff --git a/release_notes.txt b/release_notes.txt index e2905117e..4044a2650 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,11 +1,11 @@ -- ✨ Allow cooking items to be added to cart if they cannot be created through cooking | Closes #197 -- ✨ Add number of crafted items to Crafted Using tile | Closes #205 -- 🐛 Fix friend code add page -- 🐛 Fix font size of progress bar on larger screens with custom font sizes +- ✨ Conditionally show drawer items based on the user's homepage +- 💄 Tweak displaying of release notes +- 🐛 Show when release note is for Mac | Closes #218 +- 🐛 Fix Bathysphere image, again | Closes #219 - 🌐 Update translations ⠀ -Submitted to App Stores 2023-07-15 +Submitted to App Stores 2023-08-21 For more details on this update please visit the "What is New" page in the Apps or on the website