diff --git a/ScienceJournal/Assets.xcassets/Contents.json b/ScienceJournal/Assets.xcassets/Contents.json index da4a164c..73c00596 100644 --- a/ScienceJournal/Assets.xcassets/Contents.json +++ b/ScienceJournal/Assets.xcassets/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/Contents.json index da4a164c..73c00596 100644 --- a/ScienceJournal/Assets.xcassets/Sensors Full Color/Contents.json +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/ic_sensor_temperature_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/ic_sensor_temperature_full_color.imageset/Contents.json new file mode 100644 index 00000000..41127eb8 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/ic_sensor_temperature_full_color.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mkrsci_temperature_3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mkrsci_temperature_3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mkrsci_temperature_3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/ic_sensor_temperature_full_color.imageset/mkrsci_temperature_3.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/ic_sensor_temperature_full_color.imageset/mkrsci_temperature_3.png new file mode 100644 index 00000000..dc990f19 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/ic_sensor_temperature_full_color.imageset/mkrsci_temperature_3.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/ic_sensor_temperature_full_color.imageset/mkrsci_temperature_3@2x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/ic_sensor_temperature_full_color.imageset/mkrsci_temperature_3@2x.png new file mode 100644 index 00000000..238550f2 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/ic_sensor_temperature_full_color.imageset/mkrsci_temperature_3@2x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/ic_sensor_temperature_full_color.imageset/mkrsci_temperature_3@3x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/ic_sensor_temperature_full_color.imageset/mkrsci_temperature_3@3x.png new file mode 100644 index 00000000..31dcc742 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/ic_sensor_temperature_full_color.imageset/mkrsci_temperature_3@3x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_x_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_x_full_color.imageset/Contents.json new file mode 100644 index 00000000..571ff380 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_x_full_color.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mkrsci_gyrx_2.pdf", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_x_full_color.imageset/mkrsci_gyrx_2.pdf b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_x_full_color.imageset/mkrsci_gyrx_2.pdf new file mode 100644 index 00000000..21c66afc Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_x_full_color.imageset/mkrsci_gyrx_2.pdf differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_y_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_y_full_color.imageset/Contents.json new file mode 100644 index 00000000..7eaaeb64 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_y_full_color.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mkrsci_gyry_2.pdf", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_y_full_color.imageset/mkrsci_gyry_2.pdf b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_y_full_color.imageset/mkrsci_gyry_2.pdf new file mode 100644 index 00000000..44293673 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_y_full_color.imageset/mkrsci_gyry_2.pdf differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_z_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_z_full_color.imageset/Contents.json new file mode 100644 index 00000000..a52ba870 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_z_full_color.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mkrsci_gyrz_2.pdf", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_z_full_color.imageset/mkrsci_gyrz_2.pdf b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_z_full_color.imageset/mkrsci_gyrz_2.pdf new file mode 100644 index 00000000..96e4ef70 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_gyr_z_full_color.imageset/mkrsci_gyrz_2.pdf differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_magnetometer_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_magnetometer_full_color.imageset/Contents.json new file mode 100644 index 00000000..96838a30 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_magnetometer_full_color.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mkrsci_magnetometer_3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mkrsci_magnetometer_3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mkrsci_magnetometer_3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_magnetometer_full_color.imageset/mkrsci_magnetometer_3.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_magnetometer_full_color.imageset/mkrsci_magnetometer_3.png new file mode 100644 index 00000000..73834ed0 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_magnetometer_full_color.imageset/mkrsci_magnetometer_3.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_magnetometer_full_color.imageset/mkrsci_magnetometer_3@2x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_magnetometer_full_color.imageset/mkrsci_magnetometer_3@2x.png new file mode 100644 index 00000000..97f97dd5 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_magnetometer_full_color.imageset/mkrsci_magnetometer_3@2x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_magnetometer_full_color.imageset/mkrsci_magnetometer_3@3x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_magnetometer_full_color.imageset/mkrsci_magnetometer_3@3x.png new file mode 100644 index 00000000..232e1282 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_magnetometer_full_color.imageset/mkrsci_magnetometer_3@3x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_resistance_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_resistance_full_color.imageset/Contents.json new file mode 100644 index 00000000..dcc121fb --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_resistance_full_color.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mkrsci_resistance_3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mkrsci_resistance_3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mkrsci_resistance_3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_resistance_full_color.imageset/mkrsci_resistance_3.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_resistance_full_color.imageset/mkrsci_resistance_3.png new file mode 100644 index 00000000..f2c6d59e Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_resistance_full_color.imageset/mkrsci_resistance_3.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_resistance_full_color.imageset/mkrsci_resistance_3@2x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_resistance_full_color.imageset/mkrsci_resistance_3@2x.png new file mode 100644 index 00000000..2440d48e Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_resistance_full_color.imageset/mkrsci_resistance_3@2x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_resistance_full_color.imageset/mkrsci_resistance_3@3x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_resistance_full_color.imageset/mkrsci_resistance_3@3x.png new file mode 100644 index 00000000..6705bed2 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_resistance_full_color.imageset/mkrsci_resistance_3@3x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_x_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_x_full_color.imageset/Contents.json new file mode 100644 index 00000000..103a9ebb --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_x_full_color.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mkrsci_accx_2.pdf", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_x_full_color.imageset/mkrsci_accx_2.pdf b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_x_full_color.imageset/mkrsci_accx_2.pdf new file mode 100644 index 00000000..d6a82f4c Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_x_full_color.imageset/mkrsci_accx_2.pdf differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_y_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_y_full_color.imageset/Contents.json new file mode 100644 index 00000000..aad536d6 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_y_full_color.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mkrsci_accy_2.pdf", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_y_full_color.imageset/mkrsci_accy_2.pdf b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_y_full_color.imageset/mkrsci_accy_2.pdf new file mode 100644 index 00000000..e1aac819 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_y_full_color.imageset/mkrsci_accy_2.pdf differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_z_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_z_full_color.imageset/Contents.json new file mode 100644 index 00000000..ef589aca --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_z_full_color.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mkrsci_accz_2.pdf", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_z_full_color.imageset/mkrsci_accz_2.pdf b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_z_full_color.imageset/mkrsci_accz_2.pdf new file mode 100644 index 00000000..e60c6bbf Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_acc_z_full_color.imageset/mkrsci_accz_2.pdf differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_current_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_current_full_color.imageset/Contents.json new file mode 100644 index 00000000..43176586 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_current_full_color.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mkrsci_current_3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mkrsci_current_3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mkrsci_current_3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_current_full_color.imageset/mkrsci_current_3.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_current_full_color.imageset/mkrsci_current_3.png new file mode 100644 index 00000000..29d9c236 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_current_full_color.imageset/mkrsci_current_3.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_current_full_color.imageset/mkrsci_current_3@2x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_current_full_color.imageset/mkrsci_current_3@2x.png new file mode 100644 index 00000000..56319daf Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_current_full_color.imageset/mkrsci_current_3@2x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_current_full_color.imageset/mkrsci_current_3@3x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_current_full_color.imageset/mkrsci_current_3@3x.png new file mode 100644 index 00000000..4eb0e627 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_current_full_color.imageset/mkrsci_current_3@3x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_1_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_1_full_color.imageset/Contents.json new file mode 100644 index 00000000..929e6976 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_1_full_color.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mkrsci_3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mkrsci_3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mkrsci_3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_1_full_color.imageset/mkrsci_3.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_1_full_color.imageset/mkrsci_3.png new file mode 100644 index 00000000..72f634e2 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_1_full_color.imageset/mkrsci_3.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_1_full_color.imageset/mkrsci_3@2x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_1_full_color.imageset/mkrsci_3@2x.png new file mode 100644 index 00000000..011afb47 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_1_full_color.imageset/mkrsci_3@2x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_1_full_color.imageset/mkrsci_3@3x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_1_full_color.imageset/mkrsci_3@3x.png new file mode 100644 index 00000000..f0bcdc68 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_1_full_color.imageset/mkrsci_3@3x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_2_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_2_full_color.imageset/Contents.json new file mode 100644 index 00000000..929e6976 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_2_full_color.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mkrsci_3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mkrsci_3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mkrsci_3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_2_full_color.imageset/mkrsci_3.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_2_full_color.imageset/mkrsci_3.png new file mode 100644 index 00000000..72f634e2 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_2_full_color.imageset/mkrsci_3.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_2_full_color.imageset/mkrsci_3@2x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_2_full_color.imageset/mkrsci_3@2x.png new file mode 100644 index 00000000..011afb47 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_2_full_color.imageset/mkrsci_3@2x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_2_full_color.imageset/mkrsci_3@3x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_2_full_color.imageset/mkrsci_3@3x.png new file mode 100644 index 00000000..f0bcdc68 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_2_full_color.imageset/mkrsci_3@3x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_3_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_3_full_color.imageset/Contents.json new file mode 100644 index 00000000..929e6976 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_3_full_color.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mkrsci_3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mkrsci_3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mkrsci_3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_3_full_color.imageset/mkrsci_3.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_3_full_color.imageset/mkrsci_3.png new file mode 100644 index 00000000..72f634e2 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_3_full_color.imageset/mkrsci_3.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_3_full_color.imageset/mkrsci_3@2x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_3_full_color.imageset/mkrsci_3@2x.png new file mode 100644 index 00000000..011afb47 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_3_full_color.imageset/mkrsci_3@2x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_3_full_color.imageset/mkrsci_3@3x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_3_full_color.imageset/mkrsci_3@3x.png new file mode 100644 index 00000000..f0bcdc68 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_input_3_full_color.imageset/mkrsci_3@3x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_linear_accelerometer_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_linear_accelerometer_full_color.imageset/Contents.json new file mode 100644 index 00000000..e482df65 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_linear_accelerometer_full_color.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mkrsci_linear_accelerometer_3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mkrsci_linear_accelerometer_3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mkrsci_linear_accelerometer_3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_linear_accelerometer_full_color.imageset/mkrsci_linear_accelerometer_3.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_linear_accelerometer_full_color.imageset/mkrsci_linear_accelerometer_3.png new file mode 100644 index 00000000..adccac08 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_linear_accelerometer_full_color.imageset/mkrsci_linear_accelerometer_3.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_linear_accelerometer_full_color.imageset/mkrsci_linear_accelerometer_3@2x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_linear_accelerometer_full_color.imageset/mkrsci_linear_accelerometer_3@2x.png new file mode 100644 index 00000000..8f941e4c Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_linear_accelerometer_full_color.imageset/mkrsci_linear_accelerometer_3@2x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_linear_accelerometer_full_color.imageset/mkrsci_linear_accelerometer_3@3x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_linear_accelerometer_full_color.imageset/mkrsci_linear_accelerometer_3@3x.png new file mode 100644 index 00000000..32e119e9 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_sensor_linear_accelerometer_full_color.imageset/mkrsci_linear_accelerometer_3@3x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_voltage_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_voltage_full_color.imageset/Contents.json new file mode 100644 index 00000000..dc2dae0c --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_voltage_full_color.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mkrsci_voltage_3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mkrsci_voltage_3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mkrsci_voltage_3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_voltage_full_color.imageset/mkrsci_voltage_3.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_voltage_full_color.imageset/mkrsci_voltage_3.png new file mode 100644 index 00000000..db00ca36 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_voltage_full_color.imageset/mkrsci_voltage_3.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_voltage_full_color.imageset/mkrsci_voltage_3@2x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_voltage_full_color.imageset/mkrsci_voltage_3@2x.png new file mode 100644 index 00000000..4611e969 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_voltage_full_color.imageset/mkrsci_voltage_3@2x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_voltage_full_color.imageset/mkrsci_voltage_3@3x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_voltage_full_color.imageset/mkrsci_voltage_3@3x.png new file mode 100644 index 00000000..3198e067 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/mkrsci_voltage_full_color.imageset/mkrsci_voltage_3@3x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_color_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_color_full_color.imageset/Contents.json new file mode 100644 index 00000000..d843b04d --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_color_full_color.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "sensor_color_2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "sensor_color_2@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "sensor_color_2@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_color_full_color.imageset/sensor_color_2.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_color_full_color.imageset/sensor_color_2.png new file mode 100644 index 00000000..97254f0e Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_color_full_color.imageset/sensor_color_2.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_color_full_color.imageset/sensor_color_2@2x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_color_full_color.imageset/sensor_color_2@2x.png new file mode 100644 index 00000000..5b9fbf9c Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_color_full_color.imageset/sensor_color_2@2x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_color_full_color.imageset/sensor_color_2@3x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_color_full_color.imageset/sensor_color_2@3x.png new file mode 100644 index 00000000..e2f3053d Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_color_full_color.imageset/sensor_color_2@3x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_humidity_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_humidity_full_color.imageset/Contents.json new file mode 100644 index 00000000..2613e6f3 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_humidity_full_color.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "sensor_humidity_3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "sensor_humidity_3@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "sensor_humidity_3@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_humidity_full_color.imageset/sensor_humidity_3.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_humidity_full_color.imageset/sensor_humidity_3.png new file mode 100644 index 00000000..0237b495 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_humidity_full_color.imageset/sensor_humidity_3.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_humidity_full_color.imageset/sensor_humidity_3@2x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_humidity_full_color.imageset/sensor_humidity_3@2x.png new file mode 100644 index 00000000..5ea728e0 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_humidity_full_color.imageset/sensor_humidity_3@2x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_humidity_full_color.imageset/sensor_humidity_3@3x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_humidity_full_color.imageset/sensor_humidity_3@3x.png new file mode 100644 index 00000000..b2d95824 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_humidity_full_color.imageset/sensor_humidity_3@3x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_proximity_full_color.imageset/Contents.json b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_proximity_full_color.imageset/Contents.json new file mode 100644 index 00000000..6e292f17 --- /dev/null +++ b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_proximity_full_color.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "nano33_ble_sense_proximity_2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "nano33_ble_sense_proximity_2@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "nano33_ble_sense_proximity_2@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_proximity_full_color.imageset/nano33_ble_sense_proximity_2.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_proximity_full_color.imageset/nano33_ble_sense_proximity_2.png new file mode 100644 index 00000000..3213ab89 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_proximity_full_color.imageset/nano33_ble_sense_proximity_2.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_proximity_full_color.imageset/nano33_ble_sense_proximity_2@2x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_proximity_full_color.imageset/nano33_ble_sense_proximity_2@2x.png new file mode 100644 index 00000000..475ffc17 Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_proximity_full_color.imageset/nano33_ble_sense_proximity_2@2x.png differ diff --git a/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_proximity_full_color.imageset/nano33_ble_sense_proximity_2@3x.png b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_proximity_full_color.imageset/nano33_ble_sense_proximity_2@3x.png new file mode 100644 index 00000000..47740f6c Binary files /dev/null and b/ScienceJournal/Assets.xcassets/Sensors Full Color/sensor_proximity_full_color.imageset/nano33_ble_sense_proximity_2@3x.png differ diff --git a/ScienceJournal/BLESupport/SensorSpec+BLESensorInterface.swift b/ScienceJournal/BLESupport/SensorSpec+BLESensorInterface.swift index 76cf198a..6ccec879 100644 --- a/ScienceJournal/BLESupport/SensorSpec+BLESensorInterface.swift +++ b/ScienceJournal/BLESupport/SensorSpec+BLESensorInterface.swift @@ -29,9 +29,13 @@ extension SensorSpec { proto.info.address = bleSensorInterface.identifier proto.info.providerId = bleSensorInterface.providerId proto.rememberedAppearance.name = bleSensorInterface.name - proto.rememberedAppearance.iconPath = IconPath(type: .proto, pathString: nil).proto proto.rememberedAppearance.units = bleSensorInterface.unitDescription proto.rememberedAppearance.shortDescription = bleSensorInterface.textDescription + + let iconPath = IconPath(type: .proto, pathString: bleSensorInterface.identifier).proto + proto.rememberedAppearance.iconPath = iconPath + proto.rememberedAppearance.largeIconPath = iconPath + self.init(proto: proto) } diff --git a/ScienceJournal/Metadata/ExperimentDataParser.swift b/ScienceJournal/Metadata/ExperimentDataParser.swift index 631f8831..26a2c228 100644 --- a/ScienceJournal/Metadata/ExperimentDataParser.swift +++ b/ScienceJournal/Metadata/ExperimentDataParser.swift @@ -271,7 +271,7 @@ class ExperimentDataParser { private func imageAttributesForAppearance(_ appearance: BasicSensorAppearance, size: CGSize?, value: Double?) -> (UIImage?, String?) { - guard let iconPath = appearance.largeIconPath, iconPath.type == .builtin else { + guard let iconPath = appearance.largeIconPath else { return (UIImage(named: ExperimentDataParser.genericLargeIconName), nil) } @@ -285,7 +285,7 @@ class ExperimentDataParser { } switch iconPath.type { - case .builtin: + case .builtin, .proto: return (UIImage(named: sensor.iconName + ExperimentDataParser.largeIconSuffix), nil) default: return (UIImage(named: ExperimentDataParser.genericLargeIconName), nil) }