diff --git a/AvH Plan/Assets.xcassets/ic_arts.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_arts.imageset/Contents.json new file mode 100644 index 0000000..84f9205 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_arts.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_arts.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_arts-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_arts.imageset/ic_arts-1.png b/AvH Plan/Assets.xcassets/ic_arts.imageset/ic_arts-1.png new file mode 100644 index 0000000..f1f7859 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_arts.imageset/ic_arts-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_arts.imageset/ic_arts.png b/AvH Plan/Assets.xcassets/ic_arts.imageset/ic_arts.png new file mode 100644 index 0000000..3c0215f Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_arts.imageset/ic_arts.png differ diff --git a/AvH Plan/Assets.xcassets/ic_biology.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_biology.imageset/Contents.json new file mode 100644 index 0000000..bd3e712 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_biology.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_biology.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_biology-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_biology.imageset/ic_biology-1.png b/AvH Plan/Assets.xcassets/ic_biology.imageset/ic_biology-1.png new file mode 100644 index 0000000..3e0db63 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_biology.imageset/ic_biology-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_biology.imageset/ic_biology.png b/AvH Plan/Assets.xcassets/ic_biology.imageset/ic_biology.png new file mode 100644 index 0000000..ea6f855 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_biology.imageset/ic_biology.png differ diff --git a/AvH Plan/Assets.xcassets/ic_chemistry.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_chemistry.imageset/Contents.json new file mode 100644 index 0000000..323000a --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_chemistry.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_chemistry.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_chemistry-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_chemistry.imageset/ic_chemistry-1.png b/AvH Plan/Assets.xcassets/ic_chemistry.imageset/ic_chemistry-1.png new file mode 100644 index 0000000..848799b Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_chemistry.imageset/ic_chemistry-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_chemistry.imageset/ic_chemistry.png b/AvH Plan/Assets.xcassets/ic_chemistry.imageset/ic_chemistry.png new file mode 100644 index 0000000..a8f29f0 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_chemistry.imageset/ic_chemistry.png differ diff --git a/AvH Plan/Assets.xcassets/ic_chinese.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_chinese.imageset/Contents.json new file mode 100644 index 0000000..3788281 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_chinese.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_chinese.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_chinese-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_chinese.imageset/ic_chinese-1.png b/AvH Plan/Assets.xcassets/ic_chinese.imageset/ic_chinese-1.png new file mode 100644 index 0000000..9236542 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_chinese.imageset/ic_chinese-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_chinese.imageset/ic_chinese.png b/AvH Plan/Assets.xcassets/ic_chinese.imageset/ic_chinese.png new file mode 100644 index 0000000..fe73908 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_chinese.imageset/ic_chinese.png differ diff --git a/AvH Plan/Assets.xcassets/ic_cogwheel.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_cogwheel.imageset/Contents.json new file mode 100644 index 0000000..1752e48 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_cogwheel.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_cogwheel.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_cogwheel-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_cogwheel.imageset/ic_cogwheel-1.png b/AvH Plan/Assets.xcassets/ic_cogwheel.imageset/ic_cogwheel-1.png new file mode 100644 index 0000000..6589c5f Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_cogwheel.imageset/ic_cogwheel-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_cogwheel.imageset/ic_cogwheel.png b/AvH Plan/Assets.xcassets/ic_cogwheel.imageset/ic_cogwheel.png new file mode 100644 index 0000000..16706a7 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_cogwheel.imageset/ic_cogwheel.png differ diff --git a/AvH Plan/Assets.xcassets/ic_compsci.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_compsci.imageset/Contents.json new file mode 100644 index 0000000..c65b333 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_compsci.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_compsci.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_compsci-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_compsci.imageset/ic_compsci-1.png b/AvH Plan/Assets.xcassets/ic_compsci.imageset/ic_compsci-1.png new file mode 100644 index 0000000..b057775 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_compsci.imageset/ic_compsci-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_compsci.imageset/ic_compsci.png b/AvH Plan/Assets.xcassets/ic_compsci.imageset/ic_compsci.png new file mode 100644 index 0000000..8c20d54 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_compsci.imageset/ic_compsci.png differ diff --git a/AvH Plan/Assets.xcassets/ic_drama.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_drama.imageset/Contents.json new file mode 100644 index 0000000..b7c5a53 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_drama.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_drama.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_drama-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_drama.imageset/ic_drama-1.png b/AvH Plan/Assets.xcassets/ic_drama.imageset/ic_drama-1.png new file mode 100644 index 0000000..2dc3a57 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_drama.imageset/ic_drama-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_drama.imageset/ic_drama.png b/AvH Plan/Assets.xcassets/ic_drama.imageset/ic_drama.png new file mode 100644 index 0000000..91540a4 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_drama.imageset/ic_drama.png differ diff --git a/AvH Plan/Assets.xcassets/ic_empty.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_empty.imageset/Contents.json new file mode 100644 index 0000000..f8f827e --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_empty.imageset/Contents.json @@ -0,0 +1,20 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_english.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_english.imageset/Contents.json new file mode 100644 index 0000000..749e02b --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_english.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_english.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_english-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_english.imageset/ic_english-1.png b/AvH Plan/Assets.xcassets/ic_english.imageset/ic_english-1.png new file mode 100644 index 0000000..9813fa8 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_english.imageset/ic_english-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_english.imageset/ic_english.png b/AvH Plan/Assets.xcassets/ic_english.imageset/ic_english.png new file mode 100644 index 0000000..ff810a8 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_english.imageset/ic_english.png differ diff --git a/AvH Plan/Assets.xcassets/ic_french.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_french.imageset/Contents.json new file mode 100644 index 0000000..0a7dea2 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_french.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_french.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_french-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_french.imageset/ic_french-1.png b/AvH Plan/Assets.xcassets/ic_french.imageset/ic_french-1.png new file mode 100644 index 0000000..c5e6e8e Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_french.imageset/ic_french-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_french.imageset/ic_french.png b/AvH Plan/Assets.xcassets/ic_french.imageset/ic_french.png new file mode 100644 index 0000000..7af3291 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_french.imageset/ic_french.png differ diff --git a/AvH Plan/Assets.xcassets/ic_geography.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_geography.imageset/Contents.json new file mode 100644 index 0000000..6acf99c --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_geography.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_geography.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_geography-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_geography.imageset/ic_geography-1.png b/AvH Plan/Assets.xcassets/ic_geography.imageset/ic_geography-1.png new file mode 100644 index 0000000..b9c4ab5 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_geography.imageset/ic_geography-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_geography.imageset/ic_geography.png b/AvH Plan/Assets.xcassets/ic_geography.imageset/ic_geography.png new file mode 100644 index 0000000..52e6985 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_geography.imageset/ic_geography.png differ diff --git a/AvH Plan/Assets.xcassets/ic_german.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_german.imageset/Contents.json new file mode 100644 index 0000000..fae903d --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_german.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_german.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_german-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_gll.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_gll.imageset/Contents.json new file mode 100644 index 0000000..2731cf4 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_gll.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_gll.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_gll-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_gll.imageset/ic_gll-1.png b/AvH Plan/Assets.xcassets/ic_gll.imageset/ic_gll-1.png new file mode 100644 index 0000000..219cdf9 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_gll.imageset/ic_gll-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_gll.imageset/ic_gll.png b/AvH Plan/Assets.xcassets/ic_gll.imageset/ic_gll.png new file mode 100644 index 0000000..399eef9 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_gll.imageset/ic_gll.png differ diff --git a/AvH Plan/Assets.xcassets/ic_help.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_help.imageset/Contents.json new file mode 100644 index 0000000..af3f541 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_help.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_help.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_help-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_help.imageset/ic_help-1.png b/AvH Plan/Assets.xcassets/ic_help.imageset/ic_help-1.png new file mode 100644 index 0000000..13cc335 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_help.imageset/ic_help-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_help.imageset/ic_help.png b/AvH Plan/Assets.xcassets/ic_help.imageset/ic_help.png new file mode 100644 index 0000000..410a612 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_help.imageset/ic_help.png differ diff --git a/AvH Plan/Assets.xcassets/ic_history.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_history.imageset/Contents.json new file mode 100644 index 0000000..df4cc02 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_history.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_history.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_history-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_idea.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_idea.imageset/Contents.json new file mode 100644 index 0000000..f8f827e --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_idea.imageset/Contents.json @@ -0,0 +1,20 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_information.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_information.imageset/Contents.json new file mode 100644 index 0000000..4d10782 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_information.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_information.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_information-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_information.imageset/ic_information-1.png b/AvH Plan/Assets.xcassets/ic_information.imageset/ic_information-1.png new file mode 100644 index 0000000..5c4f5ea Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_information.imageset/ic_information-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_information.imageset/ic_information.png b/AvH Plan/Assets.xcassets/ic_information.imageset/ic_information.png new file mode 100644 index 0000000..6a049de Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_information.imageset/ic_information.png differ diff --git a/AvH Plan/Assets.xcassets/ic_latin.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_latin.imageset/Contents.json new file mode 100644 index 0000000..f33a45b --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_latin.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_latin.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_latin-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_latin.imageset/ic_latin-1.png b/AvH Plan/Assets.xcassets/ic_latin.imageset/ic_latin-1.png new file mode 100644 index 0000000..dabc113 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_latin.imageset/ic_latin-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_latin.imageset/ic_latin.png b/AvH Plan/Assets.xcassets/ic_latin.imageset/ic_latin.png new file mode 100644 index 0000000..7d33fdf Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_latin.imageset/ic_latin.png differ diff --git a/AvH Plan/Assets.xcassets/ic_maths.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_maths.imageset/Contents.json new file mode 100644 index 0000000..85815da --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_maths.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_maths.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_maths-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_maths.imageset/ic_maths-1.png b/AvH Plan/Assets.xcassets/ic_maths.imageset/ic_maths-1.png new file mode 100644 index 0000000..e9dd828 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_maths.imageset/ic_maths-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_maths.imageset/ic_maths.png b/AvH Plan/Assets.xcassets/ic_maths.imageset/ic_maths.png new file mode 100644 index 0000000..6c05aff Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_maths.imageset/ic_maths.png differ diff --git a/AvH Plan/Assets.xcassets/ic_music.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_music.imageset/Contents.json new file mode 100644 index 0000000..b9f1846 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_music.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_music.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_music-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_music.imageset/ic_music-1.png b/AvH Plan/Assets.xcassets/ic_music.imageset/ic_music-1.png new file mode 100644 index 0000000..aa25fcc Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_music.imageset/ic_music-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_music.imageset/ic_music.png b/AvH Plan/Assets.xcassets/ic_music.imageset/ic_music.png new file mode 100644 index 0000000..7944a85 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_music.imageset/ic_music.png differ diff --git a/AvH Plan/Assets.xcassets/ic_pe.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_pe.imageset/Contents.json new file mode 100644 index 0000000..24a6554 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_pe.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_pe.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_pe-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_pe.imageset/ic_pe-1.png b/AvH Plan/Assets.xcassets/ic_pe.imageset/ic_pe-1.png new file mode 100644 index 0000000..9769fe4 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_pe.imageset/ic_pe-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_pe.imageset/ic_pe.png b/AvH Plan/Assets.xcassets/ic_pe.imageset/ic_pe.png new file mode 100644 index 0000000..ff73618 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_pe.imageset/ic_pe.png differ diff --git a/AvH Plan/Assets.xcassets/ic_pencil.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_pencil.imageset/Contents.json new file mode 100644 index 0000000..c5a6f81 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_pencil.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_pencil.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_pencil-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_pencil.imageset/ic_pencil-1.png b/AvH Plan/Assets.xcassets/ic_pencil.imageset/ic_pencil-1.png new file mode 100644 index 0000000..7d019f6 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_pencil.imageset/ic_pencil-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_pencil.imageset/ic_pencil.png b/AvH Plan/Assets.xcassets/ic_pencil.imageset/ic_pencil.png new file mode 100644 index 0000000..b736dd2 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_pencil.imageset/ic_pencil.png differ diff --git a/AvH Plan/Assets.xcassets/ic_philosophy.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_philosophy.imageset/Contents.json new file mode 100644 index 0000000..3b61d68 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_philosophy.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_philosophy.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_philosophy-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_philosophy.imageset/ic_philosophy.png b/AvH Plan/Assets.xcassets/ic_philosophy.imageset/ic_philosophy.png new file mode 100644 index 0000000..f95dd61 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_philosophy.imageset/ic_philosophy.png differ diff --git a/AvH Plan/Assets.xcassets/ic_physics.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_physics.imageset/Contents.json new file mode 100644 index 0000000..eb772ad --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_physics.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_physics.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_physics-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_physics.imageset/ic_physics-1.png b/AvH Plan/Assets.xcassets/ic_physics.imageset/ic_physics-1.png new file mode 100644 index 0000000..5d7b978 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_physics.imageset/ic_physics-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_physics.imageset/ic_physics.png b/AvH Plan/Assets.xcassets/ic_physics.imageset/ic_physics.png new file mode 100644 index 0000000..2a74219 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_physics.imageset/ic_physics.png differ diff --git a/AvH Plan/Assets.xcassets/ic_politics.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_politics.imageset/Contents.json new file mode 100644 index 0000000..021975e --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_politics.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_politics.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_politics-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_politics.imageset/ic_politics-1.png b/AvH Plan/Assets.xcassets/ic_politics.imageset/ic_politics-1.png new file mode 100644 index 0000000..66d229a Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_politics.imageset/ic_politics-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_qmark.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_qmark.imageset/Contents.json new file mode 100644 index 0000000..8aa099c --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_qmark.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_qmark.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_qmark-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_qmark.imageset/ic_qmark-1.png b/AvH Plan/Assets.xcassets/ic_qmark.imageset/ic_qmark-1.png new file mode 100644 index 0000000..60e6184 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_qmark.imageset/ic_qmark-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_qmark.imageset/ic_qmark.png b/AvH Plan/Assets.xcassets/ic_qmark.imageset/ic_qmark.png new file mode 100644 index 0000000..9af7f34 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_qmark.imageset/ic_qmark.png differ diff --git a/AvH Plan/Assets.xcassets/ic_religion.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_religion.imageset/Contents.json new file mode 100644 index 0000000..2e5b882 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_religion.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_religion.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_religion-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_religion.imageset/ic_religion-1.png b/AvH Plan/Assets.xcassets/ic_religion.imageset/ic_religion-1.png new file mode 100644 index 0000000..f7cdd7b Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_religion.imageset/ic_religion-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_spanish.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_spanish.imageset/Contents.json new file mode 100644 index 0000000..e041c1e --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_spanish.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_spanish.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_spanish-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_spanish.imageset/ic_spanish-1.png b/AvH Plan/Assets.xcassets/ic_spanish.imageset/ic_spanish-1.png new file mode 100644 index 0000000..57a90d6 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_spanish.imageset/ic_spanish-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_spanish.imageset/ic_spanish.png b/AvH Plan/Assets.xcassets/ic_spanish.imageset/ic_spanish.png new file mode 100644 index 0000000..564f272 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_spanish.imageset/ic_spanish.png differ diff --git a/AvH Plan/Assets.xcassets/ic_tomato.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_tomato.imageset/Contents.json new file mode 100644 index 0000000..25a4e32 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_tomato.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_tomato.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_tomato-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_tomato.imageset/ic_tomato-1.png b/AvH Plan/Assets.xcassets/ic_tomato.imageset/ic_tomato-1.png new file mode 100644 index 0000000..789aacc Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_tomato.imageset/ic_tomato-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_tomato.imageset/ic_tomato.png b/AvH Plan/Assets.xcassets/ic_tomato.imageset/ic_tomato.png new file mode 100644 index 0000000..1150169 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_tomato.imageset/ic_tomato.png differ diff --git a/AvH Plan/Assets.xcassets/ic_turkish.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_turkish.imageset/Contents.json new file mode 100644 index 0000000..487b23a --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_turkish.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_turkish.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_turkish-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_turkish.imageset/ic_turkish-1.png b/AvH Plan/Assets.xcassets/ic_turkish.imageset/ic_turkish-1.png new file mode 100644 index 0000000..0876a62 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_turkish.imageset/ic_turkish-1.png differ diff --git a/AvH Plan/Assets.xcassets/ic_turkish.imageset/ic_turkish.png b/AvH Plan/Assets.xcassets/ic_turkish.imageset/ic_turkish.png new file mode 100644 index 0000000..957149c Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_turkish.imageset/ic_turkish.png differ diff --git a/AvH Plan/Assets.xcassets/ic_wat.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_wat.imageset/Contents.json new file mode 100644 index 0000000..6a572f0 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_wat.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_wat.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_wat-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_writing.imageset/Contents.json b/AvH Plan/Assets.xcassets/ic_writing.imageset/Contents.json new file mode 100644 index 0000000..3b7fea9 --- /dev/null +++ b/AvH Plan/Assets.xcassets/ic_writing.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_writing.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_writing-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AvH Plan/Assets.xcassets/ic_writing.imageset/ic_writing-1.png b/AvH Plan/Assets.xcassets/ic_writing.imageset/ic_writing-1.png new file mode 100644 index 0000000..e737507 Binary files /dev/null and b/AvH Plan/Assets.xcassets/ic_writing.imageset/ic_writing-1.png differ diff --git a/AvH Plan/Base.lproj/Main.storyboard b/AvH Plan/Base.lproj/Main.storyboard index 8c5c7b7..fd63443 100644 --- a/AvH Plan/Base.lproj/Main.storyboard +++ b/AvH Plan/Base.lproj/Main.storyboard @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@ - + @@ -43,16 +43,16 @@ - + - + - + + + + + + + + + + - + + - + @@ -148,7 +158,7 @@ - + @@ -157,7 +167,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -197,6 +239,8 @@ + + @@ -205,7 +249,9 @@ - + + + diff --git a/AvH Plan/FirstViewController.swift b/AvH Plan/FirstViewController.swift index 13d0bc9..80fe338 100644 --- a/AvH Plan/FirstViewController.swift +++ b/AvH Plan/FirstViewController.swift @@ -12,7 +12,7 @@ import Alamofire import SQLite3 class FirstViewController : UIViewController, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout { - + let reuseIdentifier = "cell" @IBOutlet weak var collectionView: UICollectionView! let queue = DispatchQueue(label: "work-queue") @@ -46,6 +46,7 @@ class FirstViewController : UIViewController, UICollectionViewDataSource, UIColl override func viewDidLoad() { super.viewDidLoad() + collectionView.backgroundColor = UIColor(red: 0.8, green: 0.8, blue: 0.8, alpha: 1.0) // let layout = collectionView.collectionViewLayout as! UICollectionViewFlowLayout @@ -68,18 +69,96 @@ class FirstViewController : UIViewController, UICollectionViewDataSource, UIColl let cell = collectionView.dequeueReusableCell(withReuseIdentifier: reuseIdentifier, for: indexPath as IndexPath) as! CollectionViewCell if self.group.count != 0 { cell.group.text = self.group[indexPath.item] - cell.course.text = self.course[indexPath.item] cell.additional.text = self.additional[indexPath.item] cell.date.text = self.date[indexPath.item] cell.time.text = self.time[indexPath.item] cell.room.text = self.room[indexPath.item] + + let course = self.course[indexPath.item] + let image = getImage(from: course) + + if image != nil { + let attachment: NSTextAttachment = NSTextAttachment() + attachment.bounds = CGRect(x: 0, y: 0, width: cell.course.frame.height - 6, height: cell.course.frame.height - 6) + attachment.image = image + + let courseImage = NSMutableAttributedString(attachment: attachment) + let courseString = NSAttributedString(string: " " + course) + courseImage.append(courseString) + + cell.course.attributedText = courseImage + } else { + cell.course.text = course + } } + +// cell.courseIcon.frame = CGRect(x: 0, y: 0, width: cell.course.frame.height, height: cell.course.frame.height) + // cell.backgroundColor = UIColor(red: 0.39, green: 0.71, blue: 0.96, alpha: 1.0) cell.backgroundColor = UIColor(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0) cell.tintView.backgroundColor = cell.backgroundColor return cell } + func getImage(from icon: String) -> UIImage? { + var imagePath = "" + let i = icon.lowercased() + if i.contains("deu") || i.contains("dep") || i.contains("daz") { + imagePath = "ic_german" + } else if i.contains("mat") || i.contains("map") { + imagePath = "ic_maths" + } else if i.contains("eng") || i.contains("enp") || i.contains("ena") { + imagePath = "ic_english" + } else if i.contains("spo") || i.contains("spp") || i.contains("spth") { + imagePath = "ic_pe" + } else if i.contains("pol") || i.contains("pop") { + imagePath = "ic_politics" + } else if i.contains("dar") || i.contains("dap") { + imagePath = "ic_drama" + } else if i.contains("phy") || i.contains("php") { + imagePath = "ic_physics" + } else if i.contains("bio") || i.contains("bip") || i.contains("nw") { + imagePath = "ic_biology" + } else if i.contains("che") || i.contains("chp") { + imagePath = "ic_chemistry" + } else if i.contains("phi") || i.contains("psp") { + imagePath = "ic_philosophy" + } else if i.contains("laa") || i.contains("laf") || i.contains("lat") { + imagePath = "ic_latin" + } else if i.contains("spa") || i.contains("spf") { + imagePath = "ic_spanish" + } else if i.contains("fra") || i.contains("frf") || i.contains("frz") { + imagePath = "ic_french" + } else if i.contains("inf") { + imagePath = "ic_compsci" + } else if i.contains("ges") { + imagePath = "ic_history" + } else if i.contains("rel") { + imagePath = "ic_religion" + } else if i.contains("geg") || i.contains("wuk") { + imagePath = "ic_geography" + } else if i.contains("kun") { + imagePath = "ic_arts" + } else if i.contains("mus") { + imagePath = "ic_music" + } else if i.contains("tue") { + imagePath = "ic_turkish" + } else if i.contains("chi") { + imagePath = "ic_chinese" + } else if i.contains("gll") { + imagePath = "ic_gll" + } else if i.contains("wat") { + imagePath = "ic_wat" + } else if i.contains("för") { + imagePath = "ic_help" + } else if i.contains("wp") || i.contains("met") { + imagePath = "ic_pencil" + } else { + return nil + } + return UIImage(named: imagePath) + } + func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { print("You selected cell#\(indexPath.item)!") }