From 265ba143abccebf92d131982b7dcd01e7c627344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans-J=C3=B8rgen=20Martinus=20Vork=20Rosenwein?= <79690355+HJMVR@users.noreply.github.com> Date: Mon, 12 Feb 2024 10:23:56 +0100 Subject: [PATCH 01/73] Create da_dk.dart --- lib/translation/da_dk.dart | 129 +++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 lib/translation/da_dk.dart diff --git a/lib/translation/da_dk.dart b/lib/translation/da_dk.dart new file mode 100644 index 0000000..220f876 --- /dev/null +++ b/lib/translation/da_dk.dart @@ -0,0 +1,129 @@ +class EnUs { + Map get messages => { + 'start': 'Get Started', + 'description': + 'Weather application with an up-to-date forecast for each hour, day, and week for any location.', + 'name': 'Weather', + 'name2': 'Convenient Design', + 'name3': 'Contact Us', + 'description2': + 'All navigation is designed to interact with the application as conveniently and quickly as possible.', + 'description3': + 'If you encounter any issues, please contact us via email or in the application reviews.', + 'next': 'Next', + 'search': 'Search...', + 'loading': 'Loading...', + 'searchCity': 'Find your city', + 'humidity': 'Humidity', + 'wind': 'Wind', + 'visibility': 'Visibility', + 'feels': 'Feels', + 'evaporation': 'Evapotranspiration', + 'precipitation': 'Precipitation', + 'direction': 'Direction', + 'pressure': 'Pressure', + 'rain': 'Rain', + 'clear_sky': 'Clear sky', + 'cloudy': 'Cloudy', + 'overcast': 'Overcast', + 'fog': 'Fog', + 'drizzle': 'Drizzle', + 'drizzling_rain': 'Freezing Drizzle', + 'freezing_rain': 'Freezing Rain', + 'heavy_rains': 'Rain showers', + 'snow': 'Snow', + 'thunderstorm': 'Thunderstorm', + 'kph': 'km/h', + 'mph': 'mph', + 'mi': 'mi', + 'km': 'km', + 'inch': 'inch', + 'mm': 'mm', + 'hPa': 'hPa', + 'settings': 'Set.', + 'no_inter': 'No Internet', + 'on_inter': 'Turn on the Internet to get meteorological data.', + 'location': 'Location', + 'no_location': + 'Enable the location service to get weather data for the current location.', + 'theme': 'Theme', + 'low': 'Low', + 'high': 'High', + 'normal': 'Normal', + 'lat': 'Latitude', + 'lon': 'Longitude', + 'create': 'Create', + 'city': 'City', + 'district': 'District', + 'noWeatherCard': 'Add a city', + 'deletedCardWeather': 'Deleting a city', + 'deletedCardWeatherQuery': 'Are you sure you want to delete the city?', + 'delete': 'Delete', + 'cancel': 'Cancel', + 'time': 'Time in the city', + 'validateName': 'Please enter the name', + 'measurements': 'System of measures', + 'degrees': 'Degrees', + 'celsius': 'Celsius', + 'fahrenheit': 'Fahrenheit', + 'imperial': 'Imperial', + 'metric': 'Metric', + 'validateValue': 'Please enter a value', + 'validateNumber': 'Please enter a valid number', + 'validate90': 'Value must be between -90 and 90', + 'validate180': 'Value must be between -180 and 180', + 'notifications': 'Notifications', + 'sunrise': 'Sunrise', + 'sunset': 'Sunset', + 'timeformat': 'Time format', + '12': '12-hour', + '24': '24-hour', + 'cloudcover': 'Сloudcover', + 'uvIndex': 'UV-index', + 'materialColor': 'Dynamic colors', + 'uvLow': 'Low', + 'uvAverage': 'Moderate', + 'uvHigh': 'High', + 'uvVeryHigh': 'Very high', + 'uvExtreme': 'Extreme', + 'weatherMore': '12-day weather forecast', + 'windgusts': 'Gust', + 'north': 'North', + 'northeast': 'Northeast', + 'east': 'East', + 'southeast': 'Southeast', + 'south': 'South', + 'southwest': 'Southwest', + 'west': 'West', + 'northwest': 'Northwest', + 'project': 'Project on', + 'version': 'Application version', + 'precipitationProbability': 'Precipitation probability', + 'apparentTemperatureMin': 'Minimum apparent temperature', + 'apparentTemperatureMax': 'Maximum apparent temperature', + 'amoledTheme': 'AMOLED-theme', + 'appearance': 'Appearance', + 'functions': 'Functions', + 'data': 'Data', + 'language': 'Language', + 'timeRange': 'Frequency (in hours)', + 'timeStart': 'Start time', + 'timeEnd': 'End time', + 'support': 'Support', + 'system': 'System', + 'dark': 'Dark', + 'light': 'Light', + 'license': 'Licenses', + 'widget': 'Widget', + 'widgetBackground': 'Widget background', + 'widgetText': 'Widget text', + 'dewpoint': 'Dewpoint', + 'shortwaveRadiation': 'Shortwave radiation', + 'W/m2': 'W/m2', + 'roundDegree': 'Round degrees', + 'settings_full': 'Settings', + 'cities': 'Cities', + 'searchMethod': 'Use search or geolocation', + 'done': 'Done', + }; +} From 0f29d2bdad795060ad0fcce0c3bb2f8552cca6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans-J=C3=B8rgen=20Martinus=20Vork=20Rosenwein?= <79690355+HJMVR@users.noreply.github.com> Date: Mon, 12 Feb 2024 20:04:55 +0100 Subject: [PATCH 02/73] Update da_dk.dart --- lib/translation/da_dk.dart | 54 +++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/translation/da_dk.dart b/lib/translation/da_dk.dart index 220f876..dda09ca 100644 --- a/lib/translation/da_dk.dart +++ b/lib/translation/da_dk.dart @@ -10,10 +10,10 @@ class EnUs { 'All navigation is designed to interact with the application as conveniently and quickly as possible.', 'description3': 'If you encounter any issues, please contact us via email or in the application reviews.', - 'next': 'Next', - 'search': 'Search...', - 'loading': 'Loading...', - 'searchCity': 'Find your city', + 'next': 'Næste', + 'search': 'Søg...', + 'loading': 'Henter...', + 'searchCity': 'Find din by', 'humidity': 'Humidity', 'wind': 'Wind', 'visibility': 'Visibility', @@ -22,45 +22,45 @@ class EnUs { 'precipitation': 'Precipitation', 'direction': 'Direction', 'pressure': 'Pressure', - 'rain': 'Rain', + 'rain': 'Regn', 'clear_sky': 'Clear sky', 'cloudy': 'Cloudy', 'overcast': 'Overcast', - 'fog': 'Fog', - 'drizzle': 'Drizzle', + 'fog': 'Tåge', + 'drizzle': 'Støv regn', 'drizzling_rain': 'Freezing Drizzle', 'freezing_rain': 'Freezing Rain', 'heavy_rains': 'Rain showers', - 'snow': 'Snow', + 'snow': 'Sne', 'thunderstorm': 'Thunderstorm', 'kph': 'km/h', 'mph': 'mph', 'mi': 'mi', 'km': 'km', - 'inch': 'inch', + 'inch': 'tommer', 'mm': 'mm', 'hPa': 'hPa', - 'settings': 'Set.', - 'no_inter': 'No Internet', + 'settings': 'Inds.', + 'no_inter': 'Ingen Internet', 'on_inter': 'Turn on the Internet to get meteorological data.', - 'location': 'Location', + 'location': 'Placering', 'no_location': 'Enable the location service to get weather data for the current location.', - 'theme': 'Theme', - 'low': 'Low', - 'high': 'High', + 'theme': 'Tema', + 'low': 'Lav', + 'high': 'Høj', 'normal': 'Normal', 'lat': 'Latitude', 'lon': 'Longitude', - 'create': 'Create', - 'city': 'City', + 'create': 'Opret', + 'city': 'By', 'district': 'District', - 'noWeatherCard': 'Add a city', - 'deletedCardWeather': 'Deleting a city', + 'noWeatherCard': 'Tilføj en by', + 'deletedCardWeather': 'Slet en by', 'deletedCardWeatherQuery': 'Are you sure you want to delete the city?', - 'delete': 'Delete', - 'cancel': 'Cancel', - 'time': 'Time in the city', + 'delete': 'Slet', + 'cancel': 'Annullere', + 'time': 'Tid i byen', 'validateName': 'Please enter the name', 'measurements': 'System of measures', 'degrees': 'Degrees', @@ -73,11 +73,11 @@ class EnUs { 'validate90': 'Value must be between -90 and 90', 'validate180': 'Value must be between -180 and 180', 'notifications': 'Notifications', - 'sunrise': 'Sunrise', - 'sunset': 'Sunset', - 'timeformat': 'Time format', - '12': '12-hour', - '24': '24-hour', + 'sunrise': 'Solopgang', + 'sunset': 'Solnedgang', + 'timeformat': 'Tids format', + '12': '12-timer', + '24': '24-timer', 'cloudcover': 'Сloudcover', 'uvIndex': 'UV-index', 'materialColor': 'Dynamic colors', From 58373c7c9c894cb4501c8cff0bb34382e073874b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans-J=C3=B8rgen=20Martinus=20Vork=20Rosenwein?= <79690355+HJMVR@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:26:30 +0100 Subject: [PATCH 03/73] UPdate --- lib/translation/da_dk.dart | 50 +++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/translation/da_dk.dart b/lib/translation/da_dk.dart index dda09ca..8a0e554 100644 --- a/lib/translation/da_dk.dart +++ b/lib/translation/da_dk.dart @@ -1,11 +1,11 @@ class EnUs { Map get messages => { - 'start': 'Get Started', + 'start': 'Kom i gang', 'description': 'Weather application with an up-to-date forecast for each hour, day, and week for any location.', 'name': 'Weather', 'name2': 'Convenient Design', - 'name3': 'Contact Us', + 'name3': 'Kontakt os', 'description2': 'All navigation is designed to interact with the application as conveniently and quickly as possible.', 'description3': @@ -15,9 +15,9 @@ class EnUs { 'loading': 'Henter...', 'searchCity': 'Find din by', 'humidity': 'Humidity', - 'wind': 'Wind', + 'wind': 'Vind', 'visibility': 'Visibility', - 'feels': 'Feels', + 'feels': 'Føles som', 'evaporation': 'Evapotranspiration', 'precipitation': 'Precipitation', 'direction': 'Direction', @@ -81,38 +81,38 @@ class EnUs { 'cloudcover': 'Сloudcover', 'uvIndex': 'UV-index', 'materialColor': 'Dynamic colors', - 'uvLow': 'Low', - 'uvAverage': 'Moderate', - 'uvHigh': 'High', - 'uvVeryHigh': 'Very high', - 'uvExtreme': 'Extreme', + 'uvLow': 'Lav', + 'uvAverage': 'Moderat', + 'uvHigh': 'Høj', + 'uvVeryHigh': 'Meget højt', + 'uvExtreme': 'Ekstrem', 'weatherMore': '12-day weather forecast', 'windgusts': 'Gust', - 'north': 'North', - 'northeast': 'Northeast', - 'east': 'East', - 'southeast': 'Southeast', - 'south': 'South', - 'southwest': 'Southwest', - 'west': 'West', - 'northwest': 'Northwest', + 'north': 'Nord', + 'northeast': 'Nordøst', + 'east': 'Øst', + 'southeast': 'Sydøst', + 'south': 'Syd', + 'southwest': 'Sydvest', + 'west': 'Vest', + 'northwest': 'Nordvest', 'project': 'Project on', 'version': 'Application version', 'precipitationProbability': 'Precipitation probability', 'apparentTemperatureMin': 'Minimum apparent temperature', 'apparentTemperatureMax': 'Maximum apparent temperature', - 'amoledTheme': 'AMOLED-theme', + 'amoledTheme': 'AMOLED-tema', 'appearance': 'Appearance', 'functions': 'Functions', 'data': 'Data', - 'language': 'Language', + 'language': 'Sprog', 'timeRange': 'Frequency (in hours)', 'timeStart': 'Start time', 'timeEnd': 'End time', 'support': 'Support', 'system': 'System', - 'dark': 'Dark', - 'light': 'Light', + 'dark': 'Mørk', + 'light': 'Lys', 'license': 'Licenses', 'widget': 'Widget', 'widgetBackground': 'Widget background', @@ -121,9 +121,9 @@ class EnUs { 'shortwaveRadiation': 'Shortwave radiation', 'W/m2': 'W/m2', 'roundDegree': 'Round degrees', - 'settings_full': 'Settings', - 'cities': 'Cities', - 'searchMethod': 'Use search or geolocation', - 'done': 'Done', + 'settings_full': 'Indstillinger', + 'cities': 'Byer', + 'searchMethod': 'Brug søgning eller geolokation', + 'done': 'Færdig', }; } From 013493c0ddf487a5448cd886c7fbfca59d635dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans-J=C3=B8rgen=20Martinus=20Vork=20Rosenwein?= <79690355+HJMVR@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:21:08 +0100 Subject: [PATCH 04/73] More danish updates --- lib/translation/da_dk.dart | 52 +++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/translation/da_dk.dart b/lib/translation/da_dk.dart index 8a0e554..cd5642b 100644 --- a/lib/translation/da_dk.dart +++ b/lib/translation/da_dk.dart @@ -3,8 +3,8 @@ class EnUs { 'start': 'Kom i gang', 'description': 'Weather application with an up-to-date forecast for each hour, day, and week for any location.', - 'name': 'Weather', - 'name2': 'Convenient Design', + 'name': 'Vejr', + 'name2': 'Praktisk design', 'name3': 'Kontakt os', 'description2': 'All navigation is designed to interact with the application as conveniently and quickly as possible.', @@ -14,25 +14,25 @@ class EnUs { 'search': 'Søg...', 'loading': 'Henter...', 'searchCity': 'Find din by', - 'humidity': 'Humidity', + 'humidity': 'Luftfugtighed', 'wind': 'Vind', - 'visibility': 'Visibility', + 'visibility': 'Sigtbarhed', 'feels': 'Føles som', - 'evaporation': 'Evapotranspiration', - 'precipitation': 'Precipitation', - 'direction': 'Direction', - 'pressure': 'Pressure', + 'evaporation': 'Fordampning', + 'precipitation': 'Nedbør', + 'direction': 'Retning', + 'pressure': 'Tryk', 'rain': 'Regn', 'clear_sky': 'Clear sky', 'cloudy': 'Cloudy', 'overcast': 'Overcast', 'fog': 'Tåge', 'drizzle': 'Støv regn', - 'drizzling_rain': 'Freezing Drizzle', - 'freezing_rain': 'Freezing Rain', - 'heavy_rains': 'Rain showers', + 'drizzling_rain': 'Frysende støvregn', + 'freezing_rain': 'Frostregn', + 'heavy_rains': 'Regnskyl', 'snow': 'Sne', - 'thunderstorm': 'Thunderstorm', + 'thunderstorm': 'Tordenvejr', 'kph': 'km/h', 'mph': 'mph', 'mi': 'mi', @@ -50,29 +50,29 @@ class EnUs { 'low': 'Lav', 'high': 'Høj', 'normal': 'Normal', - 'lat': 'Latitude', - 'lon': 'Longitude', + 'lat': 'Breddegrad', + 'lon': 'Længdegrad', 'create': 'Opret', 'city': 'By', - 'district': 'District', + 'district': 'Distrikt', 'noWeatherCard': 'Tilføj en by', 'deletedCardWeather': 'Slet en by', - 'deletedCardWeatherQuery': 'Are you sure you want to delete the city?', + 'deletedCardWeatherQuery': 'Er du sikker på at du vil slette denne by?', 'delete': 'Slet', 'cancel': 'Annullere', 'time': 'Tid i byen', - 'validateName': 'Please enter the name', - 'measurements': 'System of measures', - 'degrees': 'Degrees', + 'validateName': 'Indtast venligst navnet', + 'measurements': 'Foranstaltningssystemet', + 'degrees': 'Grader', 'celsius': 'Celsius', 'fahrenheit': 'Fahrenheit', - 'imperial': 'Imperial', - 'metric': 'Metric', - 'validateValue': 'Please enter a value', - 'validateNumber': 'Please enter a valid number', - 'validate90': 'Value must be between -90 and 90', - 'validate180': 'Value must be between -180 and 180', - 'notifications': 'Notifications', + 'imperial': 'Imperialistisk', + 'metric': 'Metrisk', + 'validateValue': 'Indtast en værdi', + 'validateNumber': 'Indtast et gyldigt nummer', + 'validate90': 'Værdien skal være mellem -90 og 90', + 'validate180': 'Værdien skal være mellem -180 og 180', + 'notifications': 'Notifikationer', 'sunrise': 'Solopgang', 'sunset': 'Solnedgang', 'timeformat': 'Tids format', From c5b55a291bfda7838c7ff981577c61215d317123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans-J=C3=B8rgen=20Martinus=20Vork=20Rosenwein?= <79690355+HJMVR@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:34:29 +0100 Subject: [PATCH 05/73] more danish --- lib/translation/da_dk.dart | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/translation/da_dk.dart b/lib/translation/da_dk.dart index cd5642b..8074714 100644 --- a/lib/translation/da_dk.dart +++ b/lib/translation/da_dk.dart @@ -23,9 +23,9 @@ class EnUs { 'direction': 'Retning', 'pressure': 'Tryk', 'rain': 'Regn', - 'clear_sky': 'Clear sky', - 'cloudy': 'Cloudy', - 'overcast': 'Overcast', + 'clear_sky': 'Skyfri himmel', + 'cloudy': 'Skyet', + 'overcast': 'Overskyet', 'fog': 'Tåge', 'drizzle': 'Støv regn', 'drizzling_rain': 'Frysende støvregn', @@ -42,10 +42,10 @@ class EnUs { 'hPa': 'hPa', 'settings': 'Inds.', 'no_inter': 'Ingen Internet', - 'on_inter': 'Turn on the Internet to get meteorological data.', + 'on_inter': 'Tænd for internettet for at få meteorologisk data.', 'location': 'Placering', 'no_location': - 'Enable the location service to get weather data for the current location.', + 'Aktiver placeringer for at få vejrdata for den aktuelle placering.', 'theme': 'Tema', 'low': 'Lav', 'high': 'Høj', @@ -78,7 +78,7 @@ class EnUs { 'timeformat': 'Tids format', '12': '12-timer', '24': '24-timer', - 'cloudcover': 'Сloudcover', + 'cloudcover': 'skydække', 'uvIndex': 'UV-index', 'materialColor': 'Dynamic colors', 'uvLow': 'Lav', @@ -86,8 +86,8 @@ class EnUs { 'uvHigh': 'Høj', 'uvVeryHigh': 'Meget højt', 'uvExtreme': 'Ekstrem', - 'weatherMore': '12-day weather forecast', - 'windgusts': 'Gust', + 'weatherMore': '12 dages vejrudsigt', + 'windgusts': 'Vindstød', 'north': 'Nord', 'northeast': 'Nordøst', 'east': 'Øst', @@ -96,31 +96,31 @@ class EnUs { 'southwest': 'Sydvest', 'west': 'Vest', 'northwest': 'Nordvest', - 'project': 'Project on', - 'version': 'Application version', - 'precipitationProbability': 'Precipitation probability', + 'project': 'Projektet findes på', + 'version': 'App version', + 'precipitationProbability': 'Sandsynlighed for nedbør', 'apparentTemperatureMin': 'Minimum apparent temperature', 'apparentTemperatureMax': 'Maximum apparent temperature', 'amoledTheme': 'AMOLED-tema', - 'appearance': 'Appearance', - 'functions': 'Functions', + 'appearance': 'Udseende', + 'functions': 'Funktioner', 'data': 'Data', 'language': 'Sprog', - 'timeRange': 'Frequency (in hours)', - 'timeStart': 'Start time', - 'timeEnd': 'End time', + 'timeRange': 'Hyppighed (i timer)', + 'timeStart': 'Start tid', + 'timeEnd': 'Slut tid', 'support': 'Support', 'system': 'System', 'dark': 'Mørk', 'light': 'Lys', - 'license': 'Licenses', + 'license': 'Licenser', 'widget': 'Widget', - 'widgetBackground': 'Widget background', - 'widgetText': 'Widget text', - 'dewpoint': 'Dewpoint', - 'shortwaveRadiation': 'Shortwave radiation', + 'widgetBackground': 'Widget baggrund', + 'widgetText': 'Widget tekst', + 'dewpoint': 'Dugpunktet', + 'shortwaveRadiation': 'Kortbølgestråling', 'W/m2': 'W/m2', - 'roundDegree': 'Round degrees', + 'roundDegree': 'Afrundede grader', 'settings_full': 'Indstillinger', 'cities': 'Byer', 'searchMethod': 'Brug søgning eller geolokation', From 1f945c4dfd4a55440abda81b145e25cd3502e3c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans-J=C3=B8rgen=20Martinus=20Vork=20Rosenwein?= <79690355+HJMVR@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:43:24 +0100 Subject: [PATCH 06/73] last update --- lib/translation/da_dk.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/translation/da_dk.dart b/lib/translation/da_dk.dart index 8074714..667c684 100644 --- a/lib/translation/da_dk.dart +++ b/lib/translation/da_dk.dart @@ -2,14 +2,14 @@ class EnUs { Map get messages => { 'start': 'Kom i gang', 'description': - 'Weather application with an up-to-date forecast for each hour, day, and week for any location.', + 'Vejr app med en opdateret vejrudsigt for hver time, dag og uge for ethvert sted.', 'name': 'Vejr', 'name2': 'Praktisk design', 'name3': 'Kontakt os', 'description2': - 'All navigation is designed to interact with the application as conveniently and quickly as possible.', + 'Al navigation er designet til at interagere med appen så bekvemt og hurtigt som muligt.', 'description3': - 'If you encounter any issues, please contact us via email or in the application reviews.', + 'Hvis du støder på problemer, må du meget gerne kontakte os via e-mail eller i app anmeldelserne.', 'next': 'Næste', 'search': 'Søg...', 'loading': 'Henter...', @@ -80,7 +80,7 @@ class EnUs { '24': '24-timer', 'cloudcover': 'skydække', 'uvIndex': 'UV-index', - 'materialColor': 'Dynamic colors', + 'materialColor': 'Dynamiske farver', 'uvLow': 'Lav', 'uvAverage': 'Moderat', 'uvHigh': 'Høj', @@ -99,8 +99,8 @@ class EnUs { 'project': 'Projektet findes på', 'version': 'App version', 'precipitationProbability': 'Sandsynlighed for nedbør', - 'apparentTemperatureMin': 'Minimum apparent temperature', - 'apparentTemperatureMax': 'Maximum apparent temperature', + 'apparentTemperatureMin': 'Minimum temperature', + 'apparentTemperatureMax': 'Maksimal temperatur', 'amoledTheme': 'AMOLED-tema', 'appearance': 'Udseende', 'functions': 'Funktioner', From f08c459bc17822ae67b12e7716d40373e5136839 Mon Sep 17 00:00:00 2001 From: Yoshi <70684753+Leonavichus@users.noreply.github.com> Date: Tue, 13 Feb 2024 22:04:57 +0300 Subject: [PATCH 07/73] Update da_dk.dart --- lib/translation/da_dk.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/translation/da_dk.dart b/lib/translation/da_dk.dart index 667c684..bd3fd7f 100644 --- a/lib/translation/da_dk.dart +++ b/lib/translation/da_dk.dart @@ -1,4 +1,4 @@ -class EnUs { +class DaDk { Map get messages => { 'start': 'Kom i gang', 'description': From fa5fbb8ce6e36f8a1d9ae8356dc0fb4001f72b7d Mon Sep 17 00:00:00 2001 From: Yoshi Date: Tue, 13 Feb 2024 22:32:28 +0300 Subject: [PATCH 08/73] Add da_DK locale and fix error --- lib/app/modules/settings/view/settings.dart | 37 +++++++++++---------- lib/app/widgets/status/status_data.dart | 15 +++++---- lib/main.dart | 1 + lib/translation/translation.dart | 2 ++ 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/lib/app/modules/settings/view/settings.dart b/lib/app/modules/settings/view/settings.dart index 7c97bd2..6c7d613 100644 --- a/lib/app/modules/settings/view/settings.dart +++ b/lib/app/modules/settings/view/settings.dart @@ -1,5 +1,4 @@ import 'dart:io'; - import 'package:flutter/material.dart'; import 'package:flutter_colorpicker/flutter_colorpicker.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; @@ -311,14 +310,16 @@ class _SettingsPageState extends State { infoSettings: true, infoWidget: _TextInfo( info: settings.timeformat == '12' - ? DateFormat.jm().format(DateFormat.Hm() - .parse(weatherController - .timeConvert(timeStart) - .format(context))) - : DateFormat.Hm().format(DateFormat.Hm() - .parse(weatherController - .timeConvert(timeStart) - .format(context))), + ? DateFormat.jm(locale.languageCode).format( + DateFormat.Hm(locale.languageCode) + .parse(weatherController + .timeConvert(timeStart) + .format(context))) + : DateFormat.Hm(locale.languageCode).format( + DateFormat.Hm(locale.languageCode) + .parse(weatherController + .timeConvert(timeStart) + .format(context))), ), onPressed: () async { final TimeOfDay? timeStartPicker = @@ -365,14 +366,16 @@ class _SettingsPageState extends State { infoSettings: true, infoWidget: _TextInfo( info: settings.timeformat == '12' - ? DateFormat.jm().format(DateFormat.Hm() - .parse(weatherController - .timeConvert(timeEnd) - .format(context))) - : DateFormat.Hm().format(DateFormat.Hm() - .parse(weatherController - .timeConvert(timeEnd) - .format(context))), + ? DateFormat.jm(locale.languageCode).format( + DateFormat.Hm(locale.languageCode) + .parse(weatherController + .timeConvert(timeEnd) + .format(context))) + : DateFormat.Hm(locale.languageCode).format( + DateFormat.Hm(locale.languageCode) + .parse(weatherController + .timeConvert(timeEnd) + .format(context))), ), onPressed: () async { final TimeOfDay? timeEndPicker = diff --git a/lib/app/widgets/status/status_data.dart b/lib/app/widgets/status/status_data.dart index 097f0b3..79c19b0 100644 --- a/lib/app/widgets/status/status_data.dart +++ b/lib/app/widgets/status/status_data.dart @@ -55,22 +55,25 @@ class StatusData { String getTimeFormat(String time) { switch (settings.timeformat) { case '12': - return DateFormat.jm().format(DateTime.tryParse(time)!); + return DateFormat.jm(locale.languageCode) + .format(DateTime.tryParse(time)!); case '24': - return DateFormat.Hm().format(DateTime.tryParse(time)!); + return DateFormat.Hm(locale.languageCode) + .format(DateTime.tryParse(time)!); default: - return DateFormat.Hm().format(DateTime.tryParse(time)!); + return DateFormat.Hm(locale.languageCode) + .format(DateTime.tryParse(time)!); } } String getTimeFormatTz(TZDateTime time) { switch (settings.timeformat) { case '12': - return DateFormat.jm().format(time); + return DateFormat.jm(locale.languageCode).format(time); case '24': - return DateFormat.Hm().format(time); + return DateFormat.Hm(locale.languageCode).format(time); default: - return DateFormat.Hm().format(time); + return DateFormat.Hm(locale.languageCode).format(time); } } } diff --git a/lib/main.dart b/lib/main.dart index 670a3d6..0f9b193 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -46,6 +46,7 @@ String widgetTextColor = ''; final List appLanguages = [ {'name': 'বাংলা', 'locale': const Locale('bn', 'IN')}, {'name': 'Čeština', 'locale': const Locale('cs', 'CZ')}, + {'name': 'Dansk', 'locale': const Locale('da', 'DK')}, {'name': 'Deutsch', 'locale': const Locale('de', 'DE')}, {'name': 'English', 'locale': const Locale('en', 'US')}, {'name': 'Español', 'locale': const Locale('es', 'ES')}, diff --git a/lib/translation/translation.dart b/lib/translation/translation.dart index 0072fb8..a2ee275 100644 --- a/lib/translation/translation.dart +++ b/lib/translation/translation.dart @@ -1,6 +1,7 @@ import 'package:get/get.dart'; import 'package:rain/translation/bn_in.dart'; import 'package:rain/translation/cs_cz.dart'; +import 'package:rain/translation/da_dk.dart'; import 'package:rain/translation/de_de.dart'; import 'package:rain/translation/en_us.dart'; import 'package:rain/translation/es_es.dart'; @@ -43,5 +44,6 @@ class Translation extends Translations { 'bn_IN': BnIn().messages, 'ga_IE': GaIe().messages, 'hu_HU': HuHu().messages, + 'da_DK': DaDk().messages, }; } From a46986f0507cbd7c6bea25bd989622b6a376c715 Mon Sep 17 00:00:00 2001 From: Yoshi Date: Thu, 15 Feb 2024 22:55:14 +0300 Subject: [PATCH 09/73] Update dependencies --- android/build.gradle | 14 +--- android/settings.gradle | 7 +- lib/app/modules/geolocation.dart | 2 +- lib/app/modules/settings/view/settings.dart | 6 +- pubspec.lock | 82 ++++++++++++++------- pubspec.yaml | 6 +- 6 files changed, 68 insertions(+), 49 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 26ab04a..bc157bd 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,15 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.22' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() @@ -20,6 +8,8 @@ allprojects { rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/android/settings.gradle b/android/settings.gradle index af1ec35..f2997bd 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -15,15 +15,12 @@ pluginManagement { mavenCentral() gradlePluginPortal() } - - plugins { - id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false - } } plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '7.4.2' apply false + id "com.android.application" version "7.4.2" apply false + id "org.jetbrains.kotlin.android" version "1.9.22" apply false } include ":app" diff --git a/lib/app/modules/geolocation.dart b/lib/app/modules/geolocation.dart index e81f624..5ac836c 100644 --- a/lib/app/modules/geolocation.dart +++ b/lib/app/modules/geolocation.dart @@ -209,7 +209,7 @@ class _SelectGeolocationState extends State { await Geolocator .isLocationServiceEnabled(); if (!serviceEnabled) { - if (!mounted) return; + if (!context.mounted) return; await showAdaptiveDialog( context: context, builder: diff --git a/lib/app/modules/settings/view/settings.dart b/lib/app/modules/settings/view/settings.dart index 6c7d613..298497d 100644 --- a/lib/app/modules/settings/view/settings.dart +++ b/lib/app/modules/settings/view/settings.dart @@ -184,7 +184,7 @@ class _SettingsPageState extends State { bool serviceEnabled = await Geolocator .isLocationServiceEnabled(); if (!serviceEnabled) { - if (!mounted) return; + if (!context.mounted) return; await showAdaptiveDialog( context: context, builder: (BuildContext context) { @@ -346,7 +346,7 @@ class _SettingsPageState extends State { timeStartPicker.format(context); isar.settings.putSync(settings); }); - if (!mounted) return; + if (!context.mounted) return; MyApp.updateAppState(context, newTimeStart: timeStartPicker.format(context)); @@ -402,7 +402,7 @@ class _SettingsPageState extends State { timeEndPicker.format(context); isar.settings.putSync(settings); }); - if (!mounted) return; + if (!context.mounted) return; MyApp.updateAppState(context, newTimeEnd: timeEndPicker.format(context)); diff --git a/pubspec.lock b/pubspec.lock index 642fa91..f162d70 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -261,10 +261,10 @@ packages: dependency: transitive description: name: ffi - sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" file: dependency: transitive description: @@ -441,10 +441,10 @@ packages: dependency: "direct main" description: name: geolocator - sha256: f4efb8d3c4cdcad2e226af9661eb1a0dd38c71a9494b22526f9da80ab79520e5 + sha256: "694ec58afe97787b5b72b8a0ab78c1a9244811c3c10e72c4362ef3c0ceb005cd" url: "https://pub.dev" source: hosted - version: "10.1.1" + version: "11.0.0" geolocator_android: dependency: transitive description: @@ -465,18 +465,18 @@ packages: dependency: transitive description: name: geolocator_platform_interface - sha256: "3b95ecdc36462c47dbc535dcfedea774d03ccd1f3c9864e0a02ad088eeff4508" + sha256: "009a21c4bc2761e58dccf07c24f219adaebe0ff707abdfd40b0a763d4003fab9" url: "https://pub.dev" source: hosted - version: "4.2.1" + version: "4.2.2" geolocator_web: dependency: transitive description: name: geolocator_web - sha256: "102e7da05b48ca6bf0a5bda0010f886b171d1a08059f01bfe02addd0175ebece" + sha256: "49d8f846ebeb5e2b6641fe477a7e97e5dd73f03cbfef3fd5c42177b7300fb0ed" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "3.0.0" geolocator_windows: dependency: transitive description: @@ -645,6 +645,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" lints: dependency: transitive description: @@ -665,26 +689,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" mime: dependency: transitive description: @@ -729,10 +753,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_provider: dependency: "direct main" description: @@ -1014,10 +1038,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f" + sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745 url: "https://pub.dev" source: hosted - version: "6.2.2" + version: "6.3.0" url_launcher_ios: dependency: transitive description: @@ -1046,10 +1070,10 @@ packages: dependency: transitive description: name: url_launcher_platform_interface - sha256: a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" url_launcher_web: dependency: transitive description: @@ -1082,6 +1106,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" + source: hosted + version: "13.0.0" watcher: dependency: transitive description: @@ -1094,18 +1126,18 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.4.2" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: cc1f6c632a248278a091fd7d9a68f624906830f7c1c5aa66503fae0804633e1c + sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.3" win32: dependency: transitive description: @@ -1155,5 +1187,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.6 <4.0.0" + dart: ">=3.3.0 <4.0.0" flutter: ">=3.16.0" diff --git a/pubspec.yaml b/pubspec.yaml index 260e69f..3256bf9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,10 +3,10 @@ description: Weather application publish_to: "none" -version: 1.3.0+33 +version: 1.3.1+34 environment: - sdk: ">=3.2.6 <4.0.0" + sdk: ">=3.3.0 <4.0.0" dependencies: flutter: @@ -21,7 +21,7 @@ dependencies: iconsax: ^0.0.8 timezone: ^0.9.2 geocoding: ^2.1.1 - geolocator: ^10.1.0 + geolocator: ^11.0.0 home_widget: ^0.4.1 workmanager: ^0.5.2 google_fonts: ^6.1.0 From 441a5ee6800e9d4ccea23c1c7b4db10b7a171709 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Sat, 2 Mar 2024 10:44:42 +0330 Subject: [PATCH 10/73] Added Persian Translation --- lib/translation/fa_ir.dart | 129 +++++++++++++++++++++++++++++++ lib/translation/translation.dart | 2 + 2 files changed, 131 insertions(+) create mode 100644 lib/translation/fa_ir.dart diff --git a/lib/translation/fa_ir.dart b/lib/translation/fa_ir.dart new file mode 100644 index 0000000..42ec991 --- /dev/null +++ b/lib/translation/fa_ir.dart @@ -0,0 +1,129 @@ +class FaIr { + Map get messages => { + 'start': 'شروع کنید', + 'description': + 'یک برنامه هواشناسی با پیش‌بینی به روز برای هر ساعت، روز و هفته و هر مکان', + 'name': 'آب و هوا', + 'name2': 'طراحی راحت', + 'name3': 'ارتباط باما', + 'description2': + 'برنامه به گونه ای طراحی شده است تا به راحتی بتوانید با آن ارتباط بگیرید.', + 'description3': + 'اگر با مشکلی روبرو شدید، لطفاً با ما از طریق ایمیل و یا نظرات برنامه ارتباط بگیرید.', + 'next': 'بعدی', + 'search': 'جستجو....', + 'loading': 'درحال بارگذاری...', + 'searchCity': 'شهر خود را پیدا کنید', + 'humidity': 'رطوبت', + 'wind': 'باد', + 'visibility': 'میزان دید', + 'feels': 'دما', + 'evaporation': 'تبخیر و تعرق', + 'precipitation': 'ته‌نشینی', + 'direction': 'جهت', + 'pressure': 'فشار', + 'rain': 'باران', + 'clear_sky': 'آسمان صاف', + 'cloudy': 'ابری', + 'overcast': 'ابری', + 'fog': 'مه', + 'drizzle': 'ریز باران', + 'drizzling_rain': 'تگرگ', + 'freezing_rain': 'باران یخ‌زن', + 'heavy_rains': 'باران شدید', + 'snow': 'برف', + 'thunderstorm': 'طوفان', + 'kph': 'km/h', + 'mph': 'mph', + 'mi': 'mi', + 'km': 'km', + 'inch': 'inch', + 'mm': 'mm', + 'hPa': 'hPa', + 'settings': 'تنظیمات', + 'no_inter': 'عدم اتصال به اینترنت', + 'on_inter': 'برای دریافت تغییرات جوی اینترنت خود را روشن کنید.', + 'location': 'مکان', + 'no_location': + 'برای دریافت اطلاعات آب و هوا برای مکان فعلی، سرویس مکان را فعال کنید.', + 'theme': 'پوسته', + 'low': 'کم', + 'high': 'زیاد', + 'normal': 'عادی', + 'lat': 'عرض جغرافیایی', + 'lon': 'طول جغرافیایی', + 'create': 'ایجاد', + 'city': 'شهر', + 'district': 'ناحیه', + 'noWeatherCard': 'یک شهر اضافه کنید', + 'deletedCardWeather': 'حذف یک شهر', + 'deletedCardWeatherQuery': 'آیا از حذف این شهر اطمینان دارید؟', + 'delete': 'حذف', + 'cancel': 'صرف نظر', + 'time': 'زمان در این شهر', + 'validateName': 'لطفاً نام را وارد کنید.', + 'measurements': 'سیستم اندازه گیری', + 'degrees': 'درجه', + 'celsius': 'سلسیوس', + 'fahrenheit': 'فارنهایت', + 'imperial': 'بریتانیایی', + 'metric': 'متریک', + 'validateValue': 'لطفاً یک مقدار را وارد کنید.', + 'validateNumber': 'لطفاً یک مقدار معتبر وارد کنید.', + 'validate90': 'مقدار شما باید بین -۹۰ و ۹۰ باشد.', + 'validate180': 'مقدار شما باید بین -۱۸۰ و ۱۸۰ باشد.', + 'notifications': 'اعلانات', + 'sunrise': 'طلوع آفتاب', + 'sunset': 'غروب آفتاب', + 'timeformat': 'نوع زمان', + '12': '۱۲ ساعته', + '24': '۲۴ ساعته', + 'cloudcover': 'پوشش ابری', + 'uvIndex': 'شاخص اشعه ماوراء بنفش', + 'materialColor': 'رنگ های پویا', + 'uvLow': 'کم', + 'uvAverage': 'متوسط', + 'uvHigh': 'زیاد', + 'uvVeryHigh': 'خیلی زیاد', + 'uvExtreme': 'شدید', + 'weatherMore': 'پیش بینی آب و هوا 12 روزه', + 'windgusts': 'وزش باد', + 'north': 'شمال', + 'northeast': 'شمال شرقی', + 'east': 'شرق', + 'southeast': 'جنوب شرقی', + 'south': 'جنوب', + 'southwest': 'جنوب غربی', + 'west': 'غرب', + 'northwest': 'شمال غربی', + 'project': 'Project on', + 'version': 'نگارش برنامه', + 'precipitationProbability': 'احتمال بارش', + 'apparentTemperatureMin': 'حداقل دمای ظاهری', + 'apparentTemperatureMax': 'حداکثر دمای ظاهری', + 'amoledTheme': 'پوسته امولد', + 'appearance': 'ظاهر', + 'functions': 'کارکرد', + 'data': 'داده ها', + 'language': 'زبان', + 'timeRange': 'فرکانس (بر حسب ساعت)', + 'timeStart': 'زمان شروع', + 'timeEnd': 'زمان پایان', + 'support': 'پشتیبانی', + 'system': 'سیستم', + 'dark': 'تیره', + 'light': 'روشن', + 'license': 'مجوز', + 'widget': 'ویجت', + 'widgetBackground': 'پس زمینه ویجت', + 'widgetText': 'متن ویجت', + 'dewpoint': 'نقطه شبنم', + 'shortwaveRadiation': 'تابش موج کوتاه', + 'W/m2': 'W/m2', + 'roundDegree': 'درجه گرد', + 'settings_full': 'تنظیمات', + 'cities': 'شهر ها', + 'searchMethod': 'از جستجو یا موقعیت جغرافیایی استفاده کنید', + 'done': 'پایان', + }; +} diff --git a/lib/translation/translation.dart b/lib/translation/translation.dart index a2ee275..5670883 100644 --- a/lib/translation/translation.dart +++ b/lib/translation/translation.dart @@ -5,6 +5,7 @@ import 'package:rain/translation/da_dk.dart'; import 'package:rain/translation/de_de.dart'; import 'package:rain/translation/en_us.dart'; import 'package:rain/translation/es_es.dart'; +import 'package:rain/translation/fa_ir.dart'; import 'package:rain/translation/fr_fr.dart'; import 'package:rain/translation/ga_ie.dart'; import 'package:rain/translation/hi_in.dart'; @@ -27,6 +28,7 @@ class Translation extends Translations { 'ru_RU': RuRu().messages, 'en_US': EnUs().messages, 'fr_FR': FrFr().messages, + 'fa_IR': FaIr().messages, 'it_IT': ItIt().messages, 'de_DE': DeDe().messages, 'tr_TR': TrTr().messages, From 902bc452079c648e5a616ee67daa093ac383cf21 Mon Sep 17 00:00:00 2001 From: Yoshi Date: Sun, 3 Mar 2024 16:11:30 +0300 Subject: [PATCH 11/73] Add locale fa_IR --- lib/main.dart | 1 + pubspec.lock | 42 +++++++++++++++++++++--------------------- pubspec.yaml | 10 +++++----- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 0f9b193..3ffad80 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -55,6 +55,7 @@ final List appLanguages = [ {'name': 'हिन्दी', 'locale': const Locale('hi', 'IN')}, {'name': 'Magyar', 'locale': const Locale('hu', 'HU')}, {'name': 'Italiano', 'locale': const Locale('it', 'IT')}, + {'name': 'فارسی', 'locale': const Locale('fa', 'IR')}, {'name': 'ქართული', 'locale': const Locale('ka', 'GE')}, {'name': 'Nederlands', 'locale': const Locale('nl', 'NL')}, {'name': 'Polski', 'locale': const Locale('pl', 'PL')}, diff --git a/pubspec.lock b/pubspec.lock index f162d70..c89baeb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -117,10 +117,10 @@ packages: dependency: transitive description: name: built_value - sha256: a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6 + sha256: fedde275e0a6b798c3296963c5cd224e3e1b55d0e478d5b7e65e6b540f363a0e url: "https://pub.dev" source: hosted - version: "8.9.0" + version: "8.9.1" characters: dependency: transitive description: @@ -237,18 +237,18 @@ packages: dependency: "direct main" description: name: dio - sha256: "797e1e341c3dd2f69f2dad42564a6feff3bfb87187d05abb93b9609e6f1645c3" + sha256: "49af28382aefc53562459104f64d16b9dfd1e8ef68c862d5af436cc8356ce5a8" url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.4.1" dynamic_color: dependency: "direct main" description: name: dynamic_color - sha256: a866f1f8947bfdaf674d7928e769eac7230388a2e7a2542824fad4bb5b87be3b + sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d url: "https://pub.dev" source: hosted - version: "1.6.9" + version: "1.7.0" fake_async: dependency: transitive description: @@ -409,34 +409,34 @@ packages: dependency: "direct main" description: name: geocoding - sha256: e1dc0ac56666d9ed1d5a9ae5543ce9eb5986db6209cc7600103487d09192059c + sha256: "06d053a67733d1b9b4267259713913bc2aa750f18b830f0869ff337a8cfa8325" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.2.0" geocoding_android: dependency: transitive description: name: geocoding_android - sha256: "609db1d71bc364dd9d0616f72a41c01e0c74f3a3807efb85e0d5a67e57baf50f" + sha256: "287a2009cb2c3d3dd2899ba8f3d3e38d9e06905ea429283859bfc3586d4f57fd" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "3.2.0" geocoding_ios: dependency: transitive description: name: geocoding_ios - sha256: "8f79e380abb640ef4d88baee8bb65390058c802601158d0813dc990b36b189d2" + sha256: "8a39bfb650af55209c42e564036a550b32d029e0733af01dc66c5afea50388d3" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.0" geocoding_platform_interface: dependency: transitive description: name: geocoding_platform_interface - sha256: "8848605d307d844d89937cdb4b8ad7dfa880552078f310fa24d8a460f6dddab4" + sha256: "8c2c8226e5c276594c2e18bfe88b19110ed770aeb7c1ab50ede570be8b92229b" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.2.0" geolocator: dependency: "direct main" description: @@ -505,10 +505,10 @@ packages: dependency: "direct main" description: name: google_fonts - sha256: f0b8d115a13ecf827013ec9fc883390ccc0e87a96ed5347a3114cac177ef18e8 + sha256: "5b1726fee554d1cc9db1baef8061b126567ff0a1140a03ed7de936e62f2ab98b" url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "6.2.0" graphs: dependency: transitive description: @@ -1030,10 +1030,10 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c + sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e" url: "https://pub.dev" source: hosted - version: "6.2.4" + version: "6.2.5" url_launcher_android: dependency: transitive description: @@ -1046,10 +1046,10 @@ packages: dependency: transitive description: name: url_launcher_ios - sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03" + sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5" url: "https://pub.dev" source: hosted - version: "6.2.4" + version: "6.2.5" url_launcher_linux: dependency: transitive description: @@ -1188,4 +1188,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.3.0 <4.0.0" - flutter: ">=3.16.0" + flutter: ">=3.16.6" diff --git a/pubspec.yaml b/pubspec.yaml index 3256bf9..af0f2e5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,21 +14,21 @@ dependencies: flutter_localizations: sdk: flutter get: ^4.6.6 - dio: ^5.4.0 + dio: ^5.4.1 intl: ^0.18.1 isar: ^3.1.0+1 shimmer: ^3.0.0 iconsax: ^0.0.8 timezone: ^0.9.2 - geocoding: ^2.1.1 + geocoding: ^2.2.0 geolocator: ^11.0.0 home_widget: ^0.4.1 workmanager: ^0.5.2 - google_fonts: ^6.1.0 + google_fonts: ^6.2.0 flutter_glow: ^0.3.0 - url_launcher: ^6.2.4 + url_launcher: ^6.2.5 time_machine: ^0.9.17 - dynamic_color: ^1.6.9 + dynamic_color: ^1.7.0 path_provider: ^2.1.2 json_annotation: ^4.8.1 flutter_timezone: ^1.0.8 From 1e11b6b7758123398d075df225dd31b7e1b2278d Mon Sep 17 00:00:00 2001 From: Regu-Miabyss Date: Sun, 10 Mar 2024 17:19:04 +0800 Subject: [PATCH 12/73] Added Chinese Traditional translation --- lib/main.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/main.dart b/lib/main.dart index 3ffad80..a2b158e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -65,7 +65,8 @@ final List appLanguages = [ {'name': 'Slovenčina', 'locale': const Locale('sk', 'SK')}, {'name': 'Türkçe', 'locale': const Locale('tr', 'TR')}, {'name': 'اردو', 'locale': const Locale('ur', 'PK')}, - {'name': '中文', 'locale': const Locale('zh', 'CN')}, + {'name': '中文(简体)', 'locale': const Locale('zh', 'CN')}, + {'name': '中文(繁體)', 'locale': const Locale('zh', 'TW')}, ]; const String appGroupId = 'DARK NIGHT'; From 400614a8f1e470ac483c825b0717a3ecfb9a16c5 Mon Sep 17 00:00:00 2001 From: Regu-Miabyss Date: Sun, 10 Mar 2024 17:20:47 +0800 Subject: [PATCH 13/73] Add Chinese Traditional translation --- lib/translation/zh_tw.dart | 129 +++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 lib/translation/zh_tw.dart diff --git a/lib/translation/zh_tw.dart b/lib/translation/zh_tw.dart new file mode 100644 index 0000000..c74fbee --- /dev/null +++ b/lib/translation/zh_tw.dart @@ -0,0 +1,129 @@ +class ZhTw { + Map get messages => { + 'start': '開始使用', + 'description': + '一個提供實時天氣資訊的天氣軟體。', + 'name': '天氣', + 'name2': '方便的設計', + 'name3': '聯絡我們', + 'description2': + '所有導覽均設計得盡可能方便交互', + 'description3': + '如遇到問題請透過電郵或軟體評論與我們聯絡', + 'next': '下一步', + 'search': '搜尋……', + 'loading': '載入中……', + 'searchCity': '查找你的所在地', + 'humidity': '濕度', + 'wind': '風速', + 'visibility': '可見度', + 'feels': '體感', + 'evaporation': '蒸發量', + 'precipitation': '降水量', + 'direction': '風向', + 'pressure': '氣壓', + 'rain': '雨', + 'clear_sky': '晴朗', + 'cloudy': '多雲', + 'overcast': '陰天', + 'fog': '霧', + 'drizzle': '毛毛雨', + 'drizzling_rain': '冻雾雨', + 'freezing_rain': '凍雨', + 'heavy_rains': '大雨', + 'snow': '雪', + 'thunderstorm': '雷暴', + 'kph': '公里/時', + 'mph': '英里/時', + 'mi': '英里', + 'km': '公里', + 'inch': '英呎', + 'mm': '毫米', + 'hPa': '百帕', + 'settings': '設定', + 'no_inter': '沒有網路連線', + 'on_inter': '啟用網路以獲取氣象資料。', + 'location': '位置', + 'no_location': + '啟用位置服務以獲取當前位置的天氣資訊。', + 'theme': '主題', + 'low': '低', + 'high': '高', + 'normal': '正常', + 'lat': '維度', + 'lon': '精度', + 'create': '建立', + 'city': '城市', + 'district': '區', + 'noWeatherCard': '新增城市', + 'deletedCardWeather': '刪除城市', + 'deletedCardWeatherQuery': '你確定要刪除這個城市嗎？', + 'delete': '刪除', + 'cancel': '取消', + 'time': '城市時間', + 'validateName': '請輸入名稱', + 'measurements': '度量單位', + 'degrees': '度', + 'celsius': '攝氏度', + 'fahrenheit': '華氏度', + 'imperial': '英制', + 'metric': '公制', + 'validateValue': '請輸入一個值', + 'validateNumber': '請輸入一個有效數字', + 'validate90': '數值必須在-90和90之間', + 'validate180': '數值必須在-180和180之間', + 'notifications': '通知', + 'sunrise': '日出', + 'sunset': '日落', + 'timeformat': '時間格式', + '12': '12小時', + '24': '24小時', + 'cloudcover': '雲量', + 'uvIndex': 'UV值', + 'materialColor': '動態取色', + 'uvLow': '低', + 'uvAverage': '中等', + 'uvHigh': '高', + 'uvVeryHigh': '很高', + 'uvExtreme': '超高', + 'weatherMore': '12天天氣預報', + 'windgusts': '陣風', + 'north': '北', + 'northeast': '東北', + 'east': '東', + 'southeast': '東南', + 'south': '南', + 'southwest': '西南', + 'west': '西', + 'northwest': '西北', + 'project': '使用項目', + 'version': '應用版本', + 'precipitationProbability': '降水概率', + 'apparentTemperatureMin': '最低體感溫度', + 'apparentTemperatureMax': '最高體感溫度', + 'amoledTheme': 'AMOLED主題', + 'appearance': '體溫', + 'functions': '功能', + 'data': '資料', + 'language': '語言', + 'timeRange': '頻率(小時)', + 'timeStart': '起始時間', + 'timeEnd': '終止時間', + 'support': '支援', + 'system': '系統', + 'dark': '黑暗', + 'light': '明亮', + 'license': '許可', + 'widget': '小組件', + 'widgetBackground': '小組件背景', + 'widgetText': '小組件文字', + 'dewpoint': '露點', + 'shortwaveRadiation': '短波輻射', + 'W/m2': '瓦/平方米', + 'roundDegree': '四捨五入度數', + 'settings_full': '設定', + 'cities': '城市', + 'searchMethod': '使用搜尋或地理位置', + 'done': '完成', + }; +} From 51f72b4e7bcb0015e24ae70a4b50ccc781beb5f7 Mon Sep 17 00:00:00 2001 From: Regu-Miabyss Date: Sun, 10 Mar 2024 17:22:53 +0800 Subject: [PATCH 14/73] Update main.dart --- lib/main.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main.dart b/lib/main.dart index a2b158e..4ddeb74 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -66,7 +66,7 @@ final List appLanguages = [ {'name': 'Türkçe', 'locale': const Locale('tr', 'TR')}, {'name': 'اردو', 'locale': const Locale('ur', 'PK')}, {'name': '中文(简体)', 'locale': const Locale('zh', 'CN')}, - {'name': '中文(繁體)', 'locale': const Locale('zh', 'TW')}, + {'name': '中文(繁體)', 'locale': const Locale('zh', 'TW')}, ]; const String appGroupId = 'DARK NIGHT'; From 4d310776ce055ecfae37c4326eb16c8a02b004da Mon Sep 17 00:00:00 2001 From: Yoshi Date: Mon, 11 Mar 2024 23:42:29 +0300 Subject: [PATCH 15/73] Add locale zh_TW --- lib/translation/translation.dart | 2 ++ pubspec.lock | 28 ++++++++++++++-------------- pubspec.yaml | 8 ++++---- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/lib/translation/translation.dart b/lib/translation/translation.dart index 5670883..047ba9a 100644 --- a/lib/translation/translation.dart +++ b/lib/translation/translation.dart @@ -21,6 +21,7 @@ import 'package:rain/translation/sk_sk.dart'; import 'package:rain/translation/tr_tr.dart'; import 'package:rain/translation/ur_pk.dart'; import 'package:rain/translation/zh_ch.dart'; +import 'package:rain/translation/zh_tw.dart'; class Translation extends Translations { @override @@ -39,6 +40,7 @@ class Translation extends Translations { 'hi_IN': HiIn().messages, 'ro_RO': RoRo().messages, 'zh_CN': ZhCh().messages, + 'zh_TW': ZhTw().messages, 'pl_PL': PlPl().messages, 'ur_PK': UrPk().messages, 'cs_CZ': CsCz().messages, diff --git a/pubspec.lock b/pubspec.lock index c89baeb..866b7dd 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -330,10 +330,10 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: c18f1de98fe0bb9dd5ba91e1330d4febc8b6a7de6aae3ffe475ef423723e72f3 + sha256: f9a05409385b77b06c18f200a41c7c2711ebf7415669350bb0f8474c07bd40d1 url: "https://pub.dev" source: hosted - version: "16.3.2" + version: "17.0.0" flutter_local_notifications_linux: dependency: transitive description: @@ -409,26 +409,26 @@ packages: dependency: "direct main" description: name: geocoding - sha256: "06d053a67733d1b9b4267259713913bc2aa750f18b830f0869ff337a8cfa8325" + sha256: "4837e0b957c49b0a795be1d8caa2f51eaeebb7d1945485faafccd510ffe197fb" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" geocoding_android: dependency: transitive description: name: geocoding_android - sha256: "287a2009cb2c3d3dd2899ba8f3d3e38d9e06905ea429283859bfc3586d4f57fd" + sha256: "4e1539a136c6ab4c44963cfc631970ee499f706a03654fc1d446b2100caf7221" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.3.0" geocoding_ios: dependency: transitive description: name: geocoding_ios - sha256: "8a39bfb650af55209c42e564036a550b32d029e0733af01dc66c5afea50388d3" + sha256: "3f79bb7793ff4796a51d18100cee875d5f7b16e1496dbcd6312e3ac8f79d608a" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "3.0.0" geocoding_platform_interface: dependency: transitive description: @@ -505,10 +505,10 @@ packages: dependency: "direct main" description: name: google_fonts - sha256: "5b1726fee554d1cc9db1baef8061b126567ff0a1140a03ed7de936e62f2ab98b" + sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.2.1" graphs: dependency: transitive description: @@ -1142,10 +1142,10 @@ packages: dependency: transitive description: name: win32 - sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" + sha256: "8cb58b45c47dcb42ab3651533626161d6b67a2921917d8d429791f76972b3480" url: "https://pub.dev" source: hosted - version: "5.2.0" + version: "5.3.0" workmanager: dependency: "direct main" description: @@ -1187,5 +1187,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.0 <4.0.0" - flutter: ">=3.16.6" + dart: ">=3.3.1 <4.0.0" + flutter: ">=3.19.2" diff --git a/pubspec.yaml b/pubspec.yaml index af0f2e5..955e494 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: "none" version: 1.3.1+34 environment: - sdk: ">=3.3.0 <4.0.0" + sdk: ">=3.3.1 <4.0.0" dependencies: flutter: @@ -20,11 +20,11 @@ dependencies: shimmer: ^3.0.0 iconsax: ^0.0.8 timezone: ^0.9.2 - geocoding: ^2.2.0 + geocoding: ^2.2.1 geolocator: ^11.0.0 home_widget: ^0.4.1 workmanager: ^0.5.2 - google_fonts: ^6.2.0 + google_fonts: ^6.2.1 flutter_glow: ^0.3.0 url_launcher: ^6.2.5 time_machine: ^0.9.17 @@ -40,7 +40,7 @@ dependencies: lat_lng_to_timezone: ^0.2.0 flutter_colorpicker: ^1.0.3 scrollable_positioned_list: ^0.3.8 - flutter_local_notifications: ^16.3.2 + flutter_local_notifications: ^17.0.0 # Uncomment this for publishing FLOSS variant # dependency_overrides: From 1342079b6b5c37956f08ed30e2161efeea9cdd0f Mon Sep 17 00:00:00 2001 From: Yoshi Date: Fri, 5 Apr 2024 22:52:00 +0300 Subject: [PATCH 16/73] Update dependencies --- lib/main.dart | 4 +- macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- pubspec.lock | 90 +++++++++---------- pubspec.yaml | 20 ++--- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 4ddeb74..d47388a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -82,8 +82,8 @@ void callbackDispatcher() { void main() async { final String timeZoneName; WidgetsFlutterBinding.ensureInitialized(); - Connectivity().onConnectivityChanged.listen((ConnectivityResult result) { - result == ConnectivityResult.none ? isOnline = false : isOnline = true; + Connectivity().onConnectivityChanged.listen((List result) { + result.contains(ConnectivityResult.none) ? isOnline = false : isOnline = true; }); SystemChrome.setSystemUIOverlayStyle( const SystemUiOverlayStyle(systemNavigationBarColor: Colors.black)); diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 206b4ae..ee92ad9 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ import path_provider_foundation import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) + ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin")) DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin")) FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) FlutterTimezonePlugin.register(with: registry.registrar(forPlugin: "FlutterTimezonePlugin")) diff --git a/pubspec.lock b/pubspec.lock index 866b7dd..6a14662 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -93,10 +93,10 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21" + sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" url: "https://pub.dev" source: hosted - version: "2.4.8" + version: "2.4.9" build_runner_core: dependency: transitive description: @@ -117,10 +117,10 @@ packages: dependency: transitive description: name: built_value - sha256: fedde275e0a6b798c3296963c5cd224e3e1b55d0e478d5b7e65e6b540f363a0e + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb url: "https://pub.dev" source: hosted - version: "8.9.1" + version: "8.9.2" characters: dependency: transitive description: @@ -173,18 +173,18 @@ packages: dependency: "direct main" description: name: connectivity_plus - sha256: "224a77051d52a11fbad53dd57827594d3bd24f945af28bd70bab376d68d437f0" + sha256: e9feae83b1849f61bad9f6f33ee00646e3410d54ce0821e02f262f9901dad3c9 url: "https://pub.dev" source: hosted - version: "5.0.2" + version: "6.0.1" connectivity_plus_platform_interface: dependency: transitive description: name: connectivity_plus_platform_interface - sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a + sha256: b6a56efe1e6675be240de39107281d4034b64ac23438026355b4234042a35adb url: "https://pub.dev" source: hosted - version: "1.2.4" + version: "2.0.0" convert: dependency: transitive description: @@ -237,10 +237,10 @@ packages: dependency: "direct main" description: name: dio - sha256: "49af28382aefc53562459104f64d16b9dfd1e8ef68c862d5af436cc8356ce5a8" + sha256: "0978e9a3e45305a80a7210dbeaf79d6ee8bee33f70c8e542dc654c952070217f" url: "https://pub.dev" source: hosted - version: "5.4.1" + version: "5.4.2+1" dynamic_color: dependency: "direct main" description: @@ -322,10 +322,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 + sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" flutter_local_notifications: dependency: "direct main" description: @@ -359,10 +359,10 @@ packages: dependency: "direct dev" description: name: flutter_native_splash - sha256: "558f10070f03ee71f850a78f7136ab239a67636a294a44a06b6b7345178edb1e" + sha256: edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0 url: "https://pub.dev" source: hosted - version: "2.3.10" + version: "2.4.0" flutter_test: dependency: "direct dev" description: flutter @@ -385,10 +385,10 @@ packages: dependency: "direct dev" description: name: freezed - sha256: "57247f692f35f068cae297549a46a9a097100685c6780fe67177503eea5ed4e5" + sha256: d25416cb7144576fa565d2c4f346f5db0d3fb5dc1dd162d2814408c32946456d url: "https://pub.dev" source: hosted - version: "2.4.7" + version: "2.4.8" freezed_annotation: dependency: "direct main" description: @@ -401,18 +401,18 @@ packages: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.0" geocoding: dependency: "direct main" description: name: geocoding - sha256: "4837e0b957c49b0a795be1d8caa2f51eaeebb7d1945485faafccd510ffe197fb" + sha256: d580c801cba9386b4fac5047c4c785a4e19554f46be42f4f5e5b7deacd088a66 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "3.0.0" geocoding_android: dependency: transitive description: @@ -425,10 +425,10 @@ packages: dependency: transitive description: name: geocoding_ios - sha256: "3f79bb7793ff4796a51d18100cee875d5f7b16e1496dbcd6312e3ac8f79d608a" + sha256: "94ddba60387501bd1c11e18dca7c5a9e8c645d6e3da9c38b9762434941870c24" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" geocoding_platform_interface: dependency: transitive description: @@ -449,18 +449,18 @@ packages: dependency: transitive description: name: geolocator_android - sha256: "136f1c97e1903366393bda514c5d9e98843418baea52899aa45edae9af8a5cd6" + sha256: f15d1536cd01b1399578f1da1eb5d566e7a718db6a3648f2c24d2e2f859f0692 url: "https://pub.dev" source: hosted - version: "4.5.2" + version: "4.5.4" geolocator_apple: dependency: transitive description: name: geolocator_apple - sha256: "2f2d4ee16c4df269e93c0e382be075cc01d5db6703c3196e4af20a634fe49ef4" + sha256: bc2aca02423ad429cb0556121f56e60360a2b7d694c8570301d06ea0c00732fd url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.3.7" geolocator_platform_interface: dependency: transitive description: @@ -481,10 +481,10 @@ packages: dependency: transitive description: name: geolocator_windows - sha256: a92fae29779d5c6dc60e8411302f5221ade464968fe80a36d330e80a71f087af + sha256: "53da08937d07c24b0d9952eb57a3b474e29aae2abf9dd717f7e1230995f13f0e" url: "https://pub.dev" source: hosted - version: "0.2.2" + version: "0.2.3" get: dependency: "direct main" description: @@ -521,10 +521,10 @@ packages: dependency: "direct main" description: name: home_widget - sha256: c58a9e6d3b94490f1a8d5ddcbeeeeebc79abd0befe5889c26b0713fb09be6857 + sha256: "29565bfee4b32eaf9e7e8b998d504618b779a74b2b1ac62dd4dac7468e66f1a3" url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.5.0" html: dependency: transitive description: @@ -537,10 +537,10 @@ packages: dependency: transitive description: name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba + sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" http_multi_server: dependency: transitive description: @@ -737,10 +737,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" + sha256: cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097 url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "6.0.0" package_info_plus_platform_interface: dependency: transitive description: @@ -833,10 +833,10 @@ packages: dependency: transitive description: name: pointycastle - sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29" + sha256: "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333" url: "https://pub.dev" source: hosted - version: "3.7.4" + version: "3.8.0" pool: dependency: transitive description: @@ -1078,10 +1078,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b + sha256: "3692a459204a33e04bc94f5fb91158faf4f2c8903281ddd82915adecdb1a901d" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.0" url_launcher_windows: dependency: transitive description: @@ -1126,26 +1126,26 @@ packages: dependency: transitive description: name: web - sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" url: "https://pub.dev" source: hosted - version: "0.4.2" + version: "0.5.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23" + sha256: "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.4" win32: dependency: transitive description: name: win32 - sha256: "8cb58b45c47dcb42ab3651533626161d6b67a2921917d8d429791f76972b3480" + sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a" url: "https://pub.dev" source: hosted - version: "5.3.0" + version: "5.4.0" workmanager: dependency: "direct main" description: @@ -1187,5 +1187,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.1 <4.0.0" + dart: ">=3.3.3 <4.0.0" flutter: ">=3.19.2" diff --git a/pubspec.yaml b/pubspec.yaml index 955e494..2d17f44 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: "none" version: 1.3.1+34 environment: - sdk: ">=3.3.1 <4.0.0" + sdk: ">=3.3.3 <4.0.0" dependencies: flutter: @@ -14,15 +14,15 @@ dependencies: flutter_localizations: sdk: flutter get: ^4.6.6 - dio: ^5.4.1 + dio: ^5.4.2+1 intl: ^0.18.1 isar: ^3.1.0+1 shimmer: ^3.0.0 iconsax: ^0.0.8 timezone: ^0.9.2 - geocoding: ^2.2.1 + geocoding: ^3.0.0 geolocator: ^11.0.0 - home_widget: ^0.4.1 + home_widget: ^0.5.0 workmanager: ^0.5.2 google_fonts: ^6.2.1 flutter_glow: ^0.3.0 @@ -32,8 +32,8 @@ dependencies: path_provider: ^2.1.2 json_annotation: ^4.8.1 flutter_timezone: ^1.0.8 - package_info_plus: ^5.0.1 - connectivity_plus: ^5.0.2 + package_info_plus: ^6.0.0 + connectivity_plus: ^6.0.1 freezed_annotation: ^2.4.1 isar_flutter_libs: ^3.1.0+1 flutter_displaymode: ^0.6.0 @@ -53,12 +53,12 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - freezed: ^2.4.7 - build_runner: ^2.4.8 - flutter_lints: ^3.0.1 + freezed: ^2.4.8 + build_runner: ^2.4.9 + flutter_lints: ^3.0.2 isar_generator: ^3.1.0+1 json_serializable: ^6.7.1 - flutter_native_splash: ^2.3.10 + flutter_native_splash: ^2.4.0 flutter_launcher_icons: ^0.13.1 flutter_icons: From a00abd4f3ac36bec7cd9cda8990a85f4cf5a5b89 Mon Sep 17 00:00:00 2001 From: Yoshi Date: Wed, 10 Apr 2024 21:25:23 +0300 Subject: [PATCH 17/73] Fix bug --- android/app/build.gradle | 3 ++- lib/app/controller/controller.dart | 16 ++++++------- lib/main.dart | 12 +++++++--- pubspec.lock | 36 ++++++++++++++++++------------ pubspec.yaml | 7 +++--- 5 files changed, 45 insertions(+), 29 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index bc8448f..881dfe8 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -84,7 +84,8 @@ flutter { } dependencies { - implementation "androidx.core:core-remoteviews:1.0.0" + implementation("androidx.core:core-remoteviews:1.0.0") + implementation("androidx.work:work-runtime-ktx:2.9.0") } // Remove this for FLOSS version diff --git a/lib/app/controller/controller.dart b/lib/app/controller/controller.dart index 96c90c3..afd0452 100644 --- a/lib/app/controller/controller.dart +++ b/lib/app/controller/controller.dart @@ -92,7 +92,7 @@ class WeatherController extends GetxController { Future getCurrentLocation() async { bool serviceEnabled = await Geolocator.isLocationServiceEnabled(); - if (!isOnline) { + if (!(await isOnline.value)) { showSnackBar(content: 'no_inter'.tr); await readCache(); return; @@ -136,7 +136,7 @@ class WeatherController extends GetxController { double lat, lon; String city, district; - if (!isOnline) { + if (!(await isOnline.value)) { showSnackBar(content: 'no_inter'.tr); } @@ -164,7 +164,7 @@ class WeatherController extends GetxController { Future getLocation(double latitude, double longitude, String district, String locality) async { - if (!isOnline) { + if (!(await isOnline.value)) { showSnackBar(content: 'no_inter'.tr); await readCache(); return; @@ -251,7 +251,7 @@ class WeatherController extends GetxController { } Future deleteCache() async { - if (!isOnline) { + if (!(await isOnline.value)) { return; } @@ -267,7 +267,7 @@ class WeatherController extends GetxController { } Future deleteAll(bool changeCity) async { - if (!isOnline) { + if (!(await isOnline.value)) { return; } @@ -288,7 +288,7 @@ class WeatherController extends GetxController { // Card Weather Future addCardWeather( double latitude, double longitude, String city, String district) async { - if (!isOnline) { + if (!(await isOnline.value)) { showSnackBar(content: 'no_inter'.tr); return; } @@ -311,7 +311,7 @@ class WeatherController extends GetxController { .sortByIndex() .findAllSync(); - if (!isOnline || weatherCard.isEmpty) { + if ((!(await isOnline.value)) || weatherCard.isEmpty) { return; } @@ -367,7 +367,7 @@ class WeatherController extends GetxController { } Future updateCard(WeatherCard weatherCard) async { - if (!isOnline) { + if (!(await isOnline.value)) { return; } diff --git a/lib/main.dart b/lib/main.dart index d47388a..dc46aed 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -10,6 +10,7 @@ import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_timezone/flutter_timezone.dart'; import 'package:get/get.dart'; import 'package:home_widget/home_widget.dart'; +import 'package:internet_connection_checker_plus/internet_connection_checker_plus.dart'; import 'package:isar/isar.dart'; import 'package:path_provider/path_provider.dart'; import 'package:rain/app/controller/controller.dart'; @@ -28,7 +29,8 @@ import 'translation/translation.dart'; late Isar isar; late Settings settings; late LocationCache locationCache; -bool isOnline = false; +final ValueNotifier> isOnline = + ValueNotifier(InternetConnection().hasInternetAccess); FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin(); @@ -82,8 +84,12 @@ void callbackDispatcher() { void main() async { final String timeZoneName; WidgetsFlutterBinding.ensureInitialized(); - Connectivity().onConnectivityChanged.listen((List result) { - result.contains(ConnectivityResult.none) ? isOnline = false : isOnline = true; + Connectivity() + .onConnectivityChanged + .listen((List result) { + result.contains(ConnectivityResult.none) + ? isOnline.value = Future(() => false) + : isOnline.value = InternetConnection().hasInternetAccess; }); SystemChrome.setSystemUIOverlayStyle( const SystemUiOverlayStyle(systemNavigationBarColor: Colors.black)); diff --git a/pubspec.lock b/pubspec.lock index 6a14662..135116f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -173,10 +173,10 @@ packages: dependency: "direct main" description: name: connectivity_plus - sha256: e9feae83b1849f61bad9f6f33ee00646e3410d54ce0821e02f262f9901dad3c9 + sha256: ebe15d94de9dd7c31dc2ac54e42780acdf3384b1497c69290c9f3c5b0279fc57 url: "https://pub.dev" source: hosted - version: "6.0.1" + version: "6.0.2" connectivity_plus_platform_interface: dependency: transitive description: @@ -385,10 +385,10 @@ packages: dependency: "direct dev" description: name: freezed - sha256: d25416cb7144576fa565d2c4f346f5db0d3fb5dc1dd162d2814408c32946456d + sha256: "91bce569d4805ea5bad6619a3e8690df8ad062a235165af4c0c5d928dda15eaf" url: "https://pub.dev" source: hosted - version: "2.4.8" + version: "2.5.1" freezed_annotation: dependency: "direct main" description: @@ -573,6 +573,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.1.7" + internet_connection_checker_plus: + dependency: "direct main" + description: + name: internet_connection_checker_plus + sha256: "423480962bda16f10d0a79efe6c4f1b5212d80203f6b8ee921edb0a1d3c17c88" + url: "https://pub.dev" + source: hosted + version: "2.3.0" intl: dependency: "direct main" description: @@ -737,18 +745,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097 + sha256: "2c582551839386fa7ddbc7770658be7c0f87f388a4bff72066478f597c34d17f" url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "7.0.0" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" path: dependency: transitive description: @@ -769,10 +777,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" + sha256: "51f0d2c554cfbc9d6a312ab35152fc77e2f0b758ce9f1a444a3a1e5b8f3c6b7f" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.3" path_provider_foundation: dependency: transitive description: @@ -1094,10 +1102,10 @@ packages: dependency: transitive description: name: uuid - sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 + sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" url: "https://pub.dev" source: hosted - version: "4.3.3" + version: "4.4.0" vector_math: dependency: transitive description: @@ -1134,10 +1142,10 @@ packages: dependency: transitive description: name: web_socket_channel - sha256: "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2" + sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "2.4.5" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 2d17f44..55f6e64 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,8 +32,8 @@ dependencies: path_provider: ^2.1.2 json_annotation: ^4.8.1 flutter_timezone: ^1.0.8 - package_info_plus: ^6.0.0 - connectivity_plus: ^6.0.1 + package_info_plus: ^7.0.0 + connectivity_plus: ^6.0.2 freezed_annotation: ^2.4.1 isar_flutter_libs: ^3.1.0+1 flutter_displaymode: ^0.6.0 @@ -41,6 +41,7 @@ dependencies: flutter_colorpicker: ^1.0.3 scrollable_positioned_list: ^0.3.8 flutter_local_notifications: ^17.0.0 + internet_connection_checker_plus: ^2.3.0 # Uncomment this for publishing FLOSS variant # dependency_overrides: @@ -53,7 +54,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - freezed: ^2.4.8 + freezed: ^2.5.1 build_runner: ^2.4.9 flutter_lints: ^3.0.2 isar_generator: ^3.1.0+1 From 696634c08fd736944297bc6e39c7dfc916b617ed Mon Sep 17 00:00:00 2001 From: jash-desai Date: Sat, 11 May 2024 22:31:43 +0530 Subject: [PATCH 18/73] settings_full label text in bottom navbar fixed --- lib/app/modules/home.dart | 2 +- pubspec.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/app/modules/home.dart b/lib/app/modules/home.dart index e0deaed..61d7a28 100644 --- a/lib/app/modules/home.dart +++ b/lib/app/modules/home.dart @@ -252,7 +252,7 @@ class _HomePageState extends State with TickerProviderStateMixin { NavigationDestination( icon: const Icon(Iconsax.category), selectedIcon: const Icon(Iconsax.category5), - label: 'settings'.tr, + label: 'settings_full'.tr, ), ], ), diff --git a/pubspec.yaml b/pubspec.yaml index 55f6e64..5f1edf6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -79,5 +79,6 @@ flutter: uses-material-design: true assets: + - assets/ - assets/images/ - assets/icons/ From f3400916d9ca0d56d9e5b3197cb769dda1687a71 Mon Sep 17 00:00:00 2001 From: jash-desai Date: Sat, 11 May 2024 22:49:11 +0530 Subject: [PATCH 19/73] fixed horizontal padding in validator text in MyTextForm widget --- .../modules/cards/view/list_weather_card.dart | 12 +++++--- .../cards/widgets/create_card_weather.dart | 6 ++++ lib/app/modules/geolocation.dart | 29 +++++++++++++------ lib/app/widgets/text_form.dart | 4 +++ lib/translation/en_us.dart | 2 +- lib/translation/hi_in.dart | 14 ++++----- 6 files changed, 46 insertions(+), 21 deletions(-) diff --git a/lib/app/modules/cards/view/list_weather_card.dart b/lib/app/modules/cards/view/list_weather_card.dart index 962f902..03e0735 100644 --- a/lib/app/modules/cards/view/list_weather_card.dart +++ b/lib/app/modules/cards/view/list_weather_card.dart @@ -76,15 +76,18 @@ class _ListWeatherCardState extends State { 'deletedCardWeather'.tr, style: textTheme.titleLarge, ), - content: Text('deletedCardWeatherQuery'.tr, - style: titleMedium), + content: Text( + 'deletedCardWeatherQuery'.tr, + style: titleMedium, + ), actions: [ TextButton( onPressed: () => Get.back(result: false), child: Text( 'cancel'.tr, style: titleMedium?.copyWith( - color: Colors.blueAccent), + color: Colors.blueAccent, + ), ), ), TextButton( @@ -92,7 +95,8 @@ class _ListWeatherCardState extends State { child: Text( 'delete'.tr, style: titleMedium?.copyWith( - color: Colors.red), + color: Colors.red, + ), ), ), ], diff --git a/lib/app/modules/cards/widgets/create_card_weather.dart b/lib/app/modules/cards/widgets/create_card_weather.dart index 6e6ee9e..8983091 100644 --- a/lib/app/modules/cards/widgets/create_card_weather.dart +++ b/lib/app/modules/cards/widgets/create_card_weather.dart @@ -228,6 +228,12 @@ class _CreateWeatherCardState extends State { type: TextInputType.streetAddress, icon: const Icon(Iconsax.global), margin: const EdgeInsets.only(left: 10, right: 10, top: 10), + validator: (value) { + if (value == null || value.isEmpty) { + return 'validateName'.tr; + } + return null; + }, ), const SizedBox(height: 20), ], diff --git a/lib/app/modules/geolocation.dart b/lib/app/modules/geolocation.dart index 5ac836c..51c7a89 100644 --- a/lib/app/modules/geolocation.dart +++ b/lib/app/modules/geolocation.dart @@ -160,7 +160,8 @@ class _SelectGeolocationState extends State { Iterable options) { return Padding( padding: const EdgeInsets.symmetric( - horizontal: 10), + horizontal: 10, + ), child: Align( alignment: Alignment.topCenter, child: Material( @@ -200,7 +201,9 @@ class _SelectGeolocationState extends State { Card( elevation: kTextFieldElevation, margin: const EdgeInsets.only( - top: 10, right: 10), + top: 10, + right: 10, + ), child: Container( margin: const EdgeInsets.all(2.5), child: IconButton( @@ -221,9 +224,10 @@ class _SelectGeolocationState extends State { .textTheme.titleLarge, ), content: Text( - 'no_location'.tr, - style: context.textTheme - .titleMedium), + 'no_location'.tr, + style: context.textTheme + .titleMedium, + ), actions: [ TextButton( onPressed: () => @@ -235,8 +239,9 @@ class _SelectGeolocationState extends State { .textTheme .titleMedium ?.copyWith( - color: Colors - .blueAccent), + color: Colors + .blueAccent, + ), ), ), TextButton( @@ -284,7 +289,10 @@ class _SelectGeolocationState extends State { type: TextInputType.number, icon: const Icon(Iconsax.location), margin: const EdgeInsets.only( - left: 10, right: 10, top: 10), + left: 10, + right: 10, + top: 10, + ), validator: (value) { if (value == null || value.isEmpty) { return 'validateValue'.tr; @@ -308,7 +316,10 @@ class _SelectGeolocationState extends State { type: TextInputType.number, icon: const Icon(Iconsax.location), margin: const EdgeInsets.only( - left: 10, right: 10, top: 10), + left: 10, + right: 10, + top: 10, + ), validator: (value) { if (value == null || value.isEmpty) { return 'validateValue'.tr; diff --git a/lib/app/widgets/text_form.dart b/lib/app/widgets/text_form.dart index 24757b0..51e19c2 100644 --- a/lib/app/widgets/text_form.dart +++ b/lib/app/widgets/text_form.dart @@ -35,6 +35,10 @@ class MyTextForm extends StatelessWidget { keyboardType: type, style: context.textTheme.labelLarge, decoration: InputDecoration( + contentPadding: const EdgeInsets.symmetric( + horizontal: 12.5, + vertical: 0, + ), prefixIcon: icon, suffixIcon: iconButton, labelText: labelText, diff --git a/lib/translation/en_us.dart b/lib/translation/en_us.dart index 220f876..f7335ce 100644 --- a/lib/translation/en_us.dart +++ b/lib/translation/en_us.dart @@ -109,7 +109,7 @@ class EnUs { 'timeRange': 'Frequency (in hours)', 'timeStart': 'Start time', 'timeEnd': 'End time', - 'support': 'Support', + 'support': 'Donate', 'system': 'System', 'dark': 'Dark', 'light': 'Light', diff --git a/lib/translation/hi_in.dart b/lib/translation/hi_in.dart index 8b457f1..5906ef8 100644 --- a/lib/translation/hi_in.dart +++ b/lib/translation/hi_in.dart @@ -5,7 +5,7 @@ class HiIn { 'प्रति घंटे, दिन और सप्ताह के लिए किसी भी स्थान के लिए आधुनिक पूर्वानुमान के साथ मौसम एप्लिकेशन।', 'name': 'मौसम', 'name2': 'आसान डिजाइन', - 'name3': 'हमसे संपर्क करें', + 'name3': 'हमे संपर्क करें', 'description2': 'सभी नेविगेशन को इस प्रकार तैयार किया गया है ताकि आप एप्लिकेशन के साथ सर्वोत्तम रूप से और तेजी से संवाद कर सकें।', 'description3': @@ -69,14 +69,14 @@ class HiIn { 'metric': 'मीट्रिक', 'validateValue': 'कृपया मान दर्ज करें', 'validateNumber': 'कृपया एक मान्य संख्या दर्ज करें', - 'validate90': 'मान -90 और 90 के बीच होना चाहिए', - 'validate180': 'मान -180 और 180 के बीच होना चाहिए', + 'validate90': 'मान -९० और ९० के बीच होना चाहिए', + 'validate180': 'मान -१८० और १८० के बीच होना चाहिए', 'notifications': 'सूचनाएं', 'sunrise': 'सूर्योदय', 'sunset': 'सूर्यास्त', 'timeformat': 'समय प्रारूप', - '12': '12 घंटा', - '24': '24 घंटा', + '12': '१२ घंटा', + '24': '२४ घंटा', 'cloudcover': 'बादलों का कवर', 'uvIndex': 'यूवी-सूचकांक', 'materialColor': 'गतिशील रंग', @@ -85,7 +85,7 @@ class HiIn { 'uvHigh': 'उच्च', 'uvVeryHigh': 'बहुत उच्च', 'uvExtreme': 'अत्यधिक', - 'weatherMore': '12-दिवसीय मौसम पूर', + 'weatherMore': '१२ - दिवसीय मौसम पूर', 'windgusts': 'गुस्त', 'north': 'उत्तर', 'northeast': 'उत्तर-पूर्व', @@ -114,7 +114,7 @@ class HiIn { 'light': 'लाइट', 'license': 'लाइसेंस', 'widget': 'विजेट', - 'widgetBackground': 'विजेट का पृष्ठभूमि', + 'widgetBackground': 'विजेट कि पृष्ठभूमि', 'widgetText': 'विजेट पाठ', 'dewpoint': 'बर्फ़ के बिंदु', 'shortwaveRadiation': 'शॉर्टवेव विकिरण', From 4b1536579d57087dd55fbfa80b5ccc5a505732f0 Mon Sep 17 00:00:00 2001 From: jash-desai Date: Sat, 11 May 2024 23:01:43 +0530 Subject: [PATCH 20/73] minor changes --- lib/app/modules/settings/view/settings.dart | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/app/modules/settings/view/settings.dart b/lib/app/modules/settings/view/settings.dart index 298497d..6adfe35 100644 --- a/lib/app/modules/settings/view/settings.dart +++ b/lib/app/modules/settings/view/settings.dart @@ -456,9 +456,12 @@ class _SettingsPageState extends State { onChange: (value) { settings.roundDegree = value; isar.writeTxnSync( - () => isar.settings.putSync(settings)); - MyApp.updateAppState(context, - newRoundDegree: value); + () => isar.settings.putSync(settings), + ); + MyApp.updateAppState( + context, + newRoundDegree: value, + ); setState(() {}); }, ), From 8eae7203f0c82b1c1831fa8c3fbae54b099ae4e5 Mon Sep 17 00:00:00 2001 From: Yoshi Date: Sat, 18 May 2024 21:58:53 +0300 Subject: [PATCH 21/73] Update dependencies --- lib/app/api/weather.freezed.dart | 2 +- lib/app/api/weather.g.dart | 16 +- lib/app/data/weather.g.dart | 8 +- lib/app/modules/settings/view/settings.dart | 21 +- lib/theme/theme.dart | 28 ++- pubspec.lock | 233 ++++++++++---------- pubspec.yaml | 50 +++-- 7 files changed, 183 insertions(+), 175 deletions(-) diff --git a/lib/app/api/weather.freezed.dart b/lib/app/api/weather.freezed.dart index e2134f7..01809be 100644 --- a/lib/app/api/weather.freezed.dart +++ b/lib/app/api/weather.freezed.dart @@ -12,7 +12,7 @@ part of 'weather.dart'; T _$identity(T value) => value; final _privateConstructorUsedError = UnsupportedError( - 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods'); + 'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models'); WeatherDataApi _$WeatherDataApiFromJson(Map json) { return _WeatherDataApi.fromJson(json); diff --git a/lib/app/api/weather.g.dart b/lib/app/api/weather.g.dart index 4fa386e..0deed85 100644 --- a/lib/app/api/weather.g.dart +++ b/lib/app/api/weather.g.dart @@ -24,7 +24,7 @@ Map _$$WeatherDataApiImplToJson( _$HourlyImpl _$$HourlyImplFromJson(Map json) => _$HourlyImpl( time: (json['time'] as List?)?.map((e) => e as String).toList(), weatherCode: (json['weathercode'] as List?) - ?.map((e) => e as int) + ?.map((e) => (e as num).toInt()) .toList(), temperature2M: (json['temperature_2m'] as List?) ?.map((e) => (e as num).toDouble()) @@ -39,7 +39,7 @@ _$HourlyImpl _$$HourlyImplFromJson(Map json) => _$HourlyImpl( ?.map((e) => (e as num?)?.toDouble()) .toList(), relativeHumidity2M: (json['relativehumidity_2m'] as List?) - ?.map((e) => e as int?) + ?.map((e) => (e as num?)?.toInt()) .toList(), surfacePressure: (json['surface_pressure'] as List?) ?.map((e) => (e as num?)?.toDouble()) @@ -54,13 +54,13 @@ _$HourlyImpl _$$HourlyImplFromJson(Map json) => _$HourlyImpl( ?.map((e) => (e as num?)?.toDouble()) .toList(), windDirection10M: (json['winddirection_10m'] as List?) - ?.map((e) => e as int?) + ?.map((e) => (e as num?)?.toInt()) .toList(), windGusts10M: (json['windgusts_10m'] as List?) ?.map((e) => (e as num?)?.toDouble()) .toList(), cloudCover: (json['cloudcover'] as List?) - ?.map((e) => e as int?) + ?.map((e) => (e as num?)?.toInt()) .toList(), uvIndex: (json['uv_index'] as List?) ?.map((e) => (e as num?)?.toDouble()) @@ -70,7 +70,7 @@ _$HourlyImpl _$$HourlyImplFromJson(Map json) => _$HourlyImpl( .toList(), precipitationProbability: (json['precipitation_probability'] as List?) - ?.map((e) => e as int?) + ?.map((e) => (e as num?)?.toInt()) .toList(), shortwaveRadiation: (json['shortwave_radiation'] as List?) ?.map((e) => (e as num?)?.toDouble()) @@ -102,7 +102,7 @@ Map _$$HourlyImplToJson(_$HourlyImpl instance) => _$DailyImpl _$$DailyImplFromJson(Map json) => _$DailyImpl( time: _dateTimeFromJson(json['time'] as List?), weatherCode: (json['weathercode'] as List?) - ?.map((e) => e as int?) + ?.map((e) => (e as num?)?.toInt()) .toList(), temperature2MMax: (json['temperature_2m_max'] as List?) ?.map((e) => (e as num?)?.toDouble()) @@ -127,7 +127,7 @@ _$DailyImpl _$$DailyImplFromJson(Map json) => _$DailyImpl( (json['sunset'] as List?)?.map((e) => e as String).toList(), precipitationProbabilityMax: (json['precipitation_probability_max'] as List?) - ?.map((e) => e as int?) + ?.map((e) => (e as num?)?.toInt()) .toList(), windSpeed10MMax: (json['windspeed_10m_max'] as List?) ?.map((e) => (e as num?)?.toDouble()) @@ -143,7 +143,7 @@ _$DailyImpl _$$DailyImplFromJson(Map json) => _$DailyImpl( .toList(), windDirection10MDominant: (json['winddirection_10m_dominant'] as List?) - ?.map((e) => e as int?) + ?.map((e) => (e as num?)?.toInt()) .toList(), ); diff --git a/lib/app/data/weather.g.dart b/lib/app/data/weather.g.dart index 76c2d16..1103612 100644 --- a/lib/app/data/weather.g.dart +++ b/lib/app/data/weather.g.dart @@ -109,7 +109,7 @@ const SettingsSchema = CollectionSchema( getId: _settingsGetId, getLinks: _settingsGetLinks, attach: _settingsAttach, - version: '3.1.0+1', + version: '3.1.7', ); int _settingsEstimateSize( @@ -2638,7 +2638,7 @@ const MainWeatherCacheSchema = CollectionSchema( getId: _mainWeatherCacheGetId, getLinks: _mainWeatherCacheGetLinks, attach: _mainWeatherCacheAttach, - version: '3.1.0+1', + version: '3.1.7', ); int _mainWeatherCacheEstimateSize( @@ -10361,7 +10361,7 @@ const LocationCacheSchema = CollectionSchema( getId: _locationCacheGetId, getLinks: _locationCacheGetLinks, attach: _locationCacheAttach, - version: '3.1.0+1', + version: '3.1.7', ); int _locationCacheEstimateSize( @@ -11460,7 +11460,7 @@ const WeatherCardSchema = CollectionSchema( getId: _weatherCardGetId, getLinks: _weatherCardGetLinks, attach: _weatherCardAttach, - version: '3.1.0+1', + version: '3.1.7', ); int _weatherCardEstimateSize( diff --git a/lib/app/modules/settings/view/settings.dart b/lib/app/modules/settings/view/settings.dart index 6adfe35..362edde 100644 --- a/lib/app/modules/settings/view/settings.dart +++ b/lib/app/modules/settings/view/settings.dart @@ -1,6 +1,6 @@ import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:flutter_colorpicker/flutter_colorpicker.dart'; +import 'package:flutter_hsvcolor_picker/flutter_hsvcolor_picker.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:geolocator/geolocator.dart'; import 'package:get/get.dart'; @@ -612,20 +612,15 @@ class _SettingsPageState extends State { ), ), child: ColorPicker( - pickerColor: widgetBackgroundColor + color: widgetBackgroundColor .isEmpty ? context.theme.primaryColor : HexColor.fromHex( widgetBackgroundColor), - onColorChanged: (pickedColor) { + onChanged: (pickedColor) { colorBackground = pickedColor.toHex(); }, - hexInputBar: true, - labelTypes: const [], - pickerAreaHeightPercent: 0.7, - pickerAreaBorderRadius: - BorderRadius.circular(20), ), ), ), @@ -704,20 +699,14 @@ class _SettingsPageState extends State { ), ), child: ColorPicker( - pickerColor: widgetTextColor - .isEmpty + color: widgetTextColor.isEmpty ? context.theme.primaryColor : HexColor.fromHex( widgetTextColor), - onColorChanged: (pickedColor) { + onChanged: (pickedColor) { colorText = pickedColor.toHex(); }, - hexInputBar: true, - labelTypes: const [], - pickerAreaHeightPercent: 0.7, - pickerAreaBorderRadius: - BorderRadius.circular(20), ), ), ), diff --git a/lib/theme/theme.dart b/lib/theme/theme.dart index 61bf1c1..f1a476d 100644 --- a/lib/theme/theme.dart +++ b/lib/theme/theme.dart @@ -1,6 +1,6 @@ -import 'package:dynamic_color/dynamic_color.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:dynamic_color/dynamic_color.dart'; final ThemeData baseLigth = ThemeData.light(useMaterial3: true); final ThemeData baseDark = ThemeData.dark(useMaterial3: true); @@ -24,8 +24,7 @@ ThemeData lightTheme(Color? color, ColorScheme? colorScheme) { colorScheme: colorScheme ?.copyWith( brightness: Brightness.light, - background: color, - surface: baseLigth.colorScheme.background, + surface: baseLigth.colorScheme.surface, ) .harmonized(), textTheme: GoogleFonts.ubuntuTextTheme(baseLigth.textTheme), @@ -41,6 +40,8 @@ ThemeData lightTheme(Color? color, ColorScheme? colorScheme) { scaffoldBackgroundColor: color, cardTheme: baseLigth.cardTheme.copyWith( color: color, + surfaceTintColor: + color == oledColor ? Colors.transparent : colorScheme?.surfaceTint, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(20), ), @@ -48,16 +49,20 @@ ThemeData lightTheme(Color? color, ColorScheme? colorScheme) { ), bottomSheetTheme: baseLigth.bottomSheetTheme.copyWith( backgroundColor: color, + surfaceTintColor: + color == oledColor ? Colors.transparent : colorScheme?.surfaceTint, ), navigationRailTheme: baseLigth.navigationRailTheme.copyWith( backgroundColor: color, ), navigationBarTheme: baseLigth.navigationBarTheme.copyWith( backgroundColor: color, + surfaceTintColor: + color == oledColor ? Colors.transparent : colorScheme?.surfaceTint, ), inputDecorationTheme: baseLigth.inputDecorationTheme.copyWith( - labelStyle: MaterialStateTextStyle.resolveWith( - (Set states) { + labelStyle: WidgetStateTextStyle.resolveWith( + (Set states) { return const TextStyle(fontSize: 14); }, ), @@ -75,8 +80,7 @@ ThemeData darkTheme(Color? color, ColorScheme? colorScheme) { colorScheme: colorScheme ?.copyWith( brightness: Brightness.dark, - background: color, - surface: baseDark.colorScheme.background, + surface: baseDark.colorScheme.surface, ) .harmonized(), textTheme: GoogleFonts.ubuntuTextTheme(baseDark.textTheme), @@ -92,6 +96,8 @@ ThemeData darkTheme(Color? color, ColorScheme? colorScheme) { scaffoldBackgroundColor: color, cardTheme: baseDark.cardTheme.copyWith( color: color, + surfaceTintColor: + color == oledColor ? Colors.transparent : colorScheme?.surfaceTint, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(20), ), @@ -99,16 +105,20 @@ ThemeData darkTheme(Color? color, ColorScheme? colorScheme) { ), bottomSheetTheme: baseDark.bottomSheetTheme.copyWith( backgroundColor: color, + surfaceTintColor: + color == oledColor ? Colors.transparent : colorScheme?.surfaceTint, ), navigationRailTheme: baseDark.navigationRailTheme.copyWith( backgroundColor: color, ), navigationBarTheme: baseDark.navigationBarTheme.copyWith( backgroundColor: color, + surfaceTintColor: + color == oledColor ? Colors.transparent : colorScheme?.surfaceTint, ), inputDecorationTheme: baseDark.inputDecorationTheme.copyWith( - labelStyle: MaterialStateTextStyle.resolveWith( - (Set states) { + labelStyle: WidgetStateTextStyle.resolveWith( + (Set states) { return const TextStyle(fontSize: 14); }, ), diff --git a/pubspec.lock b/pubspec.lock index 135116f..f19175d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a + sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" url: "https://pub.dev" source: hosted - version: "61.0.0" + version: "67.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 + sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" url: "https://pub.dev" source: hosted - version: "5.13.0" + version: "6.4.1" ansicolor: dependency: transitive description: @@ -29,18 +29,18 @@ packages: dependency: transitive description: name: archive - sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d" + sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265 url: "https://pub.dev" source: hosted - version: "3.4.10" + version: "3.5.1" args: dependency: transitive description: name: args - sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.5.0" async: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: build_daemon - sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.2" build_resolvers: dependency: transitive description: @@ -93,10 +93,10 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" + sha256: "1414d6d733a85d8ad2f1dfcb3ea7945759e35a123cb99ccfac75d0758f75edfa" url: "https://pub.dev" source: hosted - version: "2.4.9" + version: "2.4.10" build_runner_core: dependency: transitive description: @@ -173,10 +173,10 @@ packages: dependency: "direct main" description: name: connectivity_plus - sha256: ebe15d94de9dd7c31dc2ac54e42780acdf3384b1497c69290c9f3c5b0279fc57 + sha256: db7a4e143dc72cc3cb2044ef9b052a7ebfe729513e6a82943bc3526f784365b8 url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "6.0.3" connectivity_plus_platform_interface: dependency: transitive description: @@ -213,10 +213,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" + sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.6" dartx: dependency: transitive description: @@ -237,10 +237,10 @@ packages: dependency: "direct main" description: name: dio - sha256: "0978e9a3e45305a80a7210dbeaf79d6ee8bee33f70c8e542dc654c952070217f" + sha256: "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5" url: "https://pub.dev" source: hosted - version: "5.4.2+1" + version: "5.4.3+1" dynamic_color: dependency: "direct main" description: @@ -286,14 +286,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_colorpicker: - dependency: "direct main" - description: - name: flutter_colorpicker - sha256: "458a6ed8ea480eb16ff892aedb4b7092b2804affd7e046591fb03127e8d8ef8b" - url: "https://pub.dev" - source: hosted - version: "1.0.3" flutter_displaymode: dependency: "direct main" description: @@ -305,11 +297,20 @@ packages: flutter_glow: dependency: "direct main" description: - name: flutter_glow - sha256: "158f041ddbc18f199dcfd9375d40b983a2bf887752598cdf7b41ac6ff36362bf" + path: "." + ref: HEAD + resolved-ref: "7c5e1fd34583db4b40073add9ca329b03bf52a51" + url: "https://github.com/payam-zahedi/flutter-glow.git" + source: git + version: "0.3.1" + flutter_hsvcolor_picker: + dependency: "direct main" + description: + name: flutter_hsvcolor_picker + sha256: ea5868dbb1c840ef502bbf60168b26e18eab13a3a2b07bfef0c59a64e7fedc2c url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "1.5.0" flutter_launcher_icons: dependency: "direct dev" description: @@ -322,18 +323,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1" + sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "4.0.0" flutter_local_notifications: dependency: "direct main" description: name: flutter_local_notifications - sha256: f9a05409385b77b06c18f200a41c7c2711ebf7415669350bb0f8474c07bd40d1 + sha256: "40e6fbd2da7dcc7ed78432c5cdab1559674b4af035fddbfb2f9a8f9c2112fcef" url: "https://pub.dev" source: hosted - version: "17.0.0" + version: "17.1.2" flutter_local_notifications_linux: dependency: transitive description: @@ -346,10 +347,10 @@ packages: dependency: transitive description: name: flutter_local_notifications_platform_interface - sha256: "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef" + sha256: "340abf67df238f7f0ef58f4a26d2a83e1ab74c77ab03cd2b2d5018ac64db30b7" url: "https://pub.dev" source: hosted - version: "7.0.0+1" + version: "7.1.0" flutter_localizations: dependency: "direct main" description: flutter @@ -385,10 +386,10 @@ packages: dependency: "direct dev" description: name: freezed - sha256: "91bce569d4805ea5bad6619a3e8690df8ad062a235165af4c0c5d928dda15eaf" + sha256: a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1 url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.5.2" freezed_annotation: dependency: "direct main" description: @@ -417,10 +418,10 @@ packages: dependency: transitive description: name: geocoding_android - sha256: "4e1539a136c6ab4c44963cfc631970ee499f706a03654fc1d446b2100caf7221" + sha256: "1b13eca79b11c497c434678fed109c2be020b158cec7512c848c102bc7232603" url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "3.3.1" geocoding_ios: dependency: transitive description: @@ -441,18 +442,18 @@ packages: dependency: "direct main" description: name: geolocator - sha256: "694ec58afe97787b5b72b8a0ab78c1a9244811c3c10e72c4362ef3c0ceb005cd" + sha256: "149876cc5207a0f5daf4fdd3bfcf0a0f27258b3fe95108fa084f527ad0568f1b" url: "https://pub.dev" source: hosted - version: "11.0.0" + version: "12.0.0" geolocator_android: dependency: transitive description: name: geolocator_android - sha256: f15d1536cd01b1399578f1da1eb5d566e7a718db6a3648f2c24d2e2f859f0692 + sha256: "00c7177a95823dd3ee35ef42fd8666cd27d219ae14cea472ac76a21dff43000b" url: "https://pub.dev" source: hosted - version: "4.5.4" + version: "4.6.0" geolocator_apple: dependency: transitive description: @@ -465,18 +466,18 @@ packages: dependency: transitive description: name: geolocator_platform_interface - sha256: "009a21c4bc2761e58dccf07c24f219adaebe0ff707abdfd40b0a763d4003fab9" + sha256: c6005787efe9e27cb0f6b50230c217e6f0ef8e1e7a8b854efb4f46489e502603 url: "https://pub.dev" source: hosted - version: "4.2.2" + version: "4.2.3" geolocator_web: dependency: transitive description: name: geolocator_web - sha256: "49d8f846ebeb5e2b6641fe477a7e97e5dd73f03cbfef3fd5c42177b7300fb0ed" + sha256: "7a22f400d831f924a89d931ba126a10e6b8b437f31e6b9311320435f3e1571bd" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.0.0" geolocator_windows: dependency: transitive description: @@ -521,10 +522,10 @@ packages: dependency: "direct main" description: name: home_widget - sha256: "29565bfee4b32eaf9e7e8b998d504618b779a74b2b1ac62dd4dac7468e66f1a3" + sha256: "2a0fdd6267ff975bd07bedf74686bd5577200f504f5de36527ac1b56bdbe68e3" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.6.0" html: dependency: transitive description: @@ -585,10 +586,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" io: dependency: transitive description: @@ -601,50 +602,50 @@ packages: dependency: "direct main" description: name: isar - sha256: "99165dadb2cf2329d3140198363a7e7bff9bbd441871898a87e26914d25cf1ea" - url: "https://pub.dev" + sha256: e7135ff16ae4e4624bce608757b2d22aeeeb09225d9f16ec3e3a5c9f3d05e66a + url: "https://pub.isar-community.dev" source: hosted - version: "3.1.0+1" + version: "3.1.7" isar_flutter_libs: dependency: "direct main" description: name: isar_flutter_libs - sha256: bc6768cc4b9c61aabff77152e7f33b4b17d2fc93134f7af1c3dd51500fe8d5e8 - url: "https://pub.dev" + sha256: cb2cc60aac929ca190c0332d10417cab405f666dc96773ab66eb2958866a5e20 + url: "https://pub.isar-community.dev" source: hosted - version: "3.1.0+1" + version: "3.1.7" isar_generator: dependency: "direct dev" description: name: isar_generator - sha256: "76c121e1295a30423604f2f819bc255bc79f852f3bc8743a24017df6068ad133" - url: "https://pub.dev" + sha256: "9409d8c95abc67953165dea302f75d957cd40965fcbcd0134ab2b2e4c5e35042" + url: "https://pub.isar-community.dev" source: hosted - version: "3.1.0+1" + version: "3.1.7" js: dependency: transitive description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.7.1" json_annotation: dependency: "direct main" description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" json_serializable: dependency: "direct dev" description: name: json_serializable - sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969 + sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b url: "https://pub.dev" source: hosted - version: "6.7.1" + version: "6.8.0" lat_lng_to_timezone: dependency: "direct main" description: @@ -657,34 +658,34 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" lints: dependency: transitive description: name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.0.0" logging: dependency: transitive description: @@ -713,10 +714,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.12.0" mime: dependency: transitive description: @@ -745,10 +746,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "2c582551839386fa7ddbc7770658be7c0f87f388a4bff72066478f597c34d17f" + sha256: b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "8.0.0" package_info_plus_platform_interface: dependency: transitive description: @@ -769,26 +770,26 @@ packages: dependency: "direct main" description: name: path_provider - sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b + sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "51f0d2c554cfbc9d6a312ab35152fc77e2f0b758ce9f1a444a3a1e5b8f3c6b7f" + sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.2.4" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f" + sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.0" path_provider_linux: dependency: transitive description: @@ -837,14 +838,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.8" - pointycastle: - dependency: transitive - description: - name: pointycastle - sha256: "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333" - url: "https://pub.dev" - source: hosted - version: "3.8.0" pool: dependency: transitive description: @@ -889,10 +882,10 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.0" shimmer: dependency: "direct main" description: @@ -982,10 +975,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" time: dependency: transitive description: @@ -1006,10 +999,10 @@ packages: dependency: "direct main" description: name: timezone - sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0" + sha256: a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5 url: "https://pub.dev" source: hosted - version: "0.9.2" + version: "0.9.3" timing: dependency: transitive description: @@ -1038,26 +1031,26 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e" + sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e" url: "https://pub.dev" source: hosted - version: "6.2.5" + version: "6.2.6" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745 + sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775" url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5" + sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89" url: "https://pub.dev" source: hosted - version: "6.2.5" + version: "6.3.0" url_launcher_linux: dependency: transitive description: @@ -1070,10 +1063,10 @@ packages: dependency: transitive description: name: url_launcher_macos - sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 + sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.0" url_launcher_platform_interface: dependency: transitive description: @@ -1086,10 +1079,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "3692a459204a33e04bc94f5fb91158faf4f2c8903281ddd82915adecdb1a901d" + sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.1" url_launcher_windows: dependency: transitive description: @@ -1118,10 +1111,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.1" watcher: dependency: transitive description: @@ -1138,22 +1131,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.5.1" + web_socket: + dependency: transitive + description: + name: web_socket + sha256: "217f49b5213796cb508d6a942a5dc604ce1cb6a0a6b3d8cb3f0c314f0ecea712" + url: "https://pub.dev" + source: hosted + version: "0.1.4" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" + sha256: a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276 url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "3.0.0" win32: dependency: transitive description: name: win32 - sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a" + sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.5.1" workmanager: dependency: "direct main" description: @@ -1195,5 +1196,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.3 <4.0.0" - flutter: ">=3.19.2" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.20.0-1.2.pre" diff --git a/pubspec.yaml b/pubspec.yaml index 5f1edf6..5b11c6f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: "none" version: 1.3.1+34 environment: - sdk: ">=3.3.3 <4.0.0" + sdk: ">=3.4.0 <4.0.0" dependencies: flutter: @@ -14,33 +14,39 @@ dependencies: flutter_localizations: sdk: flutter get: ^4.6.6 - dio: ^5.4.2+1 - intl: ^0.18.1 - isar: ^3.1.0+1 + dio: ^5.4.3+1 + intl: ^0.19.0 + isar: + version: ^3.1.7 + hosted: https://pub.isar-community.dev/ shimmer: ^3.0.0 iconsax: ^0.0.8 - timezone: ^0.9.2 + timezone: ^0.9.3 geocoding: ^3.0.0 - geolocator: ^11.0.0 - home_widget: ^0.5.0 + geolocator: ^12.0.0 + home_widget: ^0.6.0 workmanager: ^0.5.2 google_fonts: ^6.2.1 - flutter_glow: ^0.3.0 - url_launcher: ^6.2.5 + flutter_glow: + git: + url: https://github.com/payam-zahedi/flutter-glow.git + url_launcher: ^6.2.6 time_machine: ^0.9.17 dynamic_color: ^1.7.0 - path_provider: ^2.1.2 - json_annotation: ^4.8.1 + path_provider: ^2.1.3 + json_annotation: ^4.9.0 flutter_timezone: ^1.0.8 - package_info_plus: ^7.0.0 - connectivity_plus: ^6.0.2 + package_info_plus: ^8.0.0 + connectivity_plus: ^6.0.3 freezed_annotation: ^2.4.1 - isar_flutter_libs: ^3.1.0+1 + isar_flutter_libs: + version: ^3.1.7 + hosted: https://pub.isar-community.dev/ flutter_displaymode: ^0.6.0 lat_lng_to_timezone: ^0.2.0 - flutter_colorpicker: ^1.0.3 + flutter_hsvcolor_picker: ^1.5.0 scrollable_positioned_list: ^0.3.8 - flutter_local_notifications: ^17.0.0 + flutter_local_notifications: ^17.1.2 internet_connection_checker_plus: ^2.3.0 # Uncomment this for publishing FLOSS variant @@ -54,11 +60,13 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - freezed: ^2.5.1 - build_runner: ^2.4.9 - flutter_lints: ^3.0.2 - isar_generator: ^3.1.0+1 - json_serializable: ^6.7.1 + freezed: ^2.5.2 + build_runner: ^2.4.10 + flutter_lints: ^4.0.0 + isar_generator: + version: ^3.1.7 + hosted: https://pub.isar-community.dev/ + json_serializable: ^6.8.0 flutter_native_splash: ^2.4.0 flutter_launcher_icons: ^0.13.1 From 3cfd4f824827f61f3b4bb3a3a316c7e533bc73e9 Mon Sep 17 00:00:00 2001 From: Yoshi Date: Sun, 26 May 2024 19:09:28 +0300 Subject: [PATCH 22/73] Fix flutter_native_splash --- .../app/src/main/res/drawable-hdpi/splash.png | Bin 2615 -> 2766 bytes .../app/src/main/res/drawable-mdpi/splash.png | Bin 1077 -> 1654 bytes .../src/main/res/drawable-xhdpi/splash.png | Bin 2747 -> 3295 bytes .../src/main/res/drawable-xxhdpi/splash.png | Bin 6389 -> 5399 bytes .../app/src/main/res/values-v31/styles.xml | 2 -- android/app/src/main/res/values/styles.xml | 9 +++------ .../LaunchImage.imageset/LaunchImage.png | Bin 1077 -> 1654 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 2747 -> 3295 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 6389 -> 5399 bytes ios/Runner/Info.plist | 4 ++-- lib/main.dart | 1 + pubspec.lock | 18 +++++++++--------- pubspec.yaml | 6 +++--- web/index.html | 3 +++ web/splash/img/dark-1x.png | Bin 1077 -> 1654 bytes web/splash/img/dark-2x.png | Bin 2747 -> 3295 bytes web/splash/img/dark-3x.png | Bin 6389 -> 5399 bytes web/splash/img/light-1x.png | Bin 1077 -> 1654 bytes web/splash/img/light-2x.png | Bin 2747 -> 3295 bytes web/splash/img/light-3x.png | Bin 6389 -> 5399 bytes 20 files changed, 21 insertions(+), 22 deletions(-) diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png index 417e420f7cb5af156dbd95bfb135574faddc389f..07af2f0601e8770c19486cee4449cba0a8695ec4 100644 GIT binary patch literal 2766 zcmdT``8(8W8~@Ib2{CFY={2HkQ&JMyWtn3iOCckbvSuj;L&c;VOQEvNK}i(GSi*>z z5o3!iIWd|;CNfE5nao%k%i(;_`@YxpUhki9et4eydYmY zef=Oq(Fkp8Ynz>y$1P49xCaC>SW5@=!(O!Ag?)6{h_jDAcFv*T<#F_Y6zC& z$)()^n$FwU?9}q2q|CBv!Z!v{7h8<2t*u?0on;2{Pu;Jps|(rAbGi$7GMi%~gIU#z zr-Fv=Dd>fiqr-#;gkYM>f@%BS_wP&lh}y$h>KKh<$1>C~h4ZTlMp3g?TrQX5+a)p9 za+^+z{dLnb;-YM&cO?ifA@y!^fBjL0dk z4sB$Cw$xMg?Lie4mG56Vk|~ihPVAR>QPD~5vo$_XeSLic=l`e;{{G>eP!O^vm_AE( z*RpeRDs6AKV58oInng?dimu}TGZU^ zv97(fwY9kQ<)FBg*&LoLf-i%~T;KG!)28yXtI5w9AR zh)galID*hh?ufv^s<;U29)_pXcvFkL)WSYDljw&($sYh(sO-k@X9}Zt5{9Xf0jEX_ ze-L>Stu^$2VdeJ&NY=MG&%zMtk7ujAa#rU@E!|2TT(WqMSG)myg>p=|;32XJU4l+$ z+98bZYzz4uTHgwO+}cwIn8!j)>y*Q2Ermv9(2c{u`~(@m}oc?H81r)FfhYrDxK z2w`lRi-kpET#?A?7v-U)nZe;lhkgNzv*)eorEmRtr`Ono?R4tRWhTiD?Jco?H{io9 zy4V^|>yrV4D#$7*ROEWzFgyfhR5jnq661A*s_rBtGqQYsasrMvKh(xl#^`jzihSP0 z1^ek;H{(@V0J9kEwyNhhAz*xSbr?gVRX!X6_dDSn;7w215=f;5@p%*2nX;Q^e`2UWKb%RkS37|M zj)F=+!*Pqn=U6zF4CeDXS*0OQ;1+2~AUm0C!_@yi_u<5;gFOu>Rjp1e@6J%G@gW)EG`yjB+qp z%d3T4x;6ZEjI_O|!OL5)!UtneUM1VSF;GhB&CILtGIk^qWGH@XBr_!$xOpmzz$qv|>g41!{y}T6+4+n?HG^ zykPg!wf^e6

N0W8yOhb~!#iKD(e`PH-hTIT>r3_r$Y4D@6h@`;HpeaL*jrm>s(@ z{`hlaT!;sA{%|oAaF&HG!dhBdW(}VZAzvG=dnavV;_oZBthV5|k7vE39HAs4`$6vN=lCKzHcHMF`jKiBnaW0KIOqiM0k z)6>=+$?!4?Mc2;Ju>m)~|D^xs>9xGZ#zuuld3vGw-5*0xqDAt?q(V%2aZ@A{RY(c% zzOhg_dUmJziL`=4lWA0u?S^|LM>4Jj43z%=NP&E|8vg?_6%~th_+ag+igsUYQRc zJ{&X9)22>wIRBO~$sV+|^@l2K<54A6>M5hta^ScROkG!(nR^A)N7pyr1K@2^698<2 zO-(3ZGEN=@x+Zt{w%%G3U_U{_djjONJG&%TY3ohV|4DGX_(^v5GWJ^Sk=1TH8=Hd( z3ELOPo+A(lEhX0be8(gpo8V#Vgu!@_)x7D^={h<(-Vxr&1UUHXJbWlq;ZpLep>6EG zy&kW~{%*=Z0)u>bv2O%Fs6}5LYash0{ztU`^6ejC{)C4_1n%(oTt5!ZserAulU23F HrNqAgtBu)P literal 2615 zcmdT``9IX%7r$c-Bg;f0REnn*8d(xqLdc$NiYG&|WGPEytC_--7<V@3t>cWVzI6nP0lo}$nQfS5Ll5+=gbnZJ;-F(o_;ytO!zMWPHTlTp!thCaeI+A z5dERTy(h-p+}vtoZMndhJ%1FSN$7Tb^|je^)(#FB`M8iYC8I+X?p60Cluss-3>vfm zdW+EYoM-F9X@?-|^#)_x#63TP=%>u7Nc&_OQ4hTb} zw)VFrHuKSLmL=Te&UobHrqN&O|bS+8;Q)X3JKIYacw5!1ZGZO;+-7sT>P(vj`{#w8ylpTjU$xg470?pKn(Lt z4kusOu&~S-u%9QqvpI9dkA{PlbZg;Zq}KM^63@bTy_H@k*v!)OMe9;2en&x#aEE;T zy<9H0meUVnQUjXG#IHEDhzq?jU>}AarlXKw#)WBZ*ZtJ2J7UM$wsEq zGLm_`c>lDUs?+?qvr0=V-mmy99b=CkVpe5kXBX`4Cz9YmK7MO+TURa%ocGaLk|PY+{_X#uxKBMrl0O%yvbC7C|c3*qVAWG zkzpLJQFpI=prJNJmM}?IGWyEI91B`4o7#(8d}LG9G-?Jw8b2B*QGK3*+{ z8pZiOEKYype*ToVAJDS?1|>uWefW#{)C0Dcc5!22A)NU%nn49)F8+|1gLz7EKgMoG z&VTkgd4m@~-Qj@Ri9^*~>dHSJVVjFS0MAb$5bkvn6dr1HXuAo5hzRbSL+eck_e8Mj z7>u?9SJYM^v6gf{mp72sqF@J~qr}qDH%pIv8hk=!NE#oh^leWk!W@zVUB&>0c>iOM5O}2SVcV7pVd-iN^wcr~(7=%Af@+ zkd11V0IC$k#*tBBU?gRZ?Ouh^e%yxoLDWcy|7R5zy)-4oZ-RXXnI*Ro#88=fP$2y6 zr)s|xHu6pB??a-BcIaqx$e*0ii{A+^g8Ki7+%SJj2p zp||68V0Z4^$p~bYpsu228NE}dQ{~2ajUnE4U~ITPf>Ha}C~oDL*WH(v=}IAX6T%gI z;FWr6y8nXGiUduFrAyHOgHz9mezrhm+{ZHxysG zLC@9k-O9>g)YpY=Ke*M^$e5LxynLfLx5^7GbE#~RW3hGwVxTm{2LY7c))E6Hi z+%I;6Jf!I&2)uCj^!nNreS&}V7F&oV-@O|iHB;%;VB_TUetz<{g!277ZGRgyx~O7e zjdID@Nd|ZS$oWl<4m^E|Rad2*P7}B7A|KMzbC;Hu_FR6p{>Nup_3Fg-tKs3*oX#Bx z#MxPnzUx)y1D;3CW0ELva)r~dwBtWZ9UkXn%&T%?2Q@V@8dtdXGv7i}TFFDYaFZjw zI4%9ddyI`QK=a+`xRJ-JD@BJdH1k#?JTr>lQ)S)~LtcXq#V=kgDfck@`o7X`@`o=^ zyAIGRhkwE*7p<+WE7KMJH~|%liUuq53-zqdM0S#^g(Y>%RiNh5`J+IG6u9mRFTJL2 zVDM@AXgLD%@AyB75SJx~05paAo6{7WL&x!MQNtPsztD*r=C0roG<{|{{*3(0!9fpq zdS|)l(9lqef<){^E%tE8YKijY6@<}f8L#Dpq`I+7^I0O1I8EJaYHy#WU3;S~QG~I$ zzB=DMGgRZHJdm!lo?H$Dyt~Zfc@qVU?xXrB6e=q-b3C4a=X@(mgmUrUgPEv^cG3;y z9lXnAs(wKvJMIF-K&Vhir-?-^NaT~tMWiOhCZKA5zXfB4aa~yl7_wx^fak2bFwFJf zVBMR(f@#Ud?<*$Uv@X}m@H>jxO4GBF1qB5ej5`Q5`=yz|2bc!`9wq;tBf)c%{Q>X1 zKL)D^jTw9A?uwL&6-T&~E6C0!dG|v`oQp58()n+}%PrU?MJ<8d;&)1*4jVoIXK diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png index e59ff2b95086170f63a4eafea1ad3394dca278cc..a8261e26c9f78e871450c74d833accef7b30617f 100644 GIT binary patch literal 1654 zcmcgt{WsGK9R7Y~wy>3Vx4b58$`Cj2Li5_`mRy8+J$Y-$(9ld<*oqsyxEEouQ%NVZ z@|GHA-e02b6)VE5#H20C%P@DH{)Kz)=bX>yIp=wvbDrOxPmb3~cewl>c>n<5o*pjV zQl$J?n4I)>91R};067Ow7iXU|aFPC-hc8x@awZaYeBVK$_C3pg^ad^)keObk5f5c) z2dM8lo#9JXDoV!t?p=stoc1ro&|P!)@m#v*+>>@IAE!EB-9PHISOf1*$AzS?M%QGF zil=9q@vAMd<;(Qsm5_AdS<1l2z#Xo};0TDSuL3xy!R)&-Fn7rAe0e=BH7DzX6ub|> z`>zGdC#k}at9g0Uswxx=fuNN;k~vKYQ_~A$kD1S(AJ@J!b{drE>+6Foz{Fy4*!lDMdfq~VK){|mRvVmEfIL-VK}H_KVD!=Gm#o^* zHiT(tYxav&A*a+TVNtW0Zee*W;(cYe<< zT^B*RmXT9L#QyzABqk`R%qE$a_g3|rmpU)Aa!Gp zI}HD2!X_pzE_-e+rm6hGjM+jt7q>Hu~jK0dw@G7QFHrxy*a ztTfcs)vG$*s*TE1R#&2j?>OUd2MMTc-YW(Mzc7lfs;<6=h&OP_h%U6BJbryCvUg~x62ZUz`E4B(7aPly;t1nemn~@KiuLt%)uv%Zf(zf~ zPN!|Gpb02DP6(yASkpQ~Tt6R+G&H=u%KgYkgh1pK6nrV$3I}k~IicXFM~N@C^Y-(L zBFYt;OE%Xn2-f4Aq+vfFpJLKRN|w2$lBQd(T$l166&;Rpe>m#I|2Vokh;lC`z$iQAHv zKFuTw6)1Lik;s=LXkOaUgO-Cr!&6cUZB=z-!v5~0)zX{T`sY~ipynj1ttt^@h9+RT z2gk#PEAHQi%zpah$=A~W3hWzKmL0;kC0jR&ilD*4!S@nx2-mM&Qxxp(Wq+=& z9%A(Py*CX;^j|43O9SjrQZeuQAnbI8k9B=UuYrG1Q1;cUFoBr|`}yw}6ZV5s<(={r z!UI|mB`0U6ho>h4ktJJgcjSZ2wDKV>$zQNh`ko{(q=gu1LY?$~cvi(f`lrgZ9$IWm z73vUBmmmv+;UPdX;E|AEs;Z$;N1t7c@9yqCLAPNaqck)esk<@L^@m2jP>HlHc|W4I zFbJy4=&i9KWyW7O*OTjphH}E%bQgN(dCGCJP6v=kMnwgnbCfjq%uU}?j4w26qTa2R zb;3h=GyOE0oWw@&2zT5Xmm z7k(ti)E*fZf zl4lh0C9*lZ0pRg?Oq0*k{Ehq$XyNzsd zeX{#UR#;S2x4k29+4s=IIDUOxp&S`tvzpTr@8s>5FYOSNV%?|rS3+(8_gU6TG2z|-}l KOYO0+%zptJEAMy! literal 1077 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 literal 2747 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

aOUhQZMf#vD*Z)!Zw-Jd5!+ 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 literal 6389 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 ?android:colorBackground - - - diff --git a/android/app/src/main/res/values-night-v31/themes.xml b/android/app/src/main/res/values-night-v31/themes.xml index f253c9d..acc3f89 100644 --- a/android/app/src/main/res/values-night-v31/themes.xml +++ b/android/app/src/main/res/values-night-v31/themes.xml @@ -3,7 +3,7 @@ - diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml index dbc9ea9..805a597 100644 --- a/android/app/src/main/res/values-night/styles.xml +++ b/android/app/src/main/res/values-night/styles.xml @@ -1,14 +1,14 @@ - + - - diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml index 484c85a..c491979 100644 --- a/android/app/src/main/res/values-v31/styles.xml +++ b/android/app/src/main/res/values-v31/styles.xml @@ -1,7 +1,7 @@ - diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 93bed36..2c37611 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ - Oreo Widget + Rain Widget EEE, d MMM │ EEEE, d MMM │ \ No newline at end of file diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index c759804..e50dbb0 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -2,14 +2,14 @@ - - diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml index 4704876..1fb58d5 100644 --- a/android/app/src/main/res/values/themes.xml +++ b/android/app/src/main/res/values/themes.xml @@ -1,5 +1,5 @@ -