Skip to content

Commit 77c4d0f

Browse files
fix: capitalize expense type (#62)
1 parent 750ab5c commit 77c4d0f

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

GoMoney/Scences/AddExpense/AddExpenseForm.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class AddExpenseForm: UIView {
5151
if let inputView = field?.inputView as? CategoryPickerInputView {
5252
// change category type if user create different icon type.
5353
if tag.type != self?.transType.rawValue {
54-
self?.controller?.title = "Add \(tag.type)"
54+
self?.controller?.title = "Add \(tag.type.capitalized)"
5555
if let changedType = ExpenseType(rawValue: tag.type) {
5656
self?.transType = changedType
5757
inputView.type = changedType

GoMoney/Scences/Detail/DetailView.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,13 @@ class DetailView: UIView {
105105
$0.removeFromSuperview()
106106
}
107107

108+
let currency = SettingsManager.shared.getValue(for: .currencyUnit)
109+
let amount = "\(transaction.amount.formatWithCommas()) \(currency)"
110+
108111
stackView.addArrangedSubviews(
109-
DetailCell(key: "Transaction type", value: transaction.type),
112+
DetailCell(key: "Transaction type", value: transaction.type.capitalized),
110113
DetailCell(key: "Tag", value: tag.name),
111-
DetailCell(key: "Amount", value: String(transaction.amount)),
114+
DetailCell(key: "Amount", value: amount),
112115
DetailCell(key: "When", value: DateFormatter.dmy().string(from: transaction.occuredOn)),
113116
DetailCell(key: "Note", value: transaction.note))
114117

GoMoney/Scences/Home/HomeViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,8 @@ extension HomeViewController {
275275

276276
extension HomeViewController {
277277
private enum Content {
278-
static let myExpense = "My Expenses"
279-
static let recentExpense = "Recent Expenses"
278+
static let myExpense = "My Transactions"
279+
static let recentExpense = "Recent Transactions"
280280
}
281281

282282
private enum Constant {

GoMoney/Scences/Tags/NewTagViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ class NewTagViewController: GMMainViewController {
4141

4242
private lazy var radioGroup: RadioGroup = {
4343
let radioGroup = RadioGroup(titles: [
44-
ExpenseType.expense.rawValue,
45-
ExpenseType.income.rawValue,
44+
ExpenseType.expense.rawValue.capitalized,
45+
ExpenseType.income.rawValue.capitalized,
4646
])
4747
radioGroup.selectedIndex = 0
4848

0 commit comments

Comments
 (0)