Merge branch 'dev' into main

Author: sameersyd

Expenso.xcodeproj/project.pbxproj

@@ -45,7 +45,7 @@
 		738B1C9025C680D20067407B /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738B1C8F25C680D20067407B /* AboutView.swift */; };
 		73998C5525DA5578007D735B /* AttachmentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73998C5425DA5578007D735B /* AttachmentHandler.swift */; };
 		739DFF7B25DC1E3C005BD5C8 /* AuthenticateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 739DFF7A25DC1E3C005BD5C8 /* AuthenticateView.swift */; };
-		73BD61BD25DEBC3F00E85F67 /* ExpenseFilterChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73BD61BC25DEBC3F00E85F67 /* ExpenseFilterChartView.swift */; };
+		73E688DA25FF32790000462A /* ChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73E688D925FF32790000462A /* ChartView.swift */; };
 		FF29C9FFAF86E0452686C5D0 /* Pods_Expenso.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B0E373FB89DD0864398FEE7 /* Pods_Expenso.framework */; };
 /* End PBXBuildFile section */
 
@@ -92,7 +92,7 @@
 		738B1C8F25C680D20067407B /* AboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutView.swift; sourceTree = "<group>"; };
 		73998C5425DA5578007D735B /* AttachmentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentHandler.swift; sourceTree = "<group>"; };
 		739DFF7A25DC1E3C005BD5C8 /* AuthenticateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticateView.swift; sourceTree = "<group>"; };
-		73BD61BC25DEBC3F00E85F67 /* ExpenseFilterChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpenseFilterChartView.swift; sourceTree = "<group>"; };
+		73E688D925FF32790000462A /* ChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartView.swift; sourceTree = "<group>"; };
 		B07E4D1AF457AB52E048A8B5 /* Pods-Expenso.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Expenso.release.xcconfig"; path = "Target Support Files/Pods-Expenso/Pods-Expenso.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -195,6 +195,7 @@
 				738B1C5125C6632F0067407B /* HelperMethods.swift */,
 				736C721A25CFE8E200720DEA /* LottieView.swift */,
 				73998C5425DA5578007D735B /* AttachmentHandler.swift */,
+				73E688D925FF32790000462A /* ChartView.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -248,7 +249,6 @@
 			isa = PBXGroup;
 			children = (
 				738B1C8A25C67D880067407B /* ExpenseFilterView.swift */,
-				73BD61BC25DEBC3F00E85F67 /* ExpenseFilterChartView.swift */,
 			);
 			path = ExpenseFilter;
 			sourceTree = "<group>";
@@ -410,7 +410,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				73BD61BD25DEBC3F00E85F67 /* ExpenseFilterChartView.swift in Sources */,
 				738B1C3825C661750067407B /* ExpenseView.swift in Sources */,
 				73998C5525DA5578007D735B /* AttachmentHandler.swift in Sources */,
 				738B1C8425C6764B0067407B /* ExpenseDetailedViewModel.swift in Sources */,
@@ -433,6 +432,7 @@
 				738B1C4925C662F20067407B /* DropdownButton.swift in Sources */,
 				738B1C7025C674120067407B /* ExpenseSettingsViewModel.swift in Sources */,
 				738B1C2F25C65EF70067407B /* Configs.swift in Sources */,
+				73E688DA25FF32790000462A /* ChartView.swift in Sources */,
 				736C721B25CFE8E200720DEA /* LottieView.swift in Sources */,
 				738B1C7725C675200067407B /* AddExpenseView.swift in Sources */,
 				738B1C8025C6763E0067407B /* ExpenseDetailedView.swift in Sources */,

Expenso.xcworkspace/xcuserdata/sameernawaz.xcuserdatad/UserInterfaceState.xcuserstate

@@ -1,17 +1,16 @@
 //
-//  ExpenseFilterChartView.swift
+//  ChartView.swift
 //  Expenso
 //
-//  Created by Sameer Nawaz on 18/02/21.
+//  Created by Sameer Nawaz on 15/03/21.
 //
 
 import SwiftUI
 import Charts
 
 struct ChartView: UIViewRepresentable {
 
-    var label: String
-    var entries: [PieChartDataEntry]
+    var label: String, entries: [PieChartDataEntry]
 
     func makeUIView(context: Context) -> PieChartView {
         let pieChartView = PieChartView()
@@ -31,10 +30,7 @@ struct ChartView: UIViewRepresentable {
 }
 
 struct ChartModel {
-    
-    var transType: String
-    var transAmount: Double
-    
+    var transType: String, transAmount: Double
     static func getTransaction(transactions: [ChartModel]) -> [PieChartDataEntry] {
         return transactions.map { PieChartDataEntry(value: $0.transAmount, label: $0.transType) }
     }