Skip to content

Commit 6699409

Browse files
lauramarsonlauramarson
authored
Merge pull request #30 from lauramarson/develop
App Final Version
2 parents e13ff7c + 7a90fbe commit 6699409

216 files changed

Lines changed: 19925 additions & 928 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AnimalsApp/AnimalsApp.xcodeproj/project.pbxproj‎

Lines changed: 211 additions & 37 deletions
Large diffs are not rendered by default.

‎AnimalsApp/AnimalsApp.xcodeproj/project.pbxproj.orig‎

Lines changed: 1018 additions & 0 deletions
Large diffs are not rendered by default.

‎AnimalsApp/AnimalsApp/AnimalsApp.xcdatamodeld/AnimalsApp.xcdatamodel/contents‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎AnimalsApp/AnimalsApp/Assets.xcassets/Colors/grayCellFrame.colorset/Contents.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0xA3",
9+
"green" : "0xA3",
10+
"red" : "0xA3"
11+
}
12+
},
13+
"idiom" : "universal"
14+
}
15+
],
16+
"info" : {
17+
"author" : "xcode",
18+
"version" : 1
19+
}
20+
}

‎AnimalsApp/AnimalsApp/Assets.xcassets/Colors/grayTextColor.colorset/Contents.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "srgb",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "0.400",
9-
"green" : "0.400",
10-
"red" : "0.400"
8+
"blue" : "0x66",
9+
"green" : "0x66",
10+
"red" : "0x66"
1111
}
1212
},
1313
"idiom" : "universal"

‎AnimalsApp/AnimalsApp/Assets.xcassets/Colors/lightGray.colorset/Contents.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0xD9",
9+
"green" : "0xD9",
10+
"red" : "0xD9"
11+
}
12+
},
13+
"idiom" : "universal"
14+
}
15+
],
16+
"info" : {
17+
"author" : "xcode",
18+
"version" : 1
19+
}
20+
}

‎AnimalsApp/AnimalsApp/Assets.xcassets/Icons/addFavorite.imageset/Contents.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"version" : 1
2222
},
2323
"properties" : {
24+
"localizable" : true,
2425
"template-rendering-intent" : "original"
2526
}
2627
}

‎AnimalsApp/AnimalsApp/Assets.xcassets/Images/Contents.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

‎AnimalsApp/AnimalsApp/Assets.xcassets/Images/imagePlaceholder.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "imagePlaceholder.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
}
21+
}

‎AnimalsApp/AnimalsApp/Assets.xcassets/Images/imagePlaceholder.imageset/imagePlaceholder.png‎

1.72 KB
Loading

0 commit comments

Comments
 (0)