Skip to content

Commit

Permalink
Assets and UI enhencements
Browse files Browse the repository at this point in the history
  • Loading branch information
hardyrz committed Jul 5, 2017
1 parent d12066f commit 3149afd
Show file tree
Hide file tree
Showing 20 changed files with 185 additions and 80 deletions.
23 changes: 23 additions & 0 deletions iExpense/Assets.xcassets/account_icon.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "account_icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "account_icon-1.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "account_icon-2.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions iExpense/Assets.xcassets/category_icon.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "category_icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "category_icon-1.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "category_icon-2.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions iExpense/Assets.xcassets/description_icon.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "description_icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "description_icon-1.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "description_icon-2.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions iExpense/Assets.xcassets/value_icon.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "value_icon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "value_icon-1.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "value_icon-2.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
161 changes: 87 additions & 74 deletions iExpense/Base.lproj/Main.storyboard

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion iExpense/NewAccountViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class NewAccountViewController: UIViewController {
// Do any additional setup after loading the view, typically from a nib.
self.realm = try! Realm()

nameImage.image = UIImage(named: "food_icon") //expensesTable[indexPath.row].category.image
nameImage.image = UIImage(named: "account_icon")
}


Expand Down
2 changes: 1 addition & 1 deletion iExpense/NewCategoryViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class NewCategoryViewController: UIViewController {
// Do any additional setup after loading the view, typically from a nib.
self.realm = try! Realm()

nameImage.image = UIImage(named: "food_icon") //expensesTable[indexPath.row].category.image
nameImage.image = UIImage(named: "category_icon")
}

@IBAction func saveAction(_ sender: Any) {
Expand Down
8 changes: 4 additions & 4 deletions iExpense/NewExpenseViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ class NewExpenseViewController: UIViewController, UIPickerViewDelegate, UIPicker
self.categoriesList = realm.objects(CategoryDTO.self)
self.accountsList = realm.objects(AccountDTO.self)

self.valueImage.image = UIImage(named: "food_icon") //expensesTable[indexPath.row].category.image
self.valueImage.image = UIImage(named: "value_icon")

self.descriptionImage.image = UIImage(named: "food_icon") //expensesTable[indexPath.row].category.image
self.descriptionImage.image = UIImage(named: "description_icon")

self.categoryImage.image = UIImage(named: "food_icon") //expensesTable[indexPath.row].category.image
self.categoryImage.image = UIImage(named: "category_icon")

self.accountImage.image = UIImage(named: "food_icon") //expensesTable[indexPath.row].category.image
self.accountImage.image = UIImage(named: "account_icon")

categoryPicker.dataSource = self
categoryPicker.delegate = self
Expand Down

0 comments on commit 3149afd

Please sign in to comment.