Add new default experiment (#53)

Author: manuelzomer

ScienceJournal/Assets.xcassets/Default Experiment/default_experiment_action_area.imageset/default_experiment_action_area.png

@@ -1,7 +1,7 @@
 {
 "images" : [
  {
-"filename" : "default_experiment_action_area.png",
+"filename" : "default_experiment_getting_started.png",
 "idiom" : "universal",
 "scale" : "1x"
  },

ScienceJournal/Assets.xcassets/Default Experiment/default_experiment_camera.imageset/default_experiment_camera.png

@@ -1,7 +1,7 @@
 {
 "images" : [
  {
-"filename" : "default_experiment_camera.png",
+"filename" : "default_experiment_website.png",
 "idiom" : "universal",
 "scale" : "1x"
  },

ScienceJournal/Assets.xcassets/Default Experiment/default_experiment_action_area.imageset/Contents.jsonrenamed to ScienceJournal/Assets.xcassets/Default Experiment/default_experiment_getting_started.imageset/Contents.json

@@ -34,145 +34,57 @@ class DefaultExperimentComposer {
 
  //TODO localize content
 addIntroImage(experiment: experiment)
-addIntroNote(experiment: experiment)
-addNewExperimentNote(experiment: experiment)
-addToolbarNote(experiment: experiment)
- //addActionAreaNote(experiment: experiment)
-addSensorNote(experiment: experiment)
-addSensorSettingsNote(experiment: experiment)
-addNotesNote(experiment: experiment)
-addSnapshotNote(experiment: experiment)
-addPhotosNote(experiment: experiment)
-addActivitiesNote(experiment: experiment)
-
+addActionAreaImage(experiment: experiment)
+addWebsiteImage(experiment: experiment)
+addSidebarImage(experiment: experiment)
 }
 
- // swiftlint:disable line_length
 privatefunc addIntroImage(experiment:Experiment){
 iflet defaultExperimentPicture =UIImage(named:"default_experiment_picture"){
 letcoverPicturePath= metaDataManager.relativePicturePath(for:"default_experiment_picture")
  metaDataManager.saveImage(defaultExperimentPicture, atPicturePath: coverPicturePath, experimentID: experiment.ID)
 letpictureNote=PictureNote()
  pictureNote.timestamp = timestamp +100
- pictureNote.caption =Caption(text:"Shape your future! Reason with data and think like a real scientist! Turn your phone into a pocket science laboratory with tools to measure light, motion, sound and more!")
-
- //pictureNote.caption = Caption(text: String.firstExperimentPictureNoteCaption)
+ pictureNote.caption =Caption(text:String.firstExperimentNote1)
  pictureNote.filePath = coverPicturePath
  experiment.notes.append(pictureNote)
  metaDataManager.updateCoverImageForAddedImageIfNeeded(imagePath: coverPicturePath, experiment: experiment)
 }
 }
 
-privatefunc addIntroNote(experiment:Experiment){
- //let textNote = TextNote(text: String.firstExperimentTextNote)
-lettextNote=TextNote(text:"Arduino Science Journal is a digital science journal that you can use to document projects through notes, photos, and your phone's built-in sensors, as well as external boards.")
- textNote.timestamp = timestamp +200
- experiment.notes.append(textNote)
-}
-
-privatefunc addNewExperimentNote(experiment:Experiment){
-iflet picture =UIImage(named:"default_experiment_new_experiment"){
-letpicturePath= metaDataManager.relativePicturePath(for:"default_experiment_new_experiment")
- metaDataManager.saveImage(picture, atPicturePath: picturePath, experimentID: experiment.ID)
-letpictureNote=PictureNote()
- pictureNote.timestamp = timestamp +300
- pictureNote.caption =Caption(text:"To create a new experiment, click on the + in the bottom of the Arduino Science Journal app home screen. Then click on the pencil icon in the top to give your experiment a good name!")
-
- //pictureNote.caption = Caption(text: String.firstExperimentPictureNoteCaption)
- pictureNote.filePath = picturePath
- experiment.notes.append(pictureNote)
-}
-}
-
-privatefunc addToolbarNote(experiment:Experiment){
+privatefunc addActionAreaImage(experiment:Experiment){
 iflet picture =UIImage(named:"default_experiment_toolbar"){
 letpicturePath= metaDataManager.relativePicturePath(for:"default_experiment_toolbar")
  metaDataManager.saveImage(picture, atPicturePath: picturePath, experimentID: experiment.ID)
 letpictureNote=PictureNote()
- pictureNote.timestamp = timestamp +400
- pictureNote.caption =Caption(text:"The observation toolbar in the app can help you record the data around you. Let’s take a closer look!")
- pictureNote.filePath = picturePath
- experiment.notes.append(pictureNote)
-}
-}
-
-privatefunc addActionAreaNote(experiment:Experiment){
-iflet picture =UIImage(named:"default_experiment_action_area"){
-letpicturePath= metaDataManager.relativePicturePath(for:"default_experiment_action_area")
- metaDataManager.saveImage(picture, atPicturePath: picturePath, experimentID: experiment.ID)
-letpictureNote=PictureNote()
- pictureNote.timestamp = timestamp +400
- pictureNote.caption =Caption(text:"The observation toolbar in the app can help you record the data around you. Let’s take a closer look!")
- pictureNote.filePath = picturePath
- experiment.notes.append(pictureNote)
-}
-}
-
-privatefunc addSensorNote(experiment:Experiment){
-iflet picture =UIImage(named:"default_experiment_sensor_button"){
-letpicturePath= metaDataManager.relativePicturePath(for:"default_experiment_sensor_button")
- metaDataManager.saveImage(picture, atPicturePath: picturePath, experimentID: experiment.ID)
-letpictureNote=PictureNote()
- pictureNote.timestamp = timestamp +500
- pictureNote.caption =Caption(text:"To start exploring your world by measuring light, sound, movement, and more, tap the Sensor button.")
- pictureNote.filePath = picturePath
- experiment.notes.append(pictureNote)
-}
-}
-
-privatefunc addSensorSettingsNote(experiment:Experiment){
-iflet picture =UIImage(named:"default_experiment_sensor_settings"){
-letpicturePath= metaDataManager.relativePicturePath(for:"default_experiment_sensor_settings")
- metaDataManager.saveImage(picture, atPicturePath: picturePath, experimentID: experiment.ID)
-letpictureNote=PictureNote()
- pictureNote.timestamp = timestamp +600
- pictureNote.caption =Caption(text:"You can manage your sensors in the Sensor settings screen. Go back to the sensor tab in the toolbar and tap the Gear icon on the sensor card.")
+ pictureNote.timestamp = timestamp +200
+ pictureNote.caption =Caption(text:String.firstExperimentNote2)
  pictureNote.filePath = picturePath
  experiment.notes.append(pictureNote)
 }
 }
 
-privatefuncaddNotesNote(experiment:Experiment){
-iflet picture =UIImage(named:"default_experiment_note_button"){
-letpicturePath= metaDataManager.relativePicturePath(for:"default_experiment_note_button")
+privatefuncaddWebsiteImage(experiment:Experiment){
+iflet picture =UIImage(named:"default_experiment_website"){
+letpicturePath= metaDataManager.relativePicturePath(for:"default_experiment_website")
  metaDataManager.saveImage(picture, atPicturePath: picturePath, experimentID: experiment.ID)
 letpictureNote=PictureNote()
- pictureNote.timestamp = timestamp +700
- pictureNote.caption =Caption(text:"You can add notes and hypotheses to your experiments by tapping the Note icon.")
- pictureNote.filePath = picturePath
- experiment.notes.append(pictureNote)
-}
-}
-
-privatefunc addSnapshotNote(experiment:Experiment){
-iflet picture =UIImage(named:"default_experiment_snapshot_button"){
-letpicturePath= metaDataManager.relativePicturePath(for:"default_experiment_snapshot_button")
- metaDataManager.saveImage(picture, atPicturePath: picturePath, experimentID: experiment.ID)
-letpictureNote=PictureNote()
- pictureNote.timestamp = timestamp +800
- pictureNote.caption =Caption(text:"To make note of a single sensor measurement, tap the Snapshot Sensor button. You can also record sensor data over time, select a sensor and press the Record button to start capturing data.")
+ pictureNote.timestamp = timestamp +300
+ pictureNote.caption =Caption(text:String.firstExperimentNote3)
  pictureNote.filePath = picturePath
  experiment.notes.append(pictureNote)
 }
 }
 
-privatefuncaddPhotosNote(experiment:Experiment){
-iflet picture =UIImage(named:"default_experiment_camera"){
-letpicturePath= metaDataManager.relativePicturePath(for:"default_experiment_camera")
+privatefuncaddSidebarImage(experiment:Experiment){
+iflet picture =UIImage(named:"default_experiment_getting_started"){
+letpicturePath= metaDataManager.relativePicturePath(for:"default_experiment_getting_started")
  metaDataManager.saveImage(picture, atPicturePath: picturePath, experimentID: experiment.ID)
 letpictureNote=PictureNote()
- pictureNote.timestamp = timestamp +1000
- pictureNote.caption =Caption(text:"Add camera shots, notes and photos to keep track of your observations while recording.")
+ pictureNote.timestamp = timestamp +400
+ pictureNote.caption =Caption(text:String.firstExperimentNote4)
  pictureNote.filePath = picturePath
  experiment.notes.append(pictureNote)
 }
 }
-
-privatefunc addActivitiesNote(experiment:Experiment){
-lettextNote=TextNote(text:"Find activities to try at\nscience-journal.arduino.cc\n\nNow that you know the basics of using Arduino Science Journal, you can use it to conduct experiments and explore your world!")
- textNote.timestamp = timestamp +1100
- experiment.notes.append(textNote)
-}
-
- // swiftlint:enable line_length
 }

ScienceJournal/Assets.xcassets/Default Experiment/default_experiment_getting_started.imageset/default_experiment_getting_started.png

@@ -290,6 +290,10 @@ extension String {
 staticpublicvarexportOptionsTitle:String{return"export_options_title".localized }
 staticpublicvarexportPdfModalTitle:String{return"export_pdf_modal_title".localized }
 staticpublicvarexportPhotoChooserTitle:String{return"export_photo_chooser_title".localized }
+staticpublicvarfirstExperimentNote1:String{return"first_experiment_note_1".localized }
+staticpublicvarfirstExperimentNote2:String{return"first_experiment_note_2".localized }
+staticpublicvarfirstExperimentNote3:String{return"first_experiment_note_3".localized }
+staticpublicvarfirstExperimentNote4:String{return"first_experiment_note_4".localized }
 staticpublicvarfirstExperimentPictureNoteCaption:String{return"first_experiment_picture_note_caption".localized }
 staticpublicvarfirstExperimentSecondTextNote:String{return"first_experiment_second_text_note".localized }
 staticpublicvarfirstExperimentTextNote:String{return"first_experiment_text_note".localized }