Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Income categories #32

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Income categories #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions Expenso/Configs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let CURRENCY_LIST = ["₹", "$", "€", "¥", "£", "¢", "₭"]
let TRANS_TYPE_INCOME = "income"
let TRANS_TYPE_EXPENSE = "expense"

// Transaction tags
// Expense Transaction tags
let TRANS_TAG_TRANSPORT = "transport"
let TRANS_TAG_FOOD = "food"
let TRANS_TAG_HOUSING = "housing"
Expand All @@ -39,11 +39,20 @@ let TRANS_TAG_MEDICAL = "medical"
let TRANS_TAG_SAVINGS = "savings"
let TRANS_TAG_PERSONAL = "personal"
let TRANS_TAG_ENTERTAINMENT = "entertainment"
let TRANS_TAG_OTHERS = "others"
let TRANS_TAG_UTILITIES = "utilities"

// Income Transaction tags
let TRANS_TAG_SALARY = "salary"
let TRANS_TAG_CASHBACK = "cashback"
let TRANS_TAG_INVESTMENT_RETURNS = "investment_returns"
let TRANS_TAG_SALE = "sale"

// Common Transaction tags
let TRANS_TAG_OTHERS = "others"

func getTransTagIcon(transTag: String) -> String {
switch transTag {
// Expenses
case TRANS_TAG_TRANSPORT: return "trans_type_transport"
case TRANS_TAG_FOOD: return "trans_type_food"
case TRANS_TAG_HOUSING: return "trans_type_housing"
Expand All @@ -52,14 +61,22 @@ func getTransTagIcon(transTag: String) -> String {
case TRANS_TAG_SAVINGS: return "trans_type_savings"
case TRANS_TAG_PERSONAL: return "trans_type_personal"
case TRANS_TAG_ENTERTAINMENT: return "trans_type_entertainment"
case TRANS_TAG_OTHERS: return "trans_type_others"
case TRANS_TAG_UTILITIES: return "trans_type_utilities"

// Incomes
// TODO: Add icon sets for every income tag
case TRANS_TAG_SALARY: return "trans_type_savings"
case TRANS_TAG_CASHBACK: return "trans_type_savings"
case TRANS_TAG_INVESTMENT_RETURNS: return "trans_type_savings"
case TRANS_TAG_SALE: return "trans_type_savings"

default: return "trans_type_others"
}
}

func getTransTagTitle(transTag: String) -> String {
switch transTag {
// Expenses
case TRANS_TAG_TRANSPORT: return "Transport"
case TRANS_TAG_FOOD: return "Food"
case TRANS_TAG_HOUSING: return "Housing"
Expand All @@ -68,8 +85,17 @@ func getTransTagTitle(transTag: String) -> String {
case TRANS_TAG_SAVINGS: return "Savings"
case TRANS_TAG_PERSONAL: return "Personal"
case TRANS_TAG_ENTERTAINMENT: return "Entertainment"
case TRANS_TAG_OTHERS: return "Others"
case TRANS_TAG_UTILITIES: return "Utilities"

// Incomes
case TRANS_TAG_SALARY: return "Salary"
case TRANS_TAG_CASHBACK: return "Cashback"
case TRANS_TAG_INVESTMENT_RETURNS: return "Investment Returns"
case TRANS_TAG_SALE: return "Sale"

// Common
case TRANS_TAG_OTHERS: return "Others"

default: return "Unknown"
}
}
Expand Down
16 changes: 13 additions & 3 deletions Expenso/Screens/AddExpense/AddExpenseView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ struct AddExpenseView: View {
DropdownOption(key: TRANS_TYPE_EXPENSE, val: "Expense")
]

let tagOptions = [
let expenseTagOptions = [
DropdownOption(key: TRANS_TAG_TRANSPORT, val: "Transport"),
DropdownOption(key: TRANS_TAG_FOOD, val: "Food"),
DropdownOption(key: TRANS_TAG_HOUSING, val: "Housing"),
Expand All @@ -35,6 +35,14 @@ struct AddExpenseView: View {
DropdownOption(key: TRANS_TAG_UTILITIES, val: "Utilities")
]

let incomeTagOptions = [
DropdownOption(key: TRANS_TAG_SALARY, val: "Salary"),
DropdownOption(key: TRANS_TAG_CASHBACK, val: "Cashback"),
DropdownOption(key: TRANS_TAG_INVESTMENT_RETURNS, val: "Investment Returns"),
DropdownOption(key: TRANS_TAG_OTHERS, val: "Others"),
DropdownOption(key: TRANS_TAG_SALE, val: "Sale"),
]

var body: some View {
NavigationView {
ZStack {
Expand Down Expand Up @@ -88,8 +96,10 @@ struct AddExpenseView: View {
}

DropdownButton(shouldShowDropdown: $viewModel.showTagDrop, displayText: $viewModel.tagTitle,
options: tagOptions, mainColor: Color.text_primary_color,
backgroundColor: Color.secondary_color, cornerRadius: 4, buttonHeight: 50) { key in
options: viewModel.selectedType == TRANS_TYPE_INCOME ? incomeTagOptions : expenseTagOptions,
mainColor: Color.text_primary_color, backgroundColor: Color.secondary_color,
cornerRadius: 4, buttonHeight: 50) { key in
let tagOptions = viewModel.selectedType == TRANS_TYPE_INCOME ? incomeTagOptions : expenseTagOptions
let selectedObj = tagOptions.filter({ $0.key == key }).first
if let object = selectedObj {
viewModel.tagTitle = object.val
Expand Down
16 changes: 8 additions & 8 deletions Expenso/Screens/AddExpense/AddExpenseViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ class AddExpenseViewModel: ObservableObject {
@Published var amount = ""
@Published var occuredOn = Date()
@Published var note = ""
@Published var typeTitle = "Income"
@Published var tagTitle = getTransTagTitle(transTag: TRANS_TAG_TRANSPORT)
@Published var typeTitle = "Expense"
@Published var tagTitle = getTransTagTitle(transTag: TRANS_TAG_OTHERS)
@Published var showTypeDrop = false
@Published var showTagDrop = false

@Published var selectedType = TRANS_TYPE_INCOME
@Published var selectedTag = TRANS_TAG_TRANSPORT
@Published var selectedType = TRANS_TYPE_EXPENSE
@Published var selectedTag = TRANS_TAG_OTHERS

@Published var imageUpdated = false // When transaction edit, check if attachment is updated?
@Published var imageAttached: UIImage? = nil
Expand All @@ -40,13 +40,13 @@ class AddExpenseViewModel: ObservableObject {
self.typeTitle = expenseObj.type == TRANS_TYPE_INCOME ? "Income" : "Expense"
} else {
self.amount = ""
self.typeTitle = "Income"
self.typeTitle = "Expense"
}
self.occuredOn = expenseObj?.occuredOn ?? Date()
self.note = expenseObj?.note ?? ""
self.tagTitle = getTransTagTitle(transTag: expenseObj?.tag ?? TRANS_TAG_TRANSPORT)
self.selectedType = expenseObj?.type ?? TRANS_TYPE_INCOME
self.selectedTag = expenseObj?.tag ?? TRANS_TAG_TRANSPORT
self.tagTitle = getTransTagTitle(transTag: expenseObj?.tag ?? TRANS_TAG_OTHERS)
self.selectedType = expenseObj?.type ?? TRANS_TYPE_EXPENSE
self.selectedTag = expenseObj?.tag ?? TRANS_TAG_OTHERS
if let data = expenseObj?.imageAttached {
self.imageAttached = UIImage(data: data)
}
Expand Down