diff --git a/CoEpi/Assets.xcassets/Background_purple.imageset/Contents.json b/CoEpi/Assets.xcassets/Background_purple.imageset/Contents.json index 10929a9..f68b6ab 100644 --- a/CoEpi/Assets.xcassets/Background_purple.imageset/Contents.json +++ b/CoEpi/Assets.xcassets/Background_purple.imageset/Contents.json @@ -1,23 +1,56 @@ { "images" : [ { - "idiom" : "universal", "filename" : "Background.png", + "idiom" : "universal", + "resizing" : { + "cap-insets" : { + "left" : 0, + "right" : 0 + }, + "center" : { + "mode" : "tile", + "width" : 375 + }, + "mode" : "3-part-horizontal" + }, "scale" : "1x" }, { - "idiom" : "universal", "filename" : "Background@2x.png", + "idiom" : "universal", + "resizing" : { + "cap-insets" : { + "left" : 0, + "right" : 0 + }, + "center" : { + "mode" : "tile", + "width" : 750 + }, + "mode" : "3-part-horizontal" + }, "scale" : "2x" }, { - "idiom" : "universal", "filename" : "Background@3x.png", + "idiom" : "universal", + "resizing" : { + "cap-insets" : { + "left" : 0, + "right" : 0 + }, + "center" : { + "mode" : "tile", + "width" : 1125 + }, + "mode" : "3-part-horizontal" + }, "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/CoEpi/Assets.xcassets/HeaderLabel.imageset/Contents.json b/CoEpi/Assets.xcassets/HeaderLabel.imageset/Contents.json deleted file mode 100644 index 9d8d957..0000000 --- a/CoEpi/Assets.xcassets/HeaderLabel.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "HeaderLabel.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/CoEpi/Assets.xcassets/HeaderLabel.imageset/HeaderLabel.pdf b/CoEpi/Assets.xcassets/HeaderLabel.imageset/HeaderLabel.pdf deleted file mode 100644 index bb5d128..0000000 Binary files a/CoEpi/Assets.xcassets/HeaderLabel.imageset/HeaderLabel.pdf and /dev/null differ diff --git a/CoEpi/ui/launch screen/CoEpiLaunchScreen.storyboard b/CoEpi/ui/launch screen/CoEpiLaunchScreen.storyboard index a0c499a..6bbc34e 100644 --- a/CoEpi/ui/launch screen/CoEpiLaunchScreen.storyboard +++ b/CoEpi/ui/launch screen/CoEpiLaunchScreen.storyboard @@ -1,6 +1,6 @@ - + @@ -13,22 +13,21 @@ - + - - - + + - + - + + + + diff --git a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.xib index 400edec..62d3c15 100644 --- a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.xib +++ b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.xib @@ -1,8 +1,9 @@ - + - + + @@ -21,10 +22,11 @@ - - + + + - + - + - diff --git a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverDaysViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverDaysViewController.xib index ed5918b..e1589a8 100644 --- a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverDaysViewController.xib +++ b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverDaysViewController.xib @@ -24,10 +24,11 @@ - - + + + - + @@ -122,7 +123,7 @@ - + @@ -130,7 +131,6 @@ - diff --git a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTempViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTempViewController.xib index 402259d..2b22cfc 100644 --- a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTempViewController.xib +++ b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTempViewController.xib @@ -24,10 +24,11 @@ - - + + + - + @@ -122,7 +123,7 @@ - + @@ -131,7 +132,6 @@ - diff --git a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTodayViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTodayViewController.xib index 7b7b588..ad5932c 100644 --- a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTodayViewController.xib +++ b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTodayViewController.xib @@ -1,8 +1,9 @@ - + - + + @@ -21,10 +22,11 @@ - - + + + - + @@ -84,7 +86,7 @@ - + @@ -100,8 +102,10 @@ - + + + diff --git a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewController.xib index 7154331..384de3b 100644 --- a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewController.xib +++ b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -24,9 +24,9 @@ - + - + @@ -112,7 +112,7 @@ - + diff --git a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewControllerOther.xib b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewControllerOther.xib index 9545854..8b61e73 100644 --- a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewControllerOther.xib +++ b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewControllerOther.xib @@ -1,8 +1,8 @@ - + - + @@ -21,10 +21,10 @@ - - + + - + @@ -51,7 +51,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -109,7 +109,6 @@ - diff --git a/CoEpi/ui/symptomReport/FollowUp/SymptomStartDaysViewController.xib b/CoEpi/ui/symptomReport/FollowUp/SymptomStartDaysViewController.xib index d666bda..7a2946c 100644 --- a/CoEpi/ui/symptomReport/FollowUp/SymptomStartDaysViewController.xib +++ b/CoEpi/ui/symptomReport/FollowUp/SymptomStartDaysViewController.xib @@ -24,10 +24,11 @@ - - + + + - + @@ -116,7 +117,7 @@ - + @@ -130,7 +131,6 @@ -