Reduce BatteryView hang and update localizations

liamcharger · liamcharger · commit 428c066129e9 · 2024-03-19T00:02:10.000-04:00
diff --git a/InfiniLink/Components/Chart/ChartViewComponents.swift b/InfiniLink/Components/Chart/ChartViewComponents.swift
@@ -51,7 +51,7 @@ struct HorizontalLines: View {
     }
 }
 
-struct verticalLines: View {
+struct VerticalLines: View {
     @Environment(\.colorScheme) var colorScheme
     
     var numbLines: Int
diff --git a/InfiniLink/Core/Home/Battery/Chart/BatteryChartComponents.swift b/InfiniLink/Core/Home/Battery/Chart/BatteryChartComponents.swift
@@ -52,9 +52,11 @@ struct BatteryContentView: View {
                 HStack {
                     GeometryReader { (geometry) in
                         VStack {
+                            Divider()
                             ZStack {
-                                verticalLines(numbLines: barLineNumb[pickerSelection], sizes: geometry.size, height: 100)
-                                HorizontalLines(numbLines: 5, sizes: geometry.size, height: 100)
+                                // TODO: Fix lag due to these lines without removing them
+//                                VerticalLines(numbLines: barLineNumb[pickerSelection], sizes: geometry.size, height: 100)
+//                                HorizontalLines(numbLines: 5, sizes: geometry.size, height: 100)
 
                                 VStack {
                                     setGraphType(data: data)
diff --git a/InfiniLink/Core/Home/Heart/Chart/HeartChartComponents.swift b/InfiniLink/Core/Home/Heart/Chart/HeartChartComponents.swift
@@ -96,7 +96,7 @@ struct HeartContentView: View {
                         //let bar_width = (Int(geometry.size.width - 2) - (Int(barSpacing[pickerSelection]) * (numberOfBars[pickerSelection] - 1)))
                         VStack {
                             ZStack {
-                                verticalLines(numbLines: barLineNumb[pickerSelection], sizes: geometry.size, height: 160)
+                                VerticalLines(numbLines: barLineNumb[pickerSelection], sizes: geometry.size, height: 160)
                                 HorizontalLines(numbLines: 5, sizes: geometry.size, height: 160)
                                 HStack(alignment: .center) {
                                     //let hour = (Calendar.current.component(.hour, from: Date()) - Int(floor(Double(Calendar.current.component(.hour, from: Date())) / 3.0) * 3.0)) * (numberOfBars[pickerSelection] / 24)
diff --git a/InfiniLink/en.lproj/Localizable.strings b/InfiniLink/en.lproj/Localizable.strings
@@ -158,10 +158,10 @@
 "welcome_to_version" = "Welcome to version";
 "whats_new_1" = "The UI has been completely refreshed!";
 "whats_new_2" = "Apple HealthKit is now supported to sync step count and heart rate data with Apple Health.";
-"whats_new_3" = "InfiniLink users can now upload and delete files on their watch's Bluetooth filesystem, as well as upload external resource packages. Users can also convert images to the supported image format within the app.";
-"whats_new_4" = "Weather support has also been added in this release, using the National Weather Service API (for users in the United States) and the WeatherAPI API for users outside of the United States. The weather data is pushed using InfiniTime 1.14's new Simple Weather Service. Please make sure your InfiniTime device is updated to InfiniTime 1.14 to use the implementation.";
-"whats_new_5" = "This release also contains some new localizations. Please note that not all localizations have been updated for the new UI. If you're able to assist with localizations, please get in touch with us on the GitHub repo, or feel free to submit a pull request with localizations. Any help in this capacity is much appreciated!";
-"whats_new_6" = "Huge thanks to @JenJell on GitHub for implementing external resource support, weather support, and much more!";
+"whats_new_3" = "InfiniLink users can now upload and delete files on their watch's Bluetooth filesystem, as well as upload external resource packages. Users can also convert images to the format supported by InfiniTime, within the app.";
+"whats_new_4" = "Weather support has also been added in this release, using the National Weather Service API (for users in the United States) and the WeatherAPI API for users outside of the United States. The weather data is pushed using InfiniTime's new Simple Weather Service. Requires InfiniTime 1.14 or newer.";
+"whats_new_5" = "This release also contains some new localizations. Please note that not all the localizations are complete. If you're able to assist with them, please feel free to submit a pull request with the updated localizations!";
+"whats_new_6" = "Special thanks to @JenJell on GitHub for implementing external resource support, weather support, and much more!";
 
 // - Onboarding
 "welcome_to_InfiniLink" = "Welcome to InfiniLink!";
diff --git a/InfiniLink/fr.lproj/Localizable.strings b/InfiniLink/fr.lproj/Localizable.strings
@@ -158,10 +158,10 @@
 "welcome_to_version" = "Welcome to version";
 "whats_new_1" = "The UI has been completely refreshed!";
 "whats_new_2" = "Apple HealthKit is now supported to sync step count and heart rate data with Apple Health.";
-"whats_new_3" = "InfiniLink users can now upload and delete files on their watch's Bluetooth filesystem, as well as upload external resource packages. Users can also convert images to the supported image format within the app.";
-"whats_new_4" = "Weather support has also been added in this release, using the National Weather Service API (for users in the United States) and the WeatherAPI API for users outside of the United States. The weather data is pushed using InfiniTime 1.14's new Simple Weather Service. Please make sure your InfiniTime device is updated to InfiniTime 1.14 to use the implementation.";
-"whats_new_5" = "This release also contains some new localizations. Please note that not all localizations have been updated for the new UI. If you're able to assist with localizations, please get in touch with us on the GitHub repo, or feel free to submit a pull request with localizations. Any help in this capacity is much appreciated!";
-"whats_new_6" = "Huge thanks to @JenJell on GitHub for implementing external resource support, weather support, and much more!";
+"whats_new_3" = "InfiniLink users can now upload and delete files on their watch's Bluetooth filesystem, as well as upload external resource packages. Users can also convert images to the format supported by InfiniTime, within the app.";
+"whats_new_4" = "Weather support has also been added in this release, using the National Weather Service API (for users in the United States) and the WeatherAPI API for users outside of the United States. The weather data is pushed using InfiniTime's new Simple Weather Service. Requires InfiniTime 1.14 or newer.";
+"whats_new_5" = "This release also contains some new localizations. Please note that not all the localizations are complete. If you're able to assist with them, please feel free to submit a pull request with the updated localizations!";
+"whats_new_6" = "Special thanks to @JenJell on GitHub for implementing external resource support, weather support, and much more!";
 
 // - Onboarding
 "welcome_to_InfiniLink" = "Welcome to InfiniLink!";
diff --git a/InfiniLink/ko.lproj/Localizable.strings b/InfiniLink/ko.lproj/Localizable.strings
@@ -158,10 +158,10 @@
 "welcome_to_version" = "Welcome to version";
 "whats_new_1" = "The UI has been completely refreshed!";
 "whats_new_2" = "Apple HealthKit is now supported to sync step count and heart rate data with Apple Health.";
-"whats_new_3" = "InfiniLink users can now upload and delete files on their watch's Bluetooth filesystem, as well as upload external resource packages. Users can also convert images to the supported image format within the app.";
-"whats_new_4" = "Weather support has also been added in this release, using the National Weather Service API (for users in the United States) and the WeatherAPI API for users outside of the United States. The weather data is pushed using InfiniTime 1.14's new Simple Weather Service. Please make sure your InfiniTime device is updated to InfiniTime 1.14 to use the implementation.";
-"whats_new_5" = "This release also contains some new localizations. Please note that not all localizations have been updated for the new UI. If you're able to assist with localizations, please get in touch with us on the GitHub repo, or feel free to submit a pull request with localizations. Any help in this capacity is much appreciated!";
-"whats_new_6" = "Huge thanks to @JenJell on GitHub for implementing external resource support, weather support, and much more!";
+"whats_new_3" = "InfiniLink users can now upload and delete files on their watch's Bluetooth filesystem, as well as upload external resource packages. Users can also convert images to the format supported by InfiniTime, within the app.";
+"whats_new_4" = "Weather support has also been added in this release, using the National Weather Service API (for users in the United States) and the WeatherAPI API for users outside of the United States. The weather data is pushed using InfiniTime's new Simple Weather Service. Requires InfiniTime 1.14 or newer.";
+"whats_new_5" = "This release also contains some new localizations. Please note that not all the localizations are complete. If you're able to assist with them, please feel free to submit a pull request with the updated localizations!";
+"whats_new_6" = "Special thanks to @JenJell on GitHub for implementing external resource support, weather support, and much more!";
 
 // - Onboarding
 "welcome_to_InfiniLink" = "Welcome to InfiniLink!";
diff --git a/InfiniLink/ru.lproj/Localizable.strings b/InfiniLink/ru.lproj/Localizable.strings
@@ -158,10 +158,10 @@
 "welcome_to_version" = "Welcome to version";
 "whats_new_1" = "The UI has been completely refreshed!";
 "whats_new_2" = "Apple HealthKit is now supported to sync step count and heart rate data with Apple Health.";
-"whats_new_3" = "InfiniLink users can now upload and delete files on their watch's Bluetooth filesystem, as well as upload external resource packages. Users can also convert images to the supported image format within the app.";
-"whats_new_4" = "Weather support has also been added in this release, using the National Weather Service API (for users in the United States) and the WeatherAPI API for users outside of the United States. The weather data is pushed using InfiniTime 1.14's new Simple Weather Service. Please make sure your InfiniTime device is updated to InfiniTime 1.14 to use the implementation.";
-"whats_new_5" = "This release also contains some new localizations. Please note that not all localizations have been updated for the new UI. If you're able to assist with localizations, please get in touch with us on the GitHub repo, or feel free to submit a pull request with localizations. Any help in this capacity is much appreciated!";
-"whats_new_6" = "Huge thanks to @JenJell on GitHub for implementing external resource support, weather support, and much more!";
+"whats_new_3" = "InfiniLink users can now upload and delete files on their watch's Bluetooth filesystem, as well as upload external resource packages. Users can also convert images to the format supported by InfiniTime, within the app.";
+"whats_new_4" = "Weather support has also been added in this release, using the National Weather Service API (for users in the United States) and the WeatherAPI API for users outside of the United States. The weather data is pushed using InfiniTime's new Simple Weather Service. Requires InfiniTime 1.14 or newer.";
+"whats_new_5" = "This release also contains some new localizations. Please note that not all the localizations are complete. If you're able to assist with them, please feel free to submit a pull request with the updated localizations!";
+"whats_new_6" = "Special thanks to @JenJell on GitHub for implementing external resource support, weather support, and much more!";
 
 // - Onboarding
 "welcome_to_InfiniLink" = "Welcome to InfiniLink!";
diff --git a/InfiniLink/zh-Hant.lproj/Localizable.strings b/InfiniLink/zh-Hant.lproj/Localizable.strings
@@ -157,10 +157,10 @@
 "welcome_to_version" = "Welcome to version";
 "whats_new_1" = "The UI has been completely refreshed!";
 "whats_new_2" = "Apple HealthKit is now supported to sync step count and heart rate data with Apple Health.";
-"whats_new_3" = "InfiniLink users can now upload and delete files on their watch's Bluetooth filesystem, as well as upload external resource packages. Users can also convert images to the supported image format within the app.";
-"whats_new_4" = "Weather support has also been added in this release, using the National Weather Service API (for users in the United States) and the WeatherAPI API for users outside of the United States. The weather data is pushed using InfiniTime 1.14's new Simple Weather Service. Please make sure your InfiniTime device is updated to InfiniTime 1.14 to use the implementation.";
-"whats_new_5" = "This release also contains some new localizations. Please note that not all localizations have been updated for the new UI. If you're able to assist with localizations, please get in touch with us on the GitHub repo, or feel free to submit a pull request with localizations. Any help in this capacity is much appreciated!";
-"whats_new_6" = "Huge thanks to @JenJell on GitHub for implementing external resource support, weather support, and much more!";
+"whats_new_3" = "InfiniLink users can now upload and delete files on their watch's Bluetooth filesystem, as well as upload external resource packages. Users can also convert images to the format supported by InfiniTime, within the app.";
+"whats_new_4" = "Weather support has also been added in this release, using the National Weather Service API (for users in the United States) and the WeatherAPI API for users outside of the United States. The weather data is pushed using InfiniTime's new Simple Weather Service. Requires InfiniTime 1.14 or newer.";
+"whats_new_5" = "This release also contains some new localizations. Please note that not all the localizations are complete. If you're able to assist with them, please feel free to submit a pull request with the updated localizations!";
+"whats_new_6" = "Special thanks to @JenJell on GitHub for implementing external resource support, weather support, and much more!";
 
 // - Onboarding
 "welcome_to_InfiniLink" = "Welcome to InfiniLink!";

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ struct HorizontalLines: View {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`-struct verticalLines: View {`
	`54`	`+struct VerticalLines: View {`
`55`	`55`	`@Environment(\.colorScheme) var colorScheme`
`56`	`56`
`57`	`57`	`var numbLines: Int`