Skip to content

fix: capitalize expense type #62

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

Merged
merged 2 commits into from
Nov 20, 2022
Merged

fix: capitalize expense type #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d8e190
🚑 capitalize expense type
paul-nguyen-goldenowl Nov 20, 2022
f033e76
update home title
paul-nguyen-goldenowl Nov 20, 2022
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
2 changes: 1 addition & 1 deletion GoMoney/Scences/AddExpense/AddExpenseForm.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class AddExpenseForm: UIView {
if let inputView = field?.inputView as? CategoryPickerInputView {
// change category type if user create different icon type.
if tag.type != self?.transType.rawValue {
self?.controller?.title = "Add \(tag.type)"
self?.controller?.title = "Add \(tag.type.capitalized)"
if let changedType = ExpenseType(rawValue: tag.type) {
self?.transType = changedType
inputView.type = changedType
Expand Down
7 changes: 5 additions & 2 deletions GoMoney/Scences/Detail/DetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,13 @@ class DetailView: UIView {
$0.removeFromSuperview()
}

let currency = SettingsManager.shared.getValue(for: .currencyUnit)
let amount = "\(transaction.amount.formatWithCommas()) \(currency)"

stackView.addArrangedSubviews(
DetailCell(key: "Transaction type", value: transaction.type),
DetailCell(key: "Transaction type", value: transaction.type.capitalized),
DetailCell(key: "Tag", value: tag.name),
DetailCell(key: "Amount", value: String(transaction.amount)),
DetailCell(key: "Amount", value: amount),
DetailCell(key: "When", value: DateFormatter.dmy().string(from: transaction.occuredOn)),
DetailCell(key: "Note", value: transaction.note))

Expand Down
4 changes: 2 additions & 2 deletions GoMoney/Scences/Home/HomeViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ extension HomeViewController {

extension HomeViewController {
private enum Content {
static let myExpense = "My Expenses"
static let recentExpense = "Recent Expenses"
static let myExpense = "My Transactions"
static let recentExpense = "Recent Transactions"
}

private enum Constant {
Expand Down
4 changes: 2 additions & 2 deletions GoMoney/Scences/Tags/NewTagViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ class NewTagViewController: GMMainViewController {

private lazy var radioGroup: RadioGroup = {
let radioGroup = RadioGroup(titles: [
ExpenseType.expense.rawValue,
ExpenseType.income.rawValue,
ExpenseType.expense.rawValue.capitalized,
ExpenseType.income.rawValue.capitalized,
])
radioGroup.selectedIndex = 0

Expand Down